Merge branch 'staging/for_v3.7' into v4l_for_linus

Applied on the top of changeset 782cd9e, as some of those patches
depend on some fixes that went via -arm tree.

* staging/for_v3.7: (109 commits)
  [media] m5mols: Add missing #include <linux/sizes.h>
  [media] stk1160: Add support for S-Video input
  Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
  [media]  dvb: LNA implementation changes
  [media] v4l2-ioctl: fix W=1 warnings
  [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
  [media] omap3isp: Fix compilation error in ispreg.h
  [media] rc-msi-digivox-ii: Add full scan keycodes
  [media] cx25821: testing the wrong variable
  [media] tda18271-common: hold the I2C adapter during write transfers
  [media] ds3000: add module parameter to force firmware upload
  [media] drivers/media: Remove unnecessary semicolon
  [media] winbond: remove space from driver name
  [media] iguanair: cannot send data from the stack
  [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
  [media] dvb-usb: print small buffers via %*ph
  [media] uvc: Add return code check at vb2_queue_init()
  [media] em28xx: Replace memcpy with struct assignment
  [media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
  [media] mem2mem_testdev: Use devm_kzalloc() in probe
  ...

25 files changed, 66 insertions, 87 deletions

diff --git a/drivers/media/dvb-frontends/a8293.c b/drivers/media/dvb-frontends/a8293.c
index cff44a389b40..74fbb5d58bed 100644
--- a/drivers/media/dvb-frontends/a8293.c
+++ b/drivers/media/dvb-frontends/a8293.c
@@ -90,7 +90,7 @@ static int a8293_set_voltage(struct dvb_frontend *fe,
         default:
                 ret = -EINVAL;
                 goto err;
-        };
+        }
 
         ret = a8293_wr(priv, &priv->reg[0], 1);
         if (ret)
diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c
index e9f04a36577b..a204f2828820 100644
--- a/drivers/media/dvb-frontends/af9013.c
+++ b/drivers/media/dvb-frontends/af9013.c
@@ -241,7 +241,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)
                                 KBUILD_MODNAME, gpio);
                 ret = -EINVAL;
                 goto err;
-        };
+        }
 
         switch (gpio) {
         case 0:
@@ -253,7 +253,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)
         default:
                 pos = 4;
                 break;
-        };
+        }
 
         ret = af9013_wr_reg_bits(state, addr, pos, 4, gpioval);
         if (ret)
@@ -726,7 +726,7 @@ static int af9013_set_frontend(struct dvb_frontend *fe)
         default:
                 dev_dbg(&state->i2c->dev, "%s: invalid hierarchy\n", __func__);
                 auto_mode = 1;
-        };
+        }
 
         switch (c->modulation) {
         case QAM_AUTO:
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 8162d939c4b2..464ad878490b 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -408,7 +408,7 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
 {
         struct af9033_state *state = fe->demodulator_priv;
         struct dtv_frontend_properties *c = &fe->dtv_property_cache;
-        int ret, i, spec_inv;
+        int ret, i, spec_inv, sampling_freq;
         u8 tmp, buf[3], bandwidth_reg_val;
         u32 if_frequency, freq_cw, adc_freq;
 
@@ -465,18 +465,20 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
                 else
                         if_frequency = 0;
 
-                while (if_frequency > (adc_freq / 2))
-                        if_frequency -= adc_freq;
+                sampling_freq = if_frequency;
 
-                if (if_frequency >= 0)
+                while (sampling_freq > (adc_freq / 2))
+                        sampling_freq -= adc_freq;
+
+                if (sampling_freq >= 0)
                         spec_inv *= -1;
                 else
-                        if_frequency *= -1;
+                        sampling_freq *= -1;
 
-                freq_cw = af9033_div(state, if_frequency, adc_freq, 23ul);
+                freq_cw = af9033_div(state, sampling_freq, adc_freq, 23ul);
 
                 if (spec_inv == -1)
-                        freq_cw *= -1;
+                        freq_cw = 0x800000 - freq_cw;
 
                 /* get adc multiplies */
                 ret = af9033_rd_reg(state, 0x800045, &tmp);
diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
index 033cd7ad3ca2..1b77909c0c71 100644
--- a/drivers/media/dvb-frontends/bcm3510.c
+++ b/drivers/media/dvb-frontends/bcm3510.c
@@ -527,7 +527,7 @@ static int bcm3510_set_frontend(struct dvb_frontend *fe)
                         cmd.ACQUIRE1.IF_FREQ = 0x0;
                 default:
                         return -EINVAL;
-        };
+        }
         cmd.ACQUIRE0.OFFSET = 0;
         cmd.ACQUIRE0.NTSCSWEEP = 1;
         cmd.ACQUIRE0.FA = 1;
