diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-27 03:07:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:17:44 -0200 |
| commit | 61b04cb24a129f2483d5110e119fc2e365177741 (patch) | |
| tree | c3ea9f44bf374a1bec4c9163f582cb3fa79110e3 /drivers/media/video/cx231xx/cx231xx.h | |
| parent | e350d44fed8eb86a7192a579e3687fcd76a4645b (diff) | |
[media] cx231xx-audio: fix some locking issues
Acked-by: Sri Deevi <Srinivasa.Deevi@conexant.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx.h')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index d0794332114c..f9cdc01a7faa 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h @@ -27,6 +27,7 @@ #include <linux/ioctl.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> +#include <linux/workqueue.h> #include <linux/mutex.h> #include <media/cx2341x.h> @@ -387,9 +388,6 @@ enum AUDIO_INPUT { #define CX231XX_AUDIO_BUFS 5 #define CX231XX_NUM_AUDIO_PACKETS 16 #define CX231XX_ISO_NUM_AUDIO_PACKETS 64 -#define CX231XX_CAPTURE_STREAM_EN 1 -#define CX231XX_STOP_AUDIO 0 -#define CX231XX_START_AUDIO 1 /* cx231xx extensions */ #define CX231XX_AUDIO 0x10 @@ -407,7 +405,6 @@ struct cx231xx_audio { struct snd_card *sndcard; int users, shutdown; - enum cx231xx_stream_state capture_stream; /* locks */ spinlock_t slock; @@ -624,6 +621,9 @@ struct cx231xx { struct cx231xx_IR *ir; + struct work_struct wq_trigger; /* Trigger to start/stop audio for alsa module */ + atomic_t stream_started; /* stream should be running if true */ + struct list_head devlist; int tuner_type; /* type of the tuner */ |