diff options
| author | Hans Verkuil | 2010-12-18 13:20:59 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-01-19 14:28:10 +0100 |
| commit | 9af39713feb53da96ba23fa94a73ffd0de50a815 (patch) | |
| tree | 264b278d0e741e031f0c9ed940fd78e5502de6e8 /drivers/media/common/saa7146_core.c | |
| parent | [media] bttv: remove obsolete 'no_tda9875' field (diff) | |
| download | kernel-qcow2-linux-9af39713feb53da96ba23fa94a73ffd0de50a815.tar.gz kernel-qcow2-linux-9af39713feb53da96ba23fa94a73ffd0de50a815.tar.xz kernel-qcow2-linux-9af39713feb53da96ba23fa94a73ffd0de50a815.zip | |
[media] saa7146: Convert from .ioctl to .unlocked_ioctl
Convert saa7146 to use core-assisted locking.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/saa7146_core.c')
| -rw-r--r-- | drivers/media/common/saa7146_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c index 982f000a57ff..9f47e383c57a 100644 --- a/drivers/media/common/saa7146_core.c +++ b/drivers/media/common/saa7146_core.c @@ -452,7 +452,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent INFO(("found saa7146 @ mem %p (revision %d, irq %d) (0x%04x,0x%04x).\n", dev->mem, dev->revision, pci->irq, pci->subsystem_vendor, pci->subsystem_device)); dev->ext = ext; - mutex_init(&dev->lock); + mutex_init(&dev->v4l2_lock); spin_lock_init(&dev->int_slock); spin_lock_init(&dev->slock); |