V4L/DVB (7604): em28xx-dvb: Fix analog mode
The analog entries are wrong. Fix it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index e5fd2dc..91dce95 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -225,19 +225,10 @@
EM28XX_SAA7114
};
-#define MAX_GPIO 2
-struct gpio_ctl {
- /* Register to be set */
- unsigned char reg;
- /* Initial/final value */
+struct em28xx_reg_seq {
+ int reg;
unsigned char val;
- /* reset value - if set, it will do:
- val1 - val2 - val1
- */
- unsigned char rst;
- /* Sleep times
- */
- unsigned int t1, t2, t3;
+ int sleep;
};
struct em28xx_board {
@@ -255,9 +246,6 @@
unsigned int max_range_640_480:1;
unsigned int has_dvb:1;
- struct gpio_ctl analog_gpio[MAX_GPIO];
- struct gpio_ctl digital_gpio[MAX_GPIO];
-
enum em28xx_decoder decoder;
struct em28xx_input input[MAX_EM28XX_INPUT];
@@ -343,8 +331,8 @@
unsigned int max_range_640_480:1;
unsigned int has_dvb:1;
- struct gpio_ctl *analog_gpio;
- struct gpio_ctl *digital_gpio;
+ /* GPIO sequences for tuner callback */
+ struct em28xx_reg_seq *analog_gpio, *digital_gpio;
int video_inputs; /* number of video inputs */
struct list_head devlist;