From e77df40b68ce32980f307959cc98d31918690a81 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 28 Mar 2023 08:18:45 +0000 Subject: port-probe: perform auto detection of port type hints for cdc_wdm Do not do this in the plugin; instead, do it along with the logic that looks for port type hints in udev, so that we can properly warn if things don't match. --- src/mm-plugin.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mm-plugin.c') diff --git a/src/mm-plugin.c b/src/mm-plugin.c index 97dcbc44..b4901fd8 100644 --- a/src/mm-plugin.c +++ b/src/mm-plugin.c @@ -797,7 +797,7 @@ mm_plugin_supports_port (MMPlugin *self, return; } - /* Build flags depending on what probing needed */ + /* Build flags depending on what probing is requested by the plugin */ probe_run_flags = MM_PORT_PROBE_NONE; if (g_str_equal (mm_kernel_device_get_subsystem (port), "tty")) { if (self->priv->at) @@ -807,11 +807,11 @@ mm_plugin_supports_port (MMPlugin *self, if (self->priv->qcdm || self->priv->qcdm_required) probe_run_flags |= MM_PORT_PROBE_QCDM; } else if (g_str_equal (mm_kernel_device_get_subsystem (port), "usbmisc")) { - if (self->priv->qmi && !g_strcmp0 (mm_kernel_device_get_driver (port), "qmi_wwan")) + if (self->priv->qmi) probe_run_flags |= MM_PORT_PROBE_QMI; - else if (self->priv->mbim && !g_strcmp0 (mm_kernel_device_get_driver (port), "cdc_mbim")) + if (self->priv->mbim) probe_run_flags |= MM_PORT_PROBE_MBIM; - else + if (self->priv->at) probe_run_flags |= MM_PORT_PROBE_AT; } else if (g_str_equal (mm_kernel_device_get_subsystem (port), "rpmsg")) { if (self->priv->at) -- cgit v1.2.3-70-g09d2