summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-02-18 14:29:03 -0500
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-03-01 09:43:27 -0500
commit3e4d8f48b9bfff7585135d096132df9653be9377 (patch)
treee39eb3d1af62311754cf6e30d26ce21867ea496f
parentdda1bb4e971e0105adfb1f00db7c2e1aefe3a314 (diff)
media: usb: fix several typos
Use codespell to fix lots of typos over frontends. Manually verified to avoid false-positives. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--drivers/media/usb/au0828/au0828-core.c2
-rw-r--r--drivers/media/usb/au0828/au0828.h2
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-avcore.c2
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h2
-rw-r--r--drivers/media/usb/cx231xx/cx231xx.h2
-rw-r--r--drivers/media/usb/dvb-usb-v2/dvb_usb.h2
-rw-r--r--drivers/media/usb/dvb-usb-v2/lmedm04.c8
-rw-r--r--drivers/media/usb/dvb-usb-v2/mxl111sf.c4
-rw-r--r--drivers/media/usb/dvb-usb/af9005.c2
-rw-r--r--drivers/media/usb/dvb-usb/cinergyT2-fe.c2
-rw-r--r--drivers/media/usb/dvb-usb/cxusb.c2
-rw-r--r--drivers/media/usb/dvb-usb/dvb-usb-init.c2
-rw-r--r--drivers/media/usb/dvb-usb/dvb-usb.h2
-rw-r--r--drivers/media/usb/dvb-usb/pctv452e.c4
-rw-r--r--drivers/media/usb/em28xx/em28xx-i2c.c4
-rw-r--r--drivers/media/usb/em28xx/em28xx-reg.h2
-rw-r--r--drivers/media/usb/gspca/Kconfig2
-rw-r--r--drivers/media/usb/gspca/autogain_functions.c2
-rw-r--r--drivers/media/usb/gspca/benq.c4
-rw-r--r--drivers/media/usb/gspca/mr97310a.c10
-rw-r--r--drivers/media/usb/gspca/ov519.c4
-rw-r--r--drivers/media/usb/gspca/pac_common.h2
-rw-r--r--drivers/media/usb/gspca/sn9c20x.c2
-rw-r--r--drivers/media/usb/gspca/sonixb.c4
-rw-r--r--drivers/media/usb/gspca/sonixj.c2
-rw-r--r--drivers/media/usb/gspca/spca501.c2
-rw-r--r--drivers/media/usb/gspca/sq905.c2
-rw-r--r--drivers/media/usb/gspca/sunplus.c4
-rw-r--r--drivers/media/usb/gspca/t613.c2
-rw-r--r--drivers/media/usb/gspca/touptek.c4
-rw-r--r--drivers/media/usb/gspca/w996Xcf.c2
-rw-r--r--drivers/media/usb/gspca/zc3xx-reg.h2
-rw-r--r--drivers/media/usb/gspca/zc3xx.c8
-rw-r--r--drivers/media/usb/hdpvr/hdpvr.h2
-rw-r--r--drivers/media/usb/pwc/pwc-dec23.c4
-rw-r--r--drivers/media/usb/pwc/pwc-if.c2
-rw-r--r--drivers/media/usb/pwc/pwc-misc.c2
-rw-r--r--drivers/media/usb/siano/smsusb.c2
-rw-r--r--drivers/media/usb/stk1160/stk1160-core.c4
-rw-r--r--drivers/media/usb/stk1160/stk1160-reg.h4
-rw-r--r--drivers/media/usb/stkwebcam/stk-webcam.c2
-rw-r--r--drivers/media/usb/tm6000/tm6000-alsa.c2
-rw-r--r--drivers/media/usb/tm6000/tm6000-core.c4
-rw-r--r--drivers/media/usb/tm6000/tm6000-dvb.c2
-rw-r--r--drivers/media/usb/tm6000/tm6000-i2c.c2
-rw-r--r--drivers/media/usb/tm6000/tm6000-stds.c2
-rw-r--r--drivers/media/usb/tm6000/tm6000-video.c2
-rw-r--r--drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c2
-rw-r--r--drivers/media/usb/ttusb-dec/ttusb_dec.c2
-rw-r--r--drivers/media/usb/usbvision/usbvision-core.c8
-rw-r--r--drivers/media/usb/usbvision/usbvision.h8
-rw-r--r--drivers/media/usb/uvc/uvc_video.c2
-rw-r--r--drivers/media/usb/zr364xx/zr364xx.c2
53 files changed, 81 insertions, 81 deletions
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index 1fdb1601dc65..3f8c92a70116 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -234,7 +234,7 @@ static void au0828_media_graph_notify(struct media_entity *new,
234 if (!new) { 234 if (!new) {
235 /* 235 /*
236 * Called during au0828 probe time to connect 236 * Called during au0828 probe time to connect
237 * entites that were created prior to registering 237 * entities that were created prior to registering
238 * the notify handler. Find mixer and decoder. 238 * the notify handler. Find mixer and decoder.
239 */ 239 */
240 media_device_for_each_entity(entity, dev->media_dev) { 240 media_device_for_each_entity(entity, dev->media_dev) {
diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h
index 004eadef55c7..425c35d16057 100644
--- a/drivers/media/usb/au0828/au0828.h
+++ b/drivers/media/usb/au0828/au0828.h
@@ -52,7 +52,7 @@
52 52
53#define AU0828_INTERLACED_DEFAULT 1 53#define AU0828_INTERLACED_DEFAULT 1
54 54
55/* Defination for AU0828 USB transfer */ 55/* Definition for AU0828 USB transfer */
56#define AU0828_MAX_ISO_BUFS 12 /* maybe resize this value in the future */ 56#define AU0828_MAX_ISO_BUFS 12 /* maybe resize this value in the future */
57#define AU0828_ISO_PACKETS_PER_URB 128 57#define AU0828_ISO_PACKETS_PER_URB 128
58 58
diff --git a/drivers/media/usb/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c
index fdd3c221fa0d..3374888b3021 100644
--- a/drivers/media/usb/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c
@@ -2987,7 +2987,7 @@ int cx231xx_gpio_i2c_write_ack(struct cx231xx *dev)
2987{ 2987{
2988 int status = 0; 2988 int status = 0;
2989 2989
2990 /* set SDA to ouput */ 2990 /* set SDA to output */
2991 dev->gpio_dir |= 1 << dev->board.tuner_sda_gpio; 2991 dev->gpio_dir |= 1 << dev->board.tuner_sda_gpio;
2992 status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, dev->gpio_val); 2992 status = cx231xx_set_gpio_bit(dev, dev->gpio_dir, dev->gpio_val);
2993 2993
diff --git a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
index 8f00b1d38277..bb4f817be0c5 100644
--- a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
+++ b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
@@ -86,7 +86,7 @@ enum TS_PORT{
86#define EAVP_MASK 0x8 86#define EAVP_MASK 0x8
87enum EAV_PRESENT{ 87enum EAV_PRESENT{
88 NO_EXTERNAL_AV = 0x0, /* 0: No External A/V inputs 88 NO_EXTERNAL_AV = 0x0, /* 0: No External A/V inputs
89 (no need for i2s blcok), 89 (no need for i2s block),
90 Analog Tuner must be present */ 90 Analog Tuner must be present */
91 EXTERNAL_AV = 0x8 /* 1: External A/V inputs 91 EXTERNAL_AV = 0x8 /* 1: External A/V inputs
92 present (requires i2s blk) */ 92 present (requires i2s blk) */
diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index fa640bf20111..86b7f57492b1 100644
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -646,7 +646,7 @@ struct cx231xx {
646 /* frame properties */ 646 /* frame properties */
647 int width; /* current frame width */ 647 int width; /* current frame width */
648 int height; /* current frame height */ 648 int height; /* current frame height */
649 int interlaced; /* 1=interlace fileds, 0=just top fileds */ 649 int interlaced; /* 1=interlace fields, 0=just top fields */
650 650
651 struct cx231xx_audio adev; 651 struct cx231xx_audio adev;
652 652
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb.h b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
index 3fd6cc0d6340..728ef5f3ada2 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb.h
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
@@ -146,7 +146,7 @@ struct dvb_usb_rc {
146}; 146};
147 147
148/** 148/**
149 * usb streaming configration for adapter 149 * usb streaming configuration for adapter
150 * @type: urb type 150 * @type: urb type
151 * @count: count of used urbs 151 * @count: count of used urbs
152 * @endpoint: stream usb endpoint number 152 * @endpoint: stream usb endpoint number
diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
index 602013cf3e69..15944b95970f 100644
--- a/drivers/media/usb/dvb-usb-v2/lmedm04.c
+++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c
@@ -308,7 +308,7 @@ static void lme2510_int_response(struct urb *lme_urb)
308 308
309 switch (ibuf[0]) { 309 switch (ibuf[0]) {
310 case 0xaa: 310 case 0xaa:
311 debug_data_snipet(1, "INT Remote data snipet", ibuf); 311 debug_data_snipet(1, "INT Remote data snippet", ibuf);
312 if (!adap_to_d(adap)->rc_dev) 312 if (!adap_to_d(adap)->rc_dev)
313 break; 313 break;
314 314
@@ -358,13 +358,13 @@ static void lme2510_int_response(struct urb *lme_urb)
358 358
359 lme2510_update_stats(adap); 359 lme2510_update_stats(adap);
360 360
361 debug_data_snipet(5, "INT Remote data snipet in", ibuf); 361 debug_data_snipet(5, "INT Remote data snippet in", ibuf);
362 break; 362 break;
363 case 0xcc: 363 case 0xcc:
364 debug_data_snipet(1, "INT Control data snipet", ibuf); 364 debug_data_snipet(1, "INT Control data snippet", ibuf);
365 break; 365 break;
366 default: 366 default:
367 debug_data_snipet(1, "INT Unknown data snipet", ibuf); 367 debug_data_snipet(1, "INT Unknown data snippet", ibuf);
368 break; 368 break;
369 } 369 }
370 } 370 }
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf.c b/drivers/media/usb/dvb-usb-v2/mxl111sf.c
index 85cdf593a9ad..5e2d53af68c7 100644
--- a/drivers/media/usb/dvb-usb-v2/mxl111sf.c
+++ b/drivers/media/usb/dvb-usb-v2/mxl111sf.c
@@ -140,7 +140,7 @@ int mxl111sf_write_reg_mask(struct mxl111sf_state *state,
140 if (mask != 0xff) { 140 if (mask != 0xff) {
141 ret = mxl111sf_read_reg(state, addr, &val); 141 ret = mxl111sf_read_reg(state, addr, &val);
142#if 1 142#if 1
143 /* dont know why this usually errors out on the first try */ 143 /* don't know why this usually errors out on the first try */
144 if (mxl_fail(ret)) 144 if (mxl_fail(ret))
145 pr_err("error writing addr: 0x%02x, mask: 0x%02x, data: 0x%02x, retrying...", 145 pr_err("error writing addr: 0x%02x, mask: 0x%02x, data: 0x%02x, retrying...",
146 addr, mask, data); 146 addr, mask, data);
@@ -783,7 +783,7 @@ static int mxl111sf_attach_demod(struct dvb_usb_adapter *adap, u8 fe_id)
783 if (mxl_fail(ret)) 783 if (mxl_fail(ret))
784 goto fail; 784 goto fail;
785 785
786 /* dont care if this fails */ 786 /* don't care if this fails */
787 mxl111sf_init_port_expander(state); 787 mxl111sf_init_port_expander(state);
788 788
789 adap->fe[fe_id] = dvb_attach(mxl111sf_demod_attach, state, 789 adap->fe[fe_id] = dvb_attach(mxl111sf_demod_attach, state,
diff --git a/drivers/media/usb/dvb-usb/af9005.c b/drivers/media/usb/dvb-usb/af9005.c
index 16e946e01d2c..0638d907c73e 100644
--- a/drivers/media/usb/dvb-usb/af9005.c
+++ b/drivers/media/usb/dvb-usb/af9005.c
@@ -845,7 +845,7 @@ static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state)
845 845
846 /* deb_info("rc_query\n"); */ 846 /* deb_info("rc_query\n"); */
847 st->data[0] = 3; /* rest of packet length low */ 847 st->data[0] = 3; /* rest of packet length low */
848 st->data[1] = 0; /* rest of packet lentgh high */ 848 st->data[1] = 0; /* rest of packet length high */
849 st->data[2] = 0x40; /* read remote */ 849 st->data[2] = 0x40; /* read remote */
850 st->data[3] = 1; /* rest of packet length */ 850 st->data[3] = 1; /* rest of packet length */
851 st->data[4] = seq = st->sequence++; /* sequence number */ 851 st->data[4] = seq = st->sequence++; /* sequence number */
diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
index df71df7ed524..4c9f83ba260d 100644
--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
@@ -33,7 +33,7 @@
33 * This function is probably reusable and may better get placed in a support 33 * This function is probably reusable and may better get placed in a support
34 * library. 34 * library.
35 * 35 *
36 * We replace errornous fields by default TPS fields (the ones with value 0). 36 * We replace erroneous fields by default TPS fields (the ones with value 0).
37 */ 37 */
38 38
39static uint16_t compute_tps(struct dtv_frontend_properties *op) 39static uint16_t compute_tps(struct dtv_frontend_properties *op)
diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
index a51a45c60233..9ddb2000249e 100644
--- a/drivers/media/usb/dvb-usb/cxusb.c
+++ b/drivers/media/usb/dvb-usb/cxusb.c
@@ -1016,7 +1016,7 @@ static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap)
1016 /* 1016 /*
1017 * No need to call dvb7000p_attach here, as it was called 1017 * No need to call dvb7000p_attach here, as it was called
1018 * already, as frontend_attach method is called first, and 1018 * already, as frontend_attach method is called first, and
1019 * tuner_attach is only called on sucess. 1019 * tuner_attach is only called on success.
1020 */ 1020 */
1021 tun_i2c = st->dib7000p_ops.get_i2c_master(adap->fe_adap[0].fe, 1021 tun_i2c = st->dib7000p_ops.get_i2c_master(adap->fe_adap[0].fe,
1022 DIBX000_I2C_INTERFACE_TUNER, 1); 1022 DIBX000_I2C_INTERFACE_TUNER, 1);
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
index 40ca4eafb137..99951e02a880 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
@@ -98,7 +98,7 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
98 98
99 /* 99 /*
100 * when reloading the driver w/o replugging the device 100 * when reloading the driver w/o replugging the device
101 * sometimes a timeout occures, this helps 101 * sometimes a timeout occurs, this helps
102 */ 102 */
103 if (d->props.generic_bulk_ctrl_endpoint != 0) { 103 if (d->props.generic_bulk_ctrl_endpoint != 0) {
104 usb_clear_halt(d->udev, usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint)); 104 usb_clear_halt(d->udev, usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
diff --git a/drivers/media/usb/dvb-usb/dvb-usb.h b/drivers/media/usb/dvb-usb/dvb-usb.h
index 317ed6a82d19..32829bdd5f22 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb.h
+++ b/drivers/media/usb/dvb-usb/dvb-usb.h
@@ -336,7 +336,7 @@ struct usb_data_stream {
336 * struct dvb_usb_adapter - a DVB adapter on a USB device 336 * struct dvb_usb_adapter - a DVB adapter on a USB device
337 * @id: index of this adapter (starting with 0). 337 * @id: index of this adapter (starting with 0).
338 * 338 *
339 * @feedcount: number of reqested feeds (used for streaming-activation) 339 * @feedcount: number of requested feeds (used for streaming-activation)
340 * @pid_filtering: is hardware pid_filtering used or not. 340 * @pid_filtering: is hardware pid_filtering used or not.
341 * 341 *
342 * @pll_addr: I2C address of the tuner for programming 342 * @pll_addr: I2C address of the tuner for programming
diff --git a/drivers/media/usb/dvb-usb/pctv452e.c b/drivers/media/usb/dvb-usb/pctv452e.c
index 0af74383083d..150081128196 100644
--- a/drivers/media/usb/dvb-usb/pctv452e.c
+++ b/drivers/media/usb/dvb-usb/pctv452e.c
@@ -528,13 +528,13 @@ static int pctv452e_power_ctrl(struct dvb_usb_device *d, int i)
528 528
529 rx = b0 + 5; 529 rx = b0 + 5;
530 530
531 /* hmm where shoud this should go? */ 531 /* hmm where should this should go? */
532 ret = usb_set_interface(d->udev, 0, ISOC_INTERFACE_ALTERNATIVE); 532 ret = usb_set_interface(d->udev, 0, ISOC_INTERFACE_ALTERNATIVE);
533 if (ret != 0) 533 if (ret != 0)
534 info("%s: Warning set interface returned: %d\n", 534 info("%s: Warning set interface returned: %d\n",
535 __func__, ret); 535 __func__, ret);
536 536
537 /* this is a one-time initialization, dont know where to put */ 537 /* this is a one-time initialization, don't know where to put */
538 b0[0] = 0xaa; 538 b0[0] = 0xaa;
539 b0[1] = state->c++; 539 b0[1] = state->c++;
540 b0[2] = PCTV_CMD_RESET; 540 b0[2] = PCTV_CMD_RESET;
diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c
index 02c13d71e6c1..a3155ec196cc 100644
--- a/drivers/media/usb/em28xx/em28xx-i2c.c
+++ b/drivers/media/usb/em28xx/em28xx-i2c.c
@@ -296,7 +296,7 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, u16 len)
296 return ret; 296 return ret;
297 } 297 }
298 /* 298 /*
299 * NOTE: some devices with two i2c busses have the bad habit to return 0 299 * NOTE: some devices with two i2c buses have the bad habit to return 0
300 * bytes if we are on bus B AND there was no write attempt to the 300 * bytes if we are on bus B AND there was no write attempt to the
301 * specified slave address before AND no device is present at the 301 * specified slave address before AND no device is present at the
302 * requested slave address. 302 * requested slave address.
@@ -427,7 +427,7 @@ static int em25xx_bus_B_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf,
427 return ret; 427 return ret;
428 } 428 }
429 /* 429 /*
430 * NOTE: some devices with two i2c busses have the bad habit to return 0 430 * NOTE: some devices with two i2c buses have the bad habit to return 0
431 * bytes if we are on bus B AND there was no write attempt to the 431 * bytes if we are on bus B AND there was no write attempt to the
432 * specified slave address before AND no device is present at the 432 * specified slave address before AND no device is present at the
433 * requested slave address. 433 * requested slave address.
diff --git a/drivers/media/usb/em28xx/em28xx-reg.h b/drivers/media/usb/em28xx/em28xx-reg.h
index f53afe18e92d..d7c60862874a 100644
--- a/drivers/media/usb/em28xx/em28xx-reg.h
+++ b/drivers/media/usb/em28xx/em28xx-reg.h
@@ -67,7 +67,7 @@
67#define EM28XX_I2C_CLK_WAIT_ENABLE 0x40 67#define EM28XX_I2C_CLK_WAIT_ENABLE 0x40
68#define EM28XX_I2C_EEPROM_ON_BOARD 0x08 68#define EM28XX_I2C_EEPROM_ON_BOARD 0x08
69#define EM28XX_I2C_EEPROM_KEY_VALID 0x04 69#define EM28XX_I2C_EEPROM_KEY_VALID 0x04
70#define EM2874_I2C_SECONDARY_BUS_SELECT 0x04 /* em2874 has two i2c busses */ 70#define EM2874_I2C_SECONDARY_BUS_SELECT 0x04 /* em2874 has two i2c buses */
71#define EM28XX_I2C_FREQ_1_5_MHZ 0x03 /* bus frequency (bits [1-0]) */ 71#define EM28XX_I2C_FREQ_1_5_MHZ 0x03 /* bus frequency (bits [1-0]) */
72#define EM28XX_I2C_FREQ_25_KHZ 0x02 72#define EM28XX_I2C_FREQ_25_KHZ 0x02
73#define EM28XX_I2C_FREQ_400_KHZ 0x01 73#define EM28XX_I2C_FREQ_400_KHZ 0x01
diff --git a/drivers/media/usb/gspca/Kconfig b/drivers/media/usb/gspca/Kconfig
index d3b6665c342d..088566e88467 100644
--- a/drivers/media/usb/gspca/Kconfig
+++ b/drivers/media/usb/gspca/Kconfig
@@ -46,7 +46,7 @@ config USB_GSPCA_CPIA1
46 depends on VIDEO_V4L2 && USB_GSPCA 46 depends on VIDEO_V4L2 && USB_GSPCA
47 help 47 help
48 Say Y here if you want support for USB cameras based on the cpia 48 Say Y here if you want support for USB cameras based on the cpia
49 CPiA chip. Note that you need atleast version 0.6.4 of libv4l for 49 CPiA chip. Note that you need at least version 0.6.4 of libv4l for
50 applications to understand the videoformat generated by this driver. 50 applications to understand the videoformat generated by this driver.
51 51
52 To compile this driver as a module, choose M here: the 52 To compile this driver as a module, choose M here: the
diff --git a/drivers/media/usb/gspca/autogain_functions.c b/drivers/media/usb/gspca/autogain_functions.c
index 6dfab2b077f7..f915cc7c0c63 100644
--- a/drivers/media/usb/gspca/autogain_functions.c
+++ b/drivers/media/usb/gspca/autogain_functions.c
@@ -98,7 +98,7 @@ EXPORT_SYMBOL(gspca_expo_autogain);
98 80 %) and if that does not help, only then changes exposure. This leads 98 80 %) and if that does not help, only then changes exposure. This leads
99 to a much more stable image then using the knee algorithm which at 99 to a much more stable image then using the knee algorithm which at
100 certain points of the knee graph will only try to adjust exposure, 100 certain points of the knee graph will only try to adjust exposure,
101 which leads to oscilating as one exposure step is huge. 101 which leads to oscillating as one exposure step is huge.
102 102
103 Returns 0 if no changes were made, 1 if the gain and or exposure settings 103 Returns 0 if no changes were made, 1 if the gain and or exposure settings
104 where changed. */ 104 where changed. */
diff --git a/drivers/media/usb/gspca/benq.c b/drivers/media/usb/gspca/benq.c
index 8a8db5eb6d5f..1744591b8ba0 100644
--- a/drivers/media/usb/gspca/benq.c
+++ b/drivers/media/usb/gspca/benq.c
@@ -205,12 +205,12 @@ static void sd_isoc_irq(struct urb *urb)
205 * - 80 ba/bb 00 00 = start of image followed by 'ff d8' 205 * - 80 ba/bb 00 00 = start of image followed by 'ff d8'
206 * - 04 ba/bb oo oo = image piece 206 * - 04 ba/bb oo oo = image piece
207 * where 'oo oo' is the image offset 207 * where 'oo oo' is the image offset
208 (not cheked) 208 (not checked)
209 * - (other -> bad frame) 209 * - (other -> bad frame)
210 * The images are JPEG encoded with full header and 210 * The images are JPEG encoded with full header and
211 * normal ff escape. 211 * normal ff escape.
212 * The end of image ('ff d9') may occur in any URB. 212 * The end of image ('ff d9') may occur in any URB.
213 * (not cheked) 213 * (not checked)
214 */ 214 */
215 data = (u8 *) urb0->transfer_buffer 215 data = (u8 *) urb0->transfer_buffer
216 + urb0->iso_frame_desc[i].offset; 216 + urb0->iso_frame_desc[i].offset;
diff --git a/drivers/media/usb/gspca/mr97310a.c b/drivers/media/usb/gspca/mr97310a.c
index bea196361215..af454663e295 100644
--- a/drivers/media/usb/gspca/mr97310a.c
+++ b/drivers/media/usb/gspca/mr97310a.c
@@ -520,7 +520,7 @@ static int start_cif_cam(struct gspca_dev *gspca_dev)
520 switch (gspca_dev->pixfmt.width) { 520 switch (gspca_dev->pixfmt.width) {
521 case 160: 521 case 160:
522 data[9] |= 0x04; /* reg 8, 2:1 scale down from 320 */ 522 data[9] |= 0x04; /* reg 8, 2:1 scale down from 320 */
523 /* fall thru */ 523 /* fall through */
524 case 320: 524 case 320:
525 default: 525 default:
526 data[3] = 0x28; /* reg 2, H size/8 */ 526 data[3] = 0x28; /* reg 2, H size/8 */
@@ -530,7 +530,7 @@ static int start_cif_cam(struct gspca_dev *gspca_dev)
530 break; 530 break;
531 case 176: 531 case 176:
532 data[9] |= 0x04; /* reg 8, 2:1 scale down from 352 */ 532 data[9] |= 0x04; /* reg 8, 2:1 scale down from 352 */
533 /* fall thru */ 533 /* fall through */
534 case 352: 534 case 352:
535 data[3] = 0x2c; /* reg 2, H size/8 */ 535 data[3] = 0x2c; /* reg 2, H size/8 */
536 data[4] = 0x48; /* reg 3, V size/4 */ 536 data[4] = 0x48; /* reg 3, V size/4 */
@@ -617,10 +617,10 @@ static int start_vga_cam(struct gspca_dev *gspca_dev)
617 switch (gspca_dev->pixfmt.width) { 617 switch (gspca_dev->pixfmt.width) {
618 case 160: 618 case 160:
619 data[9] |= 0x0c; /* reg 8, 4:1 scale down */ 619 data[9] |= 0x0c; /* reg 8, 4:1 scale down */
620 /* fall thru */ 620 /* fall through */
621 case 320: 621 case 320:
622 data[9] |= 0x04; /* reg 8, 2:1 scale down */ 622 data[9] |= 0x04; /* reg 8, 2:1 scale down */
623 /* fall thru */ 623 /* fall through */
624 case 640: 624 case 640:
625 default: 625 default:
626 data[3] = 0x50; /* reg 2, H size/8 */ 626 data[3] = 0x50; /* reg 2, H size/8 */
@@ -637,7 +637,7 @@ static int start_vga_cam(struct gspca_dev *gspca_dev)
637 637
638 case 176: 638 case 176:
639 data[9] |= 0x04; /* reg 8, 2:1 scale down */ 639 data[9] |= 0x04; /* reg 8, 2:1 scale down */
640 /* fall thru */ 640 /* fall through */
641 case 352: 641 case 352:
642 data[3] = 0x2c; /* reg 2, H size */ 642 data[3] = 0x2c; /* reg 2, H size */
643 data[4] = 0x48; /* reg 3, V size */ 643 data[4] = 0x48; /* reg 3, V size */
diff --git a/drivers/media/usb/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c
index 10fcbe9e8614..f2799e8cb8e7 100644
--- a/drivers/media/usb/gspca/ov519.c
+++ b/drivers/media/usb/gspca/ov519.c
@@ -1945,7 +1945,7 @@ static const struct ov_i2c_regvals norm_8610[] = {
1945 { 0x62, 0x5f }, /* was 0xd7, new from windrv 090403 */ 1945 { 0x62, 0x5f }, /* was 0xd7, new from windrv 090403 */
1946 { 0x63, 0xff }, 1946 { 0x63, 0xff },
1947 { 0x64, 0x53 }, /* new windrv 090403 says 0x57, 1947 { 0x64, 0x53 }, /* new windrv 090403 says 0x57,
1948 * maybe thats wrong */ 1948 * maybe that's wrong */
1949 { 0x65, 0x00 }, 1949 { 0x65, 0x00 },
1950 { 0x66, 0x55 }, 1950 { 0x66, 0x55 },
1951 { 0x67, 0xb0 }, 1951 { 0x67, 0xb0 },
@@ -3658,7 +3658,7 @@ static void ov518_mode_init_regs(struct sd *sd)
3658 case SEN_OV7620AE: 3658 case SEN_OV7620AE:
3659 /* 3659 /*
3660 * HdG: 640x480 needs special handling on device 3660 * HdG: 640x480 needs special handling on device
3661 * revision 2, we check for device revison > 0 to 3661 * revision 2, we check for device revision > 0 to
3662 * avoid regressions, as we don't know the correct 3662 * avoid regressions, as we don't know the correct
3663 * thing todo for revision 1. 3663 * thing todo for revision 1.
3664 * 3664 *
diff --git a/drivers/media/usb/gspca/pac_common.h b/drivers/media/usb/gspca/pac_common.h
index 31f2a42af4dd..aae97a5534e3 100644
--- a/drivers/media/usb/gspca/pac_common.h
+++ b/drivers/media/usb/gspca/pac_common.h
@@ -21,7 +21,7 @@
21 21
22/* We calculate the autogain at the end of the transfer of a frame, at this 22/* We calculate the autogain at the end of the transfer of a frame, at this
23 moment a frame with the old settings is being captured and transmitted. So 23 moment a frame with the old settings is being captured and transmitted. So
24 if we adjust the gain or exposure we must ignore atleast the next frame for 24 if we adjust the gain or exposure we must ignore at least the next frame for
25 the new settings to come into effect before doing any other adjustments. */ 25 the new settings to come into effect before doing any other adjustments. */
26#define PAC_AUTOGAIN_IGNORE_FRAMES 2 26#define PAC_AUTOGAIN_IGNORE_FRAMES 2
27 27
diff --git a/drivers/media/usb/gspca/sn9c20x.c b/drivers/media/usb/gspca/sn9c20x.c
index 5984bb12bcff..ab912903f8d7 100644
--- a/drivers/media/usb/gspca/sn9c20x.c
+++ b/drivers/media/usb/gspca/sn9c20x.c
@@ -1634,7 +1634,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
1634 break; 1634 break;
1635 case SENSOR_HV7131R: 1635 case SENSOR_HV7131R:
1636 sd->i2c_intf = 0x81; /* i2c 400 Kb/s */ 1636 sd->i2c_intf = 0x81; /* i2c 400 Kb/s */
1637 /* fall thru */ 1637 /* fall through */
1638 default: 1638 default:
1639 cam->cam_mode = vga_mode; 1639 cam->cam_mode = vga_mode;
1640 cam->nmodes = ARRAY_SIZE(vga_mode); 1640 cam->nmodes = ARRAY_SIZE(vga_mode);
diff --git a/drivers/media/usb/gspca/sonixb.c b/drivers/media/usb/gspca/sonixb.c
index 5f3f2979540a..583c9f10198c 100644
--- a/drivers/media/usb/gspca/sonixb.c
+++ b/drivers/media/usb/gspca/sonixb.c
@@ -121,7 +121,7 @@ struct sensor_data {
121 121
122/* We calculate the autogain at the end of the transfer of a frame, at this 122/* We calculate the autogain at the end of the transfer of a frame, at this
123 moment a frame with the old settings is being captured and transmitted. So 123 moment a frame with the old settings is being captured and transmitted. So
124 if we adjust the gain or exposure we must ignore atleast the next frame for 124 if we adjust the gain or exposure we must ignore at least the next frame for
125 the new settings to come into effect before doing any other adjustments. */ 125 the new settings to come into effect before doing any other adjustments. */
126#define AUTOGAIN_IGNORE_FRAMES 1 126#define AUTOGAIN_IGNORE_FRAMES 1
127 127
@@ -757,7 +757,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
757 757
758 /* Don't allow this to get below 10 when using autogain, the 758 /* Don't allow this to get below 10 when using autogain, the
759 steps become very large (relatively) when below 10 causing 759 steps become very large (relatively) when below 10 causing
760 the image to oscilate from much too dark, to much too bright 760 the image to oscillate from much too dark, to much too bright
761 and back again. */ 761 and back again. */
762 if (gspca_dev->autogain->val && reg10 < 10) 762 if (gspca_dev->autogain->val && reg10 < 10)
763 reg10 = 10; 763 reg10 = 10;
diff --git a/drivers/media/usb/gspca/sonixj.c b/drivers/media/usb/gspca/sonixj.c
index df8d8482b795..a63f155f1515 100644
--- a/drivers/media/usb/gspca/sonixj.c
+++ b/drivers/media/usb/gspca/sonixj.c
@@ -2677,7 +2677,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
2677 * which is 62 bytes long and is followed by various information 2677 * which is 62 bytes long and is followed by various information
2678 * including statuses and luminosity. 2678 * including statuses and luminosity.
2679 * 2679 *
2680 * A marker may be splitted on two packets. 2680 * A marker may be split on two packets.
2681 * 2681 *
2682 * The 6th byte of a marker contains the bits: 2682 * The 6th byte of a marker contains the bits:
2683 * 0x08: USB full 2683 * 0x08: USB full
diff --git a/drivers/media/usb/gspca/spca501.c b/drivers/media/usb/gspca/spca501.c
index 2cce74b166d8..3d215952af18 100644
--- a/drivers/media/usb/gspca/spca501.c
+++ b/drivers/media/usb/gspca/spca501.c
@@ -574,7 +574,7 @@ static const __u16 spca501_3com_open_data[][3] = {
574 {0x0, 0x0001, 0x0010}, /* TG Start Clock */ 574 {0x0, 0x0001, 0x0010}, /* TG Start Clock */
575 575
576/* {0x2, 0x006a, 0x0001}, * C/S Enable ISOSYNCH Packet Engine */ 576/* {0x2, 0x006a, 0x0001}, * C/S Enable ISOSYNCH Packet Engine */
577 {0x2, 0x0068, 0x0001}, /* C/S Diable ISOSYNCH Packet Engine */ 577 {0x2, 0x0068, 0x0001}, /* C/S Disable ISOSYNCH Packet Engine */
578 {0x2, 0x0000, 0x0005}, 578 {0x2, 0x0000, 0x0005},
579 {0x2, 0x0043, 0x0000}, /* C/S Set Timing Mode, Disable TG soft reset */ 579 {0x2, 0x0043, 0x0000}, /* C/S Set Timing Mode, Disable TG soft reset */
580 {0x2, 0x0043, 0x0000}, /* C/S Set Timing Mode, Disable TG soft reset */ 580 {0x2, 0x0043, 0x0000}, /* C/S Set Timing Mode, Disable TG soft reset */
diff --git a/drivers/media/usb/gspca/sq905.c b/drivers/media/usb/gspca/sq905.c
index ffea9c35b0a0..d5c48216deb7 100644
--- a/drivers/media/usb/gspca/sq905.c
+++ b/drivers/media/usb/gspca/sq905.c
@@ -18,7 +18,7 @@
18 * History and Acknowledgments 18 * History and Acknowledgments
19 * 19 *
20 * The original Linux driver for SQ905 based cameras was written by 20 * The original Linux driver for SQ905 based cameras was written by
21 * Marcell Lengyel and furter developed by many other contributors 21 * Marcell Lengyel and further developed by many other contributors
22 * and is available from http://sourceforge.net/projects/sqcam/ 22 * and is available from http://sourceforge.net/projects/sqcam/
23 * 23 *
24 * This driver takes advantage of the reverse engineering work done for 24 * This driver takes advantage of the reverse engineering work done for
diff --git a/drivers/media/usb/gspca/sunplus.c b/drivers/media/usb/gspca/sunplus.c
index 437a3367ab97..e1e2a605a46c 100644
--- a/drivers/media/usb/gspca/sunplus.c
+++ b/drivers/media/usb/gspca/sunplus.c
@@ -555,7 +555,7 @@ static void init_ctl_reg(struct gspca_dev *gspca_dev)
555 case BRIDGE_SPCA504: 555 case BRIDGE_SPCA504:
556 case BRIDGE_SPCA504C: 556 case BRIDGE_SPCA504C:
557 pollreg = 0; 557 pollreg = 0;
558 /* fall thru */ 558 /* fall through */
559 default: 559 default:
560/* case BRIDGE_SPCA533: */ 560/* case BRIDGE_SPCA533: */
561/* case BRIDGE_SPCA504B: */ 561/* case BRIDGE_SPCA504B: */
@@ -638,7 +638,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
638 reg_w_riv(gspca_dev, 0x00, 0x2000, 0x00); 638 reg_w_riv(gspca_dev, 0x00, 0x2000, 0x00);
639 reg_w_riv(gspca_dev, 0x00, 0x2301, 0x13); 639 reg_w_riv(gspca_dev, 0x00, 0x2301, 0x13);
640 reg_w_riv(gspca_dev, 0x00, 0x2306, 0x00); 640 reg_w_riv(gspca_dev, 0x00, 0x2306, 0x00);
641 /* fall thru */ 641 /* fall through */
642 case BRIDGE_SPCA533: 642 case BRIDGE_SPCA533:
643 spca504B_PollingDataReady(gspca_dev); 643 spca504B_PollingDataReady(gspca_dev);
644 spca50x_GetFirmware(gspca_dev); 644 spca50x_GetFirmware(gspca_dev);
diff --git a/drivers/media/usb/gspca/t613.c b/drivers/media/usb/gspca/t613.c
index 445782919446..ed9b925b723e 100644
--- a/drivers/media/usb/gspca/t613.c
+++ b/drivers/media/usb/gspca/t613.c
@@ -966,7 +966,7 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
966 V4L2_CID_SATURATION, 0, 0xf, 1, 5); 966 V4L2_CID_SATURATION, 0, 0xf, 1, 5);
967 v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, 967 v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
968 V4L2_CID_GAMMA, 0, GAMMA_MAX, 1, 10); 968 V4L2_CID_GAMMA, 0, GAMMA_MAX, 1, 10);
969 /* Activate lowlight, some apps dont bring up the 969 /* Activate lowlight, some apps don't bring up the
970 backlight_compensation control) */ 970 backlight_compensation control) */
971 v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, 971 v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
972 V4L2_CID_BACKLIGHT_COMPENSATION, 0, 1, 1, 1); 972 V4L2_CID_BACKLIGHT_COMPENSATION, 0, 1, 1, 1);
diff --git a/drivers/media/usb/gspca/touptek.c b/drivers/media/usb/gspca/touptek.c
index d1b9032d7863..6c056a448231 100644
--- a/drivers/media/usb/gspca/touptek.c
+++ b/drivers/media/usb/gspca/touptek.c
@@ -185,7 +185,7 @@ static const struct v4l2_pix_format vga_mode[] = {
185}; 185};
186 186
187/* 187/*
188 * As theres no known frame sync, the only way to keep synced is to try hard 188 * As there's no known frame sync, the only way to keep synced is to try hard
189 * to never miss any packets 189 * to never miss any packets
190 */ 190 */
191#if MAX_NURBS < 4 191#if MAX_NURBS < 4
@@ -259,7 +259,7 @@ static void setexposure(struct gspca_dev *gspca_dev, s32 val)
259 return; 259 return;
260 } 260 }
261 gspca_dbg(gspca_dev, D_STREAM, "exposure: 0x%04X ms\n\n", value); 261 gspca_dbg(gspca_dev, D_STREAM, "exposure: 0x%04X ms\n\n", value);
262 /* Wonder if theres a good reason for sending it twice */ 262 /* Wonder if there's a good reason for sending it twice */
263 /* probably not but leave it in because...why not */ 263 /* probably not but leave it in because...why not */
264 reg_w(gspca_dev, value, REG_COARSE_INTEGRATION_TIME_); 264 reg_w(gspca_dev, value, REG_COARSE_INTEGRATION_TIME_);
265 reg_w(gspca_dev, value, REG_COARSE_INTEGRATION_TIME_); 265 reg_w(gspca_dev, value, REG_COARSE_INTEGRATION_TIME_);
diff --git a/drivers/media/usb/gspca/w996Xcf.c b/drivers/media/usb/gspca/w996Xcf.c
index abfab3de1866..36cc5a5ce77a 100644
--- a/drivers/media/usb/gspca/w996Xcf.c
+++ b/drivers/media/usb/gspca/w996Xcf.c
@@ -431,7 +431,7 @@ static void w9968cf_set_crop_window(struct sd *sd)
431 start_cropy = 35; 431 start_cropy = 35;
432 } 432 }
433 433
434 /* Work around to avoid FP arithmetics */ 434 /* Work around to avoid FP arithmetic */
435 #define SC(x) ((x) << 10) 435 #define SC(x) ((x) << 10)
436 436
437 /* Scaling factors */ 437 /* Scaling factors */
diff --git a/drivers/media/usb/gspca/zc3xx-reg.h b/drivers/media/usb/gspca/zc3xx-reg.h
index 71fda38e85e0..26f6153b687f 100644
--- a/drivers/media/usb/gspca/zc3xx-reg.h
+++ b/drivers/media/usb/gspca/zc3xx-reg.h
@@ -26,7 +26,7 @@
26/* Test mode */ 26/* Test mode */
27#define ZC3XX_R00B_TESTMODECONTROL 0x000b 27#define ZC3XX_R00B_TESTMODECONTROL 0x000b
28 28
29/* Frame retreiving */ 29/* Frame retrieving */
30#define ZC3XX_R00C_LASTACQTIME 0x000c 30#define ZC3XX_R00C_LASTACQTIME 0x000c
31#define ZC3XX_R00D_MONITORRES 0x000d 31#define ZC3XX_R00D_MONITORRES 0x000d
32#define ZC3XX_R00E_TIMESTAMPHIGH 0x000e 32#define ZC3XX_R00E_TIMESTAMPHIGH 0x000e
diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c
index cf21991e3d99..ad7194029031 100644
--- a/drivers/media/usb/gspca/zc3xx.c
+++ b/drivers/media/usb/gspca/zc3xx.c
@@ -3602,7 +3602,7 @@ static const struct usb_action pas106b_InitialScale[] = { /* 176x144 */
3602 {0xaa, 0x14, 0x0081}, 3602 {0xaa, 0x14, 0x0081},
3603/* Other registers */ 3603/* Other registers */
3604 {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION}, 3604 {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION},
3605/* Frame retreiving */ 3605/* Frame retrieving */
3606 {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, 3606 {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
3607/* Gains */ 3607/* Gains */
3608 {0xa0, 0xa0, ZC3XX_R1A8_DIGITALGAIN}, 3608 {0xa0, 0xa0, ZC3XX_R1A8_DIGITALGAIN},
@@ -3718,7 +3718,7 @@ static const struct usb_action pas106b_Initial[] = { /* 352x288 */
3718 {0xaa, 0x14, 0x0081}, 3718 {0xaa, 0x14, 0x0081},
3719/* Other registers */ 3719/* Other registers */
3720 {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION}, 3720 {0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION},
3721/* Frame retreiving */ 3721/* Frame retrieving */
3722 {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, 3722 {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
3723/* Gains */ 3723/* Gains */
3724 {0xa0, 0xa0, ZC3XX_R1A8_DIGITALGAIN}, 3724 {0xa0, 0xa0, ZC3XX_R1A8_DIGITALGAIN},
@@ -6775,7 +6775,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
6775 case SENSOR_HV7131R: 6775 case SENSOR_HV7131R:
6776 case SENSOR_TAS5130C: 6776 case SENSOR_TAS5130C:
6777 reg_r(gspca_dev, 0x0008); 6777 reg_r(gspca_dev, 0x0008);
6778 /* fall thru */ 6778 /* fall through */
6779 case SENSOR_PO2030: 6779 case SENSOR_PO2030:
6780 reg_w(gspca_dev, 0x03, 0x0008); 6780 reg_w(gspca_dev, 0x03, 0x0008);
6781 break; 6781 break;
@@ -6824,7 +6824,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
6824 case SENSOR_TAS5130C: 6824 case SENSOR_TAS5130C:
6825 reg_w(gspca_dev, 0x09, 0x01ad); /* (from win traces) */ 6825 reg_w(gspca_dev, 0x09, 0x01ad); /* (from win traces) */
6826 reg_w(gspca_dev, 0x15, 0x01ae); 6826 reg_w(gspca_dev, 0x15, 0x01ae);
6827 /* fall thru */ 6827 /* fall through */
6828 case SENSOR_PAS202B: 6828 case SENSOR_PAS202B:
6829 case SENSOR_PO2030: 6829 case SENSOR_PO2030:
6830/* reg_w(gspca_dev, 0x40, ZC3XX_R117_GGAIN); in win traces */ 6830/* reg_w(gspca_dev, 0x40, ZC3XX_R117_GGAIN); in win traces */
diff --git a/drivers/media/usb/hdpvr/hdpvr.h b/drivers/media/usb/hdpvr/hdpvr.h
index 1d65b4185f57..fa43e1d45ea9 100644
--- a/drivers/media/usb/hdpvr/hdpvr.h
+++ b/drivers/media/usb/hdpvr/hdpvr.h
@@ -215,7 +215,7 @@ enum {
215 */ 215 */
216 216
217 /* :0 s 38 01 1700 0003 0001 1 = 00 217 /* :0 s 38 01 1700 0003 0001 1 = 00
218 * VIDEO STANDARD or FREQUNCY 0 = 60hz, 1 = 50hz 218 * VIDEO STANDARD or FREQUENCY 0 = 60hz, 1 = 50hz
219 */ 219 */
220 220
221 /* :0 s 38 01 3100 0003 0004 4 = 03030000 221 /* :0 s 38 01 3100 0003 0004 4 = 03030000
diff --git a/drivers/media/usb/pwc/pwc-dec23.c b/drivers/media/usb/pwc/pwc-dec23.c
index 1283b3bd9800..854c36a5dec9 100644
--- a/drivers/media/usb/pwc/pwc-dec23.c
+++ b/drivers/media/usb/pwc/pwc-dec23.c
@@ -41,7 +41,7 @@
41 * UNROLL_LOOP_FOR_COPYING_BLOCK 41 * UNROLL_LOOP_FOR_COPYING_BLOCK
42 * 0: use a loop for a smaller code (but little slower) 42 * 0: use a loop for a smaller code (but little slower)
43 * 1: when unrolling the loop, gcc produces some faster code (perhaps only 43 * 1: when unrolling the loop, gcc produces some faster code (perhaps only
44 * valid for intel processor class). Activating this option, automaticaly 44 * valid for intel processor class). Activating this option, automatically
45 * activate USE_LOOKUP_TABLE_TO_CLAMP 45 * activate USE_LOOKUP_TABLE_TO_CLAMP
46 */ 46 */
47#define UNROLL_LOOP_FOR_COPY 1 47#define UNROLL_LOOP_FOR_COPY 1
@@ -332,7 +332,7 @@ void pwc_dec23_init(struct pwc_device *pdev, const unsigned char *cmd)
332 build_table_color(TimonRomTable[version][1], pdec->table_0004_pass2, pdec->table_8004_pass2); 332 build_table_color(TimonRomTable[version][1], pdec->table_0004_pass2, pdec->table_8004_pass2);
333 } 333 }
334 334
335 /* Informations can be coded on a variable number of bits but never less than 8 */ 335 /* Information can be coded on a variable number of bits but never less than 8 */
336 shift = 8 - pdec->nbits; 336 shift = 8 - pdec->nbits;
337 pdec->scalebits = SCALEBITS - shift; 337 pdec->scalebits = SCALEBITS - shift;
338 pdec->nbitsmask = 0xFF >> shift; 338 pdec->nbitsmask = 0xFF >> shift;
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
index a81fb319b339..4e94197094ad 100644
--- a/drivers/media/usb/pwc/pwc-if.c
+++ b/drivers/media/usb/pwc/pwc-if.c
@@ -653,7 +653,7 @@ static int buffer_prepare(struct vb2_buffer *vb)
653{ 653{
654 struct pwc_device *pdev = vb2_get_drv_priv(vb->vb2_queue); 654 struct pwc_device *pdev = vb2_get_drv_priv(vb->vb2_queue);
655 655
656 /* Don't allow queing new buffers after device disconnection */ 656 /* Don't allow queueing new buffers after device disconnection */
657 if (!pdev->udev) 657 if (!pdev->udev)
658 return -ENODEV; 658 return -ENODEV;
659 659
diff --git a/drivers/media/usb/pwc/pwc-misc.c b/drivers/media/usb/pwc/pwc-misc.c
index 9be5adffa874..03888fc3804d 100644
--- a/drivers/media/usb/pwc/pwc-misc.c
+++ b/drivers/media/usb/pwc/pwc-misc.c
@@ -59,7 +59,7 @@ int pwc_get_size(struct pwc_device *pdev, int width, int height)
59 return i; 59 return i;
60 } 60 }
61 61
62 /* Never reached there always is atleast one supported mode */ 62 /* Never reached there always is at least one supported mode */
63 return 0; 63 return 0;
64} 64}
65 65
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index 2ffded08407b..4fc03ec8a4f1 100644
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -75,7 +75,7 @@ static int smsusb_submit_urb(struct smsusb_device_t *dev,
75 struct smsusb_urb_t *surb); 75 struct smsusb_urb_t *surb);
76 76
77/* 77/*
78 * Completing URB's callback handler - bottom half (proccess context) 78 * Completing URB's callback handler - bottom half (process context)
79 * submits the URB prepared on smsusb_onresponse() 79 * submits the URB prepared on smsusb_onresponse()
80 */ 80 */
81static void do_submit_urb(struct work_struct *work) 81static void do_submit_urb(struct work_struct *work)
diff --git a/drivers/media/usb/stk1160/stk1160-core.c b/drivers/media/usb/stk1160/stk1160-core.c
index 468f5ccf4ae6..a44a44ff3bb1 100644
--- a/drivers/media/usb/stk1160/stk1160-core.c
+++ b/drivers/media/usb/stk1160/stk1160-core.c
@@ -297,7 +297,7 @@ static int stk1160_probe(struct usb_interface *interface,
297 return -ENOMEM; 297 return -ENOMEM;
298 298
299 /* 299 /*
300 * Scan usb posibilities and populate alt_max_pkt_size array. 300 * Scan usb possibilities and populate alt_max_pkt_size array.
301 * Also, check if device speed is fast enough. 301 * Also, check if device speed is fast enough.
302 */ 302 */
303 rc = stk1160_scan_usb(interface, udev, alt_max_pkt_size); 303 rc = stk1160_scan_usb(interface, udev, alt_max_pkt_size);
@@ -426,7 +426,7 @@ static void stk1160_disconnect(struct usb_interface *interface)
426 426
427 /* 427 /*
428 * This calls stk1160_release if it's the last reference. 428 * This calls stk1160_release if it's the last reference.
429 * Otherwise, release is posponed until there are no users left. 429 * Otherwise, release is postponed until there are no users left.
430 */ 430 */
431 v4l2_device_put(&dev->v4l2_dev); 431 v4l2_device_put(&dev->v4l2_dev);
432} 432}
diff --git a/drivers/media/usb/stk1160/stk1160-reg.h b/drivers/media/usb/stk1160/stk1160-reg.h
index 7b08a3cc4504..2e400db0ad0e 100644
--- a/drivers/media/usb/stk1160/stk1160-reg.h
+++ b/drivers/media/usb/stk1160/stk1160-reg.h
@@ -23,7 +23,7 @@
23/* GPIO Control */ 23/* GPIO Control */
24#define STK1160_GCTRL 0x000 24#define STK1160_GCTRL 0x000
25 25
26/* Remote Wakup Control */ 26/* Remote Wakeup Control */
27#define STK1160_RMCTL 0x00c 27#define STK1160_RMCTL 0x00c
28 28
29/* Power-on Strapping Data */ 29/* Power-on Strapping Data */
@@ -104,7 +104,7 @@
104#define STK1160_SBUSR_RA 0x208 104#define STK1160_SBUSR_RA 0x208
105#define STK1160_SBUSR_RD 0x209 105#define STK1160_SBUSR_RD 0x209
106 106
107/* Alternate Serial Inteface Control */ 107/* Alternate Serial Interface Control */
108#define STK1160_ASIC 0x2fc 108#define STK1160_ASIC 0x2fc
109 109
110/* PLL Select Options */ 110/* PLL Select Options */
diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index 03f5e12b13a5..8f545861471e 100644
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -1006,7 +1006,7 @@ static int stk_setup_format(struct stk_camera *dev)
1006 stk_camera_write_reg(dev, 0x001c, 0x46); 1006 stk_camera_write_reg(dev, 0x001c, 0x46);
1007 /* 1007 /*
1008 * Registers 0x0115 0x0114 are the size of each line (bytes), 1008 * Registers 0x0115 0x0114 are the size of each line (bytes),
1009 * regs 0x0117 0x0116 are the heigth of the image. 1009 * regs 0x0117 0x0116 are the height of the image.
1010 */ 1010 */
1011 stk_camera_write_reg(dev, 0x0115, 1011 stk_camera_write_reg(dev, 0x0115,
1012 ((stk_sizes[i].w * depth) >> 8) & 0xff); 1012 ((stk_sizes[i].w * depth) >> 8) & 0xff);
diff --git a/drivers/media/usb/tm6000/tm6000-alsa.c b/drivers/media/usb/tm6000/tm6000-alsa.c
index b965931793b5..d6c79c13b332 100644
--- a/drivers/media/usb/tm6000/tm6000-alsa.c
+++ b/drivers/media/usb/tm6000/tm6000-alsa.c
@@ -58,7 +58,7 @@ module_param(debug, int, 0644);
58MODULE_PARM_DESC(debug, "enable debug messages"); 58MODULE_PARM_DESC(debug, "enable debug messages");
59 59
60/**************************************************************************** 60/****************************************************************************
61 Module specific funtions 61 Module specific functions
62 ****************************************************************************/ 62 ****************************************************************************/
63 63
64/* 64/*
diff --git a/drivers/media/usb/tm6000/tm6000-core.c b/drivers/media/usb/tm6000/tm6000-core.c
index d3229aa45fcb..2c723706f8c8 100644
--- a/drivers/media/usb/tm6000/tm6000-core.c
+++ b/drivers/media/usb/tm6000/tm6000-core.c
@@ -668,7 +668,7 @@ int tm6000_set_audio_rinput(struct tm6000_core *dev)
668 areg_f0 = 0x04; 668 areg_f0 = 0x04;
669 break; 669 break;
670 default: 670 default:
671 printk(KERN_INFO "%s: audio input dosn't support\n", 671 printk(KERN_INFO "%s: audio input doesn't support\n",
672 dev->name); 672 dev->name);
673 return 0; 673 return 0;
674 break; 674 break;
@@ -690,7 +690,7 @@ int tm6000_set_audio_rinput(struct tm6000_core *dev)
690 areg_eb = 0x04; 690 areg_eb = 0x04;
691 break; 691 break;
692 default: 692 default:
693 printk(KERN_INFO "%s: audio input dosn't support\n", 693 printk(KERN_INFO "%s: audio input doesn't support\n",
694 dev->name); 694 dev->name);
695 return 0; 695 return 0;
696 break; 696 break;
diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c
index 3a4e545c6037..36eea1950e77 100644
--- a/drivers/media/usb/tm6000/tm6000-dvb.c
+++ b/drivers/media/usb/tm6000/tm6000-dvb.c
@@ -149,7 +149,7 @@ static int tm6000_start_stream(struct tm6000_core *dev)
149 ret, __func__); 149 ret, __func__);
150 return ret; 150 return ret;
151 } else 151 } else
152 printk(KERN_ERR "tm6000: pipe resetted\n"); 152 printk(KERN_ERR "tm6000: pipe reset\n");
153 153
154/* mutex_lock(&tm6000_driver.open_close_mutex); */ 154/* mutex_lock(&tm6000_driver.open_close_mutex); */
155 ret = usb_submit_urb(dvb->bulk_urb, GFP_ATOMIC); 155 ret = usb_submit_urb(dvb->bulk_urb, GFP_ATOMIC);
diff --git a/drivers/media/usb/tm6000/tm6000-i2c.c b/drivers/media/usb/tm6000/tm6000-i2c.c
index 8c0476dfe54f..b37782d6f79c 100644
--- a/drivers/media/usb/tm6000/tm6000-i2c.c
+++ b/drivers/media/usb/tm6000/tm6000-i2c.c
@@ -155,7 +155,7 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
155 /* 155 /*
156 * The TM6000 only supports a read transaction 156 * The TM6000 only supports a read transaction
157 * immediately after a 1 or 2 byte write to select 157 * immediately after a 1 or 2 byte write to select
158 * a register. We cannot fulfil this request. 158 * a register. We cannot fulfill this request.
159 */ 159 */
160 i2c_dprintk(2, " read without preceding write not supported"); 160 i2c_dprintk(2, " read without preceding write not supported");
161 rc = -EOPNOTSUPP; 161 rc = -EOPNOTSUPP;
diff --git a/drivers/media/usb/tm6000/tm6000-stds.c b/drivers/media/usb/tm6000/tm6000-stds.c
index c0c75951246b..858cb4f3a9ca 100644
--- a/drivers/media/usb/tm6000/tm6000-stds.c
+++ b/drivers/media/usb/tm6000/tm6000-stds.c
@@ -323,7 +323,7 @@ static int tm6000_set_audio_std(struct tm6000_core *dev)
323{ 323{
324 uint8_t areg_02 = 0x04; /* GC1 Fixed gain 0dB */ 324 uint8_t areg_02 = 0x04; /* GC1 Fixed gain 0dB */
325 uint8_t areg_05 = 0x01; /* Auto 4.5 = M Japan, Auto 6.5 = DK */ 325 uint8_t areg_05 = 0x01; /* Auto 4.5 = M Japan, Auto 6.5 = DK */
326 uint8_t areg_06 = 0x02; /* Auto de-emphasis, mannual channel mode */ 326 uint8_t areg_06 = 0x02; /* Auto de-emphasis, manual channel mode */
327 327
328 if (dev->radio) { 328 if (dev->radio) {
329 tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00); 329 tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
index 5127be71dd03..072210f5f92f 100644
--- a/drivers/media/usb/tm6000/tm6000-video.c
+++ b/drivers/media/usb/tm6000/tm6000-video.c
@@ -180,7 +180,7 @@ static int copy_streams(u8 *data, unsigned long len,
180 field = (header >> 11) & 0x1; 180 field = (header >> 11) & 0x1;
181 line = (header >> 12) & 0x1ff; 181 line = (header >> 12) & 0x1ff;
182 cmd = (header >> 21) & 0x7; 182 cmd = (header >> 21) & 0x7;
183 /* Validates haeder fields */ 183 /* Validates header fields */
184 if (size > TM6000_URB_MSG_LEN) 184 if (size > TM6000_URB_MSG_LEN)
185 size = TM6000_URB_MSG_LEN; 185 size = TM6000_URB_MSG_LEN;
186 pktsize = TM6000_URB_MSG_LEN; 186 pktsize = TM6000_URB_MSG_LEN;
diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
index 6eb84cf007b4..4db7a013e049 100644
--- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
@@ -306,7 +306,7 @@ static int ttusb_boot_dsp(struct ttusb *ttusb)
306 b[3] = 28; 306 b[3] = 28;
307 307
308 /* upload dsp code in 32 byte steps (36 didn't work for me ...) */ 308 /* upload dsp code in 32 byte steps (36 didn't work for me ...) */
309 /* 32 is max packet size, no messages should be splitted. */ 309 /* 32 is max packet size, no messages should be split. */
310 for (i = 0; i < fw->size; i += 28) { 310 for (i = 0; i < fw->size; i += 28) {
311 memcpy(&b[4], &fw->data[i], 28); 311 memcpy(&b[4], &fw->data[i], 28);
312 312
diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
index 44ca66cb9b8f..897ef5e1da71 100644
--- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
@@ -284,7 +284,7 @@ static void ttusb_dec_handle_irq( struct urb *urb)
284 * 284 *
285 * this is an fact a bit too simple implementation; 285 * this is an fact a bit too simple implementation;
286 * the box also reports a keyrepeat signal 286 * the box also reports a keyrepeat signal
287 * (with buffer[3] == 0x40) in an intervall of ~100ms. 287 * (with buffer[3] == 0x40) in an interval of ~100ms.
288 * But to handle this correctly we had to imlemenent some 288 * But to handle this correctly we had to imlemenent some
289 * kind of timer which signals a 'key up' event if no 289 * kind of timer which signals a 'key up' event if no
290 * keyrepeat signal is received for lets say 200ms. 290 * keyrepeat signal is received for lets say 200ms.
diff --git a/drivers/media/usb/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c
index 2b843a7b27a4..92d166bf8c12 100644
--- a/drivers/media/usb/usbvision/usbvision-core.c
+++ b/drivers/media/usb/usbvision/usbvision-core.c
@@ -900,7 +900,7 @@ static enum parse_state usbvision_parse_lines_420(struct usb_usbvision *usbvisio
900 if ((frame->curline + 1) >= frame->frmheight) 900 if ((frame->curline + 1) >= frame->frmheight)
901 return parse_state_next_frame; 901 return parse_state_next_frame;
902 902
903 block_split = (pixel_per_line%y_block_size) ? 1 : 0; /* are some blocks splitted into different lines? */ 903 block_split = (pixel_per_line%y_block_size) ? 1 : 0; /* are some blocks split into different lines? */
904 904
905 y_odd_offset = (pixel_per_line / y_block_size) * (y_block_size + uv_block_size) 905 y_odd_offset = (pixel_per_line / y_block_size) * (y_block_size + uv_block_size)
906 + block_split * uv_block_size; 906 + block_split * uv_block_size;
@@ -1865,7 +1865,7 @@ static int usbvision_set_compress_params(struct usb_usbvision *usbvision)
1865 value[4] = 0xA2; /* Reg.48 BUF_THR I'm not sure if this does something in not compressed mode. */ 1865 value[4] = 0xA2; /* Reg.48 BUF_THR I'm not sure if this does something in not compressed mode. */
1866 value[5] = 0x00; /* Reg.49 DVI_YUV This has nothing to do with compression */ 1866 value[5] = 0x00; /* Reg.49 DVI_YUV This has nothing to do with compression */
1867 1867
1868 /* catched values for NT1004 */ 1868 /* caught values for NT1004 */
1869 /* value[0] = 0xFF; Never apply intra mode automatically */ 1869 /* value[0] = 0xFF; Never apply intra mode automatically */
1870 /* value[1] = 0xF1; Use full frame height for virtual strip width; One line per strip */ 1870 /* value[1] = 0xF1; Use full frame height for virtual strip width; One line per strip */
1871 /* value[2] = 0x01; Force intra mode on all new frames */ 1871 /* value[2] = 0x01; Force intra mode on all new frames */
@@ -1943,7 +1943,7 @@ int usbvision_set_input(struct usb_usbvision *usbvision)
1943 /* SAA7113 uses 8 bit output */ 1943 /* SAA7113 uses 8 bit output */
1944 value[0] = USBVISION_8_422_SYNC; 1944 value[0] = USBVISION_8_422_SYNC;
1945 } else { 1945 } else {
1946 /* I'm sure only about d2-d0 [010] 16 bit 4:2:2 usin sync pulses 1946 /* I'm sure only about d2-d0 [010] 16 bit 4:2:2 using sync pulses
1947 * as that is how saa7111 is configured */ 1947 * as that is how saa7111 is configured */
1948 value[0] = USBVISION_16_422_SYNC; 1948 value[0] = USBVISION_16_422_SYNC;
1949 /* | USBVISION_VSNC_POL | USBVISION_VCLK_POL);*/ 1949 /* | USBVISION_VSNC_POL | USBVISION_VCLK_POL);*/
@@ -2146,7 +2146,7 @@ int usbvision_power_on(struct usb_usbvision *usbvision)
2146 2146
2147/* 2147/*
2148 * usbvision_begin_streaming() 2148 * usbvision_begin_streaming()
2149 * Sure you have to put bit 7 to 0, if not incoming frames are droped, but no 2149 * Sure you have to put bit 7 to 0, if not incoming frames are dropped, but no
2150 * idea about the rest 2150 * idea about the rest
2151 */ 2151 */
2152int usbvision_begin_streaming(struct usb_usbvision *usbvision) 2152int usbvision_begin_streaming(struct usb_usbvision *usbvision)
diff --git a/drivers/media/usb/usbvision/usbvision.h b/drivers/media/usb/usbvision/usbvision.h
index d55088b4fd63..668167f8951d 100644
--- a/drivers/media/usb/usbvision/usbvision.h
+++ b/drivers/media/usb/usbvision/usbvision.h
@@ -135,11 +135,11 @@
135 135
136#define MIN_FRAME_WIDTH 64 136#define MIN_FRAME_WIDTH 64
137#define MAX_USB_WIDTH 320 /* 384 */ 137#define MAX_USB_WIDTH 320 /* 384 */
138#define MAX_FRAME_WIDTH 320 /* 384 */ /* streching sometimes causes crashes*/ 138#define MAX_FRAME_WIDTH 320 /* 384 */ /* stretching sometimes causes crashes*/
139 139
140#define MIN_FRAME_HEIGHT 48 140#define MIN_FRAME_HEIGHT 48
141#define MAX_USB_HEIGHT 240 /* 288 */ 141#define MAX_USB_HEIGHT 240 /* 288 */
142#define MAX_FRAME_HEIGHT 240 /* 288 */ /* Streching sometimes causes crashes*/ 142#define MAX_FRAME_HEIGHT 240 /* 288 */ /* Stretching sometimes causes crashes*/
143 143
144#define MAX_FRAME_SIZE (MAX_FRAME_WIDTH * MAX_FRAME_HEIGHT * MAX_BYTES_PER_PIXEL) 144#define MAX_FRAME_SIZE (MAX_FRAME_WIDTH * MAX_FRAME_HEIGHT * MAX_BYTES_PER_PIXEL)
145#define USBVISION_CLIPMASK_SIZE (MAX_FRAME_WIDTH * MAX_FRAME_HEIGHT / 8) /* bytesize of clipmask */ 145#define USBVISION_CLIPMASK_SIZE (MAX_FRAME_WIDTH * MAX_FRAME_HEIGHT / 8) /* bytesize of clipmask */
@@ -177,7 +177,7 @@ enum {
177 * G = 1.164*(Y-16) - 0.813*(U-128) - 0.391*(V-128) 177 * G = 1.164*(Y-16) - 0.813*(U-128) - 0.391*(V-128)
178 * R = 1.164*(Y-16) + 1.596*(U-128) 178 * R = 1.164*(Y-16) + 1.596*(U-128)
179 * 179 *
180 * If you fancy integer arithmetics (as you should), hear this: 180 * If you fancy integer arithmetic (as you should), hear this:
181 * 181 *
182 * 65536*B = 76284*(Y-16) + 132252*(V-128) 182 * 65536*B = 76284*(Y-16) + 132252*(V-128)
183 * 65536*G = 76284*(Y-16) - 53281*(U-128) - 25625*(V-128) 183 * 65536*G = 76284*(Y-16) - 53281*(U-128) - 25625*(V-128)
@@ -438,7 +438,7 @@ struct usb_usbvision {
438 int last_compr_level; /* How strong (100) or weak (0) was compression */ 438 int last_compr_level; /* How strong (100) or weak (0) was compression */
439 int usb_bandwidth; /* Mbit/s */ 439 int usb_bandwidth; /* Mbit/s */
440 440
441 /* Statistics that can be overlayed on the screen */ 441 /* Statistics that can be overlaid on the screen */
442 unsigned long isoc_urb_count; /* How many URBs we received so far */ 442 unsigned long isoc_urb_count; /* How many URBs we received so far */
443 unsigned long urb_length; /* Length of last URB */ 443 unsigned long urb_length; /* Length of last URB */
444 unsigned long isoc_data_count; /* How many bytes we received */ 444 unsigned long isoc_data_count; /* How many bytes we received */
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index e314657a1843..182dcac49aa3 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -2008,7 +2008,7 @@ int uvc_video_init(struct uvc_streaming *stream)
2008 usb_set_interface(stream->dev->udev, stream->intfnum, 0); 2008 usb_set_interface(stream->dev->udev, stream->intfnum, 0);
2009 2009
2010 /* Set the streaming probe control with default streaming parameters 2010 /* Set the streaming probe control with default streaming parameters
2011 * retrieved from the device. Webcams that don't suport GET_DEF 2011 * retrieved from the device. Webcams that don't support GET_DEF
2012 * requests on the probe control will just keep their current streaming 2012 * requests on the probe control will just keep their current streaming
2013 * parameters. 2013 * parameters.
2014 */ 2014 */
diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/media/usb/zr364xx/zr364xx.c
index 51aad2cf742f..96fee8d5b865 100644
--- a/drivers/media/usb/zr364xx/zr364xx.c
+++ b/drivers/media/usb/zr364xx/zr364xx.c
@@ -2,7 +2,7 @@
2 * Zoran 364xx based USB webcam module version 0.73 2 * Zoran 364xx based USB webcam module version 0.73
3 * 3 *
4 * Allows you to use your USB webcam with V4L2 applications 4 * Allows you to use your USB webcam with V4L2 applications
5 * This is still in heavy developpement ! 5 * This is still in heavy development !
6 * 6 *
7 * Copyright (C) 2004 Antoine Jacquet <royale@zerezo.com> 7 * Copyright (C) 2004 Antoine Jacquet <royale@zerezo.com>
8 * http://royale.zerezo.com/zr364xx/ 8 * http://royale.zerezo.com/zr364xx/