diff --git a/drivers/media/dvb-frontends/cx24110.c b/drivers/media/dvb-frontends/cx24110.c
index 3180f5b2a6a6..0cd6927e654c 100644
--- a/drivers/media/dvb-frontends/cx24110.c
+++ b/drivers/media/dvb-frontends/cx24110.c
@@ -218,7 +218,7 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
            } else
                    return -EOPNOTSUPP;
 /* fixme (low): which is the correct return code? */
-        };
+        }
         return 0;
 }
 
@@ -275,7 +275,7 @@ static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)
                 cx24110_writereg(state,0x07,tmp|0x3);
                 cx24110_writereg(state,0x06,0x78);
                 fclk=90999000UL;
-        };
+        }
         dprintk("cx24110 debug: fclk %d Hz\n",fclk);
         /* we need to divide two integers with approx. 27 bits in 32 bit
            arithmetic giving a 25 bit result */
@@ -362,7 +362,7 @@ static int cx24110_initfe(struct dvb_frontend* fe)
 
         for(i = 0; i < ARRAY_SIZE(cx24110_regdata); i++) {
                 cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);
-        };
+        }
 
         return 0;
 }
diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index 42648643693e..9b658c1cf39a 100644
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -688,7 +688,7 @@ struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,
 {
         struct cxd2820r_priv *priv;
         int ret;
-        u8 tmp, gpio[GPIO_COUNT];
+        u8 tmp;
 
         priv = kzalloc(sizeof(struct cxd2820r_priv), GFP_KERNEL);
         if (!priv) {
@@ -735,6 +735,7 @@ struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,
                  * Use static GPIO configuration if GPIOLIB is undefined.
                  * This is fallback condition.
                  */
+                u8 gpio[GPIO_COUNT];
                 gpio[0] = (*gpio_chip_base >> 0) & 0x07;
                 gpio[1] = (*gpio_chip_base >> 3) & 0x07;
                 gpio[2] = 0;
diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
index f380eb43e9d5..6d9853750d2b 100644
--- a/drivers/media/dvb-frontends/drxd_hard.c
+++ b/drivers/media/dvb-frontends/drxd_hard.c
@@ -991,7 +991,7 @@ static int HI_Command(struct drxd_state *state, u16 cmd, u16 * pResult)
                 if (nrRetries > DRXD_MAX_RETRIES) {
                         status = -1;
                         break;
-                };
+                }
                 status = Read16(state, HI_RA_RAM_SRV_CMD__A, &waitCmd, 0);
         } while (waitCmd != 0);
 
diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
index 4c8ac2657c4a..5b639087ce45 100644
--- a/drivers/media/dvb-frontends/ds3000.c
+++ b/drivers/media/dvb-frontends/ds3000.c
@@ -30,6 +30,7 @@
 #include "ds3000.h"
 
 static int debug;
+static int force_fw_upload;
 
 #define dprintk(args...) \
         do { \
@@ -392,11 +393,13 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe)
 
         dprintk("%s()\n", __func__);
 
-        if (ds3000_readreg(state, 0xb2) <= 0)
+        ret = ds3000_readreg(state, 0xb2);
+        if (ret < 0)
                 return ret;
 
-        if (state->skip_fw_load)
-                return 0;
+        if (state->skip_fw_load || !force_fw_upload)
+                return 0;       /* Firmware already uploaded, skipping */
+
         /* Load firmware */
         /* request the firmware, this will block until someone uploads it */
         printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n", __func__,
