From fec495945fd8d353d869abc77cffd9e8fdaa3b0f Mon Sep 17 00:00:00 2001
From: cdfrey <cdfrey>
Date: Thu, 19 Jul 2007 22:13:00 +0000
Subject: [PATCH] - added SUBSYSTEM=="usb_device" to example udev rules, in
 order        to avoid running bcharge for each endpoint that is        added
 by udev, when first plugged in.  Running bcharge        back-to-back multiple
 times can crash some        Blackberries.

---
 ChangeLog                       |  6 ++++++
 udev/10-blackberry.rules        | 16 ++++++++--------
 udev/10-blackberry.rules.Debian | 18 +++++++++---------
 3 files changed, 23 insertions(+), 17 deletions(-)
 rewrite udev/10-blackberry.rules (69%)
 rewrite udev/10-blackberry.rules.Debian (74%)

diff --git a/ChangeLog b/ChangeLog
index 3379b183..df1f9197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Release: version 0.8 - 2007/05/??
 ------------------------------------------------------------------------------
+2007/07/19
+	- added SUBSYSTEM=="usb_device" to example udev rules, in order
+		to avoid running bcharge for each endpoint that is
+		added by udev, when first plugged in.  Running bcharge
+		back-to-back multiple times can crash some
+		Blackberries.
 2007/07/14
 	- opensync plugin:
 		- fixed ID mapping bug in the case of a non-numeric UID
diff --git a/udev/10-blackberry.rules b/udev/10-blackberry.rules
dissimilarity index 69%
index a02a8da2..c6f05b9c 100644
--- a/udev/10-blackberry.rules
+++ b/udev/10-blackberry.rules
@@ -1,8 +1,8 @@
-# Blackberry devices
-#
-# Older devices that only use 0x0001 (no USB Mass Storage)
-BUS=="usb", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0001", SYMLINK+="bb-%k", RUN="/usr/sbin/bcharge"
-#
-# Newer devices with USB Mass Storage, 0x0006 + 0x0004.
-BUS=="usb", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0006", RUN="/usr/sbin/bcharge"
-BUS=="usb", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0004", SYMLINK+="bb-%k"
+# Blackberry devices
+#
+# Older devices that only use 0x0001 (no USB Mass Storage)
+BUS=="usb", SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0001", SYMLINK+="bb-%k", RUN="/usr/sbin/bcharge"
+#
+# Newer devices with USB Mass Storage, 0x0006 + 0x0004.
+BUS=="usb", SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0006", RUN="/usr/sbin/bcharge"
+BUS=="usb", SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0004", SYMLINK+="bb-%k"
diff --git a/udev/10-blackberry.rules.Debian b/udev/10-blackberry.rules.Debian
dissimilarity index 74%
index ac97c88e..cd9417a0 100644
--- a/udev/10-blackberry.rules.Debian
+++ b/udev/10-blackberry.rules.Debian
@@ -1,9 +1,9 @@
-# Blackberry devices
-#
-# Older devices that only use 0x0001 (no USB Mass Storage)
-BUS=="usb", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0001", SYMLINK+="bb-%k", GROUP="plugdev", MODE="0660", RUN="/usr/sbin/bcharge"
-#
-# Newer devices with USB Mass Storage, 0x0006 + 0x0004.
-BUS=="usb", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0006", GROUP="plugdev", MODE="0660", RUN="/usr/sbin/bcharge"
-BUS=="usb", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0004", SYMLINK+="bb-%k", GROUP="plugdev", MODE="0660"
-
+# Blackberry devices
+#
+# Older devices that only use 0x0001 (no USB Mass Storage)
+BUS=="usb", SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0001", SYMLINK+="bb-%k", GROUP="plugdev", MODE="0660", RUN="/usr/sbin/bcharge"
+#
+# Newer devices with USB Mass Storage, 0x0006 + 0x0004.
+BUS=="usb", SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0006", GROUP="plugdev", MODE="0660", RUN="/usr/sbin/bcharge"
+BUS=="usb", SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="0fca", SYSFS{idProduct}=="0004", SYMLINK+="bb-%k", GROUP="plugdev", MODE="0660"
+
-- 
2.11.4.GIT