diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-08-21 11:32:24 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-08-29 17:26:46 +0200 |
| commit | 494a70a8ffff4a50d0a00e99e964165054ff36aa (patch) | |
| tree | 1e4c4ff6bc9f484b0e4fac4ab06743d8dd108de9 /src/mm-port-probe.c | |
| parent | 8cb021293ce0aa316028339c8f213c0bf72c9158 (diff) | |
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.
Diffstat (limited to 'src/mm-port-probe.c')
| -rw-r--r-- | src/mm-port-probe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index 6572707a..04a1bf8b 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -1119,7 +1119,7 @@ mm_port_probe_is_at (MMPortProbe *self) subsys = g_udev_device_get_subsystem (self->priv->port); name = g_udev_device_get_name (self->priv->port); if (g_str_equal (subsys, "net") || - (g_str_equal (subsys, "usb") && + (g_str_has_prefix (subsys, "usb") && g_str_has_prefix (name, "cdc-wdm"))) return FALSE; @@ -1154,7 +1154,7 @@ mm_port_probe_is_qcdm (MMPortProbe *self) subsys = g_udev_device_get_subsystem (self->priv->port); name = g_udev_device_get_name (self->priv->port); if (g_str_equal (subsys, "net") || - (g_str_equal (subsys, "usb") && + (g_str_has_prefix (subsys, "usb") && g_str_has_prefix (name, "cdc-wdm"))) return FALSE; @@ -1173,7 +1173,7 @@ mm_port_probe_is_qmi (MMPortProbe *self) subsys = g_udev_device_get_subsystem (self->priv->port); name = g_udev_device_get_name (self->priv->port); - if (!g_str_equal (subsys, "usb") || + if (!g_str_has_prefix (subsys, "usb") || !name || !g_str_has_prefix (name, "cdc-wdm")) return FALSE; @@ -1208,7 +1208,7 @@ mm_port_probe_get_port_type (MMPortProbe *self) if (g_str_equal (subsys, "net")) return MM_PORT_TYPE_NET; - if (g_str_equal (subsys, "usb") && + if (g_str_has_prefix (subsys, "usb") && g_str_has_prefix (name, "cdc-wdm") && self->priv->is_qmi) return MM_PORT_TYPE_QMI; @@ -1267,7 +1267,7 @@ mm_port_probe_get_vendor (MMPortProbe *self) subsys = g_udev_device_get_subsystem (self->priv->port); name = g_udev_device_get_name (self->priv->port); if (g_str_equal (subsys, "net") || - (g_str_equal (subsys, "usb") && + (g_str_has_prefix (subsys, "usb") && g_str_has_prefix (name, "cdc-wdm"))) return NULL; @@ -1287,7 +1287,7 @@ mm_port_probe_get_product (MMPortProbe *self) subsys = g_udev_device_get_subsystem (self->priv->port); name = g_udev_device_get_name (self->priv->port); if (g_str_equal (subsys, "net") || - (g_str_equal (subsys, "usb") && + (g_str_has_prefix (subsys, "usb") && g_str_has_prefix (name, "cdc-wdm"))) return NULL; |