diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-18 07:20:59 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-19 08:28:10 -0500 |
| commit | 9af39713feb53da96ba23fa94a73ffd0de50a815 (patch) | |
| tree | 264b278d0e741e031f0c9ed940fd78e5502de6e8 /include/media/saa7146.h | |
| parent | b219ab9cfb2057de6e779169197f83265c310c83 (diff) | |
[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.h | 2 |
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 | |||
| 115 | 115 | ||
| 116 | /* different device locks */ | 116 | /* different device locks */ |
| 117 | spinlock_t slock; | 117 | spinlock_t slock; |
| 118 | struct mutex lock; | 118 | struct mutex v4l2_lock; |
| 119 | 119 | ||
| 120 | unsigned char __iomem *mem; /* pointer to mapped IO memory */ | 120 | unsigned char __iomem *mem; /* pointer to mapped IO memory */ |
| 121 | u32 revision; /* chip revision; needed for bug-workarounds*/ | 121 | u32 revision; /* chip revision; needed for bug-workarounds*/ |