mbm: don't tag only tty ports, and also grab cdc-wdm ports

We also need to tag cdc-wdm ports, so that they get grabbed but ignored and
not QMI-probed.

https://bugzilla.gnome.org/show_bug.cgi?id=696701

plugins/mbm/77-mm-ericsson-mbm.rules

@@ -1,7 +1,9 @@
 # do not edit this file, it will be overwritten on update
 
 ACTION!="add|change", GOTO="mm_mbm_end"
-SUBSYSTEM!="tty", GOTO="mm_mbm_end"
+SUBSYSTEMS=="usb", GOTO="mm_mbm_check"
+
+LABEL="mm_mbm_check"
 
 # Ericsson F3507g
 ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1900", ENV{ID_MM_ERICSSON_MBM}="1"
@@ -114,4 +116,3 @@ ATTRS{idVendor}=="0930", ATTRS{idProduct}=="1313", ENV{ID_MM_ERICSSON_MBM}="1"
 ATTRS{idVendor}=="0930", ATTRS{idProduct}=="1314", ENV{ID_MM_ERICSSON_MBM}="1"
 
 LABEL="mm_mbm_end"
-

plugins/mbm/mm-plugin-mbm.c

@@ -55,7 +55,7 @@ create_modem (MMPlugin *self,
 G_MODULE_EXPORT MMPlugin *
 mm_plugin_create (void)
 {
-    static const gchar *subsystems[] = { "tty", "net", NULL };
+    static const gchar *subsystems[] = { "tty", "net", "usb", NULL };
     static const gchar *udev_tags[] = {
         "ID_MM_ERICSSON_MBM",
         NULL