base-modem: don't assume all cdc-wdm ports are QMI
This commit is contained in:
@@ -242,17 +242,20 @@ mm_base_modem_grab_port (MMBaseModem *self,
|
|||||||
else if (g_str_has_prefix (subsys, "usb") &&
|
else if (g_str_has_prefix (subsys, "usb") &&
|
||||||
g_str_has_prefix (name, "cdc-wdm")) {
|
g_str_has_prefix (name, "cdc-wdm")) {
|
||||||
#if defined WITH_QMI
|
#if defined WITH_QMI
|
||||||
port = MM_PORT (mm_qmi_port_new (name));
|
if (ptype == MM_PORT_TYPE_QMI)
|
||||||
#else
|
port = MM_PORT (mm_qmi_port_new (name));
|
||||||
g_set_error (error,
|
else
|
||||||
MM_CORE_ERROR,
|
|
||||||
MM_CORE_ERROR_UNSUPPORTED,
|
|
||||||
"Cannot add port '%s/%s', QMI support not available",
|
|
||||||
subsys,
|
|
||||||
name);
|
|
||||||
g_free (key);
|
|
||||||
return FALSE;
|
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
|
g_set_error (error,
|
||||||
|
MM_CORE_ERROR,
|
||||||
|
MM_CORE_ERROR_UNSUPPORTED,
|
||||||
|
"Cannot add port '%s/%s', unsupported",
|
||||||
|
subsys,
|
||||||
|
name);
|
||||||
|
g_free (key);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
/* We already filter out before all non-tty, non-net, non-qmi ports */
|
/* We already filter out before all non-tty, non-net, non-qmi ports */
|
||||||
|
Reference in New Issue
Block a user