diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb.h')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h index 5e5d21ad93c9..d2be37cc43b7 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/input.h> | 12 | #include <linux/input.h> |
13 | #include <linux/usb.h> | 13 | #include <linux/usb.h> |
14 | #include <linux/firmware.h> | 14 | #include <linux/firmware.h> |
15 | #include <linux/mutex.h> | ||
15 | 16 | ||
16 | #include "dvb_frontend.h" | 17 | #include "dvb_frontend.h" |
17 | #include "dvb_demux.h" | 18 | #include "dvb_demux.h" |
@@ -227,8 +228,8 @@ struct dvb_usb_properties { | |||
227 | * @feedcount: number of reqested feeds (used for streaming-activation) | 228 | * @feedcount: number of reqested feeds (used for streaming-activation) |
228 | * @pid_filtering: is hardware pid_filtering used or not. | 229 | * @pid_filtering: is hardware pid_filtering used or not. |
229 | * | 230 | * |
230 | * @usb_sem: semaphore of USB control messages (reading needs two messages) | 231 | * @usb_mutex: semaphore of USB control messages (reading needs two messages) |
231 | * @i2c_sem: semaphore for i2c-transfers | 232 | * @i2c_mutex: semaphore for i2c-transfers |
232 | * | 233 | * |
233 | * @i2c_adap: device's i2c_adapter if it uses I2CoverUSB | 234 | * @i2c_adap: device's i2c_adapter if it uses I2CoverUSB |
234 | * @pll_addr: I2C address of the tuner for programming | 235 | * @pll_addr: I2C address of the tuner for programming |
@@ -283,10 +284,10 @@ struct dvb_usb_device { | |||
283 | int pid_filtering; | 284 | int pid_filtering; |
284 | 285 | ||
285 | /* locking */ | 286 | /* locking */ |
286 | struct semaphore usb_sem; | 287 | struct mutex usb_mutex; |
287 | 288 | ||
288 | /* i2c */ | 289 | /* i2c */ |
289 | struct semaphore i2c_sem; | 290 | struct mutex i2c_mutex; |
290 | struct i2c_adapter i2c_adap; | 291 | struct i2c_adapter i2c_adap; |
291 | 292 | ||
292 | /* tuner programming information */ | 293 | /* tuner programming information */ |