projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7924326
)
V4L/DVB (13372): staging/go7007: fix mutex function usage for s2250
author
Pete Eberlein
<
[email protected]
>
Sun, 15 Nov 2009 11:14:14 +0000
(08:14 -0300)
committer
Mauro Carvalho Chehab
<
[email protected]
>
Mon, 30 Nov 2009 19:49:15 +0000
(17:49 -0200)
Fix mutex function usage, which was overlooked in a previous patch.
Signed-off-by: Pete Eberlein <
[email protected]
>
Signed-off-by: Hans Verkuil <
[email protected]
>
Signed-off-by: Mauro Carvalho Chehab <
[email protected]
>
drivers/staging/go7007/s2250-board.c
patch
|
blob
|
history
diff --git
a/drivers/staging/go7007/s2250-board.c
b/drivers/staging/go7007/s2250-board.c
index 8c85a9c3665a4a37d01fdebd478e827f65239ff8..f4a6541c3e60ffcdffa1166a353e45929b4d25d7 100644
(file)
--- 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);