usb_id: fix typo

diff --git a/extras/scsi_id/scsi_id.8 b/extras/scsi_id/scsi_id.8
index 68d4a1c041a65a6867e9dd54c28e2ff86e89846f..26df0d3e669ac2b1e99a4bab11aaf1c103d306c8 100644 (file)
--- 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
 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.
 .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 1eb45b911412ca28b0f27a3a7f132bc01dae2d55..720a0f5df7323e934813a21a5993ae9782917ec2 100644 (file)
--- 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);
 
        /* 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;
        }
                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);
        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 1f2819c0cca055ea62537ac2606801743207e176..90a6bd531c3fc6b0080c4aa4772701d34275d555 100644 (file)
--- 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 {
 */
 
 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 */
        __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 */