bcm5974 (0.65) unstable; urgency=low

  * Switch back to normal mode when closing

 -- Henrik Rydberg <rydberg@euromail.se>  Sun, 14 Sep 2008 16:06:42 +0200

4 files changed, 19 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index 01f0cd9..2850cef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+bcm5974 (0.65) unstable; urgency=low
+
+  * Switch back to normal mode when closing
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Sun, 14 Sep 2008 16:06:42 +0200
+
 bcm5974 (0.64) unstable; urgency=low
 
   * Finger counting improved further
diff --git a/bcm5974-dkms-mkdeb/debian/changelog b/bcm5974-dkms-mkdeb/debian/changelog
index f6d016a..3ea1523 100644
--- a/bcm5974-dkms-mkdeb/debian/changelog
+++ b/bcm5974-dkms-mkdeb/debian/changelog
@@ -1,5 +1,5 @@
 MODULE_NAME-dkms (MODULE_VERSION) unstable; urgency=low
 
-  * Finger counting improved further
+  * Switch back to normal mode when closing
 
  -- Henrik Rydberg <rydberg@euromail.se>  DATE_STAMP
diff --git a/bcm5974.c b/bcm5974.c
index d3d08e3..bf6c59f 100644
--- a/bcm5974.c
+++ b/bcm5974.c
@@ -234,8 +234,8 @@ static inline int int2bound(const struct bcm5974_param *p, int x)
 {
         int s = int2scale(p, x);
 
-//      return clamp_val(s, 0, p->dim - 1);
-        return s < 0 ? 0 : s >= p->dim ? p->dim - 1 : s;
+        //return clamp_val(s, 0, p->dim - 1);
+        return s < 0 ? 0 : s >= p->dim ? p->dim - 1 : s;
 }
 
 /* setup which logical events to report */
@@ -352,8 +352,9 @@ static int report_tp_state(struct bcm5974 *dev, int size)
 #define BCM5974_WELLSPRING_MODE_REQUEST_VALUE           0x300
 #define BCM5974_WELLSPRING_MODE_REQUEST_INDEX           0
 #define BCM5974_WELLSPRING_MODE_VENDOR_VALUE            0x01
+#define BCM5974_WELLSPRING_MODE_NORMAL_VALUE            0x08
 
-static int bcm5974_wellspring_mode(struct bcm5974 *dev)
+static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
 {
         char *data = kmalloc(8, GFP_KERNEL);
         int retval = 0, size;
@@ -378,7 +379,9 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev)
         }
 
         /* apply the mode switch */
-        data[0] = BCM5974_WELLSPRING_MODE_VENDOR_VALUE;
+        data[0] = on ?
+                BCM5974_WELLSPRING_MODE_VENDOR_VALUE :
+                BCM5974_WELLSPRING_MODE_NORMAL_VALUE;
 
         /* write configuration */
         size = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
@@ -393,7 +396,8 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev)
                 goto out;
         }
 
-        dprintk(2, "bcm5974: switched to wellspring mode.\n");
+        dprintk(2, "bcm5974: switched to %s mode.\n",
+                on ? "wellspring" : "normal");
 
  out:
         kfree(data);
@@ -482,7 +486,7 @@ exit:
  */
 static int bcm5974_start_traffic(struct bcm5974 *dev)
 {
-        if (bcm5974_wellspring_mode(dev)) {
+        if (bcm5974_wellspring_mode(dev, true)) {
                 dprintk(1, "bcm5974: mode switch failed\n");
                 goto error;
         }
@@ -505,6 +509,7 @@ static void bcm5974_pause_traffic(struct bcm5974 *dev)
 {
         usb_kill_urb(dev->tp_urb);
         usb_kill_urb(dev->bt_urb);
+        bcm5974_wellspring_mode(dev, false);
 }
 
 /*
diff --git a/dkms.conf b/dkms.conf
index 9d8587d..aec50fa 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="bcm5974"
-PACKAGE_VERSION="0.64"
+PACKAGE_VERSION="0.65"
 MAKE[0]="make -C ${kernel_source_dir}
   SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules"
 BUILT_MODULE_NAME[0]="bcm5974"