X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fusb_id%2Fusb_id.c;h=ba8bfdf8c51475772288499cd90f4340d5123264;hp=85c6beda40e38d307d355aed4d8b789bb193cca4;hb=95776dc6ec174f47fa4dd4d8abf5d457223e5dd4;hpb=eef7c9a385575375a3e3310900022b37777aeb6c diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c index 85c6beda4..ba8bfdf8c 100644 --- a/extras/usb_id/usb_id.c +++ b/extras/usb_id/usb_id.c @@ -255,7 +255,7 @@ static int usb_id(const char *devpath) if_class = sysfs_attr_get_value(dev_interface->devpath, "bInterfaceClass"); if (!if_class) { - info("%s: cannot get bInterfaceClass attribute", dev_interface->kernel_name); + info("%s: cannot get bInterfaceClass attribute", dev_interface->kernel); return 1; } if_class_num = strtoul(if_class, NULL, 16); @@ -289,28 +289,28 @@ static int usb_id(const char *devpath) /* Generic SPC-2 device */ scsi_vendor = sysfs_attr_get_value(dev_scsi->devpath, "vendor"); if (!scsi_vendor) { - info("%s: cannot get SCSI vendor attribute", dev_scsi->kernel_name); + info("%s: cannot get SCSI vendor attribute", dev_scsi->kernel); goto fallback; } set_str(vendor_str, scsi_vendor, sizeof(vendor_str)-1); scsi_model = sysfs_attr_get_value(dev_scsi->devpath, "model"); if (!scsi_model) { - info("%s: cannot get SCSI model attribute", dev_scsi->kernel_name); + info("%s: cannot get SCSI model attribute", dev_scsi->kernel); goto fallback; } set_str(model_str, scsi_model, sizeof(model_str)-1); scsi_type = sysfs_attr_get_value(dev_scsi->devpath, "type"); if (!scsi_type) { - info("%s: cannot get SCSI type attribute", dev_scsi->kernel_name); + info("%s: cannot get SCSI type attribute", dev_scsi->kernel); goto fallback; } set_scsi_type(type_str, scsi_type, sizeof(type_str)-1); scsi_rev = sysfs_attr_get_value(dev_scsi->devpath, "rev"); if (!scsi_rev) { - info("%s: cannot get SCSI revision attribute", dev_scsi->kernel_name); + info("%s: cannot get SCSI revision attribute", dev_scsi->kernel); goto fallback; } set_str(revision_str, scsi_rev, sizeof(revision_str)-1);