@@ -1306,6 +1309,9 @@ static struct dvb_frontend_ops ds3000_ops = {
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");
 
+module_param(force_fw_upload, int, 0644);
+MODULE_PARM_DESC(force_fw_upload, "Force firmware upload (default:0)");
+
 MODULE_DESCRIPTION("DVB Frontend module for Montage Technology "
                         "DS3000/TS2020 hardware");
 MODULE_AUTHOR("Konstantin Dimitrov");
diff --git a/drivers/media/dvb-frontends/dvb_dummy_fe.c b/drivers/media/dvb-frontends/dvb_dummy_fe.c
index dcfc902c8678..d5acc304786b 100644
--- a/drivers/media/dvb-frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb-frontends/dvb_dummy_fe.c
@@ -121,16 +121,13 @@ struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void)
 
         /* allocate memory for the internal state */
         state = kzalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
-        if (state == NULL) goto error;
+        if (!state)
+                return NULL;
 
         /* create dvb_frontend */
         memcpy(&state->frontend.ops, &dvb_dummy_fe_ofdm_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
-
-error:
-        kfree(state);
-        return NULL;
 }
 
 static struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops;
@@ -141,16 +138,13 @@ struct dvb_frontend *dvb_dummy_fe_qpsk_attach(void)
 
         /* allocate memory for the internal state */
         state = kzalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
-        if (state == NULL) goto error;
+        if (!state)
+                return NULL;
 
         /* create dvb_frontend */
         memcpy(&state->frontend.ops, &dvb_dummy_fe_qpsk_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
-
-error:
-        kfree(state);
-        return NULL;
 }
 
 static struct dvb_frontend_ops dvb_dummy_fe_qam_ops;
@@ -161,16 +155,13 @@ struct dvb_frontend *dvb_dummy_fe_qam_attach(void)
 
         /* allocate memory for the internal state */
         state = kzalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);
-        if (state == NULL) goto error;
+        if (!state)
+                return NULL;
 
         /* create dvb_frontend */
         memcpy(&state->frontend.ops, &dvb_dummy_fe_qam_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
         return &state->frontend;
-
-error:
-        kfree(state);
-        return NULL;
 }
 
 static struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops = {
diff --git a/drivers/media/dvb-frontends/isl6405.c b/drivers/media/dvb-frontends/isl6405.c
index 33d33f4d8867..0c642a5bf823 100644
--- a/drivers/media/dvb-frontends/isl6405.c
+++ b/drivers/media/dvb-frontends/isl6405.c
@@ -77,7 +77,7 @@ static int isl6405_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage
                         break;
                 default:
                         return -EINVAL;
-                };
+                }
         }
         isl6405->config |= isl6405->override_or;
         isl6405->config &= isl6405->override_and;
diff --git a/drivers/media/dvb-frontends/isl6421.c b/drivers/media/dvb-frontends/isl6421.c
index 684c8ec166cb..0cb3f0f74c9c 100644
--- a/drivers/media/dvb-frontends/isl6421.c
+++ b/drivers/media/dvb-frontends/isl6421.c
@@ -63,7 +63,7 @@ static int isl6421_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         isl6421->config |= isl6421->override_or;
         isl6421->config &= isl6421->override_and;
diff --git a/drivers/media/dvb-frontends/itd1000.c b/drivers/media/dvb-frontends/itd1000.c
index 316457584fe7..c1c3400b2173 100644
--- a/drivers/media/dvb-frontends/itd1000.c
+++ b/drivers/media/dvb-frontends/itd1000.c
@@ -231,7 +231,7 @@ static void itd1000_set_lo(struct itd1000_state *state, u32 freq_khz)
         state->frequency = ((plln * 1000) + (pllf * 1000)/1048576) * 2*FREF;
         itd_dbg("frequency: %dkHz (wanted) %dkHz (set), PLLF = %d, PLLN = %d\n", freq_khz, state->frequency, pllf, plln);
 
