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-base-modem.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-base-modem.c')
| -rw-r--r-- | src/mm-base-modem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c index 642201aa..7bb24257 100644 --- a/src/mm-base-modem.c +++ b/src/mm-base-modem.c @@ -165,7 +165,7 @@ mm_base_modem_grab_port (MMBaseModem *self, /* Only allow 'tty', 'net' and 'cdc-wdm' ports */ if (!g_str_equal (subsys, "net") && !g_str_equal (subsys, "tty") && - !(g_str_equal (subsys, "usb") && g_str_has_prefix (name, "cdc-wdm"))) { + !(g_str_has_prefix (subsys, "usb") && g_str_has_prefix (name, "cdc-wdm"))) { g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED, @@ -234,7 +234,7 @@ mm_base_modem_grab_port (MMBaseModem *self, NULL)); } /* QMI ports... */ - else if (g_str_equal (subsys, "usb") && + else if (g_str_has_prefix (subsys, "usb") && g_str_has_prefix (name, "cdc-wdm")) { port = MM_PORT (mm_qmi_port_new (name)); } else |