aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/cx2341x/fw-decoder-api.txt8
-rw-r--r--Documentation/video4linux/cx2341x/fw-encoder-api.txt80
-rw-r--r--Documentation/video4linux/cx2341x/fw-memory.txt2
-rw-r--r--drivers/media/radio/radio-typhoon.c2
-rw-r--r--drivers/media/video/arv.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-input.c2
-rw-r--r--drivers/media/video/bw-qcam.c2
-rw-r--r--drivers/media/video/cpia2/cpia2_v4l.c4
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c2
-rw-r--r--drivers/media/video/ov511.c4
-rw-r--r--drivers/media/video/pms.c2
-rw-r--r--drivers/media/video/pwc/pwc-ctrl.c2
-rw-r--r--drivers/media/video/pwc/pwc-dec23.c4
-rw-r--r--drivers/media/video/pwc/pwc-if.c10
-rw-r--r--drivers/media/video/pwc/pwc-v4l.c38
-rw-r--r--drivers/media/video/saa7134/saa6752hs.c26
-rw-r--r--drivers/media/video/saa7134/saa7134-alsa.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c2
-rw-r--r--drivers/media/video/tda9875.c2
-rw-r--r--drivers/media/video/tuner-simple.c2
21 files changed, 100 insertions, 100 deletions
diff --git a/Documentation/video4linux/cx2341x/fw-decoder-api.txt b/Documentation/video4linux/cx2341x/fw-decoder-api.txt
index 59193b6b5572..9df4fb3ea0f2 100644
--- a/Documentation/video4linux/cx2341x/fw-decoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-decoder-api.txt
@@ -280,7 +280,7 @@ Description
280Param[0] 280Param[0]
281 Bitmask: 281 Bitmask:
282 0:1 Data size: 282 0:1 Data size:
283 '00' 16 bit 283 '00' 16 bit
284 '01' 20 bit 284 '01' 20 bit
285 '10' 24 bit 285 '10' 24 bit
286 2:7 Unused 286 2:7 Unused
@@ -292,9 +292,9 @@ Param[0]
292 (for left justified MSB first mode, 20 bit only) 292 (for left justified MSB first mode, 20 bit only)
293 10:11 Unused 293 10:11 Unused
294 12:13 Channel format: 294 12:13 Channel format:
295 '00' right justified MSB first mode 295 '00' right justified MSB first mode
296 '01' left justified MSB first mode 296 '01' left justified MSB first mode
297 '10' I2S mode 297 '10' I2S mode
298 14:15 Unused 298 14:15 Unused
299 16:21 Right justify bit count 299 16:21 Right justify bit count
300 22:31 Unused 300 22:31 Unused
diff --git a/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
index 64cd111349ad..08ee9f5303f9 100644
--- a/Documentation/video4linux/cx2341x/fw-encoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
@@ -281,64 +281,64 @@ Description
281Param[0] 281Param[0]
282 Bitmask: 282 Bitmask:
283 0:1 '00' 44.1Khz 283 0:1 '00' 44.1Khz
284 '01' 48Khz 284 '01' 48Khz
285 '10' 32Khz 285 '10' 32Khz
286 '11' reserved 286 '11' reserved
287 287
288 2:3 '01'=Layer I 288 2:3 '01'=Layer I
289 '10'=Layer II 289 '10'=Layer II
290 290
291 4:7 Bitrate: 291 4:7 Bitrate:
292 Index | Layer I | Layer II 292 Index | Layer I | Layer II
293 ------+-------------+------------ 293 ------+-------------+------------
294 '0000' | free format | free format 294 '0000' | free format | free format
295 '0001' | 32 kbit/s | 32 kbit/s 295 '0001' | 32 kbit/s | 32 kbit/s
296 '0010' | 64 kbit/s | 48 kbit/s 296 '0010' | 64 kbit/s | 48 kbit/s
297 '0011' | 96 kbit/s | 56 kbit/s 297 '0011' | 96 kbit/s | 56 kbit/s
298 '0100' | 128 kbit/s | 64 kbit/s 298 '0100' | 128 kbit/s | 64 kbit/s
299 '0101' | 160 kbit/s | 80 kbit/s 299 '0101' | 160 kbit/s | 80 kbit/s
300 '0110' | 192 kbit/s | 96 kbit/s 300 '0110' | 192 kbit/s | 96 kbit/s
301 '0111' | 224 kbit/s | 112 kbit/s 301 '0111' | 224 kbit/s | 112 kbit/s
302 '1000' | 256 kbit/s | 128 kbit/s 302 '1000' | 256 kbit/s | 128 kbit/s
303 '1001' | 288 kbit/s | 160 kbit/s 303 '1001' | 288 kbit/s | 160 kbit/s
304 '1010' | 320 kbit/s | 192 kbit/s 304 '1010' | 320 kbit/s | 192 kbit/s
305 '1011' | 352 kbit/s | 224 kbit/s 305 '1011' | 352 kbit/s | 224 kbit/s
306 '1100' | 384 kbit/s | 256 kbit/s 306 '1100' | 384 kbit/s | 256 kbit/s
307 '1101' | 416 kbit/s | 320 kbit/s 307 '1101' | 416 kbit/s | 320 kbit/s
308 '1110' | 448 kbit/s | 384 kbit/s 308 '1110' | 448 kbit/s | 384 kbit/s
309 Note: For Layer II, not all combinations of total bitrate 309 Note: For Layer II, not all combinations of total bitrate
310 and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2 310 and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2
311 311
312 8:9 '00'=Stereo 312 8:9 '00'=Stereo
313 '01'=JointStereo 313 '01'=JointStereo
314 '10'=Dual 314 '10'=Dual
315 '11'=Mono 315 '11'=Mono
316 316
317 10:11 Mode Extension used in joint_stereo mode. 317 10:11 Mode Extension used in joint_stereo mode.
318 In Layer I and II they indicate which subbands are in 318 In Layer I and II they indicate which subbands are in
319 intensity_stereo. All other subbands are coded in stereo. 319 intensity_stereo. All other subbands are coded in stereo.
320 '00' subbands 4-31 in intensity_stereo, bound==4 320 '00' subbands 4-31 in intensity_stereo, bound==4
321 '01' subbands 8-31 in intensity_stereo, bound==8 321 '01' subbands 8-31 in intensity_stereo, bound==8
322 '10' subbands 12-31 in intensity_stereo, bound==12 322 '10' subbands 12-31 in intensity_stereo, bound==12
323 '11' subbands 16-31 in intensity_stereo, bound==16 323 '11' subbands 16-31 in intensity_stereo, bound==16
324 324
325 12:13 Emphasis: 325 12:13 Emphasis:
326 '00' None 326 '00' None
327 '01' 50/15uS 327 '01' 50/15uS
328 '10' reserved 328 '10' reserved
329 '11' CCITT J.17 329 '11' CCITT J.17
330 330
331 14 CRC: 331 14 CRC:
332 '0' off 332 '0' off
333 '1' on 333 '1' on
334 334
335 15 Copyright: 335 15 Copyright:
336 '0' off 336 '0' off
337 '1' on 337 '1' on
338 338
339 16 Generation: 339 16 Generation:
340 '0' copy 340 '0' copy
341 '1' original 341 '1' original
342 342
343------------------------------------------------------------------------------- 343-------------------------------------------------------------------------------
344 344
diff --git a/Documentation/video4linux/cx2341x/fw-memory.txt b/Documentation/video4linux/cx2341x/fw-memory.txt
index 336d8208ef3b..ef0aad3f88fc 100644
--- a/Documentation/video4linux/cx2341x/fw-memory.txt
+++ b/Documentation/video4linux/cx2341x/fw-memory.txt
@@ -60,7 +60,7 @@ DMA Registers 0x000-0xff:
60 if changed to 0xffffffff DMA write interrupts break. 60 if changed to 0xffffffff DMA write interrupts break.
61 0x50 - always 0xffffffff 61 0x50 - always 0xffffffff
62 0x54 - always 0xffffffff (0x4c, 0x50, 0x54 seem like interrupt masks, are 62 0x54 - always 0xffffffff (0x4c, 0x50, 0x54 seem like interrupt masks, are
63 3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the 63 3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the
64 interrupt masks???). 64 interrupt masks???).
65 0x60-0x7C - random values 65 0x60-0x7C - random values
66 0x80 - first write linked list reg, for Encoder Memory addr 66 0x80 - first write linked list reg, for Encoder Memory addr
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index cf4fc08bd8a7..edd012288669 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -363,7 +363,7 @@ static int __init typhoon_init(void)
363#ifdef CONFIG_RADIO_TYPHOON_PROC_FS 363#ifdef CONFIG_RADIO_TYPHOON_PROC_FS
364 if (!create_proc_info_entry("driver/radio-typhoon", 0, NULL, 364 if (!create_proc_info_entry("driver/radio-typhoon", 0, NULL,
365 typhoon_get_info)) 365 typhoon_get_info))
366 printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n"); 366 printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n");
367#endif 367#endif
368 368
369 return 0; 369 return 0;
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 53824cc229fa..6e08e32346eb 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -213,7 +213,7 @@ void init_iic(void)
213 ar_outl(0x0300, PLDI2CMOD); /* I2CMOD ACK/8b-data/7b-addr/auto */ 213 ar_outl(0x0300, PLDI2CMOD); /* I2CMOD ACK/8b-data/7b-addr/auto */
214 ar_outl(0x1, PLDI2CACK); /* I2CACK ACK */ 214 ar_outl(0x1, PLDI2CACK); /* I2CACK ACK */
215 215
216 /* I2C CLK */ 216 /* I2C CLK */
217 /* 50MH-100k */ 217 /* 50MH-100k */
218 if (freq == 75) { 218 if (freq == 75) {
219 ar_outl(369, PLDI2CFREQ); /* BCLK = 75MHz */ 219 ar_outl(369, PLDI2CFREQ); /* BCLK = 75MHz */
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 671f92b1df18..726d570ad5bb 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -269,7 +269,7 @@ static struct CARD {
269 { 0x41a0a051, BTTV_BOARD_FLYVIDEO_98FM, "Lifeview FlyVideo 98 LR50 Rev Q" }, 269 { 0x41a0a051, BTTV_BOARD_FLYVIDEO_98FM, "Lifeview FlyVideo 98 LR50 Rev Q" },
270 { 0x18501f7f, BTTV_BOARD_FLYVIDEO_98, "Lifeview Flyvideo 98" }, 270 { 0x18501f7f, BTTV_BOARD_FLYVIDEO_98, "Lifeview Flyvideo 98" },
271 271
272 { 0x010115cb, BTTV_BOARD_GMV1, "AG GMV1" }, 272 { 0x010115cb, BTTV_BOARD_GMV1, "AG GMV1" },
273 { 0x010114c7, BTTV_BOARD_MODTEC_205, "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV" }, 273 { 0x010114c7, BTTV_BOARD_MODTEC_205, "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV" },
274 274
275 { 0x10b42636, BTTV_BOARD_HAUPPAUGE878, "STB ???" }, 275 { 0x10b42636, BTTV_BOARD_HAUPPAUGE878, "STB ???" },
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 69efa0e5174d..b41f81d2372c 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -355,7 +355,7 @@ int bttv_input_init(struct bttv *btv)
355 355
356 if (ir->rc5_gpio) { 356 if (ir->rc5_gpio) {
357 u32 gpio; 357 u32 gpio;
358 /* enable remote irq */ 358 /* enable remote irq */
359 bttv_gpio_inout(&btv->c, (1 << 4), 1 << 4); 359 bttv_gpio_inout(&btv->c, (1 << 4), 1 << 4);
360 gpio = bttv_gpio_read(&btv->c); 360 gpio = bttv_gpio_read(&btv->c);
361 bttv_gpio_write(&btv->c, gpio & ~(1 << 4)); 361 bttv_gpio_write(&btv->c, gpio & ~(1 << 4));
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index 709c07cee290..7d0b6e59c6e2 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -760,7 +760,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
760 { 760 {
761 struct video_picture *p = arg; 761 struct video_picture *p = arg;
762 if(p->palette!=VIDEO_PALETTE_GREY) 762 if(p->palette!=VIDEO_PALETTE_GREY)
763 return -EINVAL; 763 return -EINVAL;
764 if(p->depth!=4 && p->depth!=6) 764 if(p->depth!=4 && p->depth!=6)
765 return -EINVAL; 765 return -EINVAL;
766 766
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 481e178ef56d..28d93c595df0 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -1167,9 +1167,9 @@ static int ioctl_g_ctrl(void *arg,struct camera_data *cam)
1167 } else { 1167 } else {
1168 if(cam->params.flicker_control.cam_register & 1168 if(cam->params.flicker_control.cam_register &
1169 CPIA2_VP_FLICKER_MODES_50HZ) { 1169 CPIA2_VP_FLICKER_MODES_50HZ) {
1170 mode = FLICKER_50; 1170 mode = FLICKER_50;
1171 } else { 1171 } else {
1172 mode = FLICKER_60; 1172 mode = FLICKER_60;
1173 } 1173 }
1174 } 1174 }
1175 for(i=0; i<NUM_FLICKER_CONTROLS; i++) { 1175 for(i=0; i<NUM_FLICKER_CONTROLS; i++) {
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d599ecfed08b..dce1feddd55d 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -358,7 +358,7 @@ static struct or51132_config pchdtv_hd3000 = {
358 358
359#ifdef HAVE_LGDT330X 359#ifdef HAVE_LGDT330X
360static int lgdt3302_tuner_set_params(struct dvb_frontend* fe, 360static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
361 struct dvb_frontend_parameters* params) 361 struct dvb_frontend_parameters* params)
362{ 362{
363 /* FIXME make this routine use the tuner-simple code. 363 /* FIXME make this routine use the tuner-simple code.
364 * It could probably be shared with a number of ATSC 364 * It could probably be shared with a number of ATSC
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index fdc8e3f13937..a988df226aab 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -3239,7 +3239,7 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
3239 RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw); 3239 RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw);
3240 3240
3241 if (frame->scanstate == STATE_LINES) { 3241 if (frame->scanstate == STATE_LINES) {
3242 int nextf; 3242 int nextf;
3243 3243
3244 frame->grabstate = FRAME_DONE; 3244 frame->grabstate = FRAME_DONE;
3245 wake_up_interruptible(&frame->wq); 3245 wake_up_interruptible(&frame->wq);
@@ -3405,7 +3405,7 @@ eof:
3405 RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw); 3405 RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw);
3406 3406
3407 if (frame->scanstate == STATE_LINES) { 3407 if (frame->scanstate == STATE_LINES) {
3408 int nextf; 3408 int nextf;
3409 3409
3410 frame->grabstate = FRAME_DONE; 3410 frame->grabstate = FRAME_DONE;
3411 wake_up_interruptible(&frame->wq); 3411 wake_up_interruptible(&frame->wq);
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index fb6471e74dc5..5d681fa8bcb1 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -805,7 +805,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
805 struct video_picture *p = arg; 805 struct video_picture *p = arg;
806 if(!((p->palette==VIDEO_PALETTE_RGB565 && p->depth==16) 806 if(!((p->palette==VIDEO_PALETTE_RGB565 && p->depth==16)
807 ||(p->palette==VIDEO_PALETTE_RGB555 && p->depth==15))) 807 ||(p->palette==VIDEO_PALETTE_RGB555 && p->depth==15)))
808 return -EINVAL; 808 return -EINVAL;
809 pd->picture= *p; 809 pd->picture= *p;
810 810
811 /* 811 /*
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c
index 93306c717279..62a581399b19 100644
--- a/drivers/media/video/pwc/pwc-ctrl.c
+++ b/drivers/media/video/pwc/pwc-ctrl.c
@@ -1385,7 +1385,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
1385 1385
1386 ARG_IN(leds) 1386 ARG_IN(leds)
1387 ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off); 1387 ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off);
1388 break; 1388 break;
1389 } 1389 }
1390 1390
1391 1391
diff --git a/drivers/media/video/pwc/pwc-dec23.c b/drivers/media/video/pwc/pwc-dec23.c
index 39eaf58396df..9e2d91f26bfe 100644
--- a/drivers/media/video/pwc/pwc-dec23.c
+++ b/drivers/media/video/pwc/pwc-dec23.c
@@ -105,7 +105,7 @@ static void build_bit_powermask_table(struct pwc_dec23_private *pdec)
105 105
106 106
107static void build_table_color(const unsigned int romtable[16][8], 107static void build_table_color(const unsigned int romtable[16][8],
108 unsigned char p0004[16][1024], 108 unsigned char p0004[16][1024],
109 unsigned char p8004[16][256]) 109 unsigned char p8004[16][256])
110{ 110{
111 int compression_mode, j, k, bit, pw; 111 int compression_mode, j, k, bit, pw;
@@ -787,7 +787,7 @@ static void DecompressBand23(struct pwc_dec23_private *pdec,
787 * 787 *
788 */ 788 */
789static void DecompressBandBayer(struct pwc_dec23_private *pdec, 789static void DecompressBandBayer(struct pwc_dec23_private *pdec,
790 const unsigned char *rawyuv, 790 const unsigned char *rawyuv,
791 unsigned char *rgbbayer, 791 unsigned char *rgbbayer,
792 unsigned int compressed_image_width, 792 unsigned int compressed_image_width,
793 unsigned int real_image_width) 793 unsigned int real_image_width)
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 98059c8d6f69..d1cec3976063 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1064,7 +1064,7 @@ static const char *pwc_sensor_type_to_string(unsigned int sensor_type)
1064 case 0x101: 1064 case 0x101:
1065 return "PAL MR sensor"; 1065 return "PAL MR sensor";
1066 default: 1066 default:
1067 return "unknown type of sensor"; 1067 return "unknown type of sensor";
1068 } 1068 }
1069} 1069}
1070#endif 1070#endif
@@ -1696,10 +1696,10 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
1696 (device_hint[hint].pdev == NULL)) { 1696 (device_hint[hint].pdev == NULL)) {
1697 /* so far, so good... try serial number */ 1697 /* so far, so good... try serial number */
1698 if ((device_hint[hint].serial_number[0] == '*') || !strcmp(device_hint[hint].serial_number, serial_number)) { 1698 if ((device_hint[hint].serial_number[0] == '*') || !strcmp(device_hint[hint].serial_number, serial_number)) {
1699 /* match! */ 1699 /* match! */
1700 video_nr = device_hint[hint].device_node; 1700 video_nr = device_hint[hint].device_node;
1701 PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr); 1701 PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr);
1702 break; 1702 break;
1703 } 1703 }
1704 } 1704 }
1705 } 1705 }
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 9432cbc0e6f5..b7eb3ce3b968 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -676,9 +676,9 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
676 break; 676 break;
677 } 677 }
678 678
679 /* V4L2 Layer */ 679 /* V4L2 Layer */
680 case VIDIOC_QUERYCAP: 680 case VIDIOC_QUERYCAP:
681 { 681 {
682 struct v4l2_capability *cap = arg; 682 struct v4l2_capability *cap = arg;
683 683
684 PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCAP) This application "\ 684 PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCAP) This application "\
@@ -694,8 +694,8 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
694 return 0; 694 return 0;
695 } 695 }
696 696
697 case VIDIOC_ENUMINPUT: 697 case VIDIOC_ENUMINPUT:
698 { 698 {
699 struct v4l2_input *i = arg; 699 struct v4l2_input *i = arg;
700 700
701 if ( i->index ) /* Only one INPUT is supported */ 701 if ( i->index ) /* Only one INPUT is supported */
@@ -706,14 +706,14 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
706 return 0; 706 return 0;
707 } 707 }
708 708
709 case VIDIOC_G_INPUT: 709 case VIDIOC_G_INPUT:
710 { 710 {
711 int *i = arg; 711 int *i = arg;
712 *i = 0; /* Only one INPUT is supported */ 712 *i = 0; /* Only one INPUT is supported */
713 return 0; 713 return 0;
714 } 714 }
715 case VIDIOC_S_INPUT: 715 case VIDIOC_S_INPUT:
716 { 716 {
717 int *i = arg; 717 int *i = arg;
718 718
719 if ( *i ) { /* Only one INPUT is supported */ 719 if ( *i ) { /* Only one INPUT is supported */
@@ -725,7 +725,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
725 } 725 }
726 726
727 /* TODO: */ 727 /* TODO: */
728 case VIDIOC_QUERYCTRL: 728 case VIDIOC_QUERYCTRL:
729 { 729 {
730 struct v4l2_queryctrl *c = arg; 730 struct v4l2_queryctrl *c = arg;
731 int i; 731 int i;
@@ -963,13 +963,13 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
963 963
964 case VIDIOC_ENUM_FMT: 964 case VIDIOC_ENUM_FMT:
965 { 965 {
966 struct v4l2_fmtdesc *f = arg; 966 struct v4l2_fmtdesc *f = arg;
967 int index; 967 int index;
968 968
969 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) 969 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
970 return -EINVAL; 970 return -EINVAL;
971 971
972 /* We only support two format: the raw format, and YUV */ 972 /* We only support two format: the raw format, and YUV */
973 index = f->index; 973 index = f->index;
974 memset(f,0,sizeof(struct v4l2_fmtdesc)); 974 memset(f,0,sizeof(struct v4l2_fmtdesc));
975 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; 975 f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -978,23 +978,23 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
978 { 978 {
979 case 0: 979 case 0:
980 /* RAW format */ 980 /* RAW format */
981 f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2; 981 f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2;
982 f->flags = V4L2_FMT_FLAG_COMPRESSED; 982 f->flags = V4L2_FMT_FLAG_COMPRESSED;
983 strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description)); 983 strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description));
984 break; 984 break;
985 case 1: 985 case 1:
986 f->pixelformat = V4L2_PIX_FMT_YUV420; 986 f->pixelformat = V4L2_PIX_FMT_YUV420;
987 strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description)); 987 strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description));
988 break; 988 break;
989 default: 989 default:
990 return -EINVAL; 990 return -EINVAL;
991 } 991 }
992 return 0; 992 return 0;
993 } 993 }
994 994
995 case VIDIOC_G_FMT: 995 case VIDIOC_G_FMT:
996 { 996 {
997 struct v4l2_format *f = arg; 997 struct v4l2_format *f = arg;
998 998
999 PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",pdev->image.x,pdev->image.y); 999 PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",pdev->image.x,pdev->image.y);
1000 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) 1000 if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -1008,7 +1008,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
1008 case VIDIOC_TRY_FMT: 1008 case VIDIOC_TRY_FMT:
1009 return pwc_vidioc_try_fmt(pdev, arg); 1009 return pwc_vidioc_try_fmt(pdev, arg);
1010 1010
1011 case VIDIOC_S_FMT: 1011 case VIDIOC_S_FMT:
1012 return pwc_vidioc_set_fmt(pdev, arg); 1012 return pwc_vidioc_set_fmt(pdev, arg);
1013 1013
1014 case VIDIOC_G_STD: 1014 case VIDIOC_G_STD:
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 0e0ba50946e8..a95878004f93 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -62,11 +62,11 @@ struct saa6752hs_state {
62 62
63enum saa6752hs_command { 63enum saa6752hs_command {
64 SAA6752HS_COMMAND_RESET = 0, 64 SAA6752HS_COMMAND_RESET = 0,
65 SAA6752HS_COMMAND_STOP = 1, 65 SAA6752HS_COMMAND_STOP = 1,
66 SAA6752HS_COMMAND_START = 2, 66 SAA6752HS_COMMAND_START = 2,
67 SAA6752HS_COMMAND_PAUSE = 3, 67 SAA6752HS_COMMAND_PAUSE = 3,
68 SAA6752HS_COMMAND_RECONFIGURE = 4, 68 SAA6752HS_COMMAND_RECONFIGURE = 4,
69 SAA6752HS_COMMAND_SLEEP = 5, 69 SAA6752HS_COMMAND_SLEEP = 5,
70 SAA6752HS_COMMAND_RECONFIGURE_FORCE = 6, 70 SAA6752HS_COMMAND_RECONFIGURE_FORCE = 6,
71 71
72 SAA6752HS_COMMAND_MAX 72 SAA6752HS_COMMAND_MAX
@@ -241,19 +241,19 @@ static int saa6752hs_set_bitrate(struct i2c_client* client,
241 if (params->vi_bitrate.mode == V4L2_BITRATE_VBR) { 241 if (params->vi_bitrate.mode == V4L2_BITRATE_VBR) {
242 /* set the target bitrate */ 242 /* set the target bitrate */
243 buf[0] = 0x80; 243 buf[0] = 0x80;
244 buf[1] = params->vi_bitrate.target >> 8; 244 buf[1] = params->vi_bitrate.target >> 8;
245 buf[2] = params->vi_bitrate.target & 0xff; 245 buf[2] = params->vi_bitrate.target & 0xff;
246 i2c_master_send(client, buf, 3); 246 i2c_master_send(client, buf, 3);
247 247
248 /* set the max bitrate */ 248 /* set the max bitrate */
249 buf[0] = 0x81; 249 buf[0] = 0x81;
250 buf[1] = params->vi_bitrate.max >> 8; 250 buf[1] = params->vi_bitrate.max >> 8;
251 buf[2] = params->vi_bitrate.max & 0xff; 251 buf[2] = params->vi_bitrate.max & 0xff;
252 i2c_master_send(client, buf, 3); 252 i2c_master_send(client, buf, 3);
253 } else { 253 } else {
254 /* set the target bitrate (no max bitrate for CBR) */ 254 /* set the target bitrate (no max bitrate for CBR) */
255 buf[0] = 0x81; 255 buf[0] = 0x81;
256 buf[1] = params->vi_bitrate.target >> 8; 256 buf[1] = params->vi_bitrate.target >> 8;
257 buf[2] = params->vi_bitrate.target & 0xff; 257 buf[2] = params->vi_bitrate.target & 0xff;
258 i2c_master_send(client, buf, 3); 258 i2c_master_send(client, buf, 3);
259 } 259 }
@@ -395,22 +395,22 @@ static int saa6752hs_init(struct i2c_client* client)
395 buf[2] = 0x0D; 395 buf[2] = 0x0D;
396 i2c_master_send(client,buf,3); 396 i2c_master_send(client,buf,3);
397 397
398 /* Set minimum Q-scale {4} */ 398 /* Set minimum Q-scale {4} */
399 buf[0] = 0x82; 399 buf[0] = 0x82;
400 buf[1] = 0x04; 400 buf[1] = 0x04;
401 i2c_master_send(client,buf,2); 401 i2c_master_send(client,buf,2);
402 402
403 /* Set maximum Q-scale {12} */ 403 /* Set maximum Q-scale {12} */
404 buf[0] = 0x83; 404 buf[0] = 0x83;
405 buf[1] = 0x0C; 405 buf[1] = 0x0C;
406 i2c_master_send(client,buf,2); 406 i2c_master_send(client,buf,2);
407 407
408 /* Set Output Protocol */ 408 /* Set Output Protocol */
409 buf[0] = 0xD0; 409 buf[0] = 0xD0;
410 buf[1] = 0x81; 410 buf[1] = 0x81;
411 i2c_master_send(client,buf,2); 411 i2c_master_send(client,buf,2);
412 412
413 /* Set video output stream format {TS} */ 413 /* Set video output stream format {TS} */
414 buf[0] = 0xB0; 414 buf[0] = 0xB0;
415 buf[1] = 0x05; 415 buf[1] = 0x05;
416 i2c_master_send(client,buf,2); 416 i2c_master_send(client,buf,2);
@@ -441,7 +441,7 @@ static int saa6752hs_init(struct i2c_client* client)
441 localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF; 441 localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF;
442 localPMT[sizeof(PMT) - 1] = crc & 0xFF; 442 localPMT[sizeof(PMT) - 1] = crc & 0xFF;
443 443
444 /* Set Audio PID */ 444 /* Set Audio PID */
445 buf[0] = 0xC1; 445 buf[0] = 0xC1;
446 buf[1] = (h->params.ts_pid_audio >> 8) & 0xFF; 446 buf[1] = (h->params.ts_pid_audio >> 8) & 0xFF;
447 buf[2] = h->params.ts_pid_audio & 0xFF; 447 buf[2] = h->params.ts_pid_audio & 0xFF;
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index bb3e0ba946d3..d77e6a8d9432 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -818,7 +818,7 @@ static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol,
818 break; 818 break;
819 } 819 }
820 820
821 /* output xbar always main channel */ 821 /* output xbar always main channel */
822 saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10); 822 saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10);
823 823
824 if (left || right) { // We've got data, turn the input on 824 if (left || right) { // We've got data, turn the input on
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index e638b198786e..927413aded10 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2160,7 +2160,7 @@ struct saa7134_board saa7134_boards[] = {
2160 .radio = { 2160 .radio = {
2161 .name = name_radio, 2161 .name = name_radio,
2162 .amux = LINE2, 2162 .amux = LINE2,
2163 }, 2163 },
2164 }, 2164 },
2165 [SAA7134_BOARD_GOTVIEW_7135] = { 2165 [SAA7134_BOARD_GOTVIEW_7135] = {
2166 /* Mike Baikov <mike@baikov.com> */ 2166 /* Mike Baikov <mike@baikov.com> */
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 5b6aa49bf4f2..827633b3bb43 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -164,7 +164,7 @@ static void do_tda9875_init(struct i2c_client *client)
164 struct tda9875 *t = i2c_get_clientdata(client); 164 struct tda9875 *t = i2c_get_clientdata(client);
165 dprintk("In tda9875_init\n"); 165 dprintk("In tda9875_init\n");
166 tda9875_write(client, TDA9875_CFG, 0xd0 ); /*reg de config 0 (reset)*/ 166 tda9875_write(client, TDA9875_CFG, 0xd0 ); /*reg de config 0 (reset)*/
167 tda9875_write(client, TDA9875_MSR, 0x03 ); /* Monitor 0b00000XXX*/ 167 tda9875_write(client, TDA9875_MSR, 0x03 ); /* Monitor 0b00000XXX*/
168 tda9875_write(client, TDA9875_C1MSB, 0x00 ); /*Car1(FM) MSB XMHz*/ 168 tda9875_write(client, TDA9875_C1MSB, 0x00 ); /*Car1(FM) MSB XMHz*/
169 tda9875_write(client, TDA9875_C1MIB, 0x00 ); /*Car1(FM) MIB XMHz*/ 169 tda9875_write(client, TDA9875_C1MIB, 0x00 ); /*Car1(FM) MIB XMHz*/
170 tda9875_write(client, TDA9875_C1LSB, 0x00 ); /*Car1(FM) LSB XMHz*/ 170 tda9875_write(client, TDA9875_C1LSB, 0x00 ); /*Car1(FM) LSB XMHz*/
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 5d7abed71674..6da6f82b8c88 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -105,7 +105,7 @@ static int tuner_stereo(struct i2c_client *c)
105 105
106 switch (t->type) { 106 switch (t->type) {
107 case TUNER_PHILIPS_FM1216ME_MK3: 107 case TUNER_PHILIPS_FM1216ME_MK3:
108 case TUNER_PHILIPS_FM1236_MK3: 108 case TUNER_PHILIPS_FM1236_MK3:
109 case TUNER_PHILIPS_FM1256_IH3: 109 case TUNER_PHILIPS_FM1256_IH3:
110 stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3); 110 stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
111 break; 111 break;