-        itd1000_write_reg(state, PLLNH, 0x80); /* PLLNH */;
+        itd1000_write_reg(state, PLLNH, 0x80); /* PLLNH */
         itd1000_write_reg(state, PLLNL, plln & 0xff);
         itd1000_write_reg(state, PLLFH, (itd1000_read_reg(state, PLLFH) & 0xf0) | ((pllf >> 16) & 0x0f));
         itd1000_write_reg(state, PLLFM, (pllf >> 8) & 0xff);
diff --git a/drivers/media/dvb-frontends/lg2160.c b/drivers/media/dvb-frontends/lg2160.c
index cc11260e99df..5fd14f840ab0 100644
--- a/drivers/media/dvb-frontends/lg2160.c
+++ b/drivers/media/dvb-frontends/lg2160.c
@@ -1421,8 +1421,8 @@ struct dvb_frontend *lg2160_attach(const struct lg2160_config *config,
                config ? config->i2c_addr : 0);
 
         state = kzalloc(sizeof(struct lg216x_state), GFP_KERNEL);
-        if (state == NULL)
-                goto fail;
+        if (!state)
+                return NULL;
 
         state->cfg = config;
         state->i2c_adap = i2c_adap;
@@ -1449,10 +1449,6 @@ struct dvb_frontend *lg2160_attach(const struct lg2160_config *config,
         state->frontend.dtv_property_cache.atscmh_parade_id = 1;
 
         return &state->frontend;
-fail:
-        lg_warn("unable to detect LG216x hardware\n");
-        kfree(state);
-        return NULL;
 }
 EXPORT_SYMBOL(lg2160_attach);
 
diff --git a/drivers/media/dvb-frontends/lnbp21.c b/drivers/media/dvb-frontends/lnbp21.c
index 13437259eeac..f3ba7b5faa2e 100644
--- a/drivers/media/dvb-frontends/lnbp21.c
+++ b/drivers/media/dvb-frontends/lnbp21.c
@@ -65,7 +65,7 @@ static int lnbp21_set_voltage(struct dvb_frontend *fe,
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         lnbp21->config |= lnbp21->override_or;
         lnbp21->config &= lnbp21->override_and;
@@ -108,7 +108,7 @@ static int lnbp21_set_tone(struct dvb_frontend *fe,
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         lnbp21->config |= lnbp21->override_or;
         lnbp21->config &= lnbp21->override_and;
diff --git a/drivers/media/dvb-frontends/lnbp22.c b/drivers/media/dvb-frontends/lnbp22.c
index 84ad0390a4a1..c463da7f6dcc 100644
--- a/drivers/media/dvb-frontends/lnbp22.c
+++ b/drivers/media/dvb-frontends/lnbp22.c
@@ -73,7 +73,7 @@ static int lnbp22_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         dprintk(1, "%s: 0x%02x)\n", __func__, lnbp22->config[3]);
         return (i2c_transfer(lnbp22->i2c, &msg, 1) == 1) ? 0 : -EIO;
diff --git a/drivers/media/dvb-frontends/s5h1432.c b/drivers/media/dvb-frontends/s5h1432.c
index 8352ce1c9556..6ec16a243741 100644
--- a/drivers/media/dvb-frontends/s5h1432.c
+++ b/drivers/media/dvb-frontends/s5h1432.c
@@ -351,8 +351,8 @@ struct dvb_frontend *s5h1432_attach(const struct s5h1432_config *config,
         printk(KERN_INFO " Enter s5h1432_attach(). attach success!\n");
         /* allocate memory for the internal state */
         state = kmalloc(sizeof(struct s5h1432_state), GFP_KERNEL);
-        if (state == NULL)
-                goto error;
+        if (!state)
+                return NULL;
 
         /* setup the state */
         state->config = config;
@@ -367,10 +367,6 @@ struct dvb_frontend *s5h1432_attach(const struct s5h1432_config *config,
         state->frontend.demodulator_priv = state;
 
         return &state->frontend;
-
-error:
-        kfree(state);
-        return NULL;
 }
 EXPORT_SYMBOL(s5h1432_attach);
 
diff --git a/drivers/media/dvb-frontends/s921.c b/drivers/media/dvb-frontends/s921.c
index cd2288c07147..a271ac3eaec0 100644
--- a/drivers/media/dvb-frontends/s921.c
+++ b/drivers/media/dvb-frontends/s921.c
@@ -487,9 +487,9 @@ struct dvb_frontend *s921_attach(const struct s921_config *config,
                 kzalloc(sizeof(struct s921_state), GFP_KERNEL);
 
         dprintk("\n");
-        if (state == NULL) {
+        if (!state) {
                 rc("Unable to kzalloc\n");
-                goto rcor;
+                return NULL;
         }
 
         /* setup the state */
@@ -502,11 +502,6 @@ struct dvb_frontend *s921_attach(const struct s921_config *config,
         state->frontend.demodulator_priv = state;
 
         return &state->frontend;
-
-rcor:
-        kfree(state);
-
-        return NULL;
 }
 EXPORT_SYMBOL(s921_attach);
 
diff --git a/drivers/media/dvb-frontends/si21xx.c b/drivers/media/dvb-frontends/si21xx.c
index a68a64800df7..73b47cc6a13b 100644
--- a/drivers/media/dvb-frontends/si21xx.c
+++ b/drivers/media/dvb-frontends/si21xx.c
@@ -343,7 +343,7 @@ static int si21xx_wait_diseqc_idle(struct si21xx_state *state, int timeout)
                         return -ETIMEDOUT;
                 }
                 msleep(10);
-        };
+        }
 
         return 0;
 }
@@ -472,7 +472,7 @@ static int si21xx_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t volt)
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 }
 
 static int si21xx_init(struct dvb_frontend *fe)
