V4L/DVB (8505): saa7134-empress.c: fix deadlock

[linux-2.6-omap-h63xx.git] / drivers / media / video / saa7134 / saa7134.h

diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 924ffd13637ead8b5e66d058b037ae7b9cbb9bd1..ed20dd56379c6eb52df281f691b43f675390dc38 100644 (file)
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -34,6 +34,7 @@
 #include <asm/io.h>
 
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <media/tuner.h>
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
@@ -263,7 +264,11 @@ struct saa7134_format {
 #define SAA7134_BOARD_VIDEOMATE_T750       139
 #define SAA7134_BOARD_AVERMEDIA_A700_PRO    140
 #define SAA7134_BOARD_AVERMEDIA_A700_HYBRID 141
-
+#define SAA7134_BOARD_BEHOLD_H6      142
+#define SAA7134_BOARD_BEHOLD_M63      143
+#define SAA7134_BOARD_BEHOLD_M6_EXTRA    144
+#define SAA7134_BOARD_AVERMEDIA_M103    145
+#define SAA7134_BOARD_ASUSTeK_P7131_ANALOG 146
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
@@ -551,11 +556,12 @@ struct saa7134_dev {
        struct saa7134_ts          ts;
        struct saa7134_dmaqueue    ts_q;
        struct saa7134_mpeg_ops    *mops;
+       struct i2c_client          *mpeg_i2c_client;
 
        /* SAA7134_MPEG_EMPRESS only */
        struct video_device        *empress_dev;
        struct videobuf_queue      empress_tsq;
-       unsigned int               empress_users;
+       atomic_t                   empress_users;
        struct work_struct         empress_workqueue;
        int                        empress_started;