diff options
Diffstat (limited to 'drivers/media/common/saa7146_i2c.c')
| -rw-r--r-- | drivers/media/common/saa7146_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c index 8aabdd8fb3c5..d9953f7a8b6b 100644 --- a/drivers/media/common/saa7146_i2c.c +++ b/drivers/media/common/saa7146_i2c.c | |||
| @@ -279,7 +279,7 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in | |||
| 279 | int address_err = 0; | 279 | int address_err = 0; |
| 280 | int short_delay = 0; | 280 | int short_delay = 0; |
| 281 | 281 | ||
| 282 | if (down_interruptible (&dev->i2c_lock)) | 282 | if (mutex_lock_interruptible(&dev->i2c_lock)) |
| 283 | return -ERESTARTSYS; | 283 | return -ERESTARTSYS; |
| 284 | 284 | ||
| 285 | for(i=0;i<num;i++) { | 285 | for(i=0;i<num;i++) { |
| @@ -366,7 +366,7 @@ out: | |||
| 366 | } | 366 | } |
| 367 | } | 367 | } |
| 368 | 368 | ||
| 369 | up(&dev->i2c_lock); | 369 | mutex_unlock(&dev->i2c_lock); |
| 370 | return err; | 370 | return err; |
| 371 | } | 371 | } |
| 372 | 372 | ||
