summaryrefslogtreecommitdiffstats
path: root/include/media/saa7146.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-12-18 13:20:59 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-19 14:28:10 +0100
commit9af39713feb53da96ba23fa94a73ffd0de50a815 (patch)
tree264b278d0e741e031f0c9ed940fd78e5502de6e8 /include/media/saa7146.h
parent[media] bttv: remove obsolete 'no_tda9875' field (diff)
downloadlinux-9af39713feb53da96ba23fa94a73ffd0de50a815.tar.xz
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 'include/media/saa7146.h')
-rw-r--r--include/media/saa7146.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index ac7ce00f39cf..79827143d5ac 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -115,7 +115,7 @@ struct saa7146_dev
/* different device locks */
spinlock_t slock;
- struct mutex lock;
+ struct mutex v4l2_lock;
unsigned char __iomem *mem; /* pointer to mapped IO memory */
u32 revision; /* chip revision; needed for bug-workarounds*/