From b9aa6b59b5b35037725d916866793d61e78b84d5 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Thu, 4 Aug 2011 04:14:11 -0300
Subject: [PATCH] --- yaml --- r: 271691 b: refs/heads/master c:
 6f2e77bb955771a7b8de80ea519c1e9a82b864dd h: refs/heads/master i:   271689:
 c9f880a7843e012ffd19ba31a884c237faf55abf   271687:
 da67fb33a079c5bcc5aea8f8a9655742f0263ea3 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/tm6000/tm6000-cards.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 379ceda29376..5671aefd1992 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc4eab2cbae547fb278c2583b77ee0ff7f5832d3
+refs/heads/master: 6f2e77bb955771a7b8de80ea519c1e9a82b864dd
diff --git a/trunk/drivers/staging/tm6000/tm6000-cards.c b/trunk/drivers/staging/tm6000/tm6000-cards.c
index f247e7e685f9..d2ee18ffd49f 100644
--- a/trunk/drivers/staging/tm6000/tm6000-cards.c
+++ b/trunk/drivers/staging/tm6000/tm6000-cards.c
@@ -1171,7 +1171,7 @@ static int tm6000_usb_probe(struct usb_interface *interface,
 	mutex_init(&dev->usb_lock);
 
 	/* Increment usage count */
-	tm6000_devused |= 1<<nr;
+	set_bit(nr, &tm6000_devused);
 	snprintf(dev->name, 29, "tm6000 #%d", nr);
 
 	dev->model = id->driver_info;
@@ -1287,7 +1287,7 @@ static int tm6000_usb_probe(struct usb_interface *interface,
 err:
 	printk(KERN_ERR "tm6000: Error %d while registering\n", rc);
 
-	tm6000_devused &= ~(1<<nr);
+	clear_bit(nr, &tm6000_devused);
 	usb_put_dev(usbdev);
 
 	kfree(dev);
@@ -1345,6 +1345,7 @@ static void tm6000_usb_disconnect(struct usb_interface *interface)
 	tm6000_close_extension(dev);
 	tm6000_remove_from_devlist(dev);
 
+	clear_bit(dev->devno, &tm6000_devused);
 	kfree(dev);
 }