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: (430 commits)
  [media] ir-mce_kbd-decoder: include module.h for its facilities
  [media] ov5642: include module.h for its facilities
  [media] em28xx: Fix DVB-C maxsize for em2884
  [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
  [media] v4l: mt9v032: Fix Bayer pattern
  [media] V4L: mt9m111: rewrite set_pixfmt
  [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
  [media] V4L: initial driver for ov5642 CMOS sensor
  [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
  [media] V4L: soc-camera: remove soc-camera bus and devices on it
  [media] V4L: soc-camera: un-export the soc-camera bus
  [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
  [media] V4L: add media bus configuration subdev operations
  [media] V4L: soc-camera: group struct field initialisations together
  [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
  [media] V4L: pxa-camera: switch to using standard PM hooks
  [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
  [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
  [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
  [media] omap3isp: Support configurable HS/VS polarities
  ...

Fix up conflicts:
 - arch/arm/mach-omap2/board-rx51-peripherals.c:
     cleanup regulator supply definitions in mach-omap2
   vs
     OMAP3: RX-51: define vdds_csib regulator supply
 - drivers/staging/tm6000/tm6000-alsa.c (trivial)

11 files changed, 301 insertions, 124 deletions

diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index e85304c59a2b..5d73dec8ac07 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -81,6 +81,7 @@ config DVB_USB_DIB0700
         select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMISE
         select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE
         select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_XC4000 if !MEDIA_TUNER_CUSTOMISE
         select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMISE
         help
           Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 100ebc37e99e..d7ad05fc383b 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -91,7 +91,6 @@ static int af9015_rw_udev(struct usb_device *udev, struct req_t *req)
         case GET_CONFIG:
         case READ_MEMORY:
         case RECONNECT_USB:
-        case GET_IR_CODE:
                 write = 0;
                 break;
         case READ_I2C:
@@ -164,13 +163,6 @@ static int af9015_rw_udev(struct usb_device *udev, struct req_t *req)
         deb_xfer("<<< ");
         debug_dump(buf, act_len, deb_xfer);
 
-        /* remote controller query status is 1 if remote code is not received */
-        if (req->cmd == GET_IR_CODE && buf[1] == 1) {
-                buf[1] = 0; /* clear command "error" status */
-                memset(&buf[2], 0, req->data_len);
-                buf[3] = 1; /* no remote code received mark */
-        }
-
         /* check status */
         if (buf[1]) {
                 err("command failed:%d", buf[1]);
@@ -292,6 +284,10 @@ Due to that the only way to select correct tuner is use demodulator I2C-gate.
                 }
 
                 if (num > i + 1 && (msg[i+1].flags & I2C_M_RD)) {
+                        if (msg[i].len > 3 || msg[i+1].len > 61) {
+                                ret = -EOPNOTSUPP;
+                                goto error;
+                        }
                         if (msg[i].addr ==
                                 af9015_af9013_config[0].demod_address)
                                 req.cmd = READ_MEMORY;
@@ -306,12 +302,16 @@ Due to that the only way to select correct tuner is use demodulator I2C-gate.
                         ret = af9015_ctrl_msg(d, &req);
                         i += 2;
                 } else if (msg[i].flags & I2C_M_RD) {
-                        ret = -EINVAL;
+                        if (msg[i].len > 61) {
+                                ret = -EOPNOTSUPP;
+                                goto error;
+                        }
                         if (msg[i].addr ==
-                                af9015_af9013_config[0].demod_address)
+                                af9015_af9013_config[0].demod_address) {
+                                ret = -EINVAL;
                                 goto error;
-                        else
-                                req.cmd = READ_I2C;
+                        }
+                        req.cmd = READ_I2C;
                         req.i2c_addr = msg[i].addr;
                         req.addr = addr;
                         req.mbox = mbox;
@@ -321,6 +321,10 @@ Due to that the only way to select correct tuner is use demodulator I2C-gate.
                         ret = af9015_ctrl_msg(d, &req);
                         i += 1;
                 } else {
+                        if (msg[i].len > 21) {
+                                ret = -EOPNOTSUPP;
+                                goto error;
+                        }
                         if (msg[i].addr ==
                                 af9015_af9013_config[0].demod_address)
                                 req.cmd = WRITE_MEMORY;
@@ -735,6 +739,7 @@ static const struct af9015_rc_setup af9015_rc_setup_hashes[] = {
         { 0xb8feb708, RC_MAP_MSI_DIGIVOX_II },
         { 0xa3703d00, RC_MAP_ALINK_DTU_M },
         { 0x9b7dc64e, RC_MAP_TOTAL_MEDIA_IN_HAND }, /* MYGICTV U718 */
+        { 0x5d49e3db, RC_MAP_DIGITTRADE }, /* LC-Power LC-USB-DVBT */
         { }
 };
 
@@ -749,6 +754,8 @@ static const struct af9015_rc_setup af9015_rc_setup_usbids[] = {
                 RC_MAP_AZUREWAVE_AD_TU700 },
         { (USB_VID_MSI_2 << 16) + USB_PID_MSI_DIGI_VOX_MINI_III,
                 RC_MAP_MSI_DIGIVOX_III },
+        { (USB_VID_MSI_2 << 16) + USB_PID_MSI_DIGIVOX_DUO,
+                RC_MAP_MSI_DIGIVOX_III },
         { (USB_VID_LEADTEK << 16) + USB_PID_WINFAST_DTV_DONGLE_GOLD,
                 RC_MAP_LEADTEK_Y04G0051 },
         { (USB_VID_AVERMEDIA << 16) + USB_PID_AVERMEDIA_VOLAR_X,
@@ -759,6 +766,8 @@ static const struct af9015_rc_setup af9015_rc_setup_usbids[] = {
                 RC_MAP_DIGITALNOW_TINYTWIN },
         { (USB_VID_GTEK << 16) + USB_PID_TINYTWIN_3,
                 RC_MAP_DIGITALNOW_TINYTWIN },
+        { (USB_VID_KWORLD_2 << 16) + USB_PID_SVEON_STV22,
+                RC_MAP_MSI_DIGIVOX_III },
         { }
 };
 
@@ -1082,44 +1091,11 @@ error:
         return ret;
 }
 
-/* init 2nd I2C adapter */
-static int af9015_i2c_init(struct dvb_usb_device *d)
-{
-        int ret;
-        struct af9015_state *state = d->priv;
-        deb_info("%s:\n", __func__);
-
-        strncpy(state->i2c_adap.name, d->desc->name,
-                sizeof(state->i2c_adap.name));
-        state->i2c_adap.algo      = d->props.i2c_algo;
-        state->i2c_adap.algo_data = NULL;
-        state->i2c_adap.dev.parent = &d->udev->dev;
-
-        i2c_set_adapdata(&state->i2c_adap, d);
-
-        ret = i2c_add_adapter(&state->i2c_adap);
-        if (ret < 0)
-                err("could not add i2c adapter");
-
-        return ret;
-}
-
 static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap)
 {
         int ret;
-        struct af9015_state *state = adap->dev->priv;
-        struct i2c_adapter *i2c_adap;
-
-        if (adap->id == 0) {
-                /* select I2C adapter */
-                i2c_adap = &adap->dev->i2c_adap;
-
-                deb_info("%s: init I2C\n", __func__);
-                ret = af9015_i2c_init(adap->dev);
-        } else {
-                /* select I2C adapter */
-                i2c_adap = &state->i2c_adap;
 
+        if (adap->id == 1) {
                 /* copy firmware to 2nd demodulator */
                 if (af9015_config.dual_mode) {
                         ret = af9015_copy_firmware(adap->dev);
@@ -1136,7 +1112,7 @@ static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap)
 
         /* attach demodulator */
         adap->fe = dvb_attach(af9013_attach, &af9015_af9013_config[adap->id],
-                i2c_adap);
+                &adap->dev->i2c_adap);
 
         return adap->fe == NULL ? -ENODEV : 0;
 }
@@ -1206,57 +1182,56 @@ static struct mxl5007t_config af9015_mxl5007t_config = {
 
 static int af9015_tuner_attach(struct dvb_usb_adapter *adap)
 {
-        struct af9015_state *state = adap->dev->priv;
-        struct i2c_adapter *i2c_adap;
         int ret;
         deb_info("%s:\n", __func__);
 
-        /* select I2C adapter */
-        if (adap->id == 0)
-                i2c_adap = &adap->dev->i2c_adap;
-        else
-                i2c_adap = &state->i2c_adap;
-
         switch (af9015_af9013_config[adap->id].tuner) {
         case AF9013_TUNER_MT2060:
         case AF9013_TUNER_MT2060_2:
-                ret = dvb_attach(mt2060_attach, adap->fe, i2c_adap,
+                ret = dvb_attach(mt2060_attach, adap->fe, &adap->dev->i2c_adap,
                         &af9015_mt2060_config,
                         af9015_config.mt2060_if1[adap->id])
                         == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_QT1010:
         case AF9013_TUNER_QT1010A:
-                ret = dvb_attach(qt1010_attach, adap->fe, i2c_adap,
+                ret = dvb_attach(qt1010_attach, adap->fe, &adap->dev->i2c_adap,
                         &af9015_qt1010_config) == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_TDA18271:
-                ret = dvb_attach(tda18271_attach, adap->fe, 0xc0, i2c_adap,
+                ret = dvb_attach(tda18271_attach, adap->fe, 0xc0,
+                        &adap->dev->i2c_adap,
                         &af9015_tda18271_config) == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_TDA18218:
-                ret = dvb_attach(tda18218_attach, adap->fe, i2c_adap,
+                ret = dvb_attach(tda18218_attach, adap->fe,
+                        &adap->dev->i2c_adap,
                         &af9015_tda18218_config) == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_MXL5003D:
-                ret = dvb_attach(mxl5005s_attach, adap->fe, i2c_adap,
+                ret = dvb_attach(mxl5005s_attach, adap->fe,
+                        &adap->dev->i2c_adap,
                         &af9015_mxl5003_config) == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_MXL5005D:
         case AF9013_TUNER_MXL5005R:
-                ret = dvb_attach(mxl5005s_attach, adap->fe, i2c_adap,
+                ret = dvb_attach(mxl5005s_attach, adap->fe,
+                        &adap->dev->i2c_adap,
                         &af9015_mxl5005_config) == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_ENV77H11D5:
-                ret = dvb_attach(dvb_pll_attach, adap->fe, 0xc0, i2c_adap,
+                ret = dvb_attach(dvb_pll_attach, adap->fe, 0xc0,
+                        &adap->dev->i2c_adap,
                         DVB_PLL_TDA665X) == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_MC44S803:
-                ret = dvb_attach(mc44s803_attach, adap->fe, i2c_adap,
+                ret = dvb_attach(mc44s803_attach, adap->fe,
+                        &adap->dev->i2c_adap,
                         &af9015_mc44s803_config) == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_MXL5007T:
-                ret = dvb_attach(mxl5007t_attach, adap->fe, i2c_adap,
+                ret = dvb_attach(mxl5007t_attach, adap->fe,
+                        &adap->dev->i2c_adap,
                         0xc0, &af9015_mxl5007t_config) == NULL ? -ENODEV : 0;
                 break;
         case AF9013_TUNER_UNKNOWN:
@@ -1309,6 +1284,7 @@ static struct usb_device_id af9015_usb_table[] = {
                 USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC)},
 /* 35 */{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850T)},
         {USB_DEVICE(USB_VID_GTEK,      USB_PID_TINYTWIN_3)},
+        {USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_SVEON_STV22)},
         {0},
 };
 MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1502,7 +1478,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 
                 .i2c_algo = &af9015_i2c_algo,
 
-                .num_device_descs = 9, /* check max from dvb-usb.h */
+                .num_device_descs = 10, /* check max from dvb-usb.h */
                 .devices = {
                         {
                                 .name = "Xtensions XD-380",
@@ -1554,6 +1530,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                                 .cold_ids = {&af9015_usb_table[20], NULL},
                                 .warm_ids = {NULL},
                         },
+                        {
+                                .name = "Sveon STV22 Dual USB DVB-T Tuner HDTV",
+                                .cold_ids = {&af9015_usb_table[37], NULL},
+                                .warm_ids = {NULL},
+                        },
                 }
         }, {
                 .caps = DVB_USB_IS_AN_I2C_ADAPTER,
@@ -1704,33 +1685,11 @@ static int af9015_usb_probe(struct usb_interface *intf,
         return ret;
 }
 
-static void af9015_i2c_exit(struct dvb_usb_device *d)
-{
-        struct af9015_state *state = d->priv;
-        deb_info("%s:\n", __func__);
-
-        /* remove 2nd I2C adapter */
-        if (d->state & DVB_USB_STATE_I2C)
-                i2c_del_adapter(&state->i2c_adap);
-}
-
-static void af9015_usb_device_exit(struct usb_interface *intf)
-{
-        struct dvb_usb_device *d = usb_get_intfdata(intf);
-        deb_info("%s:\n", __func__);
-
-        /* remove 2nd I2C adapter */
-        if (d != NULL && d->desc != NULL)
-                af9015_i2c_exit(d);
-
-        dvb_usb_device_exit(intf);
-}
-
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver af9015_usb_driver = {
         .name = "dvb_usb_af9015",
         .probe = af9015_usb_probe,
-        .disconnect = af9015_usb_device_exit,
+        .disconnect = dvb_usb_device_exit,
         .id_table = af9015_usb_table,
 };
 
diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/dvb/dvb-usb/af9015.h
index beb3004f00ba..6252ea6c1904 100644
--- a/drivers/media/dvb/dvb-usb/af9015.h
+++ b/drivers/media/dvb/dvb-usb/af9015.h
@@ -99,7 +99,6 @@ enum af9015_ir_mode {
 };
 
 struct af9015_state {
-        struct i2c_adapter i2c_adap; /* I2C adapter for 2nd FE */
         u8 rc_repeat;
         u32 rc_keycode;
         u8 rc_last[4];
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index 7c327b54308e..2cbf19a52e38 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -347,15 +347,17 @@ static struct isl6423_config anysee_isl6423_config = {
  * PCB: ?
  * parts: DNOS404ZH102A(MT352, DTT7579(?))
  *
- * E30 VID=04b4 PID=861f HW=2 FW=2.1 Product=????????
- * PCB: ?
+ * E30 VID=04b4 PID=861f HW=2 FW=2.1 "anysee-T(LP)"
+ * PCB: PCB 507T (rev1.61)
  * parts: DNOS404ZH103A(ZL10353, DTT7579(?))
+ * OEA=0a OEB=00 OEC=00 OED=ff OEE=00
+ * IOA=45 IOB=ff IOC=00 IOD=ff IOE=00
  *
  * E30 Plus VID=04b4 PID=861f HW=6 FW=1.0 "anysee"
  * PCB: 507CD (rev1.1)
  * parts: DNOS404ZH103A(ZL10353, DTT7579(?)), CST56I01
- * OEA=80 OEB=00 OEC=00 OED=ff OEF=fe
- * IOA=4f IOB=ff IOC=00 IOD=06 IOF=01
+ * OEA=80 OEB=00 OEC=00 OED=ff OEE=fe
+ * IOA=4f IOB=ff IOC=00 IOD=06 IOE=01
  * IOD[0] ZL10353 1=enabled
  * IOA[7] TS 0=enabled
  * tuner is not behind ZL10353 I2C-gate (no care if gate disabled or not)
@@ -363,30 +365,30 @@ static struct isl6423_config anysee_isl6423_config = {
  * E30 C Plus VID=04b4 PID=861f HW=10 FW=1.0 "anysee-DC(LP)"
  * PCB: 507DC (rev0.2)
  * parts: TDA10023, DTOS403IH102B TM, CST56I01
- * OEA=80 OEB=00 OEC=00 OED=ff OEF=fe
- * IOA=4f IOB=ff IOC=00 IOD=26 IOF=01
+ * OEA=80 OEB=00 OEC=00 OED=ff OEE=fe
+ * IOA=4f IOB=ff IOC=00 IOD=26 IOE=01
  * IOD[0] TDA10023 1=enabled
  *
  * E30 S2 Plus VID=04b4 PID=861f HW=11 FW=0.1 "anysee-S2(LP)"
  * PCB: 507SI (rev2.1)
  * parts: BS2N10WCC01(CX24116, CX24118), ISL6423, TDA8024
- * OEA=80 OEB=00 OEC=ff OED=ff OEF=fe
- * IOA=4d IOB=ff IOC=00 IOD=26 IOF=01
+ * OEA=80 OEB=00 OEC=ff OED=ff OEE=fe
+ * IOA=4d IOB=ff IOC=00 IOD=26 IOE=01
  * IOD[0] CX24116 1=enabled
  *
  * E30 C Plus VID=1c73 PID=861f HW=15 FW=1.2 "anysee-FA(LP)"
  * PCB: 507FA (rev0.4)
  * parts: TDA10023, DTOS403IH102B TM, TDA8024
- * OEA=80 OEB=00 OEC=ff OED=ff OEF=ff
- * IOA=4d IOB=ff IOC=00 IOD=00 IOF=c0
+ * OEA=80 OEB=00 OEC=ff OED=ff OEE=ff
+ * IOA=4d IOB=ff IOC=00 IOD=00 IOE=c0
  * IOD[5] TDA10023 1=enabled
  * IOE[0] tuner 1=enabled
  *
  * E30 Combo Plus VID=1c73 PID=861f HW=15 FW=1.2 "anysee-FA(LP)"
  * PCB: 507FA (rev1.1)
  * parts: ZL10353, TDA10023, DTOS403IH102B TM, TDA8024
- * OEA=80 OEB=00 OEC=ff OED=ff OEF=ff
- * IOA=4d IOB=ff IOC=00 IOD=00 IOF=c0
+ * OEA=80 OEB=00 OEC=ff OED=ff OEE=ff
+ * IOA=4d IOB=ff IOC=00 IOD=00 IOE=c0
  * DVB-C:
  * IOD[5] TDA10023 1=enabled
  * IOE[0] tuner 1=enabled
@@ -398,8 +400,8 @@ static struct isl6423_config anysee_isl6423_config = {
  * E7 TC VID=1c73 PID=861f HW=18 FW=0.7 AMTCI=0.5 "anysee-E7TC(LP)"
  * PCB: 508TC (rev0.6)
  * parts: ZL10353, TDA10023, DNOD44CDH086A(TDA18212)
- * OEA=80 OEB=00 OEC=03 OED=f7 OEF=ff
- * IOA=4d IOB=00 IOC=cc IOD=48 IOF=e4
+ * OEA=80 OEB=00 OEC=03 OED=f7 OEE=ff
+ * IOA=4d IOB=00 IOC=cc IOD=48 IOE=e4
  * IOA[7] TS 1=enabled
  * IOE[4] TDA18212 1=enabled
  * DVB-C:
@@ -414,11 +416,34 @@ static struct isl6423_config anysee_isl6423_config = {
  * E7 S2 VID=1c73 PID=861f HW=19 FW=0.4 AMTCI=0.5 "anysee-E7S2(LP)"
  * PCB: 508S2 (rev0.7)
  * parts: DNBU10512IST(STV0903, STV6110), ISL6423
- * OEA=80 OEB=00 OEC=03 OED=f7 OEF=ff
- * IOA=4d IOB=00 IOC=c4 IOD=08 IOF=e4
+ * OEA=80 OEB=00 OEC=03 OED=f7 OEE=ff
+ * IOA=4d IOB=00 IOC=c4 IOD=08 IOE=e4
  * IOA[7] TS 1=enabled
  * IOE[5] STV0903 1=enabled
  *
+ * E7 PTC VID=1c73 PID=861f HW=21 FW=0.1 AMTCI=?? "anysee-E7PTC(LP)"
+ * PCB: 508PTC (rev0.5)
+ * parts: ZL10353, TDA10023, DNOD44CDH086A(TDA18212)
+ * OEA=80 OEB=00 OEC=03 OED=f7 OEE=ff
+ * IOA=4d IOB=00 IOC=cc IOD=48 IOE=e4
+ * IOA[7] TS 1=enabled
+ * IOE[4] TDA18212 1=enabled
+ * DVB-C:
+ * IOD[6] ZL10353 0=disabled
+ * IOD[5] TDA10023 1=enabled
+ * IOE[0] IF 1=enabled
+ * DVB-T:
+ * IOD[5] TDA10023 0=disabled
+ * IOD[6] ZL10353 1=enabled
+ * IOE[0] IF 0=enabled
+ *
+ * E7 S2 VID=1c73 PID=861f HW=22 FW=0.1 AMTCI=?? "anysee-E7PS2(LP)"
+ * PCB: 508PS2 (rev0.4)
+ * parts: DNBU10512IST(STV0903, STV6110), ISL6423
+ * OEA=80 OEB=00 OEC=03 OED=f7 OEE=ff
+ * IOA=4d IOB=00 IOC=c4 IOD=08 IOE=e4
+ * IOA[7] TS 1=enabled
+ * IOE[5] STV0903 1=enabled
  */
 
 static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
@@ -459,7 +484,7 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
         state->hw = hw_info[0];
 
         switch (state->hw) {
-        case ANYSEE_HW_02: /* 2 */
+        case ANYSEE_HW_507T: /* 2 */
                 /* E30 */
 
                 /* attach demod */
@@ -593,7 +618,9 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
 
                 break;
         case ANYSEE_HW_508TC: /* 18 */
+        case ANYSEE_HW_508PTC: /* 21 */
                 /* E7 TC */
+                /* E7 PTC */
 
                 /* enable transport stream on IOA[7] */
                 ret = anysee_wr_reg_mask(adap->dev, REG_IOA, (1 << 7), 0x80);
@@ -650,7 +677,9 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
 
                 break;
         case ANYSEE_HW_508S2: /* 19 */
+        case ANYSEE_HW_508PS2: /* 22 */
                 /* E7 S2 */
+                /* E7 PS2 */
 
                 /* enable transport stream on IOA[7] */
                 ret = anysee_wr_reg_mask(adap->dev, REG_IOA, (1 << 7), 0x80);
@@ -687,7 +716,7 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
         deb_info("%s:\n", __func__);
 
         switch (state->hw) {
-        case ANYSEE_HW_02: /* 2 */
+        case ANYSEE_HW_507T: /* 2 */
                 /* E30 */
 
                 /* attach tuner */
@@ -762,7 +791,9 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
 
                 break;
         case ANYSEE_HW_508TC: /* 18 */
+        case ANYSEE_HW_508PTC: /* 21 */
                 /* E7 TC */
+                /* E7 PTC */
 
                 /* enable tuner on IOE[4] */
                 ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (1 << 4), 0x10);
@@ -775,7 +806,9 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
 
                 break;
         case ANYSEE_HW_508S2: /* 19 */
+        case ANYSEE_HW_508PS2: /* 22 */
                 /* E7 S2 */
+                /* E7 PS2 */
 
                 /* attach tuner */
                 fe = dvb_attach(stv6110_attach, adap->fe,
diff --git a/drivers/media/dvb/dvb-usb/anysee.h b/drivers/media/dvb/dvb-usb/anysee.h
index a7673aa1e007..ad6ccd1ea2d9 100644
--- a/drivers/media/dvb/dvb-usb/anysee.h
+++ b/drivers/media/dvb/dvb-usb/anysee.h
@@ -61,13 +61,15 @@ struct anysee_state {
         u8 seq;
 };
 
-#define ANYSEE_HW_02     2 /* E30 */
-#define ANYSEE_HW_507CD  6 /* E30 Plus */
-#define ANYSEE_HW_507DC 10 /* E30 C Plus */
-#define ANYSEE_HW_507SI 11 /* E30 S2 Plus */
-#define ANYSEE_HW_507FA 15 /* E30 Combo Plus / E30 C Plus */
-#define ANYSEE_HW_508TC 18 /* E7 TC */
-#define ANYSEE_HW_508S2 19 /* E7 S2 */
+#define ANYSEE_HW_507T    2 /* E30 */
+#define ANYSEE_HW_507CD   6 /* E30 Plus */
+#define ANYSEE_HW_507DC  10 /* E30 C Plus */
+#define ANYSEE_HW_507SI  11 /* E30 S2 Plus */
+#define ANYSEE_HW_507FA  15 /* E30 Combo Plus / E30 C Plus */
+#define ANYSEE_HW_508TC  18 /* E7 TC */
+#define ANYSEE_HW_508S2  19 /* E7 S2 */
+#define ANYSEE_HW_508PTC 21 /* E7 PTC Plus */
+#define ANYSEE_HW_508PS2 22 /* E7 PS2 Plus */
 
 #define REG_IOA       0x80 /* Port A (bit addressable) */
 #define REG_IOB       0x90 /* Port B (bit addressable) */
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index c519ad5eb731..d0ea5b64f6b4 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -17,6 +17,7 @@
 #include "mt2266.h"
 #include "tuner-xc2028.h"
 #include "xc5000.h"
+#include "xc4000.h"
 #include "s5h1411.h"
 #include "dib0070.h"
 #include "dib0090.h"
@@ -2655,6 +2656,156 @@ static int xc5000_tuner_attach(struct dvb_usb_adapter *adap)
                 == NULL ? -ENODEV : 0;
 }
 
+static int dib0700_xc4000_tuner_callback(void *priv, int component,
+                                         int command, int arg)
+{
+        struct dvb_usb_adapter *adap = priv;
+
+        if (command == XC4000_TUNER_RESET) {
+                /* Reset the tuner */
+                dib7000p_set_gpio(adap->fe, 8, 0, 0);
+                msleep(10);
+                dib7000p_set_gpio(adap->fe, 8, 0, 1);
+        } else {
+                err("xc4000: unknown tuner callback command: %d\n", command);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static struct dibx000_agc_config stk7700p_7000p_xc4000_agc_config = {
+        .band_caps = BAND_UHF | BAND_VHF,
+        .setup = 0x64,
+        .inv_gain = 0x02c8,
+        .time_stabiliz = 0x15,
+        .alpha_level = 0x00,
+        .thlock = 0x76,
+        .wbd_inv = 0x01,
+        .wbd_ref = 0x0b33,
+        .wbd_sel = 0x00,
+        .wbd_alpha = 0x02,
+        .agc1_max = 0x00,
+        .agc1_min = 0x00,
+        .agc2_max = 0x9b26,
+        .agc2_min = 0x26ca,
+        .agc1_pt1 = 0x00,
+        .agc1_pt2 = 0x00,
+        .agc1_pt3 = 0x00,
+        .agc1_slope1 = 0x00,
+        .agc1_slope2 = 0x00,
+        .agc2_pt1 = 0x00,
+        .agc2_pt2 = 0x80,
+        .agc2_slope1 = 0x1d,
+        .agc2_slope2 = 0x1d,
+        .alpha_mant = 0x11,
+        .alpha_exp = 0x1b,
+        .beta_mant = 0x17,
+        .beta_exp = 0x33,
+        .perform_agc_softsplit = 0x00,
+};
+
+static struct dibx000_bandwidth_config stk7700p_xc4000_pll_config = {
+        60000, 30000,   /* internal, sampling */
+        1, 8, 3, 1, 0,  /* pll_cfg: prediv, ratio, range, reset, bypass */
+        0, 0, 1, 1, 0,  /* misc: refdiv, bypclk_div, IO_CLK_en_core, */
+                        /* ADClkSrc, modulo */
+        (3 << 14) | (1 << 12) | 524,    /* sad_cfg: refsel, sel, freq_15k */
+        39370534,       /* ifreq */
+        20452225,       /* timf */
+        30000000        /* xtal */
+};
+
+/* FIXME: none of these inputs are validated yet */
+static struct dib7000p_config pctv_340e_config = {
+        .output_mpeg2_in_188_bytes = 1,
+
+        .agc_config_count = 1,
+        .agc = &stk7700p_7000p_xc4000_agc_config,
+        .bw  = &stk7700p_xc4000_pll_config,
+
+        .gpio_dir = DIB7000M_GPIO_DEFAULT_DIRECTIONS,
+        .gpio_val = DIB7000M_GPIO_DEFAULT_VALUES,
+        .gpio_pwm_pos = DIB7000M_GPIO_DEFAULT_PWM_POS,
+};
+
+/* PCTV 340e GPIOs map:
+   dib0700:
+   GPIO2  - CX25843 sleep
+   GPIO3  - CS5340 reset
+   GPIO5  - IRD
+   GPIO6  - Power Supply
+   GPIO8  - LNA (1=off 0=on)
+   GPIO10 - CX25843 reset
+   dib7000:
+   GPIO8  - xc4000 reset
+ */
+static int pctv340e_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        struct dib0700_state *st = adap->dev->priv;
+
+        /* Power Supply on */
+        dib0700_set_gpio(adap->dev, GPIO6,  GPIO_OUT, 0);
+        msleep(50);
+        dib0700_set_gpio(adap->dev, GPIO6,  GPIO_OUT, 1);
+        msleep(100); /* Allow power supply to settle before probing */
+
+        /* cx25843 reset */
+        dib0700_set_gpio(adap->dev, GPIO10,  GPIO_OUT, 0);
+        msleep(1); /* cx25843 datasheet say 350us required */
+        dib0700_set_gpio(adap->dev, GPIO10,  GPIO_OUT, 1);
+
+        /* LNA off for now */
+        dib0700_set_gpio(adap->dev, GPIO8,  GPIO_OUT, 1);
+
+        /* Put the CX25843 to sleep for now since we're in digital mode */
+        dib0700_set_gpio(adap->dev, GPIO2, GPIO_OUT, 1);
+
+        /* FIXME: not verified yet */
+        dib0700_ctrl_clock(adap->dev, 72, 1);
+
+        msleep(500);
+
+        if (dib7000pc_detection(&adap->dev->i2c_adap) == 0) {
+                /* Demodulator not found for some reason? */
+                return -ENODEV;
+        }
+
+        adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x12,
+                              &pctv_340e_config);
+        st->is_dib7000pc = 1;
+
+        return adap->fe == NULL ? -ENODEV : 0;
+}
+
+static struct xc4000_config dib7000p_xc4000_tunerconfig = {
+        .i2c_address      = 0x61,
+        .default_pm       = 1,
+        .dvb_amplitude    = 0,
+        .set_smoothedcvbs = 0,
+        .if_khz           = 5400
+};
+
+static int xc4000_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        struct i2c_adapter *tun_i2c;
+
+        /* The xc4000 is not on the main i2c bus */
+        tun_i2c = dib7000p_get_i2c_master(adap->fe,
+                                          DIBX000_I2C_INTERFACE_TUNER, 1);
+        if (tun_i2c == NULL) {
+                printk(KERN_ERR "Could not reach tuner i2c bus\n");
+                return 0;
+        }
+
+        /* Setup the reset callback */
+        adap->fe->callback = dib0700_xc4000_tuner_callback;
+
+        return dvb_attach(xc4000_attach, adap->fe, tun_i2c,
+                          &dib7000p_xc4000_tunerconfig)
+                == NULL ? -ENODEV : 0;
+}
+
 static struct lgdt3305_config hcw_lgdt3305_config = {
         .i2c_addr           = 0x0e,
         .mpeg_mode          = LGDT3305_MPEG_PARALLEL,
@@ -2802,6 +2953,8 @@ struct usb_device_id dib0700_usb_id_table[] = {
         { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_TFE7090PVR) },
         { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2) },
 /* 75 */{ USB_DEVICE(USB_VID_MEDION,    USB_PID_CREATIX_CTX1921) },
+        { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV340E) },
+        { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV340E_SE) },
         { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -3772,6 +3925,41 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                                             RC_TYPE_NEC,
                         .change_protocol  = dib0700_change_protocol,
                 },
+        }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+                .num_adapters = 1,
+                .adapter = {
+                        {
+                                .frontend_attach  = pctv340e_frontend_attach,
+                                .tuner_attach     = xc4000_tuner_attach,
+
+                                DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+
+                                .size_of_priv = sizeof(struct
+                                                dib0700_adapter_state),
+                        },
+                },
+
+                .num_device_descs = 2,
+                .devices = {
+                        {   "Pinnacle PCTV 340e HD Pro USB Stick",
+                                { &dib0700_usb_id_table[76], NULL },
+                                { NULL },
+                        },
+                        {   "Pinnacle PCTV Hybrid Stick Solo",
+                                { &dib0700_usb_id_table[77], NULL },
+                                { NULL },
+                        },
+                },
+                .rc.core = {
+                        .rc_interval      = DEFAULT_RC_INTERVAL,
+                        .rc_codes         = RC_MAP_DIB0700_RC5_TABLE,
+                        .module_name      = "dib0700",
+                        .rc_query         = dib0700_rc_query_old_firmware,
+                        .allowed_protos   = RC_TYPE_RC5 |
+                                            RC_TYPE_RC6 |
+                                            RC_TYPE_NEC,
+                        .change_protocol  = dib0700_change_protocol,
+                },
         },
 };
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 21b15495d2d7..2a79b8fb3e8d 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -230,6 +230,8 @@
 #define USB_PID_PINNACLE_PCTV310E                       0x3211
 #define USB_PID_PINNACLE_PCTV801E                       0x023a
 #define USB_PID_PINNACLE_PCTV801E_SE                    0x023b
+#define USB_PID_PINNACLE_PCTV340E                       0x023d
+#define USB_PID_PINNACLE_PCTV340E_SE                    0x023e
 #define USB_PID_PINNACLE_PCTV73A                        0x0243
 #define USB_PID_PINNACLE_PCTV73ESE                      0x0245
 #define USB_PID_PINNACLE_PCTV74E                        0x0246
@@ -313,6 +315,7 @@
 #define USB_PID_FRIIO_WHITE                             0x0001
 #define USB_PID_TVWAY_PLUS                              0x0002
 #define USB_PID_SVEON_STV20                             0xe39d
+#define USB_PID_SVEON_STV22                             0xe401
 #define USB_PID_AZUREWAVE_AZ6027                        0x3275
 #define USB_PID_TERRATEC_DVBS2CI_V1                     0x10a4
 #define USB_PID_TERRATEC_DVBS2CI_V2                     0x10ac
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 76a80968482a..7d35d078342b 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -85,7 +85,7 @@ static inline u8 rc5_data(struct rc_map_table *key)
         return key->scancode & 0xff;
 }
 
-static inline u8 rc5_scan(struct rc_map_table *key)
+static inline u16 rc5_scan(struct rc_map_table *key)
 {
         return key->scancode & 0xffff;
 }
diff --git a/drivers/media/dvb/dvb-usb/gp8psk.h b/drivers/media/dvb/dvb-usb/gp8psk.h
index 831749a518cb..ed32b9da4843 100644
--- a/drivers/media/dvb/dvb-usb/gp8psk.h
+++ b/drivers/media/dvb/dvb-usb/gp8psk.h
@@ -78,9 +78,6 @@ extern int dvb_usb_gp8psk_debug;
 #define ADV_MOD_DVB_BPSK 9     /* DVB-S BPSK */
 
 #define GET_USB_SPEED                     0x07
- #define USB_SPEED_LOW                    0
- #define USB_SPEED_FULL                   1
- #define USB_SPEED_HIGH                   2
 
 #define RESET_FX2                         0x13
 
diff --git a/drivers/media/dvb/dvb-usb/technisat-usb2.c b/drivers/media/dvb/dvb-usb/technisat-usb2.c
index 08f8842ad280..473b95ed4d52 100644
--- a/drivers/media/dvb/dvb-usb/technisat-usb2.c
+++ b/drivers/media/dvb/dvb-usb/technisat-usb2.c
@@ -765,10 +765,8 @@ static void technisat_usb2_disconnect(struct usb_interface *intf)
         /* work and stuff was only created when the device is is hot-state */
         if (dev != NULL) {
                 struct technisat_usb2_state *state = dev->priv;
-                if (state != NULL) {
+                if (state != NULL)
                         cancel_delayed_work_sync(&state->green_led_work);
-                        flush_scheduled_work();
-                }
         }
 
         dvb_usb_device_exit(intf);
diff --git a/drivers/media/dvb/dvb-usb/vp7045.h b/drivers/media/dvb/dvb-usb/vp7045.h
index 969688f85267..cf5ec46f8bb1 100644
--- a/drivers/media/dvb/dvb-usb/vp7045.h
+++ b/drivers/media/dvb/dvb-usb/vp7045.h
@@ -36,9 +36,6 @@
  #define Tuner_Power_OFF                  0
 
 #define GET_USB_SPEED                     0x07
- #define USB_SPEED_LOW                    0
- #define USB_SPEED_FULL                   1
- #define USB_SPEED_HIGH                   2
 
 #define LOCK_TUNER_COMMAND                0x09