aboutsummaryrefslogtreecommitdiff
path: root/src/mm-port-probe.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mm-port-probe.c')
-rw-r--r--src/mm-port-probe.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c
index 9913001b..c02f0b23 100644
--- a/src/mm-port-probe.c
+++ b/src/mm-port-probe.c
@@ -1676,29 +1676,29 @@ MMPortType
mm_port_probe_get_port_type (MMPortProbe *self)
{
const gchar *subsys;
- const gchar *name;
g_return_val_if_fail (MM_IS_PORT_PROBE (self), FALSE);
subsys = mm_kernel_device_get_subsystem (self->priv->port);
- name = mm_kernel_device_get_name (self->priv->port);
if (g_str_equal (subsys, "net"))
return MM_PORT_TYPE_NET;
+ if (g_str_has_prefix (subsys, "usb")) {
+ const gchar *name;
+
+ name = mm_kernel_device_get_name (self->priv->port);
+ if (g_str_has_prefix (name, "cdc-wdm")) {
#if defined WITH_QMI
- if (g_str_has_prefix (subsys, "usb") &&
- g_str_has_prefix (name, "cdc-wdm") &&
- self->priv->is_qmi)
- return MM_PORT_TYPE_QMI;
+ if (self->priv->is_qmi)
+ return MM_PORT_TYPE_QMI;
#endif
-
#if defined WITH_MBIM
- if (g_str_has_prefix (subsys, "usb") &&
- g_str_has_prefix (name, "cdc-wdm") &&
- self->priv->is_mbim)
- return MM_PORT_TYPE_MBIM;
+ if (self->priv->is_mbim)
+ return MM_PORT_TYPE_MBIM;
#endif
+ }
+ }
if (self->priv->flags & MM_PORT_PROBE_QCDM &&
self->priv->is_qcdm)