From 2c1fb96c5976bd43075187393ad3f379d24ef884 Mon Sep 17 00:00:00 2001
From: Pete Eberlein <pete@sensoray.com>
Date: Sun, 15 Nov 2009 08:14:14 -0300
Subject: [PATCH] --- yaml --- r: 168918 b: refs/heads/master c:
 e49bd72f9cfba9f0d0204f961d036cd0c7e37f2e h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/go7007/s2250-board.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0c98f30a8e3f..9e91d464f6f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7924326fef03e9992c118a42aa148c4f824a4097
+refs/heads/master: e49bd72f9cfba9f0d0204f961d036cd0c7e37f2e
diff --git a/trunk/drivers/staging/go7007/s2250-board.c b/trunk/drivers/staging/go7007/s2250-board.c
index 8c85a9c3665a..f4a6541c3e60 100644
--- a/trunk/drivers/staging/go7007/s2250-board.c
+++ b/trunk/drivers/staging/go7007/s2250-board.c
@@ -261,7 +261,7 @@ static int read_reg_fp(struct i2c_client *client, u16 addr, u16 *val)
 
 	memset(buf, 0xcd, 6);
 	usb = go->hpi_context;
-	if (down_interruptible(&usb->i2c_lock) != 0) {
+	if (mutex_lock_interruptible(&usb->i2c_lock) != 0) {
 		printk(KERN_INFO "i2c lock failed\n");
 		kfree(buf);
 		return -EINTR;
@@ -270,7 +270,7 @@ static int read_reg_fp(struct i2c_client *client, u16 addr, u16 *val)
 		kfree(buf);
 		return -EFAULT;
 	}
-	up(&usb->i2c_lock);
+	mutex_unlock(&usb->i2c_lock);
 
 	*val = (buf[0] << 8) | buf[1];
 	kfree(buf);