From 3b5aedc8ab2f06d8e5066fe38730b5e8105a6def Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Mon, 1 May 2017 22:52:51 +0200 Subject: [PATCH] udevng/gobi: use subsystem as first identification Using kernel 4.10 with systemd 232 on archlinux the detection of a gobi 2000 doesn't detect the qmi/cdc-wdm interface. The device is detected as follows: [devnode interface number label sysattr subsystem] /dev/cdc-wdm1 255/255/255 00 (null) (null) usbmisc wwan1 255/255/255 00 (null) (null) net /dev/ttyUSB5 255/255/255 01 (null) (null) tty /dev/ttyUSB6 255/255/255 02 (null) (null) tty /dev/ttyUSB7 255/255/255 03 (null) (null) tty --- plugins/udevng.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/plugins/udevng.c b/plugins/udevng.c index 47bc8910..e8b800c1 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -208,17 +208,19 @@ static gboolean setup_gobi(struct modem_info *modem) info->number, info->label, info->sysattr, info->subsystem); - if (g_strcmp0(info->interface, "255/255/255") == 0) { - if (info->number == NULL) - qmi = info->devnode; - else if (g_strcmp0(info->number, "00") == 0) - net = info->devnode; - else if (g_strcmp0(info->number, "01") == 0) - diag = info->devnode; - else if (g_strcmp0(info->number, "02") == 0) - mdm = info->devnode; - else if (g_strcmp0(info->number, "03") == 0) - gps = info->devnode; + if (g_strcmp0(info->subsystem, "usbmisc") == 0) /* cdc-wdm */ + qmi = info->devnode; + else if (g_strcmp0(info->subsystem, "net") == 0) /* wwan */ + net = info->devnode; + else if (g_strcmp0(info->subsystem, "tty") == 0) { + if (g_strcmp0(info->interface, "255/255/255") == 0) { + if (g_strcmp0(info->number, "01") == 0) + diag = info->devnode; + else if (g_strcmp0(info->number, "02") == 0) + mdm = info->devnode; + else if (g_strcmp0(info->number, "03") == 0) + gps = info->devnode; + } } }