chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: Ubuntu merge - use group "cdrom"
[elogind.git]
/
extras
/
usb_id
/
usb_id.c
diff --git
a/extras/usb_id/usb_id.c
b/extras/usb_id/usb_id.c
index 28352eb08a239d9c36e812b893b10ce2c9c12626..f069f3a1acd12208272bc1a6da72f2f6f83f8106 100644
(file)
--- a/
extras/usb_id/usb_id.c
+++ b/
extras/usb_id/usb_id.c
@@
-192,7
+192,7
@@
static int usb_id(struct udev_device *dev)
dbg(udev, "syspath %s\n", udev_device_get_syspath(dev));
/* usb interface directory */
dbg(udev, "syspath %s\n", udev_device_get_syspath(dev));
/* usb interface directory */
- dev_interface = udev_device_get_parent_with_subsystem
(dev, "usb
");
+ dev_interface = udev_device_get_parent_with_subsystem
_devtype(dev, "usb", "usb_interface
");
if (dev_interface == NULL) {
info(udev, "unable to access usb_interface device of '%s'\n",
udev_device_get_syspath(dev));
if (dev_interface == NULL) {
info(udev, "unable to access usb_interface device of '%s'\n",
udev_device_get_syspath(dev));
@@
-218,7
+218,7
@@
static int usb_id(struct udev_device *dev)
udev_device_get_syspath(dev_interface), if_class_num, protocol);
/* usb device directory */
udev_device_get_syspath(dev_interface), if_class_num, protocol);
/* usb device directory */
- dev_usb = udev_device_get_parent_with_subsystem
(dev_interface, "usb
");
+ dev_usb = udev_device_get_parent_with_subsystem
_devtype(dev_interface, "usb", "usb_device
");
if (!dev_usb) {
info(udev, "unable to find parent 'usb' device of '%s'\n",
udev_device_get_syspath(dev));
if (!dev_usb) {
info(udev, "unable to find parent 'usb' device of '%s'\n",
udev_device_get_syspath(dev));
@@
-232,7
+232,7
@@
static int usb_id(struct udev_device *dev)
int host, bus, target, lun;
/* get scsi device */
int host, bus, target, lun;
/* get scsi device */
- dev_scsi = udev_device_get_parent_with_subsystem
(dev, "scsi
");
+ dev_scsi = udev_device_get_parent_with_subsystem
_devtype(dev, "scsi", "scsi_device
");
if (dev_scsi == NULL) {
info(udev, "unable to find parent 'scsi' device of '%s'\n",
udev_device_get_syspath(dev));
if (dev_scsi == NULL) {
info(udev, "unable to find parent 'scsi' device of '%s'\n",
udev_device_get_syspath(dev));