From 3ca06ee8346dccc626c13cf995ea49e51f61a6ed Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Thu, 4 Aug 2011 04:14:10 -0300
Subject: [PATCH] --- yaml --- r: 271690 b: refs/heads/master c:
 fc4eab2cbae547fb278c2583b77ee0ff7f5832d3 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/tm6000/tm6000-cards.c | 1 +
 trunk/drivers/staging/tm6000/tm6000-core.c  | 4 +++-
 trunk/drivers/staging/tm6000/tm6000.h       | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 16f50734b103..379ceda29376 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0fa65ff9e7fdbdea7bf1bbc02fb2c3ee6814cc7
+refs/heads/master: fc4eab2cbae547fb278c2583b77ee0ff7f5832d3
diff --git a/trunk/drivers/staging/tm6000/tm6000-cards.c b/trunk/drivers/staging/tm6000/tm6000-cards.c
index bac4309a3868..f247e7e685f9 100644
--- a/trunk/drivers/staging/tm6000/tm6000-cards.c
+++ b/trunk/drivers/staging/tm6000/tm6000-cards.c
@@ -1168,6 +1168,7 @@ static int tm6000_usb_probe(struct usb_interface *interface,
 		return -ENOMEM;
 	}
 	spin_lock_init(&dev->slock);
+	mutex_init(&dev->usb_lock);
 
 	/* Increment usage count */
 	tm6000_devused |= 1<<nr;
diff --git a/trunk/drivers/staging/tm6000/tm6000-core.c b/trunk/drivers/staging/tm6000/tm6000-core.c
index f85e5f2cf75d..31fdf15477e1 100644
--- a/trunk/drivers/staging/tm6000/tm6000-core.c
+++ b/trunk/drivers/staging/tm6000/tm6000-core.c
@@ -39,6 +39,8 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req,
 	unsigned int pipe;
 	u8	     *data = NULL;
 
+	mutex_lock(&dev->usb_lock);
+
 	if (len)
 		data = kzalloc(len, GFP_KERNEL);
 
@@ -86,9 +88,9 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req,
 	}
 
 	kfree(data);
-
 	msleep(5);
 
+	mutex_unlock(&dev->usb_lock);
 	return ret;
 }
 
diff --git a/trunk/drivers/staging/tm6000/tm6000.h b/trunk/drivers/staging/tm6000/tm6000.h
index 4323fc2c1487..cf57e1e3aa62 100644
--- a/trunk/drivers/staging/tm6000/tm6000.h
+++ b/trunk/drivers/staging/tm6000/tm6000.h
@@ -245,6 +245,7 @@ struct tm6000_core {
 
 	/* locks */
 	struct mutex			lock;
+	struct mutex			usb_lock;
 
 	/* usb transfer */
 	struct usb_device		*udev;		/* the usb device */