summaryrefslogtreecommitdiffstats
path: root/drivers/media/common/saa7146_i2c.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-24 15:24:04 +0100
committerJeff Garzik <jeff@garzik.org>2006-03-24 15:24:04 +0100
commit11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e (patch)
treeb01421cb139b11065d776ed361a7a12b3a1aecc9 /drivers/media/common/saa7146_i2c.c
parentMerge branch 'upstream' (diff)
parent[libata] Move some bmdma-specific code to libata-bmdma.c (diff)
downloadlinux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.tar.xz
linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.zip
Merge branch 'upstream'
Conflicts: drivers/scsi/sata_vsc.c
Diffstat (limited to 'drivers/media/common/saa7146_i2c.c')
-rw-r--r--drivers/media/common/saa7146_i2c.c4
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
int address_err = 0;
int short_delay = 0;
- if (down_interruptible (&dev->i2c_lock))
+ if (mutex_lock_interruptible(&dev->i2c_lock))
return -ERESTARTSYS;
for(i=0;i<num;i++) {
@@ -366,7 +366,7 @@ out:
}
}
- up(&dev->i2c_lock);
+ mutex_unlock(&dev->i2c_lock);
return err;
}