Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] v1.88 DM04/QQBOX Move remote to use rc_core dvb-usb-remote
  [media] Add missing include guard to header file
  [media] Inlined functions should be static
  [media] Remove invalid parameter description
  [media] cpia2: fix warning about invalid trigraph sequence
  [media] s5p-csis: Add missing dependency on PLAT_S5P
  [media] gspca/kinect: wrap gspca_debug with GSPCA_DEBUG
  [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function
  [media] uvcvideo: Connect video devices to media entities
  [media] uvcvideo: Register subdevices for each entity
  [media] uvcvideo: Register a v4l2_device
  [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook
  [media] Documentation/DocBook: Rename media fops xml files
  [media] Media DocBook: fix validation errors
  [media] wl12xx: g_volatile_ctrl fix: wrong field set
  [media] fix kconfig dependency warning for VIDEO_TIMBERDALE
  [media] dm1105: GPIO handling added, I2C on GPIO added, LNB control through GPIO reworked
  [media] Add support for M-5MOLS 8 Mega Pixel camera ISP

4 files changed, 280 insertions, 102 deletions

diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 2d8b4044be36..b2b0c45f32a9 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -20,6 +20,7 @@
  */
 
 #include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -49,11 +50,12 @@
 
 #define UNSET (-1U)
 
-#define DM1105_BOARD_NOAUTO             UNSET
-#define DM1105_BOARD_UNKNOWN            0
-#define DM1105_BOARD_DVBWORLD_2002      1
-#define DM1105_BOARD_DVBWORLD_2004      2
-#define DM1105_BOARD_AXESS_DM05         3
+#define DM1105_BOARD_NOAUTO                     UNSET
+#define DM1105_BOARD_UNKNOWN                    0
+#define DM1105_BOARD_DVBWORLD_2002              1
+#define DM1105_BOARD_DVBWORLD_2004              2
+#define DM1105_BOARD_AXESS_DM05                 3
+#define DM1105_BOARD_UNBRANDED_I2C_ON_GPIO      4
 
 /* ----------------------------------------------- */
 /*
@@ -157,22 +159,38 @@
 #define DM1105_MAX                              0x04
 
 #define DRIVER_NAME                             "dm1105"
+#define DM1105_I2C_GPIO_NAME                    "dm1105-gpio"
 
 #define DM1105_DMA_PACKETS                      47
 #define DM1105_DMA_PACKET_LENGTH                (128*4)
 #define DM1105_DMA_BYTES                        (128 * 4 * DM1105_DMA_PACKETS)
 
+/*  */
+#define GPIO08                                  (1 << 8)
+#define GPIO13                                  (1 << 13)
+#define GPIO14                                  (1 << 14)
+#define GPIO15                                  (1 << 15)
+#define GPIO16                                  (1 << 16)
+#define GPIO17                                  (1 << 17)
+#define GPIO_ALL                                0x03ffff
+
 /* GPIO's for LNB power control */
-#define DM1105_LNB_MASK                         0x00000000
-#define DM1105_LNB_OFF                          0x00020000
-#define DM1105_LNB_13V                          0x00010100
-#define DM1105_LNB_18V                          0x00000100
+#define DM1105_LNB_MASK                         (GPIO_ALL & ~(GPIO14 | GPIO13))
+#define DM1105_LNB_OFF                          GPIO17
+#define DM1105_LNB_13V                          (GPIO16 | GPIO08)
+#define DM1105_LNB_18V                          GPIO08
 
 /* GPIO's for LNB power control for Axess DM05 */
-#define DM05_LNB_MASK                           0x00000000
-#define DM05_LNB_OFF                            0x00020000/* actually 13v */
-#define DM05_LNB_13V                            0x00020000
-#define DM05_LNB_18V                            0x00030000
+#define DM05_LNB_MASK                           (GPIO_ALL & ~(GPIO14 | GPIO13))
+#define DM05_LNB_OFF                            GPIO17/* actually 13v */
+#define DM05_LNB_13V                            GPIO17
+#define DM05_LNB_18V                            (GPIO17 | GPIO16)
+
+/* GPIO's for LNB power control for unbranded with I2C on GPIO */
+#define UNBR_LNB_MASK                           (GPIO17 | GPIO16)
+#define UNBR_LNB_OFF                            0
+#define UNBR_LNB_13V                            GPIO17
+#define UNBR_LNB_18V                            (GPIO17 | GPIO16)
 
 static unsigned int card[]  = {[0 ... 3] = UNSET };
 module_param_array(card,  int, NULL, 0444);
@@ -187,7 +205,11 @@ static unsigned int dm1105_devcount;
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 struct dm1105_board {
-        char                    *name;
+        char    *name;
+        struct  {
+                u32     mask, off, v13, v18;
+        } lnb;
+        u32     gpio_scl, gpio_sda;
 };
 
 struct dm1105_subid {
@@ -199,15 +221,50 @@ struct dm1105_subid {
 static const struct dm1105_board dm1105_boards[] = {
         [DM1105_BOARD_UNKNOWN] = {
                 .name           = "UNKNOWN/GENERIC",
+                .lnb = {
+                        .mask = DM1105_LNB_MASK,
+                        .off = DM1105_LNB_OFF,
+                        .v13 = DM1105_LNB_13V,
+                        .v18 = DM1105_LNB_18V,
+                },
         },
         [DM1105_BOARD_DVBWORLD_2002] = {
                 .name           = "DVBWorld PCI 2002",
+                .lnb = {
+                        .mask = DM1105_LNB_MASK,
+                        .off = DM1105_LNB_OFF,
+                        .v13 = DM1105_LNB_13V,
+                        .v18 = DM1105_LNB_18V,
+                },
         },
         [DM1105_BOARD_DVBWORLD_2004] = {
                 .name           = "DVBWorld PCI 2004",
+                .lnb = {
+                        .mask = DM1105_LNB_MASK,
+                        .off = DM1105_LNB_OFF,
+                        .v13 = DM1105_LNB_13V,
+                        .v18 = DM1105_LNB_18V,
+                },
         },
         [DM1105_BOARD_AXESS_DM05] = {
                 .name           = "Axess/EasyTv DM05",
+                .lnb = {
+                        .mask = DM05_LNB_MASK,
+                        .off = DM05_LNB_OFF,
+                        .v13 = DM05_LNB_13V,
+                        .v18 = DM05_LNB_18V,
+                },
+        },
+        [DM1105_BOARD_UNBRANDED_I2C_ON_GPIO] = {
+                .name           = "Unbranded DM1105 with i2c on GPIOs",
+                .lnb = {
+                        .mask = UNBR_LNB_MASK,
+                        .off = UNBR_LNB_OFF,
+                        .v13 = UNBR_LNB_13V,
+                        .v18 = UNBR_LNB_18V,
+                },
+                .gpio_scl       = GPIO14,
+                .gpio_sda       = GPIO13,
         },
 };
 
@@ -293,6 +350,8 @@ struct dm1105_dev {
 
         /* i2c */
         struct i2c_adapter i2c_adap;
+        struct i2c_adapter i2c_bb_adap;
+        struct i2c_algo_bit_data i2c_bit;
 
         /* irq */
         struct work_struct work;
@@ -328,6 +387,103 @@ struct dm1105_dev {
 #define dm_setl(reg, bit)       dm_andorl((reg), (bit), (bit))
 #define dm_clearl(reg, bit)     dm_andorl((reg), (bit), 0)
 
+/* The chip has 18 GPIOs. In HOST mode GPIO's used as 15 bit address lines,
+ so we can use only 3 GPIO's from GPIO15 to GPIO17.
+ Here I don't check whether HOST is enebled as it is not implemented yet.
+ */
+static void dm1105_gpio_set(struct dm1105_dev *dev, u32 mask)
+{
+        if (mask & 0xfffc0000)
+                printk(KERN_ERR "%s: Only 18 GPIO's are allowed\n", __func__);
+
+        if (mask & 0x0003ffff)
+                dm_setl(DM1105_GPIOVAL, mask & 0x0003ffff);
+
+}
+
+static void dm1105_gpio_clear(struct dm1105_dev *dev, u32 mask)
+{
+        if (mask & 0xfffc0000)
+                printk(KERN_ERR "%s: Only 18 GPIO's are allowed\n", __func__);
+
+        if (mask & 0x0003ffff)
+                dm_clearl(DM1105_GPIOVAL, mask & 0x0003ffff);
+
+}
+
+static void dm1105_gpio_andor(struct dm1105_dev *dev, u32 mask, u32 val)
+{
+        if (mask & 0xfffc0000)
+                printk(KERN_ERR "%s: Only 18 GPIO's are allowed\n", __func__);
+
+        if (mask & 0x0003ffff)
+                dm_andorl(DM1105_GPIOVAL, mask & 0x0003ffff, val);
+
+}
+
+static u32 dm1105_gpio_get(struct dm1105_dev *dev, u32 mask)
+{
+        if (mask & 0xfffc0000)
+                printk(KERN_ERR "%s: Only 18 GPIO's are allowed\n", __func__);
+
+        if (mask & 0x0003ffff)
+                return dm_readl(DM1105_GPIOVAL) & mask & 0x0003ffff;
+
+        return 0;
+}
+
+static void dm1105_gpio_enable(struct dm1105_dev *dev, u32 mask, int asoutput)
+{
+        if (mask & 0xfffc0000)
+                printk(KERN_ERR "%s: Only 18 GPIO's are allowed\n", __func__);
+
+        if ((mask & 0x0003ffff) && asoutput)
+                dm_clearl(DM1105_GPIOCTR, mask & 0x0003ffff);
+        else if ((mask & 0x0003ffff) && !asoutput)
+                dm_setl(DM1105_GPIOCTR, mask & 0x0003ffff);
+
+}
+
+static void dm1105_setline(struct dm1105_dev *dev, u32 line, int state)
+{
+        if (state)
+                dm1105_gpio_enable(dev, line, 0);
+        else {
+                dm1105_gpio_enable(dev, line, 1);
+                dm1105_gpio_clear(dev, line);
+        }
+}
+
+static void dm1105_setsda(void *data, int state)
+{
+        struct dm1105_dev *dev = data;
+
+        dm1105_setline(dev, dm1105_boards[dev->boardnr].gpio_sda, state);
+}
+
+static void dm1105_setscl(void *data, int state)
+{
+        struct dm1105_dev *dev = data;
+
+        dm1105_setline(dev, dm1105_boards[dev->boardnr].gpio_scl, state);
+}
+
+static int dm1105_getsda(void *data)
+{
+        struct dm1105_dev *dev = data;
+
+        return dm1105_gpio_get(dev, dm1105_boards[dev->boardnr].gpio_sda)
+                                                                        ? 1 : 0;
+}
+
+static int dm1105_getscl(void *data)
+{
+        struct dm1105_dev *dev = data;
+
+        return dm1105_gpio_get(dev, dm1105_boards[dev->boardnr].gpio_scl)
+                                                                        ? 1 : 0;
+}
+
 static int dm1105_i2c_xfer(struct i2c_adapter *i2c_adap,
                             struct i2c_msg *msgs, int num)
 {
@@ -436,31 +592,20 @@ static inline struct dm1105_dev *frontend_to_dm1105_dev(struct dvb_frontend *fe)
 static int dm1105_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
 {
         struct dm1105_dev *dev = frontend_to_dm1105_dev(fe);
-        u32 lnb_mask, lnb_13v, lnb_18v, lnb_off;
 
-        switch (dev->boardnr) {
-        case DM1105_BOARD_AXESS_DM05:
-                lnb_mask = DM05_LNB_MASK;
-                lnb_off = DM05_LNB_OFF;
-                lnb_13v = DM05_LNB_13V;
-                lnb_18v = DM05_LNB_18V;
-                break;
-        case DM1105_BOARD_DVBWORLD_2002:
-        case DM1105_BOARD_DVBWORLD_2004:
-        default:
-                lnb_mask = DM1105_LNB_MASK;
-                lnb_off = DM1105_LNB_OFF;
-                lnb_13v = DM1105_LNB_13V;
-                lnb_18v = DM1105_LNB_18V;
-        }
-
-        dm_writel(DM1105_GPIOCTR, lnb_mask);
+        dm1105_gpio_enable(dev, dm1105_boards[dev->boardnr].lnb.mask, 1);
         if (voltage == SEC_VOLTAGE_18)
-                dm_writel(DM1105_GPIOVAL, lnb_18v);
+                dm1105_gpio_andor(dev,
+                                dm1105_boards[dev->boardnr].lnb.mask,
+                                dm1105_boards[dev->boardnr].lnb.v18);
         else if (voltage == SEC_VOLTAGE_13)
-                dm_writel(DM1105_GPIOVAL, lnb_13v);
+                dm1105_gpio_andor(dev,
+                                dm1105_boards[dev->boardnr].lnb.mask,
+                                dm1105_boards[dev->boardnr].lnb.v13);
         else
-                dm_writel(DM1105_GPIOVAL, lnb_off);
+                dm1105_gpio_andor(dev,
+                                dm1105_boards[dev->boardnr].lnb.mask,
+                                dm1105_boards[dev->boardnr].lnb.off);
 
         return 0;
 }
@@ -708,6 +853,38 @@ static int __devinit frontend_init(struct dm1105_dev *dev)
         int ret;
 
         switch (dev->boardnr) {
+        case DM1105_BOARD_UNBRANDED_I2C_ON_GPIO:
+                dm1105_gpio_enable(dev, GPIO15, 1);
+                dm1105_gpio_clear(dev, GPIO15);
+                msleep(100);
+                dm1105_gpio_set(dev, GPIO15);
+                msleep(200);
+                dev->fe = dvb_attach(
+                        stv0299_attach, &sharp_z0194a_config,
+                        &dev->i2c_bb_adap);
+                if (dev->fe) {
+                        dev->fe->ops.set_voltage = dm1105_set_voltage;
+                        dvb_attach(dvb_pll_attach, dev->fe, 0x60,
+                                        &dev->i2c_bb_adap, DVB_PLL_OPERA1);
+                        break;
+                }
+
+                dev->fe = dvb_attach(
+                        stv0288_attach, &earda_config,
+                        &dev->i2c_bb_adap);
+                if (dev->fe) {
+                        dev->fe->ops.set_voltage = dm1105_set_voltage;
+                        dvb_attach(stb6000_attach, dev->fe, 0x61,
+                                        &dev->i2c_bb_adap);
+                        break;
+                }
+
+                dev->fe = dvb_attach(
+                        si21xx_attach, &serit_config,
+                        &dev->i2c_bb_adap);
+                if (dev->fe)
+                        dev->fe->ops.set_voltage = dm1105_set_voltage;
+                break;
         case DM1105_BOARD_DVBWORLD_2004:
                 dev->fe = dvb_attach(
                         cx24116_attach, &serit_sp2633_config,
@@ -870,11 +1047,32 @@ static int __devinit dm1105_probe(struct pci_dev *pdev,
         if (ret < 0)
                 goto err_dm1105_hw_exit;
 
+        i2c_set_adapdata(&dev->i2c_bb_adap, dev);
+        strcpy(dev->i2c_bb_adap.name, DM1105_I2C_GPIO_NAME);
+        dev->i2c_bb_adap.owner = THIS_MODULE;
+        dev->i2c_bb_adap.dev.parent = &pdev->dev;
+        dev->i2c_bb_adap.algo_data = &dev->i2c_bit;
+        dev->i2c_bit.data = dev;
+        dev->i2c_bit.setsda = dm1105_setsda;
+        dev->i2c_bit.setscl = dm1105_setscl;
+        dev->i2c_bit.getsda = dm1105_getsda;
+        dev->i2c_bit.getscl = dm1105_getscl;
+        dev->i2c_bit.udelay = 10;
+        dev->i2c_bit.timeout = 10;
+
+        /* Raise SCL and SDA */
+        dm1105_setsda(dev, 1);
+        dm1105_setscl(dev, 1);
+
+        ret = i2c_bit_add_bus(&dev->i2c_bb_adap);
+        if (ret < 0)
+                goto err_i2c_del_adapter;
+
         /* dvb */
         ret = dvb_register_adapter(&dev->dvb_adapter, DRIVER_NAME,
                                         THIS_MODULE, &pdev->dev, adapter_nr);
         if (ret < 0)
-                goto err_i2c_del_adapter;
+                goto err_i2c_del_adapters;
 
         dvb_adapter = &dev->dvb_adapter;
 
@@ -952,6 +1150,8 @@ err_dvb_dmx_release:
         dvb_dmx_release(dvbdemux);
 err_dvb_unregister_adapter:
         dvb_unregister_adapter(dvb_adapter);
+err_i2c_del_adapters:
+        i2c_del_adapter(&dev->i2c_bb_adap);
 err_i2c_del_adapter:
         i2c_del_adapter(&dev->i2c_adap);
 err_dm1105_hw_exit:
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
index f36f471deae2..37b146961ae2 100644
--- a/drivers/media/dvb/dvb-usb/lmedm04.c
+++ b/drivers/media/dvb/dvb-usb/lmedm04.c
@@ -207,17 +207,6 @@ static int lme2510_stream_restart(struct dvb_usb_device *d)
                         rbuff, sizeof(rbuff));
         return ret;
 }
-static int lme2510_remote_keypress(struct dvb_usb_adapter *adap, u32 keypress)
-{
-        struct dvb_usb_device *d = adap->dev;
-
-        deb_info(1, "INT Key Keypress =%04x", keypress);
-
-        if (keypress > 0)
-                rc_keydown(d->rc_dev, keypress, 0);
-
-        return 0;
-}
 
 static int lme2510_enable_pid(struct dvb_usb_device *d, u8 index, u16 pid_out)
 {
@@ -256,6 +245,7 @@ static void lme2510_int_response(struct urb *lme_urb)
         struct lme2510_state *st = adap->dev->priv;
         static u8 *ibuf, *rbuf;
         int i = 0, offset;
+        u32 key;
 
         switch (lme_urb->status) {
         case 0:
@@ -282,10 +272,16 @@ static void lme2510_int_response(struct urb *lme_urb)
 
                 switch (ibuf[0]) {
                 case 0xaa:
-                        debug_data_snipet(1, "INT Remote data snipet in", ibuf);
-                        lme2510_remote_keypress(adap,
-                                (u32)(ibuf[2] << 24) + (ibuf[3] << 16) +
-                                (ibuf[4] << 8) + ibuf[5]);
+                        debug_data_snipet(1, "INT Remote data snipet", ibuf);
+                        if ((ibuf[4] + ibuf[5]) == 0xff) {
+                                key = ibuf[5];
+                                key += (ibuf[3] > 0)
+                                        ? (ibuf[3] ^ 0xff) << 8 : 0;
+                                key += (ibuf[2] ^ 0xff) << 16;
+                                deb_info(1, "INT Key =%08x", key);
+                                if (adap->dev->rc_dev != NULL)
+                                        rc_keydown(adap->dev->rc_dev, key, 0);
+                        }
                         break;
                 case 0xbb:
                         switch (st->tuner_config) {
@@ -691,45 +687,6 @@ static int lme2510_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
         return (ret < 0) ? -ENODEV : 0;
 }
 
-static int lme2510_int_service(struct dvb_usb_adapter *adap)
-{
-        struct dvb_usb_device *d = adap->dev;
-        struct rc_dev *rc;
-        int ret;
-
-        info("STA Configuring Remote");
-
-        rc = rc_allocate_device();
-        if (!rc)
-                return -ENOMEM;
-
-        usb_make_path(d->udev, d->rc_phys, sizeof(d->rc_phys));
-        strlcat(d->rc_phys, "/ir0", sizeof(d->rc_phys));
-
-        rc->input_name = "LME2510 Remote Control";
-        rc->input_phys = d->rc_phys;
-        rc->map_name = RC_MAP_LME2510;
-        rc->driver_name = "LME 2510";
-        usb_to_input_id(d->udev, &rc->input_id);
-
-        ret = rc_register_device(rc);
-        if (ret) {
-                rc_free_device(rc);
-                return ret;
-        }
-        d->rc_dev = rc;
-
-        /* Start the Interrupt */
-        ret = lme2510_int_read(adap);
-        if (ret < 0) {
-                rc_unregister_device(rc);
-                info("INT Unable to start Interrupt Service");
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
 static u8 check_sum(u8 *p, u8 len)
 {
         u8 sum = 0;
@@ -831,7 +788,7 @@ static int lme_firmware_switch(struct usb_device *udev, int cold)
 
         cold_fw = !cold;
 
-        if (udev->descriptor.idProduct == 0x1122) {
+        if (le16_to_cpu(udev->descriptor.idProduct) == 0x1122) {
                 switch (dvb_usb_lme2510_firmware) {
                 default:
                         dvb_usb_lme2510_firmware = TUNER_S0194;
@@ -1053,8 +1010,11 @@ static int dm04_lme2510_frontend_attach(struct dvb_usb_adapter *adap)
 
 
 end:    if (ret) {
-                kfree(adap->fe);
-                adap->fe = NULL;
+                if (adap->fe) {
+                        dvb_frontend_detach(adap->fe);
+                        adap->fe = NULL;
+                }
+                adap->dev->props.rc.core.rc_codes = NULL;
                 return -ENODEV;
         }
 
@@ -1097,8 +1057,12 @@ static int dm04_lme2510_tuner(struct dvb_usb_adapter *adap)
                 return -ENODEV;
         }
 
-        /* Start the Interrupt & Remote*/
-        ret = lme2510_int_service(adap);
+        /* Start the Interrupt*/
+        ret = lme2510_int_read(adap);
+        if (ret < 0) {
+                info("INT Unable to start Interrupt Service");
+                return -ENODEV;
+        }
 
         return ret;
 }
@@ -1204,6 +1168,12 @@ static struct dvb_usb_device_properties lme2510_properties = {
                         }
                 }
         },
+        .rc.core = {
+                .protocol       = RC_TYPE_NEC,
+                .module_name    = "LME2510 Remote Control",
+                .allowed_protos = RC_TYPE_NEC,
+                .rc_codes       = RC_MAP_LME2510,
+        },
         .power_ctrl       = lme2510_powerup,
         .identify_state   = lme2510_identify_state,
         .i2c_algo         = &lme2510_i2c_algo,
@@ -1246,6 +1216,12 @@ static struct dvb_usb_device_properties lme2510c_properties = {
                         }
                 }
         },
+        .rc.core = {
+                .protocol       = RC_TYPE_NEC,
+                .module_name    = "LME2510 Remote Control",
+                .allowed_protos = RC_TYPE_NEC,
+                .rc_codes       = RC_MAP_LME2510,
+        },
         .power_ctrl       = lme2510_powerup,
         .identify_state   = lme2510_identify_state,
         .i2c_algo         = &lme2510_i2c_algo,
@@ -1269,19 +1245,21 @@ static void *lme2510_exit_int(struct dvb_usb_device *d)
                 adap->feedcount = 0;
         }
 
-        if (st->lme_urb != NULL) {
+        if (st->usb_buffer != NULL) {
                 st->i2c_talk_onoff = 1;
                 st->signal_lock = 0;
                 st->signal_level = 0;
                 st->signal_sn = 0;
                 buffer = st->usb_buffer;
+        }
+
+        if (st->lme_urb != NULL) {
                 usb_kill_urb(st->lme_urb);
                 usb_free_coherent(d->udev, 5000, st->buffer,
                                   st->lme_urb->transfer_dma);
                 info("Interrupt Service Stopped");
-                rc_unregister_device(d->rc_dev);
-                info("Remote Stopped");
         }
+
         return buffer;
 }
 
@@ -1293,7 +1271,8 @@ static void lme2510_exit(struct usb_interface *intf)
         if (d != NULL) {
                 usb_buffer = lme2510_exit_int(d);
                 dvb_usb_device_exit(intf);
-                kfree(usb_buffer);
+                if (usb_buffer != NULL)
+                        kfree(usb_buffer);
         }
 }
 
@@ -1327,5 +1306,5 @@ module_exit(lme2510_module_exit);
 
 MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
 MODULE_DESCRIPTION("LME2510(C) DVB-S USB2.0");
-MODULE_VERSION("1.86");
+MODULE_VERSION("1.88");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c
index 2da55ec20392..d70eee00f33a 100644
--- a/drivers/media/dvb/frontends/stb0899_algo.c
+++ b/drivers/media/dvb/frontends/stb0899_algo.c
@@ -23,7 +23,7 @@
 #include "stb0899_priv.h"
 #include "stb0899_reg.h"
 
-inline u32 stb0899_do_div(u64 n, u32 d)
+static inline u32 stb0899_do_div(u64 n, u32 d)
 {
         /* wrap do_div() for ease of use */
 
diff --git a/drivers/media/dvb/frontends/tda8261.c b/drivers/media/dvb/frontends/tda8261.c
index 1742056a34e8..53c7d8f1df28 100644
--- a/drivers/media/dvb/frontends/tda8261.c
+++ b/drivers/media/dvb/frontends/tda8261.c
@@ -224,7 +224,6 @@ exit:
 }
 
 EXPORT_SYMBOL(tda8261_attach);
-MODULE_PARM_DESC(verbose, "Set verbosity level");
 
 MODULE_AUTHOR("Manu Abraham");
 MODULE_DESCRIPTION("TDA8261 8PSK/QPSK Tuner");