Merge pull request #1 from NordicSemiconductor/fix/modemmanager-ignore

Remove bInterfaceProtocol check when blacklisting ModemManager
NordicSemiconductor · Jun 7, 2018 · 20b83b5 · 20b83b5
2 parents 2b0f5b1 + a896605
commit 20b83b5
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 5 deletions.
diff --git a/nrf-udev_1.0.0-all/lib/udev/rules.d/99-mm-nrf-blacklist.rules b/nrf-udev_1.0.0-all/lib/udev/rules.d/99-mm-nrf-blacklist.rules
diff --git a/nrf-udev_1.0.0-all/DEBIAN/control → nrf-udev_1.0.1-all/DEBIAN/control b/nrf-udev_1.0.0-all/DEBIAN/control → nrf-udev_1.0.1-all/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: nrf-udev
-Version: 1.0.0
+Version: 1.0.1
 Architecture: all
 Maintainer: Iván Sánchez Ortega <[email protected]>
 Description: udev rules for nRF (Nordic Semiconductor) development kits

diff --git a/nrf-udev_1.0.0-all/DEBIAN/postinst → nrf-udev_1.0.1-all/DEBIAN/postinst b/nrf-udev_1.0.0-all/DEBIAN/postinst → nrf-udev_1.0.1-all/DEBIAN/postinst
diff --git a/nrf-udev_1.0.0-all/DEBIAN/postrm → nrf-udev_1.0.1-all/DEBIAN/postrm b/nrf-udev_1.0.0-all/DEBIAN/postrm → nrf-udev_1.0.1-all/DEBIAN/postrm
diff --git a/...v_1.0.0-all/lib/udev/rules.d/71-nrf.rules → ...v_1.0.1-all/lib/udev/rules.d/71-nrf.rules b/...v_1.0.0-all/lib/udev/rules.d/71-nrf.rules → ...v_1.0.1-all/lib/udev/rules.d/71-nrf.rules
diff --git a/nrf-udev_1.0.1-all/lib/udev/rules.d/99-mm-nrf-blacklist.rules b/nrf-udev_1.0.1-all/lib/udev/rules.d/99-mm-nrf-blacklist.rules
@@ -0,0 +1,3 @@
+# 99-modemmmanager-acm-fix.rules
+# Previously flagged nRF USB CDC ACM devices shall be ignored by ModemManager
+ENV{NRF_CDC_ACM}=="1", ENV{ID_MM_CANDIDATE}="0", ENV{ID_MM_DEVICE_IGNORE}="1"