diff --git a/drivers/media/dvb-frontends/sp8870.c b/drivers/media/dvb-frontends/sp8870.c
index e37274c8f14e..2aa8ef76eba2 100644
--- a/drivers/media/dvb-frontends/sp8870.c
+++ b/drivers/media/dvb-frontends/sp8870.c
@@ -188,7 +188,7 @@ static int configure_reg0xc05 (struct dtv_frontend_properties *p, u16 *reg0xc05)
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         switch (p->hierarchy) {
         case HIERARCHY_NONE:
@@ -207,7 +207,7 @@ static int configure_reg0xc05 (struct dtv_frontend_properties *p, u16 *reg0xc05)
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         switch (p->code_rate_HP) {
         case FEC_1_2:
@@ -229,7 +229,7 @@ static int configure_reg0xc05 (struct dtv_frontend_properties *p, u16 *reg0xc05)
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         if (known_parameters)
                 *reg0xc05 |= (2 << 1);  /* use specified parameters */
diff --git a/drivers/media/dvb-frontends/sp887x.c b/drivers/media/dvb-frontends/sp887x.c
index f4096ccb226e..1bb81b5ae6e0 100644
--- a/drivers/media/dvb-frontends/sp887x.c
+++ b/drivers/media/dvb-frontends/sp887x.c
@@ -229,7 +229,7 @@ static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05)
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         switch (p->hierarchy) {
         case HIERARCHY_NONE:
@@ -248,7 +248,7 @@ static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05)
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         switch (p->code_rate_HP) {
         case FEC_1_2:
@@ -270,7 +270,7 @@ static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05)
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         if (known_parameters)
                 *reg0xc05 |= (2 << 1);  /* use specified parameters */
diff --git a/drivers/media/dvb-frontends/stb6100.c b/drivers/media/dvb-frontends/stb6100.c
index 2e93e65d2cdb..45f9523f968f 100644
--- a/drivers/media/dvb-frontends/stb6100.c
+++ b/drivers/media/dvb-frontends/stb6100.c
@@ -575,8 +575,8 @@ struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe,
         struct stb6100_state *state = NULL;
 
         state = kzalloc(sizeof (struct stb6100_state), GFP_KERNEL);
-        if (state == NULL)
-                goto error;
+        if (!state)
+                return NULL;
 
         state->config           = config;
         state->i2c              = i2c;
@@ -587,10 +587,6 @@ struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe,
 
         printk("%s: Attaching STB6100 \n", __func__);
         return fe;
-
-error:
-        kfree(state);
-        return NULL;
 }
 
 static int stb6100_release(struct dvb_frontend *fe)
