diff options
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110.h')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h index fafd25fab835..3e2e12124bae 100644 --- a/drivers/media/dvb/ttpci/av7110.h +++ b/drivers/media/dvb/ttpci/av7110.h | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/dvb/ca.h> | 16 | #include <linux/dvb/ca.h> |
17 | #include <linux/dvb/osd.h> | 17 | #include <linux/dvb/osd.h> |
18 | #include <linux/dvb/net.h> | 18 | #include <linux/dvb/net.h> |
19 | #include <linux/mutex.h> | ||
19 | 20 | ||
20 | #include "dvbdev.h" | 21 | #include "dvbdev.h" |
21 | #include "demux.h" | 22 | #include "demux.h" |
@@ -127,7 +128,7 @@ struct av7110 { | |||
127 | /* DEBI and polled command interface */ | 128 | /* DEBI and polled command interface */ |
128 | 129 | ||
129 | spinlock_t debilock; | 130 | spinlock_t debilock; |
130 | struct semaphore dcomlock; | 131 | struct mutex dcomlock; |
131 | volatile int debitype; | 132 | volatile int debitype; |
132 | volatile int debilen; | 133 | volatile int debilen; |
133 | 134 | ||
@@ -146,7 +147,7 @@ struct av7110 { | |||
146 | 147 | ||
147 | int osdwin; /* currently active window */ | 148 | int osdwin; /* currently active window */ |
148 | u16 osdbpp[8]; | 149 | u16 osdbpp[8]; |
149 | struct semaphore osd_sema; | 150 | struct mutex osd_mutex; |
150 | 151 | ||
151 | /* CA */ | 152 | /* CA */ |
152 | 153 | ||
@@ -172,7 +173,7 @@ struct av7110 { | |||
172 | struct tasklet_struct vpe_tasklet; | 173 | struct tasklet_struct vpe_tasklet; |
173 | 174 | ||
174 | int fe_synced; | 175 | int fe_synced; |
175 | struct semaphore pid_mutex; | 176 | struct mutex pid_mutex; |
176 | 177 | ||
177 | int video_blank; | 178 | int video_blank; |
178 | struct video_status videostate; | 179 | struct video_status videostate; |