diff options
| author | Pete Eberlein <pete@sensoray.com> | 2009-11-15 08:14:14 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-11-30 17:49:15 -0200 |
| commit | e49bd72f9cfba9f0d0204f961d036cd0c7e37f2e (patch) | |
| tree | f2323f23474893a94a1aa8c07ce2170bb145ffbc | |
| parent | 7924326fef03e9992c118a42aa148c4f824a4097 (diff) | |
| download | linux-3.10-e49bd72f9cfba9f0d0204f961d036cd0c7e37f2e.tar.gz linux-3.10-e49bd72f9cfba9f0d0204f961d036cd0c7e37f2e.tar.bz2 linux-3.10-e49bd72f9cfba9f0d0204f961d036cd0c7e37f2e.zip | |
V4L/DVB (13372): staging/go7007: fix mutex function usage for s2250
Fix mutex function usage, which was overlooked in a previous patch.
Signed-off-by: Pete Eberlein <pete@sensoray.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/staging/go7007/s2250-board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/go7007/s2250-board.c index 8c85a9c3665..f4a6541c3e6 100644 --- a/drivers/staging/go7007/s2250-board.c +++ b/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); |