diff --git a/drivers/media/dvb-frontends/stv0299.c b/drivers/media/dvb-frontends/stv0299.c
index 057b5f8effc0..92a6075cd82f 100644
--- a/drivers/media/dvb-frontends/stv0299.c
+++ b/drivers/media/dvb-frontends/stv0299.c
@@ -199,7 +199,7 @@ static int stv0299_wait_diseqc_fifo (struct stv0299_state* state, int timeout)
                         return -ETIMEDOUT;
                 }
                 msleep(10);
-        };
+        }
 
         return 0;
 }
@@ -216,7 +216,7 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)
                         return -ETIMEDOUT;
                 }
                 msleep(10);
-        };
+        }
 
         return 0;
 }
@@ -387,7 +387,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         if (state->config->op0_off)
                 reg0x0c &= ~0x10;
diff --git a/drivers/media/dvb-frontends/stv0900_core.c b/drivers/media/dvb-frontends/stv0900_core.c
index 7f1badaf0d03..262dfa503c2a 100644
--- a/drivers/media/dvb-frontends/stv0900_core.c
+++ b/drivers/media/dvb-frontends/stv0900_core.c
@@ -1552,8 +1552,8 @@ static int stv0900_status(struct stv0900_internal *intp,
                 bitrate = (stv0900_get_mclk_freq(intp, intp->quartz)/1000000)
                         * (tsbitrate1_val << 8 | tsbitrate0_val);
                 bitrate /= 16384;
-                dprintk("TS bitrate = %d Mbit/sec \n", bitrate);
-        };
+                dprintk("TS bitrate = %d Mbit/sec\n", bitrate);
+        }
 
         return locked;
 }
diff --git a/drivers/media/dvb-frontends/tda665x.c b/drivers/media/dvb-frontends/tda665x.c
index 2c1c759a4f42..63cc12378d9a 100644
--- a/drivers/media/dvb-frontends/tda665x.c
+++ b/drivers/media/dvb-frontends/tda665x.c
@@ -228,8 +228,8 @@ struct dvb_frontend *tda665x_attach(struct dvb_frontend *fe,
         struct dvb_tuner_info *info;
 
         state = kzalloc(sizeof(struct tda665x_state), GFP_KERNEL);
-        if (state == NULL)
-                goto exit;
+        if (!state)
+                return NULL;
 
         state->config           = config;
         state->i2c              = i2c;
@@ -246,10 +246,6 @@ struct dvb_frontend *tda665x_attach(struct dvb_frontend *fe,
         printk(KERN_DEBUG "%s: Attaching TDA665x (%s) tuner\n", __func__, info->name);
 
         return fe;
-
-exit:
-        kfree(state);
-        return NULL;
 }
 EXPORT_SYMBOL(tda665x_attach);
 
diff --git a/drivers/media/dvb-frontends/tda8083.c b/drivers/media/dvb-frontends/tda8083.c
index 15912c96926a..9d08350fe4b0 100644
--- a/drivers/media/dvb-frontends/tda8083.c
+++ b/drivers/media/dvb-frontends/tda8083.c
@@ -175,7 +175,7 @@ static void tda8083_wait_diseqc_fifo (struct tda8083_state* state, int timeout)
                !(tda8083_readreg(state, 0x02) & 0x80))
         {
                 msleep(50);
-        };
+        }
 }
 
 static int tda8083_set_tone (struct tda8083_state* state, fe_sec_tone_mode_t tone)
@@ -215,7 +215,7 @@ static int tda8083_send_diseqc_burst (struct tda8083_state* state, fe_sec_mini_c
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         tda8083_wait_diseqc_fifo (state, 100);