aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorRoss Cohen <rcohen@snurgle.org>2008-09-29 22:36:24 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-10 18:31:11 -0400
commitdf20d69ec968b33526461457c219ad4ba8ba8ac8 (patch)
tree378597585d42511271d9a8c65d6b1e0aa076698c /drivers/staging
parentd63d692a44c918723895f792ffd17eab7bcfb8ef (diff)
Staging: go7007 v4l fixes
Fix up some of the v4l issues that were recently changed to make the go7007 driver a bit cleaner. From: Ross Cohen <rcohen@snurgle.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/go7007/go7007-driver.c2
-rw-r--r--drivers/staging/go7007/go7007-v4l2.c12
-rw-r--r--drivers/staging/go7007/snd-go7007.c4
-rw-r--r--drivers/staging/go7007/wis-ov7640.c3
-rw-r--r--drivers/staging/go7007/wis-saa7113.c25
-rw-r--r--drivers/staging/go7007/wis-saa7115.c29
-rw-r--r--drivers/staging/go7007/wis-sony-tuner.c3
-rw-r--r--drivers/staging/go7007/wis-tw2804.c29
-rw-r--r--drivers/staging/go7007/wis-tw9903.c21
-rw-r--r--drivers/staging/go7007/wis-uda1342.c2
10 files changed, 59 insertions, 71 deletions
diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/go7007/go7007-driver.c
index 5a336ff2d9bb..81ae4b0fa890 100644
--- a/drivers/staging/go7007/go7007-driver.c
+++ b/drivers/staging/go7007/go7007-driver.c
@@ -31,7 +31,7 @@
31#include <linux/semaphore.h> 31#include <linux/semaphore.h>
32#include <linux/uaccess.h> 32#include <linux/uaccess.h>
33#include <asm/system.h> 33#include <asm/system.h>
34#include <linux/videodev.h> 34#include <linux/videodev2.h>
35#include <media/tuner.h> 35#include <media/tuner.h>
36#include <media/v4l2-common.h> 36#include <media/v4l2-common.h>
37 37
diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
index d54d0190d814..94e1141a1fcd 100644
--- a/drivers/staging/go7007/go7007-v4l2.c
+++ b/drivers/staging/go7007/go7007-v4l2.c
@@ -26,8 +26,7 @@
26#include <linux/time.h> 26#include <linux/time.h>
27#include <linux/vmalloc.h> 27#include <linux/vmalloc.h>
28#include <linux/pagemap.h> 28#include <linux/pagemap.h>
29#include <linux/videodev.h> 29#include <linux/videodev2.h>
30#include <linux/video_decoder.h>
31#include <media/v4l2-common.h> 30#include <media/v4l2-common.h>
32#include <media/v4l2-ioctl.h> 31#include <media/v4l2-ioctl.h>
33#include <linux/i2c.h> 32#include <linux/i2c.h>
@@ -835,7 +834,6 @@ static int go7007_do_ioctl(struct inode *inode, struct file *file,
835 case VIDIOC_S_STD: 834 case VIDIOC_S_STD:
836 { 835 {
837 v4l2_std_id *std = arg; 836 v4l2_std_id *std = arg;
838 int norm;
839 837
840 if (go->streaming) 838 if (go->streaming)
841 return -EBUSY; 839 return -EBUSY;
@@ -856,20 +854,17 @@ static int go7007_do_ioctl(struct inode *inode, struct file *file,
856 if (*std & V4L2_STD_NTSC) { 854 if (*std & V4L2_STD_NTSC) {
857 go->standard = GO7007_STD_NTSC; 855 go->standard = GO7007_STD_NTSC;
858 go->sensor_framerate = 30000; 856 go->sensor_framerate = 30000;
859 norm = VIDEO_MODE_NTSC;
860 } else if (*std & V4L2_STD_PAL) { 857 } else if (*std & V4L2_STD_PAL) {
861 go->standard = GO7007_STD_PAL; 858 go->standard = GO7007_STD_PAL;
862 go->sensor_framerate = 25025; 859 go->sensor_framerate = 25025;
863 norm = VIDEO_MODE_PAL;
864 } else if (*std & V4L2_STD_SECAM) { 860 } else if (*std & V4L2_STD_SECAM) {
865 go->standard = GO7007_STD_PAL; 861 go->standard = GO7007_STD_PAL;
866 go->sensor_framerate = 25025; 862 go->sensor_framerate = 25025;
867 norm = VIDEO_MODE_SECAM;
868 } else 863 } else
869 return -EINVAL; 864 return -EINVAL;
870 if (go->i2c_adapter_online) 865 if (go->i2c_adapter_online)
871 i2c_clients_command(&go->i2c_adapter, 866 i2c_clients_command(&go->i2c_adapter,
872 DECODER_SET_NORM, &norm); 867 VIDIOC_S_STD, std);
873 set_capture_size(go, NULL, 0); 868 set_capture_size(go, NULL, 0);
874 return 0; 869 return 0;
875 } 870 }
@@ -933,7 +928,7 @@ static int go7007_do_ioctl(struct inode *inode, struct file *file,
933 return -EBUSY; 928 return -EBUSY;
934 go->input = *input; 929 go->input = *input;
935 if (go->i2c_adapter_online) { 930 if (go->i2c_adapter_online) {
936 i2c_clients_command(&go->i2c_adapter, DECODER_SET_INPUT, 931 i2c_clients_command(&go->i2c_adapter, VIDIOC_S_INPUT,
937 &go->board_info->inputs[*input].video_input); 932 &go->board_info->inputs[*input].video_input);
938 i2c_clients_command(&go->i2c_adapter, VIDIOC_S_AUDIO, 933 i2c_clients_command(&go->i2c_adapter, VIDIOC_S_AUDIO,
939 &go->board_info->inputs[*input].audio_input); 934 &go->board_info->inputs[*input].audio_input);
@@ -1459,6 +1454,7 @@ static struct file_operations go7007_fops = {
1459 1454
1460static struct video_device go7007_template = { 1455static struct video_device go7007_template = {
1461 .name = "go7007", 1456 .name = "go7007",
1457 .vfl_type = VID_TYPE_CAPTURE,
1462 .fops = &go7007_fops, 1458 .fops = &go7007_fops,
1463 .minor = -1, 1459 .minor = -1,
1464 .release = go7007_vfl_release, 1460 .release = go7007_vfl_release,
diff --git a/drivers/staging/go7007/snd-go7007.c b/drivers/staging/go7007/snd-go7007.c
index f5cac08b07ea..382740c405ff 100644
--- a/drivers/staging/go7007/snd-go7007.c
+++ b/drivers/staging/go7007/snd-go7007.c
@@ -44,8 +44,8 @@ module_param_array(index, int, NULL, 0444);
44module_param_array(id, charp, NULL, 0444); 44module_param_array(id, charp, NULL, 0444);
45module_param_array(enable, bool, NULL, 0444); 45module_param_array(enable, bool, NULL, 0444);
46MODULE_PARM_DESC(index, "Index value for the go7007 audio driver"); 46MODULE_PARM_DESC(index, "Index value for the go7007 audio driver");
47MODULE_PARM_DESC(index, "ID string for the go7007 audio driver"); 47MODULE_PARM_DESC(id, "ID string for the go7007 audio driver");
48MODULE_PARM_DESC(index, "Enable for the go7007 audio driver"); 48MODULE_PARM_DESC(enable, "Enable for the go7007 audio driver");
49 49
50struct go7007_snd { 50struct go7007_snd {
51 struct snd_card *card; 51 struct snd_card *card;
diff --git a/drivers/staging/go7007/wis-ov7640.c b/drivers/staging/go7007/wis-ov7640.c
index 815615a62306..f5f11e927af3 100644
--- a/drivers/staging/go7007/wis-ov7640.c
+++ b/drivers/staging/go7007/wis-ov7640.c
@@ -19,8 +19,7 @@
19#include <linux/init.h> 19#include <linux/init.h>
20#include <linux/version.h> 20#include <linux/version.h>
21#include <linux/i2c.h> 21#include <linux/i2c.h>
22#include <linux/videodev.h> 22#include <linux/videodev2.h>
23#include <linux/video_decoder.h>
24 23
25#include "wis-i2c.h" 24#include "wis-i2c.h"
26 25
diff --git a/drivers/staging/go7007/wis-saa7113.c b/drivers/staging/go7007/wis-saa7113.c
index 4b14ca88b1a9..c1aff1b923a0 100644
--- a/drivers/staging/go7007/wis-saa7113.c
+++ b/drivers/staging/go7007/wis-saa7113.c
@@ -19,8 +19,7 @@
19#include <linux/init.h> 19#include <linux/init.h>
20#include <linux/version.h> 20#include <linux/version.h>
21#include <linux/i2c.h> 21#include <linux/i2c.h>
22#include <linux/videodev.h> 22#include <linux/videodev2.h>
23#include <linux/video_decoder.h>
24#include <linux/ioctl.h> 23#include <linux/ioctl.h>
25 24
26#include "wis-i2c.h" 25#include "wis-i2c.h"
@@ -124,7 +123,7 @@ static int wis_saa7113_command(struct i2c_client *client,
124 struct wis_saa7113 *dec = i2c_get_clientdata(client); 123 struct wis_saa7113 *dec = i2c_get_clientdata(client);
125 124
126 switch (cmd) { 125 switch (cmd) {
127 case DECODER_SET_INPUT: 126 case VIDIOC_S_INPUT:
128 { 127 {
129 int *input = arg; 128 int *input = arg;
130 129
@@ -133,23 +132,19 @@ static int wis_saa7113_command(struct i2c_client *client,
133 *input < 6 ? 0x40 : 0x80); 132 *input < 6 ? 0x40 : 0x80);
134 break; 133 break;
135 } 134 }
136 case DECODER_SET_NORM: 135 case VIDIOC_S_STD:
137 { 136 {
138 int *input = arg; 137 v4l2_std_id *input = arg;
139 dec->norm = *input; 138 dec->norm = *input;
140 switch (dec->norm) { 139 if (dec->norm & V4L2_STD_NTSC) {
141 case VIDEO_MODE_PAL:
142 write_reg(client, 0x0e, 0x01);
143 write_reg(client, 0x10, 0x48);
144 break;
145 case VIDEO_MODE_NTSC:
146 write_reg(client, 0x0e, 0x01); 140 write_reg(client, 0x0e, 0x01);
147 write_reg(client, 0x10, 0x40); 141 write_reg(client, 0x10, 0x40);
148 break; 142 } else if (dec->norm & V4L2_STD_PAL) {
149 case VIDEO_MODE_SECAM: 143 write_reg(client, 0x0e, 0x01);
144 write_reg(client, 0x10, 0x48);
145 } else if (dec->norm * V4L2_STD_SECAM) {
150 write_reg(client, 0x0e, 0x50); 146 write_reg(client, 0x0e, 0x50);
151 write_reg(client, 0x10, 0x48); 147 write_reg(client, 0x10, 0x48);
152 break;
153 } 148 }
154 break; 149 break;
155 } 150 }
@@ -295,7 +290,7 @@ static int wis_saa7113_detect(struct i2c_adapter *adapter, int addr, int kind)
295 kfree(client); 290 kfree(client);
296 return -ENOMEM; 291 return -ENOMEM;
297 } 292 }
298 dec->norm = VIDEO_MODE_NTSC; 293 dec->norm = V4L2_STD_NTSC;
299 dec->brightness = 128; 294 dec->brightness = 128;
300 dec->contrast = 71; 295 dec->contrast = 71;
301 dec->saturation = 64; 296 dec->saturation = 64;
diff --git a/drivers/staging/go7007/wis-saa7115.c b/drivers/staging/go7007/wis-saa7115.c
index bd40bf4be282..5c94c883b312 100644
--- a/drivers/staging/go7007/wis-saa7115.c
+++ b/drivers/staging/go7007/wis-saa7115.c
@@ -19,8 +19,7 @@
19#include <linux/init.h> 19#include <linux/init.h>
20#include <linux/version.h> 20#include <linux/version.h>
21#include <linux/i2c.h> 21#include <linux/i2c.h>
22#include <linux/videodev.h> 22#include <linux/videodev2.h>
23#include <linux/video_decoder.h>
24#include <linux/ioctl.h> 23#include <linux/ioctl.h>
25 24
26#include "wis-i2c.h" 25#include "wis-i2c.h"
@@ -204,7 +203,7 @@ static int wis_saa7115_command(struct i2c_client *client,
204 struct wis_saa7115 *dec = i2c_get_clientdata(client); 203 struct wis_saa7115 *dec = i2c_get_clientdata(client);
205 204
206 switch (cmd) { 205 switch (cmd) {
207 case DECODER_SET_INPUT: 206 case VIDIOC_S_INPUT:
208 { 207 {
209 int *input = arg; 208 int *input = arg;
210 209
@@ -222,7 +221,7 @@ static int wis_saa7115_command(struct i2c_client *client,
222 int h_scaling_increment = (704 / h_integer_scaler) * 221 int h_scaling_increment = (704 / h_integer_scaler) *
223 1024 / res->width; 222 1024 / res->width;
224 /* Fine-grained scaler only */ 223 /* Fine-grained scaler only */
225 int v_scaling_increment = (dec->norm == VIDEO_MODE_NTSC ? 224 int v_scaling_increment = (dec->norm & V4L2_STD_NTSC ?
226 240 : 288) * 1024 / res->height; 225 240 : 288) * 1024 / res->height;
227 u8 regs[] = { 226 u8 regs[] = {
228 0x88, 0xc0, 227 0x88, 0xc0,
@@ -262,20 +261,20 @@ static int wis_saa7115_command(struct i2c_client *client,
262 write_regs(client, regs); 261 write_regs(client, regs);
263 break; 262 break;
264 } 263 }
265 case DECODER_SET_NORM: 264 case VIDIOC_S_STD:
266 { 265 {
267 int *input = arg; 266 v4l2_std_id *input = arg;
268 u8 regs[] = { 267 u8 regs[] = {
269 0x88, 0xc0, 268 0x88, 0xc0,
270 0x98, *input == VIDEO_MODE_NTSC ? 0x12 : 0x16, 269 0x98, *input & V4L2_STD_NTSC ? 0x12 : 0x16,
271 0x9a, *input == VIDEO_MODE_NTSC ? 0xf2 : 0x20, 270 0x9a, *input & V4L2_STD_NTSC ? 0xf2 : 0x20,
272 0x9b, *input == VIDEO_MODE_NTSC ? 0x00 : 0x01, 271 0x9b, *input & V4L2_STD_NTSC ? 0x00 : 0x01,
273 0xc8, *input == VIDEO_MODE_NTSC ? 0x12 : 0x16, 272 0xc8, *input & V4L2_STD_NTSC ? 0x12 : 0x16,
274 0xca, *input == VIDEO_MODE_NTSC ? 0xf2 : 0x20, 273 0xca, *input & V4L2_STD_NTSC ? 0xf2 : 0x20,
275 0xcb, *input == VIDEO_MODE_NTSC ? 0x00 : 0x01, 274 0xcb, *input & V4L2_STD_NTSC ? 0x00 : 0x01,
276 0x88, 0xf0, 275 0x88, 0xf0,
277 0x30, *input == VIDEO_MODE_NTSC ? 0x66 : 0x00, 276 0x30, *input & V4L2_STD_NTSC ? 0x66 : 0x00,
278 0x31, *input == VIDEO_MODE_NTSC ? 0x90 : 0xe0, 277 0x31, *input & V4L2_STD_NTSC ? 0x90 : 0xe0,
279 0, 0, 278 0, 0,
280 }; 279 };
281 write_regs(client, regs); 280 write_regs(client, regs);
@@ -424,7 +423,7 @@ static int wis_saa7115_detect(struct i2c_adapter *adapter, int addr, int kind)
424 kfree(client); 423 kfree(client);
425 return -ENOMEM; 424 return -ENOMEM;
426 } 425 }
427 dec->norm = VIDEO_MODE_NTSC; 426 dec->norm = V4L2_STD_NTSC;
428 dec->brightness = 128; 427 dec->brightness = 128;
429 dec->contrast = 64; 428 dec->contrast = 64;
430 dec->saturation = 64; 429 dec->saturation = 64;
diff --git a/drivers/staging/go7007/wis-sony-tuner.c b/drivers/staging/go7007/wis-sony-tuner.c
index 82e66d65f36c..5997fb479459 100644
--- a/drivers/staging/go7007/wis-sony-tuner.c
+++ b/drivers/staging/go7007/wis-sony-tuner.c
@@ -19,9 +19,10 @@
19#include <linux/init.h> 19#include <linux/init.h>
20#include <linux/version.h> 20#include <linux/version.h>
21#include <linux/i2c.h> 21#include <linux/i2c.h>
22#include <linux/videodev.h> 22#include <linux/videodev2.h>
23#include <media/tuner.h> 23#include <media/tuner.h>
24#include <media/v4l2-common.h> 24#include <media/v4l2-common.h>
25#include <media/v4l2-ioctl.h>
25 26
26#include "wis-i2c.h" 27#include "wis-i2c.h"
27 28
diff --git a/drivers/staging/go7007/wis-tw2804.c b/drivers/staging/go7007/wis-tw2804.c
index 69ed7bf03227..27fe4d0d4ed6 100644
--- a/drivers/staging/go7007/wis-tw2804.c
+++ b/drivers/staging/go7007/wis-tw2804.c
@@ -19,8 +19,7 @@
19#include <linux/init.h> 19#include <linux/init.h>
20#include <linux/version.h> 20#include <linux/version.h>
21#include <linux/i2c.h> 21#include <linux/i2c.h>
22#include <linux/videodev.h> 22#include <linux/videodev2.h>
23#include <linux/video_decoder.h>
24#include <linux/ioctl.h> 23#include <linux/ioctl.h>
25 24
26#include "wis-i2c.h" 25#include "wis-i2c.h"
@@ -159,20 +158,20 @@ static int wis_tw2804_command(struct i2c_client *client,
159 } 158 }
160 159
161 switch (cmd) { 160 switch (cmd) {
162 case DECODER_SET_NORM: 161 case VIDIOC_S_STD:
163 { 162 {
164 int *input = arg; 163 v4l2_std_id *input = arg;
165 u8 regs[] = { 164 u8 regs[] = {
166 0x01, *input == VIDEO_MODE_NTSC ? 0xc4 : 0x84, 165 0x01, *input & V4L2_STD_NTSC ? 0xc4 : 0x84,
167 0x09, *input == VIDEO_MODE_NTSC ? 0x07 : 0x04, 166 0x09, *input & V4L2_STD_NTSC ? 0x07 : 0x04,
168 0x0a, *input == VIDEO_MODE_NTSC ? 0xf0 : 0x20, 167 0x0a, *input & V4L2_STD_NTSC ? 0xf0 : 0x20,
169 0x0b, *input == VIDEO_MODE_NTSC ? 0x07 : 0x04, 168 0x0b, *input & V4L2_STD_NTSC ? 0x07 : 0x04,
170 0x0c, *input == VIDEO_MODE_NTSC ? 0xf0 : 0x20, 169 0x0c, *input & V4L2_STD_NTSC ? 0xf0 : 0x20,
171 0x0d, *input == VIDEO_MODE_NTSC ? 0x40 : 0x4a, 170 0x0d, *input & V4L2_STD_NTSC ? 0x40 : 0x4a,
172 0x16, *input == VIDEO_MODE_NTSC ? 0x00 : 0x40, 171 0x16, *input & V4L2_STD_NTSC ? 0x00 : 0x40,
173 0x17, *input == VIDEO_MODE_NTSC ? 0x00 : 0x40, 172 0x17, *input & V4L2_STD_NTSC ? 0x00 : 0x40,
174 0x20, *input == VIDEO_MODE_NTSC ? 0x07 : 0x0f, 173 0x20, *input & V4L2_STD_NTSC ? 0x07 : 0x0f,
175 0x21, *input == VIDEO_MODE_NTSC ? 0x07 : 0x0f, 174 0x21, *input & V4L2_STD_NTSC ? 0x07 : 0x0f,
176 0xff, 0xff, 175 0xff, 0xff,
177 }; 176 };
178 write_regs(client, regs, dec->channel); 177 write_regs(client, regs, dec->channel);
@@ -322,7 +321,7 @@ static int wis_tw2804_detect(struct i2c_adapter *adapter, int addr, int kind)
322 return -ENOMEM; 321 return -ENOMEM;
323 } 322 }
324 dec->channel = -1; 323 dec->channel = -1;
325 dec->norm = VIDEO_MODE_NTSC; 324 dec->norm = V4L2_STD_NTSC;
326 dec->brightness = 128; 325 dec->brightness = 128;
327 dec->contrast = 128; 326 dec->contrast = 128;
328 dec->saturation = 128; 327 dec->saturation = 128;
diff --git a/drivers/staging/go7007/wis-tw9903.c b/drivers/staging/go7007/wis-tw9903.c
index 1cdf01a8b338..d8e41968022e 100644
--- a/drivers/staging/go7007/wis-tw9903.c
+++ b/drivers/staging/go7007/wis-tw9903.c
@@ -19,8 +19,7 @@
19#include <linux/init.h> 19#include <linux/init.h>
20#include <linux/version.h> 20#include <linux/version.h>
21#include <linux/i2c.h> 21#include <linux/i2c.h>
22#include <linux/videodev.h> 22#include <linux/videodev2.h>
23#include <linux/video_decoder.h>
24#include <linux/ioctl.h> 23#include <linux/ioctl.h>
25 24
26#include "wis-i2c.h" 25#include "wis-i2c.h"
@@ -106,7 +105,7 @@ static int wis_tw9903_command(struct i2c_client *client,
106 struct wis_tw9903 *dec = i2c_get_clientdata(client); 105 struct wis_tw9903 *dec = i2c_get_clientdata(client);
107 106
108 switch (cmd) { 107 switch (cmd) {
109 case DECODER_SET_INPUT: 108 case VIDIOC_S_INPUT:
110 { 109 {
111 int *input = arg; 110 int *input = arg;
112 111
@@ -119,7 +118,7 @@ static int wis_tw9903_command(struct i2c_client *client,
119 struct video_decoder_resolution *res = arg; 118 struct video_decoder_resolution *res = arg;
120 /*int hscale = 256 * 720 / res->width;*/ 119 /*int hscale = 256 * 720 / res->width;*/
121 int hscale = 256 * 720 / (res->width - (res->width > 704 ? 0 : 8)); 120 int hscale = 256 * 720 / (res->width - (res->width > 704 ? 0 : 8));
122 int vscale = 256 * (dec->norm == VIDEO_MODE_NTSC ? 240 : 288) 121 int vscale = 256 * (dec->norm & V4L2_STD_NTSC ? 240 : 288)
123 / res->height; 122 / res->height;
124 u8 regs[] = { 123 u8 regs[] = {
125 0x0d, vscale & 0xff, 124 0x0d, vscale & 0xff,
@@ -134,14 +133,14 @@ static int wis_tw9903_command(struct i2c_client *client,
134 break; 133 break;
135 } 134 }
136#endif 135#endif
137 case DECODER_SET_NORM: 136 case VIDIOC_S_STD:
138 { 137 {
139 int *input = arg; 138 v4l2_std_id *input = arg;
140 u8 regs[] = { 139 u8 regs[] = {
141 0x05, *input == VIDEO_MODE_NTSC ? 0x80 : 0x00, 140 0x05, *input & V4L2_STD_NTSC ? 0x80 : 0x00,
142 0x07, *input == VIDEO_MODE_NTSC ? 0x02 : 0x12, 141 0x07, *input & V4L2_STD_NTSC ? 0x02 : 0x12,
143 0x08, *input == VIDEO_MODE_NTSC ? 0x14 : 0x18, 142 0x08, *input & V4L2_STD_NTSC ? 0x14 : 0x18,
144 0x09, *input == VIDEO_MODE_NTSC ? 0xf0 : 0x20, 143 0x09, *input & V4L2_STD_NTSC ? 0xf0 : 0x20,
145 0, 0, 144 0, 0,
146 }; 145 };
147 write_regs(client, regs); 146 write_regs(client, regs);
@@ -297,7 +296,7 @@ static int wis_tw9903_detect(struct i2c_adapter *adapter, int addr, int kind)
297 kfree(client); 296 kfree(client);
298 return -ENOMEM; 297 return -ENOMEM;
299 } 298 }
300 dec->norm = VIDEO_MODE_NTSC; 299 dec->norm = V4L2_STD_NTSC;
301 dec->brightness = 0; 300 dec->brightness = 0;
302 dec->contrast = 0x60; 301 dec->contrast = 0x60;
303 dec->hue = 0; 302 dec->hue = 0;
diff --git a/drivers/staging/go7007/wis-uda1342.c b/drivers/staging/go7007/wis-uda1342.c
index 28c10bf3a47b..a0894e3cb8c7 100644
--- a/drivers/staging/go7007/wis-uda1342.c
+++ b/drivers/staging/go7007/wis-uda1342.c
@@ -19,7 +19,7 @@
19#include <linux/init.h> 19#include <linux/init.h>
20#include <linux/version.h> 20#include <linux/version.h>
21#include <linux/i2c.h> 21#include <linux/i2c.h>
22#include <linux/videodev.h> 22#include <linux/videodev2.h>
23#include <media/tvaudio.h> 23#include <media/tvaudio.h>
24#include <media/v4l2-common.h> 24#include <media/v4l2-common.h>
25 25
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-05 18:42:24 -0400