Message ID | 1257880891.21307.1104.camel@pete-desktop (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
diff -r a603ad1e6a1c -r 99e4a0cf6788 linux/drivers/staging/go7007/s2250-board.c --- a/linux/drivers/staging/go7007/s2250-board.c Tue Nov 10 10:41:56 2009 -0800 +++ b/linux/drivers/staging/go7007/s2250-board.c Tue Nov 10 10:47:34 2009 -0800 @@ -261,7 +261,7 @@ 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 @@ kfree(buf); return -EFAULT; } - up(&usb->i2c_lock); + mutex_unlock(&usb->i2c_lock); *val = (buf[0] << 8) | buf[1]; kfree(buf);