summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2005-07-19 14:36:34 -0400
committerKay Sievers <kay.sievers@suse.de>2005-07-19 14:36:34 -0400
commit33aa91b1befa3e4f8da57714ac09b7044cf54451 (patch)
treecc552482733ef31977d0fcfa8c7e445705ef5653
parent46f01c6dc44ba516e42d5c8c1ada98a743f916f2 (diff)
usb_id: fix typo
-rw-r--r--extras/scsi_id/scsi_id.84
-rw-r--r--extras/usb_id/usb_id.c4
-rw-r--r--extras/volume_id/volume_id/ocfs2.c2
3 files changed, 7 insertions, 3 deletions
diff --git a/extras/scsi_id/scsi_id.8 b/extras/scsi_id/scsi_id.8
index 68d4a1c041..26df0d3e66 100644
--- a/extras/scsi_id/scsi_id.8
+++ b/extras/scsi_id/scsi_id.8
@@ -58,6 +58,10 @@ leading \-, runs in a hotplug mode, and expects the environment variable
DEVPATH to specify the corresponding sysfs device. See section below on
usage with \fBudev\fP.
.TP
+.BI \-a
+Always print information (model, vendor strings) about the device even
+if it does not support VPD pages.
+.TP
.BI \-b
The default behaviour \- treat the device as black listed, and do nothing
unless a white listed device is found in the scsi_id config\-file.
diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index 1eb45b9114..720a0f5df7 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -316,11 +316,11 @@ static int usb_id(const char *target_path)
/* usb device directory */
usb_dev = sysfs_get_device_parent(interface_dev);
- if (!strcmp(interface_dev->bus, "bus") != 0) {
+ if (strcmp(interface_dev->bus, "usb") != 0) {
info("%s is not an usb device", target_path);
return 1;
}
-
+
if_class = sysfs_get_device_attr(interface_dev, "bInterfaceClass");
if (!if_class) {
info("%s: cannot get bInterfaceClass attribute", interface_dev->name);
diff --git a/extras/volume_id/volume_id/ocfs2.c b/extras/volume_id/volume_id/ocfs2.c
index 1f2819c0cc..90a6bd531c 100644
--- a/extras/volume_id/volume_id/ocfs2.c
+++ b/extras/volume_id/volume_id/ocfs2.c
@@ -51,7 +51,7 @@ This is one has been simplified since we only care about the superblock.
*/
struct ocfs2_super_block {
- __u8 i_signature[8]; /* Signature for validation */
+ __u8 i_signature[8]; /* Signature for validation */
__u32 i_generation; /* Generation number */
__s16 i_suballoc_slot; /* Slot suballocator this inode belongs to */
__u16 i_suballoc_bit; /* Bit offset in suballocator block group */