diff options
author | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-10-20 20:34:01 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-12-09 11:50:50 -0500 |
commit | f58c91ce82cbb55a48fbc1a0cb7c84c0d0a4e1bd (patch) | |
tree | 62e7cfe6198ac0aceeefc3171cf8d8daab87785f /drivers/media | |
parent | c1b96a236e94d49d9396d0bbceb5524519c5c66e (diff) |
[media] media_tree: Fix spelling errors
Fix various spelling errors in strings and comments throughout the media
tree. The majority of these were found using Lucas De Marchi's codespell
tool.
[m.chehab@samsung.com: discard hunks with conflicts]
Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
43 files changed, 65 insertions, 65 deletions
diff --git a/drivers/media/common/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h index d0799e323364..9c9063cd3208 100644 --- a/drivers/media/common/siano/smscoreapi.h +++ b/drivers/media/common/siano/smscoreapi.h | |||
@@ -955,7 +955,7 @@ struct sms_rx_stats { | |||
955 | u32 modem_state; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET */ | 955 | u32 modem_state; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET */ |
956 | s32 SNR; /* dB */ | 956 | s32 SNR; /* dB */ |
957 | u32 ber; /* Post Viterbi ber [1E-5] */ | 957 | u32 ber; /* Post Viterbi ber [1E-5] */ |
958 | u32 ber_error_count; /* Number of erronous SYNC bits. */ | 958 | u32 ber_error_count; /* Number of erroneous SYNC bits. */ |
959 | u32 ber_bit_count; /* Total number of SYNC bits. */ | 959 | u32 ber_bit_count; /* Total number of SYNC bits. */ |
960 | u32 ts_per; /* Transport stream PER, | 960 | u32 ts_per; /* Transport stream PER, |
961 | 0xFFFFFFFF indicate N/A */ | 961 | 0xFFFFFFFF indicate N/A */ |
@@ -981,7 +981,7 @@ struct sms_rx_stats_ex { | |||
981 | u32 modem_state; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET */ | 981 | u32 modem_state; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET */ |
982 | s32 SNR; /* dB */ | 982 | s32 SNR; /* dB */ |
983 | u32 ber; /* Post Viterbi ber [1E-5] */ | 983 | u32 ber; /* Post Viterbi ber [1E-5] */ |
984 | u32 ber_error_count; /* Number of erronous SYNC bits. */ | 984 | u32 ber_error_count; /* Number of erroneous SYNC bits. */ |
985 | u32 ber_bit_count; /* Total number of SYNC bits. */ | 985 | u32 ber_bit_count; /* Total number of SYNC bits. */ |
986 | u32 ts_per; /* Transport stream PER, | 986 | u32 ts_per; /* Transport stream PER, |
987 | 0xFFFFFFFF indicate N/A */ | 987 | 0xFFFFFFFF indicate N/A */ |
diff --git a/drivers/media/common/siano/smsdvb.h b/drivers/media/common/siano/smsdvb.h index 92c413ba0c79..ae36d0ae0fb1 100644 --- a/drivers/media/common/siano/smsdvb.h +++ b/drivers/media/common/siano/smsdvb.h | |||
@@ -95,7 +95,7 @@ struct RECEPTION_STATISTICS_PER_SLICES_S { | |||
95 | u32 is_demod_locked; /* 0 - not locked, 1 - locked */ | 95 | u32 is_demod_locked; /* 0 - not locked, 1 - locked */ |
96 | 96 | ||
97 | u32 ber_bit_count; /* Total number of SYNC bits. */ | 97 | u32 ber_bit_count; /* Total number of SYNC bits. */ |
98 | u32 ber_error_count; /* Number of erronous SYNC bits. */ | 98 | u32 ber_error_count; /* Number of erroneous SYNC bits. */ |
99 | 99 | ||
100 | s32 MRC_SNR; /* dB */ | 100 | s32 MRC_SNR; /* dB */ |
101 | s32 mrc_in_band_pwr; /* In band power in dBM */ | 101 | s32 mrc_in_band_pwr; /* In band power in dBM */ |
diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c index eeb8d7fec924..6c7ff0cdcd32 100644 --- a/drivers/media/dvb-core/dvb_demux.c +++ b/drivers/media/dvb-core/dvb_demux.c | |||
@@ -435,7 +435,7 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) | |||
435 | dprintk_tscheck("TEI detected. " | 435 | dprintk_tscheck("TEI detected. " |
436 | "PID=0x%x data1=0x%x\n", | 436 | "PID=0x%x data1=0x%x\n", |
437 | pid, buf[1]); | 437 | pid, buf[1]); |
438 | /* data in this packet cant be trusted - drop it unless | 438 | /* data in this packet can't be trusted - drop it unless |
439 | * module option dvb_demux_feed_err_pkts is set */ | 439 | * module option dvb_demux_feed_err_pkts is set */ |
440 | if (!dvb_demux_feed_err_pkts) | 440 | if (!dvb_demux_feed_err_pkts) |
441 | return; | 441 | return; |
diff --git a/drivers/media/dvb-frontends/dib8000.c b/drivers/media/dvb-frontends/dib8000.c index 90536147bf04..6dbbee453ee1 100644 --- a/drivers/media/dvb-frontends/dib8000.c +++ b/drivers/media/dvb-frontends/dib8000.c | |||
@@ -3048,7 +3048,7 @@ static int dib8000_tune(struct dvb_frontend *fe) | |||
3048 | dib8000_set_diversity_in(state->fe[0], state->diversity_onoff); | 3048 | dib8000_set_diversity_in(state->fe[0], state->diversity_onoff); |
3049 | 3049 | ||
3050 | locks = (dib8000_read_word(state, 180) >> 6) & 0x3f; /* P_coff_winlen ? */ | 3050 | locks = (dib8000_read_word(state, 180) >> 6) & 0x3f; /* P_coff_winlen ? */ |
3051 | /* coff should lock over P_coff_winlen ofdm symbols : give 3 times this lenght to lock */ | 3051 | /* coff should lock over P_coff_winlen ofdm symbols : give 3 times this length to lock */ |
3052 | *timeout = dib8000_get_timeout(state, 2 * locks, SYMBOL_DEPENDENT_ON); | 3052 | *timeout = dib8000_get_timeout(state, 2 * locks, SYMBOL_DEPENDENT_ON); |
3053 | *tune_state = CT_DEMOD_STEP_5; | 3053 | *tune_state = CT_DEMOD_STEP_5; |
3054 | break; | 3054 | break; |
@@ -3115,7 +3115,7 @@ static int dib8000_tune(struct dvb_frontend *fe) | |||
3115 | 3115 | ||
3116 | case CT_DEMOD_STEP_9: /* 39 */ | 3116 | case CT_DEMOD_STEP_9: /* 39 */ |
3117 | if ((state->revision == 0x8090) || ((dib8000_read_word(state, 1291) >> 9) & 0x1)) { /* fe capable of deinterleaving : esram */ | 3117 | if ((state->revision == 0x8090) || ((dib8000_read_word(state, 1291) >> 9) & 0x1)) { /* fe capable of deinterleaving : esram */ |
3118 | /* defines timeout for mpeg lock depending on interleaver lenght of longest layer */ | 3118 | /* defines timeout for mpeg lock depending on interleaver length of longest layer */ |
3119 | for (i = 0; i < 3; i++) { | 3119 | for (i = 0; i < 3; i++) { |
3120 | if (c->layer[i].interleaving >= deeper_interleaver) { | 3120 | if (c->layer[i].interleaving >= deeper_interleaver) { |
3121 | dprintk("layer%i: time interleaver = %d ", i, c->layer[i].interleaving); | 3121 | dprintk("layer%i: time interleaver = %d ", i, c->layer[i].interleaving); |
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c index d416c15691da..bf29a3f0e6f0 100644 --- a/drivers/media/dvb-frontends/drxk_hard.c +++ b/drivers/media/dvb-frontends/drxk_hard.c | |||
@@ -1191,7 +1191,7 @@ static int mpegts_configure_pins(struct drxk_state *state, bool mpeg_enable) | |||
1191 | goto error; | 1191 | goto error; |
1192 | 1192 | ||
1193 | if (state->m_enable_parallel == true) { | 1193 | if (state->m_enable_parallel == true) { |
1194 | /* paralel -> enable MD1 to MD7 */ | 1194 | /* parallel -> enable MD1 to MD7 */ |
1195 | status = write16(state, SIO_PDR_MD1_CFG__A, | 1195 | status = write16(state, SIO_PDR_MD1_CFG__A, |
1196 | sio_pdr_mdx_cfg); | 1196 | sio_pdr_mdx_cfg); |
1197 | if (status < 0) | 1197 | if (status < 0) |
@@ -1428,7 +1428,7 @@ static int mpegts_stop(struct drxk_state *state) | |||
1428 | 1428 | ||
1429 | dprintk(1, "\n"); | 1429 | dprintk(1, "\n"); |
1430 | 1430 | ||
1431 | /* Gracefull shutdown (byte boundaries) */ | 1431 | /* Graceful shutdown (byte boundaries) */ |
1432 | status = read16(state, FEC_OC_SNC_MODE__A, &fec_oc_snc_mode); | 1432 | status = read16(state, FEC_OC_SNC_MODE__A, &fec_oc_snc_mode); |
1433 | if (status < 0) | 1433 | if (status < 0) |
1434 | goto error; | 1434 | goto error; |
@@ -2021,7 +2021,7 @@ static int mpegts_dto_setup(struct drxk_state *state, | |||
2021 | fec_oc_dto_burst_len = 204; | 2021 | fec_oc_dto_burst_len = 204; |
2022 | } | 2022 | } |
2023 | 2023 | ||
2024 | /* Check serial or parrallel output */ | 2024 | /* Check serial or parallel output */ |
2025 | fec_oc_reg_ipr_mode &= (~(FEC_OC_IPR_MODE_SERIAL__M)); | 2025 | fec_oc_reg_ipr_mode &= (~(FEC_OC_IPR_MODE_SERIAL__M)); |
2026 | if (state->m_enable_parallel == false) { | 2026 | if (state->m_enable_parallel == false) { |
2027 | /* MPEG data output is serial -> set ipr_mode[0] */ | 2027 | /* MPEG data output is serial -> set ipr_mode[0] */ |
@@ -2908,7 +2908,7 @@ static int adc_synchronization(struct drxk_state *state) | |||
2908 | goto error; | 2908 | goto error; |
2909 | 2909 | ||
2910 | if (count == 1) { | 2910 | if (count == 1) { |
2911 | /* Try sampling on a diffrent edge */ | 2911 | /* Try sampling on a different edge */ |
2912 | u16 clk_neg = 0; | 2912 | u16 clk_neg = 0; |
2913 | 2913 | ||
2914 | status = read16(state, IQM_AF_CLKNEG__A, &clk_neg); | 2914 | status = read16(state, IQM_AF_CLKNEG__A, &clk_neg); |
@@ -3306,7 +3306,7 @@ static int dvbt_sc_command(struct drxk_state *state, | |||
3306 | if (status < 0) | 3306 | if (status < 0) |
3307 | goto error; | 3307 | goto error; |
3308 | 3308 | ||
3309 | /* Retreive results parameters from SC */ | 3309 | /* Retrieve results parameters from SC */ |
3310 | switch (cmd) { | 3310 | switch (cmd) { |
3311 | /* All commands yielding 5 results */ | 3311 | /* All commands yielding 5 results */ |
3312 | /* All commands yielding 4 results */ | 3312 | /* All commands yielding 4 results */ |
@@ -3849,7 +3849,7 @@ static int set_dvbt(struct drxk_state *state, u16 intermediate_freqk_hz, | |||
3849 | break; | 3849 | break; |
3850 | } | 3850 | } |
3851 | #if 0 | 3851 | #if 0 |
3852 | /* No hierachical channels support in BDA */ | 3852 | /* No hierarchical channels support in BDA */ |
3853 | /* Priority (only for hierarchical channels) */ | 3853 | /* Priority (only for hierarchical channels) */ |
3854 | switch (channel->priority) { | 3854 | switch (channel->priority) { |
3855 | case DRX_PRIORITY_LOW: | 3855 | case DRX_PRIORITY_LOW: |
@@ -4081,7 +4081,7 @@ error: | |||
4081 | /*============================================================================*/ | 4081 | /*============================================================================*/ |
4082 | 4082 | ||
4083 | /** | 4083 | /** |
4084 | * \brief Retreive lock status . | 4084 | * \brief Retrieve lock status . |
4085 | * \param demod Pointer to demodulator instance. | 4085 | * \param demod Pointer to demodulator instance. |
4086 | * \param lockStat Pointer to lock status structure. | 4086 | * \param lockStat Pointer to lock status structure. |
4087 | * \return DRXStatus_t. | 4087 | * \return DRXStatus_t. |
@@ -6174,7 +6174,7 @@ static int init_drxk(struct drxk_state *state) | |||
6174 | goto error; | 6174 | goto error; |
6175 | 6175 | ||
6176 | /* Stamp driver version number in SCU data RAM in BCD code | 6176 | /* Stamp driver version number in SCU data RAM in BCD code |
6177 | Done to enable field application engineers to retreive drxdriver version | 6177 | Done to enable field application engineers to retrieve drxdriver version |
6178 | via I2C from SCU RAM. | 6178 | via I2C from SCU RAM. |
6179 | Not using SCU command interface for SCU register access since no | 6179 | Not using SCU command interface for SCU register access since no |
6180 | microcode may be present. | 6180 | microcode may be present. |
@@ -6399,7 +6399,7 @@ static int drxk_set_parameters(struct dvb_frontend *fe) | |||
6399 | fe->ops.tuner_ops.get_if_frequency(fe, &IF); | 6399 | fe->ops.tuner_ops.get_if_frequency(fe, &IF); |
6400 | start(state, 0, IF); | 6400 | start(state, 0, IF); |
6401 | 6401 | ||
6402 | /* After set_frontend, stats aren't avaliable */ | 6402 | /* After set_frontend, stats aren't available */ |
6403 | p->strength.stat[0].scale = FE_SCALE_RELATIVE; | 6403 | p->strength.stat[0].scale = FE_SCALE_RELATIVE; |
6404 | p->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE; | 6404 | p->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE; |
6405 | p->block_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE; | 6405 | p->block_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE; |
diff --git a/drivers/media/i2c/adv7183_regs.h b/drivers/media/i2c/adv7183_regs.h index 4a5b7d211d2f..b253d400e817 100644 --- a/drivers/media/i2c/adv7183_regs.h +++ b/drivers/media/i2c/adv7183_regs.h | |||
@@ -52,9 +52,9 @@ | |||
52 | #define ADV7183_VS_FIELD_CTRL_1 0x31 /* Vsync field control 1 */ | 52 | #define ADV7183_VS_FIELD_CTRL_1 0x31 /* Vsync field control 1 */ |
53 | #define ADV7183_VS_FIELD_CTRL_2 0x32 /* Vsync field control 2 */ | 53 | #define ADV7183_VS_FIELD_CTRL_2 0x32 /* Vsync field control 2 */ |
54 | #define ADV7183_VS_FIELD_CTRL_3 0x33 /* Vsync field control 3 */ | 54 | #define ADV7183_VS_FIELD_CTRL_3 0x33 /* Vsync field control 3 */ |
55 | #define ADV7183_HS_POS_CTRL_1 0x34 /* Hsync positon control 1 */ | 55 | #define ADV7183_HS_POS_CTRL_1 0x34 /* Hsync position control 1 */ |
56 | #define ADV7183_HS_POS_CTRL_2 0x35 /* Hsync positon control 2 */ | 56 | #define ADV7183_HS_POS_CTRL_2 0x35 /* Hsync position control 2 */ |
57 | #define ADV7183_HS_POS_CTRL_3 0x36 /* Hsync positon control 3 */ | 57 | #define ADV7183_HS_POS_CTRL_3 0x36 /* Hsync position control 3 */ |
58 | #define ADV7183_POLARITY 0x37 /* Polarity */ | 58 | #define ADV7183_POLARITY 0x37 /* Polarity */ |
59 | #define ADV7183_NTSC_COMB_CTRL 0x38 /* NTSC comb control */ | 59 | #define ADV7183_NTSC_COMB_CTRL 0x38 /* NTSC comb control */ |
60 | #define ADV7183_PAL_COMB_CTRL 0x39 /* PAL comb control */ | 60 | #define ADV7183_PAL_COMB_CTRL 0x39 /* PAL comb control */ |
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index fbfdd2fc2a36..a324106b9f11 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c | |||
@@ -877,7 +877,7 @@ static void configure_custom_video_timings(struct v4l2_subdev *sd, | |||
877 | break; | 877 | break; |
878 | case ADV7604_MODE_HDMI: | 878 | case ADV7604_MODE_HDMI: |
879 | /* set default prim_mode/vid_std for HDMI | 879 | /* set default prim_mode/vid_std for HDMI |
880 | accoring to [REF_03, c. 4.2] */ | 880 | according to [REF_03, c. 4.2] */ |
881 | io_write(sd, 0x00, 0x02); /* video std */ | 881 | io_write(sd, 0x00, 0x02); /* video std */ |
882 | io_write(sd, 0x01, 0x06); /* prim mode */ | 882 | io_write(sd, 0x01, 0x06); /* prim mode */ |
883 | break; | 883 | break; |
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index 22f729d66a96..b154f36740b4 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c | |||
@@ -1013,7 +1013,7 @@ static void configure_custom_video_timings(struct v4l2_subdev *sd, | |||
1013 | break; | 1013 | break; |
1014 | case ADV7842_MODE_HDMI: | 1014 | case ADV7842_MODE_HDMI: |
1015 | /* set default prim_mode/vid_std for HDMI | 1015 | /* set default prim_mode/vid_std for HDMI |
1016 | accoring to [REF_03, c. 4.2] */ | 1016 | according to [REF_03, c. 4.2] */ |
1017 | io_write(sd, 0x00, 0x02); /* video std */ | 1017 | io_write(sd, 0x00, 0x02); /* video std */ |
1018 | io_write(sd, 0x01, 0x06); /* prim mode */ | 1018 | io_write(sd, 0x01, 0x06); /* prim mode */ |
1019 | break; | 1019 | break; |
diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c index 82bf5679da30..99ee456700f4 100644 --- a/drivers/media/i2c/ir-kbd-i2c.c +++ b/drivers/media/i2c/ir-kbd-i2c.c | |||
@@ -394,7 +394,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
394 | 394 | ||
395 | if (!rc) { | 395 | if (!rc) { |
396 | /* | 396 | /* |
397 | * If platform_data doesn't specify rc_dev, initilize it | 397 | * If platform_data doesn't specify rc_dev, initialize it |
398 | * internally | 398 | * internally |
399 | */ | 399 | */ |
400 | rc = rc_allocate_device(); | 400 | rc = rc_allocate_device(); |
diff --git a/drivers/media/i2c/m5mols/m5mols_controls.c b/drivers/media/i2c/m5mols/m5mols_controls.c index f34429e452ab..a60931e66312 100644 --- a/drivers/media/i2c/m5mols/m5mols_controls.c +++ b/drivers/media/i2c/m5mols/m5mols_controls.c | |||
@@ -544,7 +544,7 @@ int m5mols_init_controls(struct v4l2_subdev *sd) | |||
544 | u16 zoom_step; | 544 | u16 zoom_step; |
545 | int ret; | 545 | int ret; |
546 | 546 | ||
547 | /* Determine the firmware dependant control range and step values */ | 547 | /* Determine the firmware dependent control range and step values */ |
548 | ret = m5mols_read_u16(sd, AE_MAX_GAIN_MON, &exposure_max); | 548 | ret = m5mols_read_u16(sd, AE_MAX_GAIN_MON, &exposure_max); |
549 | if (ret < 0) | 549 | if (ret < 0) |
550 | return ret; | 550 | return ret; |
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c index 6fec9384d86e..e7f555cc827a 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c +++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c | |||
@@ -1460,7 +1460,7 @@ static int s5c73m3_oif_registered(struct v4l2_subdev *sd) | |||
1460 | mutex_unlock(&state->lock); | 1460 | mutex_unlock(&state->lock); |
1461 | 1461 | ||
1462 | v4l2_dbg(1, s5c73m3_dbg, sd, "%s: Booting %s (%d)\n", | 1462 | v4l2_dbg(1, s5c73m3_dbg, sd, "%s: Booting %s (%d)\n", |
1463 | __func__, ret ? "failed" : "succeded", ret); | 1463 | __func__, ret ? "failed" : "succeeded", ret); |
1464 | 1464 | ||
1465 | return ret; | 1465 | return ret; |
1466 | } | 1466 | } |
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3.h b/drivers/media/i2c/s5c73m3/s5c73m3.h index 9d2c08652246..9dfa516f6944 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3.h +++ b/drivers/media/i2c/s5c73m3/s5c73m3.h | |||
@@ -393,7 +393,7 @@ struct s5c73m3 { | |||
393 | 393 | ||
394 | /* External master clock frequency */ | 394 | /* External master clock frequency */ |
395 | u32 mclk_frequency; | 395 | u32 mclk_frequency; |
396 | /* Video bus type - MIPI-CSI2/paralell */ | 396 | /* Video bus type - MIPI-CSI2/parallel */ |
397 | enum v4l2_mbus_type bus_type; | 397 | enum v4l2_mbus_type bus_type; |
398 | 398 | ||
399 | const struct s5c73m3_frame_size *sensor_pix_size[2]; | 399 | const struct s5c73m3_frame_size *sensor_pix_size[2]; |
diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c index 637d02634527..afdbcb045cee 100644 --- a/drivers/media/i2c/saa7115.c +++ b/drivers/media/i2c/saa7115.c | |||
@@ -1699,7 +1699,7 @@ static void saa711x_write_platform_data(struct saa711x_state *state, | |||
1699 | * the analog demod. | 1699 | * the analog demod. |
1700 | * If the tuner is not found, it returns -ENODEV. | 1700 | * If the tuner is not found, it returns -ENODEV. |
1701 | * If auto-detection is disabled and the tuner doesn't match what it was | 1701 | * If auto-detection is disabled and the tuner doesn't match what it was |
1702 | * requred, it returns -EINVAL and fills 'name'. | 1702 | * required, it returns -EINVAL and fills 'name'. |
1703 | * If the chip is found, it returns the chip ID and fills 'name'. | 1703 | * If the chip is found, it returns the chip ID and fills 'name'. |
1704 | */ | 1704 | */ |
1705 | static int saa711x_detect_chip(struct i2c_client *client, | 1705 | static int saa711x_detect_chip(struct i2c_client *client, |
diff --git a/drivers/media/i2c/soc_camera/ov5642.c b/drivers/media/i2c/soc_camera/ov5642.c index 0a5c5d4fedd6..d2daa6a8f272 100644 --- a/drivers/media/i2c/soc_camera/ov5642.c +++ b/drivers/media/i2c/soc_camera/ov5642.c | |||
@@ -642,7 +642,7 @@ static const struct ov5642_datafmt | |||
642 | static int reg_read(struct i2c_client *client, u16 reg, u8 *val) | 642 | static int reg_read(struct i2c_client *client, u16 reg, u8 *val) |
643 | { | 643 | { |
644 | int ret; | 644 | int ret; |
645 | /* We have 16-bit i2c addresses - care for endianess */ | 645 | /* We have 16-bit i2c addresses - care for endianness */ |
646 | unsigned char data[2] = { reg >> 8, reg & 0xff }; | 646 | unsigned char data[2] = { reg >> 8, reg & 0xff }; |
647 | 647 | ||
648 | ret = i2c_master_send(client, data, 2); | 648 | ret = i2c_master_send(client, data, 2); |
diff --git a/drivers/media/pci/cx18/cx18-driver.h b/drivers/media/pci/cx18/cx18-driver.h index 2767c64df0c8..57f4688ea55b 100644 --- a/drivers/media/pci/cx18/cx18-driver.h +++ b/drivers/media/pci/cx18/cx18-driver.h | |||
@@ -262,7 +262,7 @@ struct cx18_options { | |||
262 | }; | 262 | }; |
263 | 263 | ||
264 | /* per-mdl bit flags */ | 264 | /* per-mdl bit flags */ |
265 | #define CX18_F_M_NEED_SWAP 0 /* mdl buffer data must be endianess swapped */ | 265 | #define CX18_F_M_NEED_SWAP 0 /* mdl buffer data must be endianness swapped */ |
266 | 266 | ||
267 | /* per-stream, s_flags */ | 267 | /* per-stream, s_flags */ |
268 | #define CX18_F_S_CLAIMED 3 /* this stream is claimed */ | 268 | #define CX18_F_S_CLAIMED 3 /* this stream is claimed */ |
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c index e3fc2c71808a..95666eee7b27 100644 --- a/drivers/media/pci/cx23885/cx23885-417.c +++ b/drivers/media/pci/cx23885/cx23885-417.c | |||
@@ -427,7 +427,7 @@ int mc417_register_read(struct cx23885_dev *dev, u16 address, u32 *value) | |||
427 | cx_write(MC417_RWD, regval); | 427 | cx_write(MC417_RWD, regval); |
428 | 428 | ||
429 | /* Transition RD to effect read transaction across bus. | 429 | /* Transition RD to effect read transaction across bus. |
430 | * Transtion 0x5000 -> 0x9000 correct (RD/RDY -> WR/RDY)? | 430 | * Transition 0x5000 -> 0x9000 correct (RD/RDY -> WR/RDY)? |
431 | * Should it be 0x9000 -> 0xF000 (also why is RDY being set, its | 431 | * Should it be 0x9000 -> 0xF000 (also why is RDY being set, its |
432 | * input only...) | 432 | * input only...) |
433 | */ | 433 | */ |
diff --git a/drivers/media/pci/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c index 8164d74b46a4..655d6854a8d7 100644 --- a/drivers/media/pci/pluto2/pluto2.c +++ b/drivers/media/pci/pluto2/pluto2.c | |||
@@ -401,7 +401,7 @@ static int pluto_hw_init(struct pluto *pluto) | |||
401 | /* set automatic LED control by FPGA */ | 401 | /* set automatic LED control by FPGA */ |
402 | pluto_rw(pluto, REG_MISC, MISC_ALED, MISC_ALED); | 402 | pluto_rw(pluto, REG_MISC, MISC_ALED, MISC_ALED); |
403 | 403 | ||
404 | /* set data endianess */ | 404 | /* set data endianness */ |
405 | #ifdef __LITTLE_ENDIAN | 405 | #ifdef __LITTLE_ENDIAN |
406 | pluto_rw(pluto, REG_PIDn(0), PID0_END, PID0_END); | 406 | pluto_rw(pluto, REG_PIDn(0), PID0_END, PID0_END); |
407 | #else | 407 | #else |
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index bd72fb97fea5..61f3dbcc259f 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c | |||
@@ -1434,7 +1434,7 @@ static void coda_buf_queue(struct vb2_buffer *vb) | |||
1434 | if (q_data->fourcc == V4L2_PIX_FMT_H264 && | 1434 | if (q_data->fourcc == V4L2_PIX_FMT_H264 && |
1435 | vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) { | 1435 | vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) { |
1436 | /* | 1436 | /* |
1437 | * For backwards compatiblity, queuing an empty buffer marks | 1437 | * For backwards compatibility, queuing an empty buffer marks |
1438 | * the stream end | 1438 | * the stream end |
1439 | */ | 1439 | */ |
1440 | if (vb2_get_plane_payload(vb, 0) == 0) | 1440 | if (vb2_get_plane_payload(vb, 0) == 0) |
diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c index 3d66d88ea3a1..f7915695c907 100644 --- a/drivers/media/platform/exynos4-is/fimc-core.c +++ b/drivers/media/platform/exynos4-is/fimc-core.c | |||
@@ -1039,7 +1039,7 @@ static int fimc_runtime_resume(struct device *dev) | |||
1039 | 1039 | ||
1040 | dbg("fimc%d: state: 0x%lx", fimc->id, fimc->state); | 1040 | dbg("fimc%d: state: 0x%lx", fimc->id, fimc->state); |
1041 | 1041 | ||
1042 | /* Enable clocks and perform basic initalization */ | 1042 | /* Enable clocks and perform basic initialization */ |
1043 | clk_enable(fimc->clock[CLK_GATE]); | 1043 | clk_enable(fimc->clock[CLK_GATE]); |
1044 | fimc_hw_reset(fimc); | 1044 | fimc_hw_reset(fimc); |
1045 | 1045 | ||
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index 7a4ee4c0449d..c1bce170df6f 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c | |||
@@ -759,7 +759,7 @@ static int fimc_md_register_platform_entity(struct fimc_md *fmd, | |||
759 | goto dev_unlock; | 759 | goto dev_unlock; |
760 | 760 | ||
761 | drvdata = dev_get_drvdata(dev); | 761 | drvdata = dev_get_drvdata(dev); |
762 | /* Some subdev didn't probe succesfully id drvdata is NULL */ | 762 | /* Some subdev didn't probe successfully id drvdata is NULL */ |
763 | if (drvdata) { | 763 | if (drvdata) { |
764 | switch (plat_entity) { | 764 | switch (plat_entity) { |
765 | case IDX_FIMC: | 765 | case IDX_FIMC: |
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 1c3608039663..561bce8ffb1b 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c | |||
@@ -1673,7 +1673,7 @@ void omap3isp_print_status(struct isp_device *isp) | |||
1673 | * ISP clocks get disabled in suspend(). Similarly, the clocks are reenabled in | 1673 | * ISP clocks get disabled in suspend(). Similarly, the clocks are reenabled in |
1674 | * resume(), and the the pipelines are restarted in complete(). | 1674 | * resume(), and the the pipelines are restarted in complete(). |
1675 | * | 1675 | * |
1676 | * TODO: PM dependencies between the ISP and sensors are not modeled explicitly | 1676 | * TODO: PM dependencies between the ISP and sensors are not modelled explicitly |
1677 | * yet. | 1677 | * yet. |
1678 | */ | 1678 | */ |
1679 | static int isp_pm_prepare(struct device *dev) | 1679 | static int isp_pm_prepare(struct device *dev) |
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc.h b/drivers/media/platform/s5p-mfc/regs-mfc.h index 9319e93599ae..6ccc3f8c122a 100644 --- a/drivers/media/platform/s5p-mfc/regs-mfc.h +++ b/drivers/media/platform/s5p-mfc/regs-mfc.h | |||
@@ -382,7 +382,7 @@ | |||
382 | #define S5P_FIMV_R2H_CMD_EDFU_INIT_RET 16 | 382 | #define S5P_FIMV_R2H_CMD_EDFU_INIT_RET 16 |
383 | #define S5P_FIMV_R2H_CMD_ERR_RET 32 | 383 | #define S5P_FIMV_R2H_CMD_ERR_RET 32 |
384 | 384 | ||
385 | /* Dummy definition for MFCv6 compatibilty */ | 385 | /* Dummy definition for MFCv6 compatibility */ |
386 | #define S5P_FIMV_CODEC_H264_MVC_DEC -1 | 386 | #define S5P_FIMV_CODEC_H264_MVC_DEC -1 |
387 | #define S5P_FIMV_R2H_CMD_FIELD_DONE_RET -1 | 387 | #define S5P_FIMV_R2H_CMD_FIELD_DONE_RET -1 |
388 | #define S5P_FIMV_MFC_RESET -1 | 388 | #define S5P_FIMV_MFC_RESET -1 |
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 5f2c4ad6c2cb..e46067a57853 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c | |||
@@ -239,7 +239,7 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx) | |||
239 | frame_type = s5p_mfc_hw_call(dev->mfc_ops, get_dec_frame_type, dev); | 239 | frame_type = s5p_mfc_hw_call(dev->mfc_ops, get_dec_frame_type, dev); |
240 | 240 | ||
241 | /* Copy timestamp / timecode from decoded src to dst and set | 241 | /* Copy timestamp / timecode from decoded src to dst and set |
242 | appropraite flags */ | 242 | appropriate flags */ |
243 | src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); | 243 | src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); |
244 | list_for_each_entry(dst_buf, &ctx->dst_queue, list) { | 244 | list_for_each_entry(dst_buf, &ctx->dst_queue, list) { |
245 | if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dec_y_addr) { | 245 | if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dec_y_addr) { |
@@ -428,7 +428,7 @@ static void s5p_mfc_handle_error(struct s5p_mfc_dev *dev, | |||
428 | case MFCINST_FINISHING: | 428 | case MFCINST_FINISHING: |
429 | case MFCINST_FINISHED: | 429 | case MFCINST_FINISHED: |
430 | case MFCINST_RUNNING: | 430 | case MFCINST_RUNNING: |
431 | /* It is higly probable that an error occured | 431 | /* It is highly probable that an error occurred |
432 | * while decoding a frame */ | 432 | * while decoding a frame */ |
433 | clear_work_bit(ctx); | 433 | clear_work_bit(ctx); |
434 | ctx->state = MFCINST_ERROR; | 434 | ctx->state = MFCINST_ERROR; |
@@ -611,7 +611,7 @@ static irqreturn_t s5p_mfc_irq(int irq, void *priv) | |||
611 | mfc_debug(1, "Int reason: %d (err: %08x)\n", reason, err); | 611 | mfc_debug(1, "Int reason: %d (err: %08x)\n", reason, err); |
612 | switch (reason) { | 612 | switch (reason) { |
613 | case S5P_MFC_R2H_CMD_ERR_RET: | 613 | case S5P_MFC_R2H_CMD_ERR_RET: |
614 | /* An error has occured */ | 614 | /* An error has occurred */ |
615 | if (ctx->state == MFCINST_RUNNING && | 615 | if (ctx->state == MFCINST_RUNNING && |
616 | s5p_mfc_hw_call(dev->mfc_ops, err_dec, err) >= | 616 | s5p_mfc_hw_call(dev->mfc_ops, err_dec, err) >= |
617 | dev->warn_start) | 617 | dev->warn_start) |
@@ -840,7 +840,7 @@ static int s5p_mfc_open(struct file *file) | |||
840 | mutex_unlock(&dev->mfc_mutex); | 840 | mutex_unlock(&dev->mfc_mutex); |
841 | mfc_debug_leave(); | 841 | mfc_debug_leave(); |
842 | return ret; | 842 | return ret; |
843 | /* Deinit when failure occured */ | 843 | /* Deinit when failure occurred */ |
844 | err_queue_init: | 844 | err_queue_init: |
845 | if (dev->num_inst == 1) | 845 | if (dev->num_inst == 1) |
846 | s5p_mfc_deinit_hw(dev); | 846 | s5p_mfc_deinit_hw(dev); |
@@ -881,14 +881,14 @@ static int s5p_mfc_release(struct file *file) | |||
881 | /* Mark context as idle */ | 881 | /* Mark context as idle */ |
882 | clear_work_bit_irqsave(ctx); | 882 | clear_work_bit_irqsave(ctx); |
883 | /* If instance was initialised then | 883 | /* If instance was initialised then |
884 | * return instance and free reosurces */ | 884 | * return instance and free resources */ |
885 | if (ctx->inst_no != MFC_NO_INSTANCE_SET) { | 885 | if (ctx->inst_no != MFC_NO_INSTANCE_SET) { |
886 | mfc_debug(2, "Has to free instance\n"); | 886 | mfc_debug(2, "Has to free instance\n"); |
887 | ctx->state = MFCINST_RETURN_INST; | 887 | ctx->state = MFCINST_RETURN_INST; |
888 | set_work_bit_irqsave(ctx); | 888 | set_work_bit_irqsave(ctx); |
889 | s5p_mfc_clean_ctx_int_flags(ctx); | 889 | s5p_mfc_clean_ctx_int_flags(ctx); |
890 | s5p_mfc_hw_call(dev->mfc_ops, try_run, dev); | 890 | s5p_mfc_hw_call(dev->mfc_ops, try_run, dev); |
891 | /* Wait until instance is returned or timeout occured */ | 891 | /* Wait until instance is returned or timeout occurred */ |
892 | if (s5p_mfc_wait_for_done_ctx | 892 | if (s5p_mfc_wait_for_done_ctx |
893 | (ctx, S5P_MFC_R2H_CMD_CLOSE_INSTANCE_RET, 0)) { | 893 | (ctx, S5P_MFC_R2H_CMD_CLOSE_INSTANCE_RET, 0)) { |
894 | s5p_mfc_clock_off(); | 894 | s5p_mfc_clock_off(); |
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c index 7cab6849fb5b..2475a3c9a0a6 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | |||
@@ -69,7 +69,7 @@ int s5p_mfc_alloc_firmware(struct s5p_mfc_dev *dev) | |||
69 | 69 | ||
70 | } else { | 70 | } else { |
71 | /* In this case bank2 can point to the same address as bank1. | 71 | /* In this case bank2 can point to the same address as bank1. |
72 | * Firmware will always occupy the beggining of this area so it is | 72 | * Firmware will always occupy the beginning of this area so it is |
73 | * impossible having a video frame buffer with zero address. */ | 73 | * impossible having a video frame buffer with zero address. */ |
74 | dev->bank2 = dev->bank1; | 74 | dev->bank2 = dev->bank1; |
75 | } | 75 | } |
diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h index 04e6490a45be..fb2acc53112a 100644 --- a/drivers/media/platform/s5p-tv/mixer.h +++ b/drivers/media/platform/s5p-tv/mixer.h | |||
@@ -65,7 +65,7 @@ struct mxr_format { | |||
65 | int num_subframes; | 65 | int num_subframes; |
66 | /** specifies to which subframe belong given plane */ | 66 | /** specifies to which subframe belong given plane */ |
67 | int plane2subframe[MXR_MAX_PLANES]; | 67 | int plane2subframe[MXR_MAX_PLANES]; |
68 | /** internal code, driver dependant */ | 68 | /** internal code, driver dependent */ |
69 | unsigned long cookie; | 69 | unsigned long cookie; |
70 | }; | 70 | }; |
71 | 71 | ||
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c index 641b1f071e06..81b97db111d8 100644 --- a/drivers/media/platform/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c | |||
@@ -528,7 +528,7 @@ static int mxr_s_dv_timings(struct file *file, void *fh, | |||
528 | mutex_lock(&mdev->mutex); | 528 | mutex_lock(&mdev->mutex); |
529 | 529 | ||
530 | /* timings change cannot be done while there is an entity | 530 | /* timings change cannot be done while there is an entity |
531 | * dependant on output configuration | 531 | * dependent on output configuration |
532 | */ | 532 | */ |
533 | if (mdev->n_output > 0) { | 533 | if (mdev->n_output > 0) { |
534 | mutex_unlock(&mdev->mutex); | 534 | mutex_unlock(&mdev->mutex); |
@@ -585,7 +585,7 @@ static int mxr_s_std(struct file *file, void *fh, v4l2_std_id norm) | |||
585 | mutex_lock(&mdev->mutex); | 585 | mutex_lock(&mdev->mutex); |
586 | 586 | ||
587 | /* standard change cannot be done while there is an entity | 587 | /* standard change cannot be done while there is an entity |
588 | * dependant on output configuration | 588 | * dependent on output configuration |
589 | */ | 589 | */ |
590 | if (mdev->n_output > 0) { | 590 | if (mdev->n_output > 0) { |
591 | mutex_unlock(&mdev->mutex); | 591 | mutex_unlock(&mdev->mutex); |
diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c index 6769193c7c7b..74ce8b6b79fa 100644 --- a/drivers/media/platform/soc_camera/omap1_camera.c +++ b/drivers/media/platform/soc_camera/omap1_camera.c | |||
@@ -1495,7 +1495,7 @@ static int omap1_cam_set_bus_param(struct soc_camera_device *icd) | |||
1495 | if (ctrlclock & LCLK_EN) | 1495 | if (ctrlclock & LCLK_EN) |
1496 | CAM_WRITE(pcdev, CTRLCLOCK, ctrlclock); | 1496 | CAM_WRITE(pcdev, CTRLCLOCK, ctrlclock); |
1497 | 1497 | ||
1498 | /* select bus endianess */ | 1498 | /* select bus endianness */ |
1499 | xlate = soc_camera_xlate_by_fourcc(icd, pixfmt); | 1499 | xlate = soc_camera_xlate_by_fourcc(icd, pixfmt); |
1500 | fmt = xlate->host_fmt; | 1500 | fmt = xlate->host_fmt; |
1501 | 1501 | ||
diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c index 1d3f11965196..2d4e73b45c5e 100644 --- a/drivers/media/platform/vivi.c +++ b/drivers/media/platform/vivi.c | |||
@@ -1108,7 +1108,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i) | |||
1108 | return 0; | 1108 | return 0; |
1109 | } | 1109 | } |
1110 | 1110 | ||
1111 | /* timeperframe is arbitrary and continous */ | 1111 | /* timeperframe is arbitrary and continuous */ |
1112 | static int vidioc_enum_frameintervals(struct file *file, void *priv, | 1112 | static int vidioc_enum_frameintervals(struct file *file, void *priv, |
1113 | struct v4l2_frmivalenum *fival) | 1113 | struct v4l2_frmivalenum *fival) |
1114 | { | 1114 | { |
@@ -1125,7 +1125,7 @@ static int vidioc_enum_frameintervals(struct file *file, void *priv, | |||
1125 | 1125 | ||
1126 | fival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS; | 1126 | fival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS; |
1127 | 1127 | ||
1128 | /* fill in stepwise (step=1.0 is requred by V4L2 spec) */ | 1128 | /* fill in stepwise (step=1.0 is required by V4L2 spec) */ |
1129 | fival->stepwise.min = tpf_min; | 1129 | fival->stepwise.min = tpf_min; |
1130 | fival->stepwise.max = tpf_max; | 1130 | fival->stepwise.max = tpf_max; |
1131 | fival->stepwise.step = (struct v4l2_fract) {1, 1}; | 1131 | fival->stepwise.step = (struct v4l2_fract) {1, 1}; |
diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c index 1c9e771aa15c..d16bf0f41e24 100644 --- a/drivers/media/platform/vsp1/vsp1_drv.c +++ b/drivers/media/platform/vsp1/vsp1_drv.c | |||
@@ -323,7 +323,7 @@ static void vsp1_clocks_disable(struct vsp1_device *vsp1) | |||
323 | * Increment the VSP1 reference count and initialize the device if the first | 323 | * Increment the VSP1 reference count and initialize the device if the first |
324 | * reference is taken. | 324 | * reference is taken. |
325 | * | 325 | * |
326 | * Return a pointer to the VSP1 device or NULL if an error occured. | 326 | * Return a pointer to the VSP1 device or NULL if an error occurred. |
327 | */ | 327 | */ |
328 | struct vsp1_device *vsp1_device_get(struct vsp1_device *vsp1) | 328 | struct vsp1_device *vsp1_device_get(struct vsp1_device *vsp1) |
329 | { | 329 | { |
diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c index 9c9084cb99f7..2fd9009f8663 100644 --- a/drivers/media/radio/radio-si476x.c +++ b/drivers/media/radio/radio-si476x.c | |||
@@ -268,8 +268,8 @@ struct si476x_radio; | |||
268 | * | 268 | * |
269 | * @tune_freq: Tune chip to a specific frequency | 269 | * @tune_freq: Tune chip to a specific frequency |
270 | * @seek_start: Star station seeking | 270 | * @seek_start: Star station seeking |
271 | * @rsq_status: Get Recieved Signal Quality(RSQ) status | 271 | * @rsq_status: Get Received Signal Quality(RSQ) status |
272 | * @rds_blckcnt: Get recived RDS blocks count | 272 | * @rds_blckcnt: Get received RDS blocks count |
273 | * @phase_diversity: Change phase diversity mode of the tuner | 273 | * @phase_diversity: Change phase diversity mode of the tuner |
274 | * @phase_div_status: Get phase diversity mode status | 274 | * @phase_div_status: Get phase diversity mode status |
275 | * @acf_status: Get the status of Automatically Controlled | 275 | * @acf_status: Get the status of Automatically Controlled |
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index 72e3fa652481..f329485c6629 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c | |||
@@ -1370,7 +1370,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf) | |||
1370 | * 0x68nnnnB7 to 0x6AnnnnB7, the left mouse button generates | 1370 | * 0x68nnnnB7 to 0x6AnnnnB7, the left mouse button generates |
1371 | * 0x688301b7 and the right one 0x688481b7. All other keys generate | 1371 | * 0x688301b7 and the right one 0x688481b7. All other keys generate |
1372 | * 0x2nnnnnnn. Position coordinate is encoded in buf[1] and buf[2] with | 1372 | * 0x2nnnnnnn. Position coordinate is encoded in buf[1] and buf[2] with |
1373 | * reversed endianess. Extract direction from buffer, rotate endianess, | 1373 | * reversed endianness. Extract direction from buffer, rotate endianness, |
1374 | * adjust sign and feed the values into stabilize(). The resulting codes | 1374 | * adjust sign and feed the values into stabilize(). The resulting codes |
1375 | * will be 0x01008000, 0x01007F00, which match the newer devices. | 1375 | * will be 0x01008000, 0x01007F00, which match the newer devices. |
1376 | */ | 1376 | */ |
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c index 094484fac94c..a5d4f883d053 100644 --- a/drivers/media/rc/redrat3.c +++ b/drivers/media/rc/redrat3.c | |||
@@ -118,7 +118,7 @@ static int debug; | |||
118 | #define RR3_IR_IO_LENGTH_FUZZ 0x04 | 118 | #define RR3_IR_IO_LENGTH_FUZZ 0x04 |
119 | /* Timeout for end of signal detection */ | 119 | /* Timeout for end of signal detection */ |
120 | #define RR3_IR_IO_SIG_TIMEOUT 0x05 | 120 | #define RR3_IR_IO_SIG_TIMEOUT 0x05 |
121 | /* Minumum value for pause recognition. */ | 121 | /* Minimum value for pause recognition. */ |
122 | #define RR3_IR_IO_MIN_PAUSE 0x06 | 122 | #define RR3_IR_IO_MIN_PAUSE 0x06 |
123 | 123 | ||
124 | /* Clock freq. of EZ-USB chip */ | 124 | /* Clock freq. of EZ-USB chip */ |
diff --git a/drivers/media/tuners/mt2063.c b/drivers/media/tuners/mt2063.c index 2e1a02e360ff..20cca405bf45 100644 --- a/drivers/media/tuners/mt2063.c +++ b/drivers/media/tuners/mt2063.c | |||
@@ -1195,7 +1195,7 @@ static u32 mt2063_set_dnc_output_enable(struct mt2063_state *state, | |||
1195 | * DNC Output is selected, the other is always off) | 1195 | * DNC Output is selected, the other is always off) |
1196 | * | 1196 | * |
1197 | * @state: ptr to mt2063_state structure | 1197 | * @state: ptr to mt2063_state structure |
1198 | * @Mode: desired reciever delivery system | 1198 | * @Mode: desired receiver delivery system |
1199 | * | 1199 | * |
1200 | * Note: Register cache must be valid for it to work | 1200 | * Note: Register cache must be valid for it to work |
1201 | */ | 1201 | */ |
@@ -2119,7 +2119,7 @@ static int mt2063_set_analog_params(struct dvb_frontend *fe, | |||
2119 | 2119 | ||
2120 | /* | 2120 | /* |
2121 | * As defined on EN 300 429, the DVB-C roll-off factor is 0.15. | 2121 | * As defined on EN 300 429, the DVB-C roll-off factor is 0.15. |
2122 | * So, the amount of the needed bandwith is given by: | 2122 | * So, the amount of the needed bandwidth is given by: |
2123 | * Bw = Symbol_rate * (1 + 0.15) | 2123 | * Bw = Symbol_rate * (1 + 0.15) |
2124 | * As such, the maximum symbol rate supported by 6 MHz is given by: | 2124 | * As such, the maximum symbol rate supported by 6 MHz is given by: |
2125 | * max_symbol_rate = 6 MHz / 1.15 = 5217391 Bauds | 2125 | * max_symbol_rate = 6 MHz / 1.15 = 5217391 Bauds |
diff --git a/drivers/media/tuners/tuner-xc2028-types.h b/drivers/media/tuners/tuner-xc2028-types.h index 74dc46a71f64..7e4798783db7 100644 --- a/drivers/media/tuners/tuner-xc2028-types.h +++ b/drivers/media/tuners/tuner-xc2028-types.h | |||
@@ -119,7 +119,7 @@ | |||
119 | #define V4L2_STD_A2 (V4L2_STD_A2_A | V4L2_STD_A2_B) | 119 | #define V4L2_STD_A2 (V4L2_STD_A2_A | V4L2_STD_A2_B) |
120 | #define V4L2_STD_NICAM (V4L2_STD_NICAM_A | V4L2_STD_NICAM_B) | 120 | #define V4L2_STD_NICAM (V4L2_STD_NICAM_A | V4L2_STD_NICAM_B) |
121 | 121 | ||
122 | /* To preserve backward compatibilty, | 122 | /* To preserve backward compatibility, |
123 | (std & V4L2_STD_AUDIO) = 0 means that ALL audio stds are supported | 123 | (std & V4L2_STD_AUDIO) = 0 means that ALL audio stds are supported |
124 | */ | 124 | */ |
125 | 125 | ||
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf.c b/drivers/media/usb/dvb-usb-v2/mxl111sf.c index 2627553f7de1..08240e498451 100644 --- a/drivers/media/usb/dvb-usb-v2/mxl111sf.c +++ b/drivers/media/usb/dvb-usb-v2/mxl111sf.c | |||
@@ -266,7 +266,7 @@ static int mxl111sf_adap_fe_init(struct dvb_frontend *fe) | |||
266 | struct mxl111sf_adap_state *adap_state = &state->adap_state[fe->id]; | 266 | struct mxl111sf_adap_state *adap_state = &state->adap_state[fe->id]; |
267 | int err; | 267 | int err; |
268 | 268 | ||
269 | /* exit if we didnt initialize the driver yet */ | 269 | /* exit if we didn't initialize the driver yet */ |
270 | if (!state->chip_id) { | 270 | if (!state->chip_id) { |
271 | mxl_debug("driver not yet initialized, exit."); | 271 | mxl_debug("driver not yet initialized, exit."); |
272 | goto fail; | 272 | goto fail; |
@@ -322,7 +322,7 @@ static int mxl111sf_adap_fe_sleep(struct dvb_frontend *fe) | |||
322 | struct mxl111sf_adap_state *adap_state = &state->adap_state[fe->id]; | 322 | struct mxl111sf_adap_state *adap_state = &state->adap_state[fe->id]; |
323 | int err; | 323 | int err; |
324 | 324 | ||
325 | /* exit if we didnt initialize the driver yet */ | 325 | /* exit if we didn't initialize the driver yet */ |
326 | if (!state->chip_id) { | 326 | if (!state->chip_id) { |
327 | mxl_debug("driver not yet initialized, exit."); | 327 | mxl_debug("driver not yet initialized, exit."); |
328 | goto fail; | 328 | goto fail; |
diff --git a/drivers/media/usb/gspca/gl860/gl860.c b/drivers/media/usb/gspca/gl860/gl860.c index cb1e64ca59c9..cea8d7f51c3c 100644 --- a/drivers/media/usb/gspca/gl860/gl860.c +++ b/drivers/media/usb/gspca/gl860/gl860.c | |||
@@ -438,7 +438,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
438 | s32 nToSkip = | 438 | s32 nToSkip = |
439 | sd->swapRB * (gspca_dev->cam.cam_mode[mode].bytesperline + 1); | 439 | sd->swapRB * (gspca_dev->cam.cam_mode[mode].bytesperline + 1); |
440 | 440 | ||
441 | /* Test only against 0202h, so endianess does not matter */ | 441 | /* Test only against 0202h, so endianness does not matter */ |
442 | switch (*(s16 *) data) { | 442 | switch (*(s16 *) data) { |
443 | case 0x0202: /* End of frame, start a new one */ | 443 | case 0x0202: /* End of frame, start a new one */ |
444 | gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0); | 444 | gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0); |
diff --git a/drivers/media/usb/gspca/pac207.c b/drivers/media/usb/gspca/pac207.c index cd79c180f67b..07529e5a0c56 100644 --- a/drivers/media/usb/gspca/pac207.c +++ b/drivers/media/usb/gspca/pac207.c | |||
@@ -416,7 +416,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
416 | #if IS_ENABLED(CONFIG_INPUT) | 416 | #if IS_ENABLED(CONFIG_INPUT) |
417 | static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, | 417 | static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, |
418 | u8 *data, /* interrupt packet data */ | 418 | u8 *data, /* interrupt packet data */ |
419 | int len) /* interrput packet length */ | 419 | int len) /* interrupt packet length */ |
420 | { | 420 | { |
421 | int ret = -EINVAL; | 421 | int ret = -EINVAL; |
422 | 422 | ||
diff --git a/drivers/media/usb/gspca/pac7302.c b/drivers/media/usb/gspca/pac7302.c index a91509643563..2fd1c5e31a0f 100644 --- a/drivers/media/usb/gspca/pac7302.c +++ b/drivers/media/usb/gspca/pac7302.c | |||
@@ -874,7 +874,7 @@ static int sd_dbg_s_register(struct gspca_dev *gspca_dev, | |||
874 | #if IS_ENABLED(CONFIG_INPUT) | 874 | #if IS_ENABLED(CONFIG_INPUT) |
875 | static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, | 875 | static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, |
876 | u8 *data, /* interrupt packet data */ | 876 | u8 *data, /* interrupt packet data */ |
877 | int len) /* interrput packet length */ | 877 | int len) /* interrupt packet length */ |
878 | { | 878 | { |
879 | int ret = -EINVAL; | 879 | int ret = -EINVAL; |
880 | u8 data0, data1; | 880 | u8 data0, data1; |
diff --git a/drivers/media/usb/gspca/stv0680.c b/drivers/media/usb/gspca/stv0680.c index 9c0827631b9c..7f94ec74282e 100644 --- a/drivers/media/usb/gspca/stv0680.c +++ b/drivers/media/usb/gspca/stv0680.c | |||
@@ -139,7 +139,7 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
139 | struct sd *sd = (struct sd *) gspca_dev; | 139 | struct sd *sd = (struct sd *) gspca_dev; |
140 | struct cam *cam = &gspca_dev->cam; | 140 | struct cam *cam = &gspca_dev->cam; |
141 | 141 | ||
142 | /* Give the camera some time to settle, otherwise initalization will | 142 | /* Give the camera some time to settle, otherwise initialization will |
143 | fail on hotplug, and yes it really needs a full second. */ | 143 | fail on hotplug, and yes it really needs a full second. */ |
144 | msleep(1000); | 144 | msleep(1000); |
145 | 145 | ||
diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c index 7b95d8e88a20..d3e1b6d8bf49 100644 --- a/drivers/media/usb/gspca/zc3xx.c +++ b/drivers/media/usb/gspca/zc3xx.c | |||
@@ -6905,7 +6905,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev, | |||
6905 | #if IS_ENABLED(CONFIG_INPUT) | 6905 | #if IS_ENABLED(CONFIG_INPUT) |
6906 | static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, | 6906 | static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, |
6907 | u8 *data, /* interrupt packet data */ | 6907 | u8 *data, /* interrupt packet data */ |
6908 | int len) /* interrput packet length */ | 6908 | int len) /* interrupt packet length */ |
6909 | { | 6909 | { |
6910 | if (len == 8 && data[4] == 1) { | 6910 | if (len == 8 && data[4] == 1) { |
6911 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, 1); | 6911 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, 1); |
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c index 77bbf7889659..78c9bc8e7f56 100644 --- a/drivers/media/usb/pwc/pwc-if.c +++ b/drivers/media/usb/pwc/pwc-if.c | |||
@@ -1039,7 +1039,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id | |||
1039 | /* Set the leds off */ | 1039 | /* Set the leds off */ |
1040 | pwc_set_leds(pdev, 0, 0); | 1040 | pwc_set_leds(pdev, 0, 0); |
1041 | 1041 | ||
1042 | /* Setup intial videomode */ | 1042 | /* Setup initial videomode */ |
1043 | rc = pwc_set_video_mode(pdev, MAX_WIDTH, MAX_HEIGHT, | 1043 | rc = pwc_set_video_mode(pdev, MAX_WIDTH, MAX_HEIGHT, |
1044 | V4L2_PIX_FMT_YUV420, 30, &compression, 1); | 1044 | V4L2_PIX_FMT_YUV420, 30, &compression, 1); |
1045 | if (rc) | 1045 | if (rc) |
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 899cb6d1c4a4..898c208889cd 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c | |||
@@ -556,7 +556,7 @@ static u16 uvc_video_clock_host_sof(const struct uvc_clock_sample *sample) | |||
556 | * | 556 | * |
557 | * SOF = ((SOF2 - SOF1) * PTS + SOF1 * STC2 - SOF2 * STC1) / (STC2 - STC1) (1) | 557 | * SOF = ((SOF2 - SOF1) * PTS + SOF1 * STC2 - SOF2 * STC1) / (STC2 - STC1) (1) |
558 | * | 558 | * |
559 | * to avoid loosing precision in the division. Similarly, the host timestamp is | 559 | * to avoid losing precision in the division. Similarly, the host timestamp is |
560 | * computed with | 560 | * computed with |
561 | * | 561 | * |
562 | * TS = ((TS2 - TS1) * PTS + TS1 * SOF2 - TS2 * SOF1) / (SOF2 - SOF1) (2) | 562 | * TS = ((TS2 - TS1) * PTS + TS1 * SOF2 - TS2 * SOF1) / (SOF2 - SOF1) (2) |
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 60dcc0f3b32e..fb46790d0eca 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c | |||
@@ -420,7 +420,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) | |||
420 | "Advanced Simple", | 420 | "Advanced Simple", |
421 | "Core", | 421 | "Core", |
422 | "Simple Scalable", | 422 | "Simple Scalable", |
423 | "Advanced Coding Efficency", | 423 | "Advanced Coding Efficiency", |
424 | NULL, | 424 | NULL, |
425 | }; | 425 | }; |
426 | 426 | ||