From 494a70a8ffff4a50d0a00e99e964165054ff36aa Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 21 Aug 2012 11:32:24 +0200 Subject: core: handle the 'usb'->'usbmisc' subsystem rename in the kernel We'll try to cope with getting devices being reported in either 'usb' or 'usbmisc', trying to avoid the need of checking kernel version during runtime. --- src/mm-device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mm-device.c') diff --git a/src/mm-device.c b/src/mm-device.c index faf7c942..06755722 100644 --- a/src/mm-device.c +++ b/src/mm-device.c @@ -140,8 +140,8 @@ get_device_ids (GUdevDevice *device, /* Platform devices don't usually have a VID/PID */ success = TRUE; goto out; - } else if (!strcmp (parent_subsys, "usb") && - !strcmp (g_udev_device_get_driver (parent), "qmi_wwan")) { + } else if (g_str_has_prefix (parent_subsys, "usb") && + g_str_equal (g_udev_device_get_driver (parent), "qmi_wwan")) { /* Need to look for vendor/product in the parent of the QMI device */ GUdevDevice *qmi_parent; -- cgit v1.2.3-70-g09d2