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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (313 commits)
  V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
  V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
  V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
  V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
  V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
  V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
  V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
  V4L/DVB (9179): S2API: frontend.h cleanup
  V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
  V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
  V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
  V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
  V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
  V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
  V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
  V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
  V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
  V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
  V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
  V4L/DVB: v4l2-dev: remove duplicated #include
  ...

236 files changed, 14582 insertions, 4910 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 3e9e0dcd217e..47102c2c8250 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -34,6 +34,7 @@ config VIDEOBUF_DVB
         select VIDEOBUF_GEN
 
 config VIDEO_BTCX
+        depends on PCI
         tristate
 
 config VIDEO_IR
@@ -71,6 +72,15 @@ config VIDEO_ADV_DEBUG
           V4L devices.
           In doubt, say N.
 
+config VIDEO_FIXED_MINOR_RANGES
+        bool "Enable old-style fixed minor ranges for video devices"
+        default n
+        ---help---
+          Say Y here to enable the old-style fixed-range minor assignments.
+          Only useful if you rely on the old behavior and use mknod instead of udev.
+
+          When in doubt, say N.
+
 config VIDEO_HELPER_CHIPS_AUTO
         bool "Autoselect pertinent encoders/decoders and other helper chips"
         default y
@@ -578,13 +588,6 @@ config VIDEO_SAA5249
           To compile this driver as a module, choose M here: the
           module will be called saa5249.
 
-config TUNER_3036
-        tristate "SAB3036 tuner"
-        depends on I2C && VIDEO_V4L1
-        help
-          Say Y here to include support for Philips SAB3036 compatible tuners.
-          If in doubt, say N.
-
 config VIDEO_VINO
         tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
         depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2
@@ -602,79 +605,7 @@ config VIDEO_STRADIS
           driver for PCI.  There is a product page at
           <http://www.stradis.com/>.
 
-config VIDEO_ZORAN
-        tristate "Zoran ZR36057/36067 Video For Linux"
-        depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS
-        help
-          Say Y for support for MJPEG capture cards based on the Zoran
-          36057/36067 PCI controller chipset. This includes the Iomega
-          Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is
-          a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For
-          more information, check <file:Documentation/video4linux/Zoran>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called zr36067.
-
-config VIDEO_ZORAN_DC30
-        tristate "Pinnacle/Miro DC30(+) support"
-        depends on VIDEO_ZORAN
-        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
-          card. This also supports really old DC10 cards based on the
-          zr36050 MJPEG codec and zr36016 VFE.
-
-config VIDEO_ZORAN_ZR36060
-        tristate "Zoran ZR36060"
-        depends on VIDEO_ZORAN
-        help
-          Say Y to support Zoran boards based on 36060 chips.
-          This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33
-          and 33 R10 and AverMedia 6 boards.
-
-config VIDEO_ZORAN_BUZ
-        tristate "Iomega Buz support"
-        depends on VIDEO_ZORAN_ZR36060
-        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Support for the Iomega Buz MJPEG capture/playback card.
-
-config VIDEO_ZORAN_DC10
-        tristate "Pinnacle/Miro DC10(+) support"
-        depends on VIDEO_ZORAN_ZR36060
-        select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback
-          card.
-
-config VIDEO_ZORAN_LML33
-        tristate "Linux Media Labs LML33 support"
-        depends on VIDEO_ZORAN_ZR36060
-        select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Support for the Linux Media Labs LML33 MJPEG capture/playback
-          card.
-
-config VIDEO_ZORAN_LML33R10
-        tristate "Linux Media Labs LML33R10 support"
-        depends on VIDEO_ZORAN_ZR36060
-        select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          support for the Linux Media Labs LML33R10 MJPEG capture/playback
-          card.
-
-config VIDEO_ZORAN_AVS6EYES
-        tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"
-        depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1
-        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
-        select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Support for the AverMedia 6 Eyes video surveillance card.
+source "drivers/media/video/zoran/Kconfig"
 
 config VIDEO_MEYE
         tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
@@ -697,7 +628,7 @@ config VIDEO_MXB
         depends on PCI && VIDEO_V4L1 && I2C
         select VIDEO_SAA7146_VV
         select VIDEO_TUNER
-        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_SAA7115 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO
@@ -708,21 +639,6 @@ config VIDEO_MXB
           To compile this driver as a module, choose M here: the
           module will be called mxb.
 
-config VIDEO_DPC
-        tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
-        depends on PCI && VIDEO_V4L1 && I2C
-        select VIDEO_SAA7146_VV
-        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
-        ---help---
-          This is a video4linux driver for the 'dpc7146 demonstration
-          board' by Philips-Semiconductors. It's the reference design
-          for SAA7146 bases boards, so if you have some unsupported
-          saa7146 based, analog video card, chances are good that it
-          will work with this skeleton driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called dpc7146.
-
 config VIDEO_HEXIUM_ORION
         tristate "Hexium HV-PCI6 and Orion frame grabber"
         depends on PCI && VIDEO_V4L2 && I2C
@@ -784,6 +700,70 @@ config VIDEO_CAFE_CCIC
           CMOS camera controller.  This is the controller found on first-
           generation OLPC systems.
 
+config SOC_CAMERA
+        tristate "SoC camera support"
+        depends on VIDEO_V4L2 && HAS_DMA
+        select VIDEOBUF_GEN
+        help
+          SoC Camera is a common API to several cameras, not connecting
+          over a bus like PCI or USB. For example some i2c camera connected
+          directly to the data bus of an SoC.
+
+config SOC_CAMERA_MT9M001
+        tristate "mt9m001 support"
+        depends on SOC_CAMERA && I2C
+        select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
+        help
+          This driver supports MT9M001 cameras from Micron, monochrome
+          and colour models.
+
+config MT9M001_PCA9536_SWITCH
+        bool "pca9536 datawidth switch for mt9m001"
+        depends on SOC_CAMERA_MT9M001 && GENERIC_GPIO
+        help
+          Select this if your MT9M001 camera uses a PCA9536 I2C GPIO
+          extender to switch between 8 and 10 bit datawidth modes
+
+config SOC_CAMERA_MT9M111
+        tristate "mt9m111 support"
+        depends on SOC_CAMERA && I2C
+        help
+          This driver supports MT9M111 cameras from Micron
+
+config SOC_CAMERA_MT9V022
+        tristate "mt9v022 support"
+        depends on SOC_CAMERA && I2C
+        select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
+        help
+          This driver supports MT9V022 cameras from Micron
+
+config MT9V022_PCA9536_SWITCH
+        bool "pca9536 datawidth switch for mt9v022"
+        depends on SOC_CAMERA_MT9V022 && GENERIC_GPIO
+        help
+          Select this if your MT9V022 camera uses a PCA9536 I2C GPIO
+          extender to switch between 8 and 10 bit datawidth modes
+
+config SOC_CAMERA_PLATFORM
+        tristate "platform camera support"
+        depends on SOC_CAMERA
+        help
+          This is a generic SoC camera platform driver, useful for testing
+
+config VIDEO_PXA27x
+        tristate "PXA27x Quick Capture Interface driver"
+        depends on VIDEO_DEV && PXA27x && SOC_CAMERA
+        select VIDEOBUF_DMA_SG
+        ---help---
+          This is a v4l2 driver for the PXA27x Quick Capture Interface
+
+config VIDEO_SH_MOBILE_CEU
+        tristate "SuperH Mobile CEU Interface driver"
+        depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA
+        select VIDEOBUF_DMA_CONTIG
+        ---help---
+          This is a v4l2 driver for the SuperH Mobile CEU Interface
+
 #
 # USB Multimedia device configuration
 #
@@ -822,8 +802,7 @@ config VIDEO_OVCAMCHIP
 
 config USB_W9968CF
         tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-        depends on VIDEO_V4L1 && I2C
-        select VIDEO_OVCAMCHIP
+        depends on VIDEO_V4L1 && I2C && VIDEO_OVCAMCHIP
         ---help---
           Say Y here if you want support for cameras based on OV681 or
           Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
@@ -914,64 +893,4 @@ config USB_S2255
 
 endif # V4L_USB_DRIVERS
 
-config SOC_CAMERA
-        tristate "SoC camera support"
-        depends on VIDEO_V4L2 && HAS_DMA
-        select VIDEOBUF_GEN
-        help
-          SoC Camera is a common API to several cameras, not connecting
-          over a bus like PCI or USB. For example some i2c camera connected
-          directly to the data bus of an SoC.
-
-config SOC_CAMERA_MT9M001
-        tristate "mt9m001 support"
-        depends on SOC_CAMERA && I2C
-        select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
-        help
-          This driver supports MT9M001 cameras from Micron, monochrome
-          and colour models.
-
-config MT9M001_PCA9536_SWITCH
-        bool "pca9536 datawidth switch for mt9m001"
-        depends on SOC_CAMERA_MT9M001 && GENERIC_GPIO
-        help
-          Select this if your MT9M001 camera uses a PCA9536 I2C GPIO
-          extender to switch between 8 and 10 bit datawidth modes
-
-config SOC_CAMERA_MT9V022
-        tristate "mt9v022 support"
-        depends on SOC_CAMERA && I2C
-        select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
-        help
-          This driver supports MT9V022 cameras from Micron
-
-config MT9V022_PCA9536_SWITCH
-        bool "pca9536 datawidth switch for mt9v022"
-        depends on SOC_CAMERA_MT9V022 && GENERIC_GPIO
-        help
-          Select this if your MT9V022 camera uses a PCA9536 I2C GPIO
-          extender to switch between 8 and 10 bit datawidth modes
-
-config SOC_CAMERA_PLATFORM
-        tristate "platform camera support"
-        depends on SOC_CAMERA
-        help
-          This is a generic SoC camera platform driver, useful for testing
-
-config VIDEO_PXA27x
-        tristate "PXA27x Quick Capture Interface driver"
-        depends on VIDEO_DEV && PXA27x
-        select SOC_CAMERA
-        select VIDEOBUF_DMA_SG
-        ---help---
-          This is a v4l2 driver for the PXA27x Quick Capture Interface
-
-config VIDEO_SH_MOBILE_CEU
-        tristate "SuperH Mobile CEU Interface driver"
-        depends on VIDEO_DEV && HAS_DMA
-        select SOC_CAMERA
-        select VIDEOBUF_DMA_CONTIG
-        ---help---
-          This is a v4l2 driver for the SuperH Mobile CEU Interface
-
 endif # VIDEO_CAPTURE_DRIVERS
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index ef7c8d3ffb18..16962f3aa157 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the video capture/playback device drivers.
 #
 
-zr36067-objs    :=      zoran_procfs.o zoran_device.o \
-                        zoran_driver.o zoran_card.o
 tuner-objs      :=      tuner-core.o
 
 msp3400-objs    :=      msp3400-driver.o msp3400-kthreads.o
@@ -54,9 +52,7 @@ obj-$(CONFIG_VIDEO_BT856) += bt856.o
 obj-$(CONFIG_VIDEO_BT866) += bt866.o
 obj-$(CONFIG_VIDEO_KS0127) += ks0127.o
 
-obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o
-obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o
-obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o
+obj-$(CONFIG_VIDEO_ZORAN) += zoran/
 
 obj-$(CONFIG_VIDEO_PMS) += pms.o
 obj-$(CONFIG_VIDEO_VINO) += vino.o indycam.o
@@ -84,8 +80,6 @@ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
 obj-$(CONFIG_VIDEO_MXB) += mxb.o
 obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
 obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
-obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
-obj-$(CONFIG_TUNER_3036) += tuner-3036.o
 
 obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
 obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
@@ -137,6 +131,7 @@ obj-$(CONFIG_VIDEO_PXA27x)	+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)       += sh_mobile_ceu_camera.o
 obj-$(CONFIG_SOC_CAMERA)        += soc_camera.o
 obj-$(CONFIG_SOC_CAMERA_MT9M001)        += mt9m001.o
+obj-$(CONFIG_SOC_CAMERA_MT9M111)        += mt9m111.o
 obj-$(CONFIG_SOC_CAMERA_MT9V022)        += mt9v022.o
 obj-$(CONFIG_SOC_CAMERA_PLATFORM)       += soc_camera_platform.o
 
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 9e436ad3d34b..218754b4906a 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -116,6 +116,7 @@ struct ar_device {
         int width, height;
         int frame_bytes, line_bytes;
         wait_queue_head_t wait;
+        unsigned long in_use;
         struct mutex lock;
 };
 
@@ -269,7 +270,7 @@ static inline void wait_for_vertical_sync(int exp_line)
 static ssize_t ar_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
         struct video_device *v = video_devdata(file);
-        struct ar_device *ar = v->priv;
+        struct ar_device *ar = video_get_drvdata(v);
         long ret = ar->frame_bytes;             /* return read bytes */
         unsigned long arvcr1 = 0;
         unsigned long flags;
@@ -399,7 +400,7 @@ static int ar_do_ioctl(struct inode *inode, struct file *file,
                        unsigned int cmd, void *arg)
 {
         struct video_device *dev = video_devdata(file);
-        struct ar_device *ar = dev->priv;
+        struct ar_device *ar = video_get_drvdata(dev);
 
         DEBUG(1, "ar_ioctl()\n");
         switch(cmd) {
@@ -625,7 +626,7 @@ static void ar_interrupt(int irq, void *dev)
  */
 static int ar_initialize(struct video_device *dev)
 {
-        struct ar_device *ar = dev->priv;
+        struct ar_device *ar = video_get_drvdata(dev);
         unsigned long cr = 0;
         int i,found=0;
 
@@ -732,7 +733,7 @@ static int ar_initialize(struct video_device *dev)
 
 void ar_release(struct video_device *vfd)
 {
-        struct ar_device *ar = vfd->priv;
+        struct ar_device *ar = video_get_drvdata(vfd);
         mutex_lock(&ar->lock);
         video_device_release(vfd);
 }
@@ -742,10 +743,23 @@ void ar_release(struct video_device *vfd)
  * Video4Linux Module functions
  *
  ****************************************************************************/
+static struct ar_device ardev;
+
+static int ar_exclusive_open(struct inode *inode, struct file *file)
+{
+        return test_and_set_bit(0, &ardev.in_use) ? -EBUSY : 0;
+}
+
+static int ar_exclusive_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &ardev.in_use);
+        return 0;
+}
+
 static const struct file_operations ar_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = ar_exclusive_open,
+        .release        = ar_exclusive_release,
         .read           = ar_read,
         .ioctl          = ar_ioctl,
 #ifdef CONFIG_COMPAT
@@ -762,7 +776,6 @@ static struct video_device ar_template = {
 };
 
 #define ALIGN4(x)       ((((int)(x)) & 0x3) == 0)
-static struct ar_device ardev;
 
 static int __init ar_init(void)
 {
@@ -802,7 +815,7 @@ static int __init ar_init(void)
                 return -ENOMEM;
         }
         memcpy(ar->vdev, &ar_template, sizeof(ar_template));
-        ar->vdev->priv = ar;
+        video_set_drvdata(ar->vdev, ar);
 
         if (vga) {
                 ar->width       = AR_WIDTH_VGA;
diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c
index ed48908a9034..5f07a8a072b6 100644
--- a/drivers/media/video/au0828/au0828-cards.c
+++ b/drivers/media/video/au0828/au0828-cards.c
@@ -46,7 +46,7 @@ struct au0828_board au0828_boards[] = {
 /* Tuner callback function for au0828 boards. Currently only needed
  * for HVR1500Q, which has an xc5000 tuner.
  */
-int au0828_tuner_callback(void *priv, int command, int arg)
+int au0828_tuner_callback(void *priv, int component, int command, int arg)
 {
         struct au0828_dev *dev = priv;
 
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index ba94be7e0ac1..f0fcdb4769d7 100644
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -36,11 +36,39 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 #define _AU0828_BULKPIPE 0x83
 #define _BULKPIPESIZE 0xe522
 
+static u8 hauppauge_hvr950q_led_states[] = {
+        0x00, /* off */
+        0x02, /* yellow */
+        0x04, /* green */
+};
+
+static struct au8522_led_config hauppauge_hvr950q_led_cfg = {
+        .gpio_output = 0x00e0,
+        .gpio_output_enable  = 0x6006,
+        .gpio_output_disable = 0x0660,
+
+        .gpio_leds = 0x00e2,
+        .led_states  = hauppauge_hvr950q_led_states,
+        .num_led_states = sizeof(hauppauge_hvr950q_led_states),
+
+        .vsb8_strong   = 20 /* dB */ * 10,
+        .qam64_strong  = 25 /* dB */ * 10,
+        .qam256_strong = 32 /* dB */ * 10,
+};
+
 static struct au8522_config hauppauge_hvr950q_config = {
         .demod_address = 0x8e >> 1,
         .status_mode   = AU8522_DEMODLOCKING,
         .qam_if        = AU8522_IF_6MHZ,
         .vsb_if        = AU8522_IF_6MHZ,
+        .led_cfg       = &hauppauge_hvr950q_led_cfg,
+};
+
+static struct au8522_config fusionhdtv7usb_config = {
+        .demod_address = 0x8e >> 1,
+        .status_mode   = AU8522_DEMODLOCKING,
+        .qam_if        = AU8522_IF_6MHZ,
+        .vsb_if        = AU8522_IF_6MHZ,
 };
 
 static struct au8522_config hauppauge_woodbury_config = {
@@ -53,7 +81,6 @@ static struct au8522_config hauppauge_woodbury_config = {
 static struct xc5000_config hauppauge_hvr950q_tunerconfig = {
         .i2c_address      = 0x61,
         .if_khz           = 6000,
-        .tuner_callback   = au0828_tuner_callback
 };
 
 static struct mxl5007t_config mxl5007t_hvr950q_config = {
@@ -353,14 +380,12 @@ int au0828_dvb_register(struct au0828_dev *dev)
         switch (dev->board) {
         case AU0828_BOARD_HAUPPAUGE_HVR850:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q:
-        case AU0828_BOARD_DVICO_FUSIONHDTV7:
                 dvb->frontend = dvb_attach(au8522_attach,
                                 &hauppauge_hvr950q_config,
                                 &dev->i2c_adap);
                 if (dvb->frontend != NULL)
-                        dvb_attach(xc5000_attach, dvb->frontend,
-                                &dev->i2c_adap,
-                                &hauppauge_hvr950q_tunerconfig, dev);
+                        dvb_attach(xc5000_attach, dvb->frontend, &dev->i2c_adap,
+                                   &hauppauge_hvr950q_tunerconfig);
                 break;
         case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
                 dvb->frontend = dvb_attach(au8522_attach,
@@ -380,6 +405,16 @@ int au0828_dvb_register(struct au0828_dev *dev)
                                    0x60, &dev->i2c_adap,
                                    &hauppauge_woodbury_tunerconfig);
                 break;
+        case AU0828_BOARD_DVICO_FUSIONHDTV7:
+                dvb->frontend = dvb_attach(au8522_attach,
+                                &fusionhdtv7usb_config,
+                                &dev->i2c_adap);
+                if (dvb->frontend != NULL) {
+                        dvb_attach(xc5000_attach, dvb->frontend,
+                                &dev->i2c_adap,
+                                &hauppauge_hvr950q_tunerconfig);
+                }
+                break;
         default:
                 printk(KERN_WARNING "The frontend of your DVB/ATSC card "
                        "isn't supported yet\n");
@@ -390,6 +425,8 @@ int au0828_dvb_register(struct au0828_dev *dev)
                        __func__);
                 return -1;
         }
+        /* define general-purpose callback pointer */
+        dvb->frontend->callback = au0828_tuner_callback;
 
         /* register everything */
         ret = dvb_register(dev);
diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
index 4f10ff300135..9d6a1161dc98 100644
--- a/drivers/media/video/au0828/au0828.h
+++ b/drivers/media/video/au0828/au0828.h
@@ -103,7 +103,8 @@ extern int au0828_debug;
 extern struct au0828_board au0828_boards[];
 extern struct usb_device_id au0828_usb_id_table[];
 extern void au0828_gpio_setup(struct au0828_dev *dev);
-extern int au0828_tuner_callback(void *priv, int command, int arg);
+extern int au0828_tuner_callback(void *priv, int component,
+                                 int command, int arg);
 extern void au0828_card_setup(struct au0828_dev *dev);
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 98ee2d8feb34..ab2ce4d7b5de 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -68,8 +68,8 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* ----------------------------------------------------------------------- */
 
-#define REG_OFFSET      0xDA
-#define BT856_NR_REG    6
+#define BT856_REG_OFFSET        0xDA
+#define BT856_NR_REG            6
 
 struct bt856 {
         unsigned char reg[BT856_NR_REG];
@@ -89,7 +89,7 @@ bt856_write (struct i2c_client *client,
 {
         struct bt856 *encoder = i2c_get_clientdata(client);
 
-        encoder->reg[reg - REG_OFFSET] = value;
+        encoder->reg[reg - BT856_REG_OFFSET] = value;
         return i2c_smbus_write_byte_data(client, reg, value);
 }
 
@@ -103,7 +103,7 @@ bt856_setbit (struct i2c_client *client,
 
         return bt856_write(client, reg,
                            (encoder->
-                            reg[reg - REG_OFFSET] & ~(1 << bit)) |
+                            reg[reg - BT856_REG_OFFSET] & ~(1 << bit)) |
                             (value ? (1 << bit) : 0));
 }
 
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 6081edc362df..13742b0bbe3e 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -305,7 +305,7 @@ static struct CARD {
         { 0x00261822, BTTV_BOARD_TWINHAN_DST,   "DNTV Live! Mini "},
         { 0xd200dbc0, BTTV_BOARD_DVICO_FUSIONHDTV_2,    "DViCO FusionHDTV 2" },
         { 0x763c008a, BTTV_BOARD_GEOVISION_GV600,       "GeoVision GV-600" },
-
+        { 0x18011000, BTTV_BOARD_ENLTV_FM_2,    "Encore ENL TV-FM-2" },
         { 0, -1, NULL }
 };
 
@@ -3037,6 +3037,31 @@ struct tvcard bttv_tvcards[] = {
                 .has_radio      = 1,
                 .has_remote     = 1,
         },
+        [BTTV_BOARD_ENLTV_FM_2] = {
+                /* Encore TV Tuner Pro ENL TV-FM-2
+                   Mauro Carvalho Chehab <mchehab@infradead.org */
+                .name           = "Encore ENL TV-FM-2",
+                .video_inputs   = 3,
+                .audio_inputs   = 1,
+                .tuner          = 0,
+                .svhs           = 2,
+                /* bit 6          -> IR disabled
+                   bit 18/17 = 00 -> mute
+                               01 -> enable external audio input
+                               10 -> internal audio input (mono?)
+                               11 -> internal audio input
+                 */
+                .gpiomask       = 0x060040,
+                .muxsel         = { 2, 3, 3 },
+                .gpiomux        = { 0x60000, 0x60000, 0x20000, 0x20000 },
+                .gpiomute       = 0,
+                .tuner_type     = TUNER_TCL_MF02GIP_5N,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+                .has_radio      = 1,
+                .has_remote     = 1,
+        }
 };
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 933eaef41ead..5858bf5ff41c 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -76,9 +76,9 @@ static unsigned int gbuffers = 8;
 static unsigned int gbufsize = 0x208000;
 static unsigned int reset_crop = 1;
 
-static int video_nr = -1;
-static int radio_nr = -1;
-static int vbi_nr = -1;
+static int video_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };
+static int radio_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };
+static int vbi_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };
 static int debug_latency;
 
 static unsigned int fdsr;
@@ -108,9 +108,6 @@ module_param(irq_debug,         int, 0644);
 module_param(debug_latency,     int, 0644);
 
 module_param(fdsr,              int, 0444);
-module_param(video_nr,          int, 0444);
-module_param(radio_nr,          int, 0444);
-module_param(vbi_nr,            int, 0444);
 module_param(gbuffers,          int, 0444);
 module_param(gbufsize,          int, 0444);
 module_param(reset_crop,        int, 0444);
@@ -130,7 +127,10 @@ module_param(uv_ratio,          int, 0444);
 module_param(full_luma_range,   int, 0444);
 module_param(coring,            int, 0444);
 
-module_param_array(radio, int, NULL, 0444);
+module_param_array(radio,       int, NULL, 0444);
+module_param_array(video_nr,    int, NULL, 0444);
+module_param_array(radio_nr,    int, NULL, 0444);
+module_param_array(vbi_nr,      int, NULL, 0444);
 
 MODULE_PARM_DESC(radio,"The TV card supports radio, default is 0 (no)");
 MODULE_PARM_DESC(bigendian,"byte order of the framebuffer, default is native endian");
@@ -152,6 +152,9 @@ MODULE_PARM_DESC(irq_iswitch,"switch inputs in irq handler");
 MODULE_PARM_DESC(uv_ratio,"ratio between u and v gains, default is 50");
 MODULE_PARM_DESC(full_luma_range,"use the full luma range, default is 0 (no)");
 MODULE_PARM_DESC(coring,"set the luma coring level, default is 0 (no)");
+MODULE_PARM_DESC(video_nr, "video device numbers");
+MODULE_PARM_DESC(vbi_nr, "vbi device numbers");
+MODULE_PARM_DESC(radio_nr, "radio device numbers");
 
 MODULE_DESCRIPTION("bttv - v4l/v4l2 driver module for bt848/878 based cards");
 MODULE_AUTHOR("Ralph Metzler & Marcus Metzler & Gerd Knorr");
@@ -1367,7 +1370,7 @@ static void init_irqreg(struct bttv *btv)
                         (btv->gpioirq ? BT848_INT_GPINT : 0) |
                         BT848_INT_SCERR |
                         (fdsr ? BT848_INT_FDSR : 0) |
-                        BT848_INT_RISCI|BT848_INT_OCERR|BT848_INT_VPRES|
+                        BT848_INT_RISCI | BT848_INT_OCERR |
                         BT848_INT_FMTCHG|BT848_INT_HLOCK|
                         BT848_INT_I2CDONE,
                         BT848_INT_MASK);
@@ -2661,18 +2664,6 @@ static int bttv_querycap(struct file *file, void  *priv,
         return 0;
 }
 
-static int bttv_enum_fmt_vbi_cap(struct file *file, void  *priv,
-                                struct v4l2_fmtdesc *f)
-{
-        if (0 != f->index)
-                return -EINVAL;
-
-        f->pixelformat = V4L2_PIX_FMT_GREY;
-        strcpy(f->description, "vbi data");
-
-        return 0;
-}
-
 static int bttv_enum_fmt_cap_ovr(struct v4l2_fmtdesc *f)
 {
         int index = -1, i;
@@ -3227,6 +3218,7 @@ static int bttv_open(struct inode *inode, struct file *file)
 
         dprintk(KERN_DEBUG "bttv: open minor=%d\n",minor);
 
+        lock_kernel();
         for (i = 0; i < bttv_num; i++) {
                 if (bttvs[i].video_dev &&
                     bttvs[i].video_dev->minor == minor) {
@@ -3241,16 +3233,20 @@ static int bttv_open(struct inode *inode, struct file *file)
                         break;
                 }
         }
-        if (NULL == btv)
+        if (NULL == btv) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         dprintk(KERN_DEBUG "bttv%d: open called (type=%s)\n",
                 btv->c.nr,v4l2_type_names[type]);
 
         /* allocate per filehandle data */
         fh = kmalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         *fh = btv->init;
         fh->type = type;
@@ -3270,6 +3266,7 @@ static int bttv_open(struct inode *inode, struct file *file)
                             sizeof(struct bttv_buffer),
                             fh);
         set_tvnorm(btv,btv->tvnorm);
+        set_input(btv, btv->input, btv->tvnorm);
 
         btv->users++;
 
@@ -3290,6 +3287,7 @@ static int bttv_open(struct inode *inode, struct file *file)
         bttv_vbi_fmt_reset(&fh->vbi_fmt, btv->tvnorm);
 
         bttv_field_count(btv);
+        unlock_kernel();
         return 0;
 }
 
@@ -3330,6 +3328,10 @@ static int bttv_release(struct inode *inode, struct file *file)
 
         btv->users--;
         bttv_field_count(btv);
+
+        if (!btv->users)
+                audio_mute(btv, 1);
+
         return 0;
 }
 
@@ -3367,7 +3369,6 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = {
         .vidioc_g_fmt_vid_overlay       = bttv_g_fmt_vid_overlay,
         .vidioc_try_fmt_vid_overlay     = bttv_try_fmt_vid_overlay,
         .vidioc_s_fmt_vid_overlay       = bttv_s_fmt_vid_overlay,
-        .vidioc_enum_fmt_vbi_cap        = bttv_enum_fmt_vbi_cap,
         .vidioc_g_fmt_vbi_cap           = bttv_g_fmt_vbi_cap,
         .vidioc_try_fmt_vbi_cap         = bttv_try_fmt_vbi_cap,
         .vidioc_s_fmt_vbi_cap           = bttv_s_fmt_vbi_cap,
@@ -3430,21 +3431,26 @@ static int radio_open(struct inode *inode, struct file *file)
 
         dprintk("bttv: open minor=%d\n",minor);
 
+        lock_kernel();
         for (i = 0; i < bttv_num; i++) {
                 if (bttvs[i].radio_dev && bttvs[i].radio_dev->minor == minor) {
                         btv = &bttvs[i];
                         break;
                 }
         }
-        if (NULL == btv)
+        if (NULL == btv) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         dprintk("bttv%d: open called (radio)\n",btv->c.nr);
 
         /* allocate per filehandle data */
         fh = kmalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         *fh = btv->init;
         v4l2_prio_open(&btv->prio, &fh->prio);
@@ -3457,6 +3463,7 @@ static int radio_open(struct inode *inode, struct file *file)
         audio_input(btv,TVAUDIO_INPUT_RADIO);
 
         mutex_unlock(&btv->lock);
+        unlock_kernel();
         return 0;
 }
 
@@ -4235,7 +4242,8 @@ static int __devinit bttv_register_video(struct bttv *btv)
 
         if (NULL == btv->video_dev)
                 goto err;
-        if (video_register_device(btv->video_dev,VFL_TYPE_GRABBER,video_nr)<0)
+        if (video_register_device(btv->video_dev, VFL_TYPE_GRABBER,
+                                  video_nr[btv->c.nr]) < 0)
                 goto err;
         printk(KERN_INFO "bttv%d: registered device video%d\n",
                btv->c.nr,btv->video_dev->minor & 0x1f);
@@ -4251,7 +4259,8 @@ static int __devinit bttv_register_video(struct bttv *btv)
 
         if (NULL == btv->vbi_dev)
                 goto err;
-        if (video_register_device(btv->vbi_dev,VFL_TYPE_VBI,vbi_nr)<0)
+        if (video_register_device(btv->vbi_dev, VFL_TYPE_VBI,
+                                  vbi_nr[btv->c.nr]) < 0)
                 goto err;
         printk(KERN_INFO "bttv%d: registered device vbi%d\n",
                btv->c.nr,btv->vbi_dev->minor & 0x1f);
@@ -4262,7 +4271,8 @@ static int __devinit bttv_register_video(struct bttv *btv)
         btv->radio_dev = vdev_init(btv, &radio_template, "radio");
         if (NULL == btv->radio_dev)
                 goto err;
-        if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,radio_nr)<0)
+        if (video_register_device(btv->radio_dev, VFL_TYPE_RADIO,
+                                  radio_nr[btv->c.nr]) < 0)
                 goto err;
         printk(KERN_INFO "bttv%d: registered device radio%d\n",
                btv->c.nr,btv->radio_dev->minor & 0x1f);
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index a38af98f4cae..2f289d981fe6 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -28,8 +28,8 @@
 #include "bttvp.h"
 
 
-static int debug;
-module_param(debug, int, 0644);    /* debug level (0,1,2) */
+static int ir_debug;
+module_param(ir_debug, int, 0644);
 static int repeat_delay = 500;
 module_param(repeat_delay, int, 0644);
 static int repeat_period = 33;
@@ -40,6 +40,12 @@ module_param(ir_rc5_remote_gap, int, 0644);
 static int ir_rc5_key_timeout = 200;
 module_param(ir_rc5_key_timeout, int, 0644);
 
+#undef dprintk
+#define dprintk(arg...) do {    \
+        if (ir_debug >= 1)      \
+                printk(arg);    \
+} while (0)
+
 #define DEVNAME "bttv-input"
 
 /* ---------------------------------------------------------------------- */
@@ -79,6 +85,45 @@ static void ir_handle_key(struct bttv *btv)
 
 }
 
+static void ir_enltv_handle_key(struct bttv *btv)
+{
+        struct card_ir *ir = btv->remote;
+        u32 gpio, data, keyup;
+
+        /* read gpio value */
+        gpio = bttv_gpio_read(&btv->c);
+
+        /* extract data */
+        data = ir_extract_bits(gpio, ir->mask_keycode);
+
+        /* Check if it is keyup */
+        keyup = (gpio & ir->mask_keyup) ? 1 << 31 : 0;
+
+        if ((ir->last_gpio & 0x7f) != data) {
+                dprintk(KERN_INFO DEVNAME ": gpio=0x%x code=%d | %s\n",
+                        gpio, data,
+                        (gpio & ir->mask_keyup) ? " up" : "up/down");
+
+                ir_input_keydown(ir->dev, &ir->ir, data, data);
+                if (keyup)
+                        ir_input_nokey(ir->dev, &ir->ir);
+        } else {
+                if ((ir->last_gpio & 1 << 31) == keyup)
+                        return;
+
+                dprintk(KERN_INFO DEVNAME ":(cnt) gpio=0x%x code=%d | %s\n",
+                        gpio, data,
+                        (gpio & ir->mask_keyup) ? " up" : "down");
+
+                if (keyup)
+                        ir_input_nokey(ir->dev, &ir->ir);
+                else
+                        ir_input_keydown(ir->dev, &ir->ir, data, data);
+        }
+
+        ir->last_gpio = data | keyup;
+}
+
 void bttv_input_irq(struct bttv *btv)
 {
         struct card_ir *ir = btv->remote;
@@ -92,7 +137,10 @@ static void bttv_input_timer(unsigned long data)
         struct bttv *btv = (struct bttv*)data;
         struct card_ir *ir = btv->remote;
 
-        ir_handle_key(btv);
+        if (btv->c.type == BTTV_BOARD_ENLTV_FM_2)
+                ir_enltv_handle_key(btv);
+        else
+                ir_handle_key(btv);
         mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
 }
 
@@ -284,6 +332,14 @@ int bttv_input_init(struct bttv *btv)
                 ir->mask_keyup   = 0x006000;
                 ir->polling      = 50; /* ms */
                 break;
+        case BTTV_BOARD_ENLTV_FM_2:
+                ir_codes         = ir_codes_encore_enltv2;
+                ir->mask_keycode = 0x00fd00;
+                ir->mask_keyup   = 0x000080;
+                ir->polling      = 1; /* ms */
+                ir->last_gpio    = ir_extract_bits(bttv_gpio_read(&btv->c),
+                                                   ir->mask_keycode);
+                break;
         }
         if (NULL == ir_codes) {
                 dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type);
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index 6d93d16c96e4..46cb90e0985b 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -176,7 +176,7 @@
 #define BTTV_BOARD_TYPHOON_TVTUNERPCI      0x95
 #define BTTV_BOARD_GEOVISION_GV600         0x96
 #define BTTV_BOARD_KOZUMI_KTV_01C          0x97
-
+#define BTTV_BOARD_ENLTV_FM_2              0x98
 
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10
diff --git a/drivers/media/video/btcx-risc.c b/drivers/media/video/btcx-risc.c
index 3324ab38f58c..ac1b2687a20d 100644
--- a/drivers/media/video/btcx-risc.c
+++ b/drivers/media/video/btcx-risc.c
@@ -64,7 +64,7 @@ int btcx_riscmem_alloc(struct pci_dev *pci,
                        unsigned int size)
 {
         __le32 *cpu;
-        dma_addr_t dma;
+        dma_addr_t dma = 0;
 
         if (NULL != risc->cpu && risc->size < size)
                 btcx_riscmem_free(pci,risc);
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index 6e39e253ce53..ace4ff9ea023 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -495,7 +495,7 @@ static void qc_set(struct qcam_device *q)
                 val2 = (((q->port_mode & QC_MODE_MASK) == QC_BIDIR) ? 24 : 8) *
                     q->transfer_scale;
         }
-        val = (val + val2 - 1) / val2;
+        val = DIV_ROUND_UP(val, val2);
         qc_command(q, 0x13);
         qc_command(q, val);
 
@@ -651,7 +651,7 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l
         transperline = q->width * q->bpp;
         divisor = (((q->port_mode & QC_MODE_MASK) == QC_BIDIR) ? 24 : 8) *
             q->transfer_scale;
-        transperline = (transperline + divisor - 1) / divisor;
+        transperline = DIV_ROUND_UP(transperline, divisor);
 
         for (i = 0, yield = yieldlines; i < linestotrans; i++)
         {
@@ -894,10 +894,27 @@ static ssize_t qcam_read(struct file *file, char __user *buf,
         return len;
 }
 
+static int qcam_exclusive_open(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct qcam_device *qcam = (struct qcam_device *)dev;
+
+        return test_and_set_bit(0, &qcam->in_use) ? -EBUSY : 0;
+}
+
+static int qcam_exclusive_release(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct qcam_device *qcam = (struct qcam_device *)dev;
+
+        clear_bit(0, &qcam->in_use);
+        return 0;
+}
+
 static const struct file_operations qcam_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = qcam_exclusive_open,
+        .release        = qcam_exclusive_release,
         .ioctl          = qcam_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -909,6 +926,7 @@ static struct video_device qcam_template=
 {
         .name           = "Connectix Quickcam",
         .fops           = &qcam_fops,
+        .release        = video_device_release_empty,
 };
 
 #define MAX_CAMS 4
diff --git a/drivers/media/video/bw-qcam.h b/drivers/media/video/bw-qcam.h
index 6701dafbc0da..8a60c5de0935 100644
--- a/drivers/media/video/bw-qcam.h
+++ b/drivers/media/video/bw-qcam.h
@@ -65,4 +65,5 @@ struct qcam_device {
         int top, left;
         int status;
         unsigned int saved_bits;
+        unsigned long in_use;
 };
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index 7f6c6b4bec10..17aa0adb3467 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -51,6 +51,7 @@ struct qcam_device {
         int contrast, brightness, whitebal;
         int top, left;
         unsigned int bidirectional;
+        unsigned long in_use;
         struct mutex lock;
 };
 
@@ -687,11 +688,28 @@ static ssize_t qcam_read(struct file *file, char __user *buf,
         return len;
 }
 
+static int qcam_exclusive_open(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct qcam_device *qcam = (struct qcam_device *)dev;
+
+        return test_and_set_bit(0, &qcam->in_use) ? -EBUSY : 0;
+}
+
+static int qcam_exclusive_release(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct qcam_device *qcam = (struct qcam_device *)dev;
+
+        clear_bit(0, &qcam->in_use);
+        return 0;
+}
+
 /* video device template */
 static const struct file_operations qcam_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = qcam_exclusive_open,
+        .release        = qcam_exclusive_release,
         .ioctl          = qcam_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -704,6 +722,7 @@ static struct video_device qcam_template=
 {
         .name           = "Colour QuickCam",
         .fops           = &qcam_fops,
+        .release        = video_device_release_empty,
 };
 
 /* Initialize the QuickCam driver control structure. */
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 08efbe7254ff..fc9497bdd322 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1476,9 +1476,12 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp)
 {
         struct cafe_camera *cam;
 
+        lock_kernel();
         cam = cafe_find_dev(iminor(inode));
-        if (cam == NULL)
+        if (cam == NULL) {
+                unlock_kernel();
                 return -ENODEV;
+        }
         filp->private_data = cam;
 
         mutex_lock(&cam->s_mutex);
@@ -1490,6 +1493,7 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp)
         }
         (cam->users)++;
         mutex_unlock(&cam->s_mutex);
+        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index a661800b0e69..c325e926de8a 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -3155,7 +3155,7 @@ static void put_cam(struct cpia_camera_ops* ops)
 static int cpia_open(struct inode *inode, struct file *file)
 {
         struct video_device *dev = video_devdata(file);
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int err;
 
         if (!cam) {
@@ -3202,7 +3202,7 @@ static int cpia_open(struct inode *inode, struct file *file)
 
         /* Set ownership of /proc/cpia/videoX to current user */
         if(cam->proc_entry)
-                cam->proc_entry->uid = current->uid;
+                cam->proc_entry->uid = current_uid();
 
         /* set mark for loading first frame uncompressed */
         cam->first_frame = 1;
@@ -3232,7 +3232,7 @@ static int cpia_open(struct inode *inode, struct file *file)
 static int cpia_close(struct inode *inode, struct file *file)
 {
         struct  video_device *dev = file->private_data;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
 
         if (cam->ops) {
                 /* Return ownership of /proc/cpia/videoX to root */
@@ -3284,7 +3284,7 @@ static ssize_t cpia_read(struct file *file, char __user *buf,
                          size_t count, loff_t *ppos)
 {
         struct video_device *dev = file->private_data;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int err;
 
         /* make this _really_ smp and multithread-safe */
@@ -3341,7 +3341,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                          unsigned int ioctlnr, void *arg)
 {
         struct video_device *dev = file->private_data;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int retval = 0;
 
         if (!cam || !cam->ops)
@@ -3739,7 +3739,7 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma)
         unsigned long start = vma->vm_start;
         unsigned long size  = vma->vm_end - vma->vm_start;
         unsigned long page, pos;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int retval;
 
         if (!cam || !cam->ops)
@@ -3801,6 +3801,7 @@ static const struct file_operations cpia_fops = {
 static struct video_device cpia_template = {
         .name           = "CPiA Camera",
         .fops           = &cpia_fops,
+        .release        = video_device_release_empty,
 };
 
 /* initialise cam_data structure  */
@@ -3928,7 +3929,7 @@ static void init_camera_struct(struct cam_data *cam,
         cam->proc_entry = NULL;
 
         memcpy(&cam->vdev, &cpia_template, sizeof(cpia_template));
-        cam->vdev.priv = cam;
+        video_set_drvdata(&cam->vdev, cam);
 
         cam->curframe = 0;
         for (i = 0; i < FRAME_NUM; i++) {
diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index af8b9ec8e358..7e791b6923f9 100644
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -1537,7 +1537,7 @@ static int config_sensor_500(struct camera_data *cam,
  *
  *  This sets all user changeable properties to the values in cam->params.
  *****************************************************************************/
-int set_all_properties(struct camera_data *cam)
+static int set_all_properties(struct camera_data *cam)
 {
         /**
          * Don't set target_kb here, it will be set later.
@@ -1588,7 +1588,7 @@ void cpia2_save_camera_state(struct camera_data *cam)
  *  get_color_params
  *
  *****************************************************************************/
-void get_color_params(struct camera_data *cam)
+static void get_color_params(struct camera_data *cam)
 {
         cpia2_do_command(cam, CPIA2_CMD_GET_VP_BRIGHTNESS, TRANSFER_READ, 0);
         cpia2_do_command(cam, CPIA2_CMD_GET_VP_SATURATION, TRANSFER_READ, 0);
@@ -1881,7 +1881,7 @@ void cpia2_set_saturation(struct camera_data *cam, unsigned char value)
  *  wake_system
  *
  *****************************************************************************/
-void wake_system(struct camera_data *cam)
+static void wake_system(struct camera_data *cam)
 {
         cpia2_do_command(cam, CPIA2_CMD_SET_WAKEUP, TRANSFER_WRITE, 0);
 }
@@ -1892,7 +1892,7 @@ void wake_system(struct camera_data *cam)
  *
  *  Valid for STV500 sensor only
  *****************************************************************************/
-void set_lowlight_boost(struct camera_data *cam)
+static void set_lowlight_boost(struct camera_data *cam)
 {
         struct cpia2_command cmd;
 
@@ -2169,7 +2169,7 @@ void cpia2_dbg_dump_registers(struct camera_data *cam)
  *
  *  Sets all values to the defaults
  *****************************************************************************/
-void reset_camera_struct(struct camera_data *cam)
+static void reset_camera_struct(struct camera_data *cam)
 {
         /***
          * The following parameter values are the defaults from the register map.
diff --git a/drivers/media/video/cpia2/cpia2_usb.c b/drivers/media/video/cpia2/cpia2_usb.c
index a8a199047cbd..73511a542077 100644
--- a/drivers/media/video/cpia2/cpia2_usb.c
+++ b/drivers/media/video/cpia2/cpia2_usb.c
@@ -478,7 +478,7 @@ int cpia2_usb_change_streaming_alternate(struct camera_data *cam,
  * set_alternate
  *
  *****************************************************************************/
-int set_alternate(struct camera_data *cam, unsigned int alt)
+static int set_alternate(struct camera_data *cam, unsigned int alt)
 {
         int ret = 0;
 
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index eb9f15cd4c45..897e8d1a5c3c 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -241,8 +241,7 @@ static struct v4l2_queryctrl controls[] = {
  *****************************************************************************/
 static int cpia2_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct camera_data *cam = video_get_drvdata(dev);
+        struct camera_data *cam = video_drvdata(file);
         int retval = 0;
 
         if (!cam) {
@@ -357,8 +356,7 @@ static int cpia2_close(struct inode *inode, struct file *file)
 static ssize_t cpia2_v4l_read(struct file *file, char __user *buf, size_t count,
                               loff_t *off)
 {
-        struct video_device *dev = video_devdata(file);
-        struct camera_data *cam = video_get_drvdata(dev);
+        struct camera_data *cam = video_drvdata(file);
         int noblock = file->f_flags&O_NONBLOCK;
 
         struct cpia2_fh *fh = file->private_data;
@@ -382,9 +380,7 @@ static ssize_t cpia2_v4l_read(struct file *file, char __user *buf, size_t count,
  *****************************************************************************/
 static unsigned int cpia2_v4l_poll(struct file *filp, struct poll_table_struct *wait)
 {
-        struct video_device *dev = video_devdata(filp);
-        struct camera_data *cam = video_get_drvdata(dev);
-
+        struct camera_data *cam = video_drvdata(filp);
         struct cpia2_fh *fh = filp->private_data;
 
         if(!cam)
@@ -1579,8 +1575,7 @@ static int ioctl_dqbuf(void *arg,struct camera_data *cam, struct file *file)
 static int cpia2_do_ioctl(struct inode *inode, struct file *file,
                           unsigned int ioctl_nr, void *arg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct camera_data *cam = video_get_drvdata(dev);
+        struct camera_data *cam = video_drvdata(file);
         int retval = 0;
 
         if (!cam)
@@ -1860,9 +1855,8 @@ static int cpia2_ioctl(struct inode *inode, struct file *file,
  *****************************************************************************/
 static int cpia2_mmap(struct file *file, struct vm_area_struct *area)
 {
+        struct camera_data *cam = video_drvdata(file);
         int retval;
-        struct video_device *dev = video_devdata(file);
-        struct camera_data *cam = video_get_drvdata(dev);
 
         /* Priority check */
         struct cpia2_fh *fh = file->private_data;
diff --git a/drivers/media/video/cx18/Makefile b/drivers/media/video/cx18/Makefile
index b23d2e26120f..f7bf0edf93f9 100644
--- a/drivers/media/video/cx18/Makefile
+++ b/drivers/media/video/cx18/Makefile
@@ -2,7 +2,7 @@ cx18-objs    := cx18-driver.o cx18-cards.o cx18-i2c.o cx18-firmware.o cx18-gpio.
         cx18-queue.o cx18-streams.o cx18-fileops.o cx18-ioctl.o cx18-controls.o \
         cx18-mailbox.o cx18-vbi.o cx18-audio.o cx18-video.o cx18-irq.o \
         cx18-av-core.o cx18-av-audio.o cx18-av-firmware.o cx18-av-vbi.o cx18-scb.o \
-        cx18-dvb.o
+        cx18-dvb.o cx18-io.o
 
 obj-$(CONFIG_VIDEO_CX18) += cx18.o
 
diff --git a/drivers/media/video/cx18/cx18-audio.c b/drivers/media/video/cx18/cx18-audio.c
index 6d5b94fc7087..57beddf0af4d 100644
--- a/drivers/media/video/cx18/cx18-audio.c
+++ b/drivers/media/video/cx18/cx18-audio.c
@@ -22,6 +22,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-i2c.h"
 #include "cx18-cards.h"
 #include "cx18-audio.h"
@@ -60,10 +61,10 @@ int cx18_audio_set_io(struct cx18 *cx)
         if (err)
                 return err;
 
-        val = read_reg(CX18_AUDIO_ENABLE) & ~0x30;
+        val = cx18_read_reg(cx, CX18_AUDIO_ENABLE) & ~0x30;
         val |= (audio_input > CX18_AV_AUDIO_SERIAL2) ? 0x20 :
                                         (audio_input << 4);
-        write_reg(val | 0xb00, CX18_AUDIO_ENABLE);
+        cx18_write_reg(cx, val | 0xb00, CX18_AUDIO_ENABLE);
         cx18_vapi(cx, CX18_APU_RESETAI, 1, 0);
         return 0;
 }
diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c
index 3b0a2c450605..73f5141a42d1 100644
--- a/drivers/media/video/cx18/cx18-av-core.c
+++ b/drivers/media/video/cx18/cx18-av-core.c
@@ -22,27 +22,35 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 
 int cx18_av_write(struct cx18 *cx, u16 addr, u8 value)
 {
-        u32 x = readl(cx->reg_mem + 0xc40000 + (addr & ~3));
+        u32 reg = 0xc40000 + (addr & ~3);
         u32 mask = 0xff;
         int shift = (addr & 3) * 8;
+        u32 x = cx18_read_reg(cx, reg);
 
         x = (x & ~(mask << shift)) | ((u32)value << shift);
-        writel(x, cx->reg_mem + 0xc40000 + (addr & ~3));
+        cx18_write_reg(cx, x, reg);
         return 0;
 }
 
 int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value)
 {
-        writel(value, cx->reg_mem + 0xc40000 + addr);
+        cx18_write_reg(cx, value, 0xc40000 + addr);
+        return 0;
+}
+
+int cx18_av_write4_noretry(struct cx18 *cx, u16 addr, u32 value)
+{
+        cx18_write_reg_noretry(cx, value, 0xc40000 + addr);
         return 0;
 }
 
 u8 cx18_av_read(struct cx18 *cx, u16 addr)
 {
-        u32 x = readl(cx->reg_mem + 0xc40000 + (addr & ~3));
+        u32 x = cx18_read_reg(cx, 0xc40000 + (addr & ~3));
         int shift = (addr & 3) * 8;
 
         return (x >> shift) & 0xff;
@@ -50,7 +58,12 @@ u8 cx18_av_read(struct cx18 *cx, u16 addr)
 
 u32 cx18_av_read4(struct cx18 *cx, u16 addr)
 {
-        return readl(cx->reg_mem + 0xc40000 + addr);
+        return cx18_read_reg(cx, 0xc40000 + addr);
+}
+
+u32 cx18_av_read4_noretry(struct cx18 *cx, u16 addr)
+{
+        return cx18_read_reg_noretry(cx, 0xc40000 + addr);
 }
 
 int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned and_mask,
diff --git a/drivers/media/video/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h
index eb61fa1e0965..b67d8df20cc6 100644
--- a/drivers/media/video/cx18/cx18-av-core.h
+++ b/drivers/media/video/cx18/cx18-av-core.h
@@ -301,8 +301,10 @@ struct cx18_av_state {
 /* cx18_av-core.c                                                          */
 int cx18_av_write(struct cx18 *cx, u16 addr, u8 value);
 int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value);
+int cx18_av_write4_noretry(struct cx18 *cx, u16 addr, u32 value);
 u8 cx18_av_read(struct cx18 *cx, u16 addr);
 u32 cx18_av_read4(struct cx18 *cx, u16 addr);
+u32 cx18_av_read4_noretry(struct cx18 *cx, u16 addr);
 int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned mask, u8 value);
 int cx18_av_and_or4(struct cx18 *cx, u16 addr, u32 mask, u32 value);
 int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg);
diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c
index e996a4e3123a..522a035b2e8f 100644
--- a/drivers/media/video/cx18/cx18-av-firmware.c
+++ b/drivers/media/video/cx18/cx18-av-firmware.c
@@ -20,6 +20,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include <linux/firmware.h>
 
 #define CX18_AUDIO_ENABLE 0xc72014
@@ -49,7 +50,7 @@ int cx18_av_loadfw(struct cx18 *cx)
                 cx18_av_write4(cx, 0x8100, 0x00010000);
 
                 /* Put the 8051 in reset and enable firmware upload */
-                cx18_av_write4(cx, CXADEC_DL_CTL, 0x0F000000);
+                cx18_av_write4_noretry(cx, CXADEC_DL_CTL, 0x0F000000);
 
                 ptr = fw->data;
                 size = fw->size;
@@ -58,22 +59,28 @@ int cx18_av_loadfw(struct cx18 *cx)
                         u32 dl_control = 0x0F000000 | i | ((u32)ptr[i] << 16);
                         u32 value = 0;
                         int retries2;
+                        int unrec_err = 0;
 
-                        for (retries2 = 0; retries2 < 5; retries2++) {
-                                cx18_av_write4(cx, CXADEC_DL_CTL, dl_control);
+                        for (retries2 = 0; retries2 < CX18_MAX_MMIO_RETRIES;
+                             retries2++) {
+                                cx18_av_write4_noretry(cx, CXADEC_DL_CTL,
+                                                       dl_control);
                                 udelay(10);
-                                value = cx18_av_read4(cx, CXADEC_DL_CTL);
+                                value = cx18_av_read4_noretry(cx,
+                                                              CXADEC_DL_CTL);
                                 if (value == dl_control)
                                         break;
                                 /* Check if we can correct the byte by changing
                                    the address.  We can only write the lower
                                    address byte of the address. */
                                 if ((value & 0x3F00) != (dl_control & 0x3F00)) {
-                                        retries2 = 5;
+                                        unrec_err = 1;
                                         break;
                                 }
                         }
-                        if (retries2 >= 5)
+                        cx18_log_write_retries(cx, retries2,
+                                        cx->reg_mem + 0xc40000 + CXADEC_DL_CTL);
+                        if (unrec_err || retries2 >= CX18_MAX_MMIO_RETRIES)
                                 break;
                 }
                 if (i == size)
@@ -119,10 +126,10 @@ int cx18_av_loadfw(struct cx18 *cx)
            have a name in the spec. */
         cx18_av_write4(cx, 0x09CC, 1);
 
-        v = read_reg(CX18_AUDIO_ENABLE);
-        /* If bit 11 is 1 */
+        v = cx18_read_reg(cx, CX18_AUDIO_ENABLE);
+        /* If bit 11 is 1, clear bit 10 */
         if (v & 0x800)
-                write_reg(v & 0xFFFFFBFF, CX18_AUDIO_ENABLE); /* Clear bit 10 */
+                cx18_write_reg(cx, v & 0xFFFFFBFF, CX18_AUDIO_ENABLE);
 
         /* Enable WW auto audio standard detection */
         v = cx18_av_read4(cx, CXADEC_STD_DET_CTL);
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c
index 3cb9734ec07b..5efe01ebe9db 100644
--- a/drivers/media/video/cx18/cx18-cards.c
+++ b/drivers/media/video/cx18/cx18-cards.c
@@ -292,12 +292,111 @@ static const struct cx18_card cx18_card_cnxt_raptor_pal = {
 
 /* ------------------------------------------------------------------------- */
 
+/* Toshiba Qosmio laptop internal DVB-T/Analog Hybrid Tuner */
+
+static const struct cx18_card_pci_info cx18_pci_toshiba_qosmio_dvbt[] = {
+        { PCI_DEVICE_ID_CX23418, CX18_PCI_ID_TOSHIBA, 0x0110 },
+        { 0, 0, 0 }
+};
+
+static const struct cx18_card cx18_card_toshiba_qosmio_dvbt = {
+        .type = CX18_CARD_TOSHIBA_QOSMIO_DVBT,
+        .name = "Toshiba Qosmio DVB-T/Analog",
+        .comment = "Experimenters and photos needed for device to work well.\n"
+                  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
+        .v4l2_capabilities = CX18_CAP_ENCODER,
+        .hw_audio_ctrl = CX18_HW_CX23418,
+        .hw_all = CX18_HW_TUNER,
+        .video_inputs = {
+                { CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE6 },
+                { CX18_CARD_INPUT_SVIDEO1,    1,
+                        CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },
+                { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE1 },
+        },
+        .audio_inputs = {
+                { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
+                { CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL1, 1 },
+        },
+        .tuners = {
+                { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
+        },
+        .ddr = {
+                .chip_config = 0x202,
+                .refresh = 0x3bb,
+                .timing1 = 0x33320a63,
+                .timing2 = 0x0a,
+                .tune_lane = 0,
+                .initial_emrs = 0x42,
+        },
+        .xceive_pin = 15,
+        .pci_list = cx18_pci_toshiba_qosmio_dvbt,
+        .i2c = &cx18_i2c_std,
+};
+
+/* ------------------------------------------------------------------------- */
+
+/* Leadtek WinFast PVR2100 */
+
+static const struct cx18_card_pci_info cx18_pci_leadtek_pvr2100[] = {
+        { PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6f27 },
+        { 0, 0, 0 }
+};
+
+static const struct cx18_card cx18_card_leadtek_pvr2100 = {
+        .type = CX18_CARD_LEADTEK_PVR2100,
+        .name = "Leadtek WinFast PVR2100",
+        .comment = "Experimenters and photos needed for device to work well.\n"
+                  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
+        .v4l2_capabilities = CX18_CAP_ENCODER,
+        .hw_audio_ctrl = CX18_HW_CX23418,
+        .hw_muxer = CX18_HW_GPIO,
+        .hw_all = CX18_HW_TUNER | CX18_HW_GPIO,
+        .video_inputs = {
+                { CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE2 },
+                { CX18_CARD_INPUT_SVIDEO1,    1,
+                        CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },
+                { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE7 },
+        },
+        .audio_inputs = {
+                { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
+                { CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL1, 1 },
+        },
+        .tuners = {
+                /* XC3028 tuner */
+                { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
+        },
+        .radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 2 },
+        .ddr = {
+                /*
+                 * Pointer to proper DDR config values provided by
+                 * Terry Wu <terrywu at leadtek.com.tw>
+                 */
+                .chip_config = 0x303,
+                .refresh = 0x3bb,
+                .timing1 = 0x24220e83,
+                .timing2 = 0x1f,
+                .tune_lane = 0,
+                .initial_emrs = 0x2,
+        },
+        .gpio_init.initial_value = 0x6,
+        .gpio_init.direction = 0x7,
+        .gpio_audio_input = { .mask   = 0x7,
+                              .tuner  = 0x6, .linein = 0x2, .radio  = 0x2 },
+        .xceive_pin = 15,
+        .pci_list = cx18_pci_leadtek_pvr2100,
+        .i2c = &cx18_i2c_std,
+};
+
+/* ------------------------------------------------------------------------- */
+
 static const struct cx18_card *cx18_card_list[] = {
         &cx18_card_hvr1600_esmt,
         &cx18_card_hvr1600_samsung,
         &cx18_card_h900,
         &cx18_card_mpc718,
         &cx18_card_cnxt_raptor_pal,
+        &cx18_card_toshiba_qosmio_dvbt,
+        &cx18_card_leadtek_pvr2100,
 };
 
 const struct cx18_card *cx18_get_card(u16 index)
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index bd18afebbf86..085121c2b47f 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -4,6 +4,7 @@
  *  Derived from ivtv-driver.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
+ *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,6 +23,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-version.h"
 #include "cx18-cards.h"
 #include "cx18-i2c.h"
@@ -73,10 +75,14 @@ static int radio[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,
                                      -1, -1, -1, -1, -1, -1, -1, -1,
                                      -1, -1, -1, -1, -1, -1, -1, -1,
                                      -1, -1, -1, -1, -1, -1, -1, -1 };
-
+static int mmio_ndelay[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1,
+                                           -1, -1, -1, -1, -1, -1, -1, -1,
+                                           -1, -1, -1, -1, -1, -1, -1, -1,
+                                           -1, -1, -1, -1, -1, -1, -1, -1 };
 static unsigned cardtype_c = 1;
 static unsigned tuner_c = 1;
 static unsigned radio_c = 1;
+static unsigned mmio_ndelay_c = 1;
 static char pal[] = "--";
 static char secam[] = "--";
 static char ntsc[] = "-";
@@ -90,15 +96,18 @@ static int enc_pcm_buffers = CX18_DEFAULT_ENC_PCM_BUFFERS;
 
 static int cx18_pci_latency = 1;
 
+int cx18_retry_mmio = 1;
 int cx18_debug;
 
 module_param_array(tuner, int, &tuner_c, 0644);
 module_param_array(radio, bool, &radio_c, 0644);
 module_param_array(cardtype, int, &cardtype_c, 0644);
+module_param_array(mmio_ndelay, int, &mmio_ndelay_c, 0644);
 module_param_string(pal, pal, sizeof(pal), 0644);
 module_param_string(secam, secam, sizeof(secam), 0644);
 module_param_string(ntsc, ntsc, sizeof(ntsc), 0644);
 module_param_named(debug, cx18_debug, int, 0644);
+module_param_named(retry_mmio, cx18_retry_mmio, int, 0644);
 module_param(cx18_pci_latency, int, 0644);
 module_param(cx18_first_minor, int, 0644);
 
@@ -121,6 +130,8 @@ MODULE_PARM_DESC(cardtype,
                  "\t\t\t 3 = Compro VideoMate H900\n"
                  "\t\t\t 4 = Yuan MPC718\n"
                  "\t\t\t 5 = Conexant Raptor PAL/SECAM\n"
+                 "\t\t\t 6 = Toshiba Qosmio DVB-T/Analog\n"
+                 "\t\t\t 7 = Leadtek WinFast PVR2100\n"
                  "\t\t\t 0 = Autodetect (default)\n"
                  "\t\t\t-1 = Ignore this card\n\t\t");
 MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");
@@ -140,6 +151,14 @@ MODULE_PARM_DESC(debug,
 MODULE_PARM_DESC(cx18_pci_latency,
                  "Change the PCI latency to 64 if lower: 0 = No, 1 = Yes,\n"
                  "\t\t\tDefault: Yes");
+MODULE_PARM_DESC(retry_mmio,
+                 "Check and retry memory mapped IO accesses\n"
+                 "\t\t\tDefault: 1 [Yes]");
+MODULE_PARM_DESC(mmio_ndelay,
+                 "Delay (ns) for each CX23418 memory mapped IO access.\n"
+                 "\t\t\tTry larger values that are close to a multiple of the\n"
+                 "\t\t\tPCI clock period, 30.3 ns, if your card doesn't work.\n"
+                 "\t\t\tDefault: " __stringify(CX18_DEFAULT_MMIO_NDELAY));
 MODULE_PARM_DESC(enc_mpg_buffers,
                  "Encoder MPG Buffers (in MB)\n"
                  "\t\t\tDefault: " __stringify(CX18_DEFAULT_ENC_MPG_BUFFERS));
@@ -156,7 +175,7 @@ MODULE_PARM_DESC(enc_pcm_buffers,
                  "Encoder PCM buffers (in MB)\n"
                  "\t\t\tDefault: " __stringify(CX18_DEFAULT_ENC_PCM_BUFFERS));
 
-MODULE_PARM_DESC(cx18_first_minor, "Set minor assigned to first card");
+MODULE_PARM_DESC(cx18_first_minor, "Set kernel number assigned to first card");
 
 MODULE_AUTHOR("Hans Verkuil");
 MODULE_DESCRIPTION("CX23418 driver");
@@ -356,6 +375,11 @@ static void cx18_process_options(struct cx18 *cx)
         cx->options.tuner = tuner[cx->num];
         cx->options.radio = radio[cx->num];
 
+        if (mmio_ndelay[cx->num] < 0)
+                cx->options.mmio_ndelay = CX18_DEFAULT_MMIO_NDELAY;
+        else
+                cx->options.mmio_ndelay = mmio_ndelay[cx->num];
+
         cx->std = cx18_parse_std(cx);
         if (cx->options.cardtype == -1) {
                 CX18_INFO("Ignore card\n");
@@ -395,9 +419,9 @@ done:
 
         if (cx->card == NULL) {
                 cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);
-                CX18_ERR("Unknown card: vendor/device: %04x/%04x\n",
+                CX18_ERR("Unknown card: vendor/device: [%04x:%04x]\n",
                      cx->dev->vendor, cx->dev->device);
-                CX18_ERR("              subsystem vendor/device: %04x/%04x\n",
+                CX18_ERR("              subsystem vendor/device: [%04x:%04x]\n",
                      cx->dev->subsystem_vendor, cx->dev->subsystem_device);
                 CX18_ERR("Defaulting to %s card\n", cx->card->name);
                 CX18_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n");
@@ -511,9 +535,9 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,
                 return -EIO;
         }
 
-        /* Check for bus mastering */
+        /* Enable bus mastering and memory mapped IO for the CX23418 */
         pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
+        cmd |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
         pci_write_config_word(dev, PCI_COMMAND, cmd);
 
         pci_read_config_byte(dev, PCI_CLASS_REVISION, &cx->card_rev);
@@ -525,11 +549,6 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,
                 pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);
                 pci_read_config_byte(dev, PCI_LATENCY_TIMER, &pci_latency);
         }
-        /* This config space value relates to DMA latencies. The
-           default value 0x8080 is too low however and will lead
-           to DMA errors. 0xffff is the max value which solves
-           these problems. */
-        pci_write_config_dword(dev, 0x40, 0xffff);
 
         CX18_DEBUG_INFO("cx%d (rev %d) at %02x:%02x.%x, "
                    "irq: %d, latency: %d, memory: 0x%lx\n",
@@ -656,7 +675,7 @@ static int __devinit cx18_probe(struct pci_dev *dev,
                 goto free_mem;
         }
         cx->reg_mem = cx->enc_mem + CX18_REG_OFFSET;
-        devtype = read_reg(0xC72028);
+        devtype = cx18_read_reg(cx, 0xC72028);
         switch (devtype & 0xff000000) {
         case 0xff000000:
                 CX18_INFO("cx23418 revision %08x (A)\n", devtype);
@@ -815,6 +834,7 @@ err:
         if (retval == 0)
                 retval = -ENODEV;
         CX18_ERR("Error %d on initialization\n", retval);
+        cx18_log_statistics(cx);
 
         kfree(cx18_cards[cx18_cards_active]);
         cx18_cards[cx18_cards_active] = NULL;
@@ -902,8 +922,8 @@ static void cx18_remove(struct pci_dev *pci_dev)
                 cx18_stop_all_captures(cx);
 
         /* Interrupts */
-        sw1_irq_disable(IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);
-        sw2_irq_disable(IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);
+        cx18_sw1_irq_disable(cx, IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);
+        cx18_sw2_irq_disable(cx, IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);
 
         cx18_halt_firmware(cx);
 
@@ -919,6 +939,7 @@ static void cx18_remove(struct pci_dev *pci_dev)
 
         pci_disable_device(cx->dev);
 
+        cx18_log_statistics(cx);
         CX18_INFO("Removed %s, card #%d\n", cx->card_name, cx->num);
 }
 
@@ -938,7 +959,7 @@ static int module_start(void)
 
         /* Validate parameters */
         if (cx18_first_minor < 0 || cx18_first_minor >= CX18_MAX_CARDS) {
-                printk(KERN_ERR "cx18:  Exiting, ivtv_first_minor must be between 0 and %d\n",
+                printk(KERN_ERR "cx18:  Exiting, cx18_first_minor must be between 0 and %d\n",
                      CX18_MAX_CARDS - 1);
                 return -1;
         }
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 4801bc7fb5b2..fa8be0731a3f 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -38,7 +38,6 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/list.h>
 #include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
 #include <linux/pagemap.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
@@ -64,6 +63,9 @@
 #  error "This driver requires kernel PCI support."
 #endif
 
+/* Default delay to throttle mmio access to the CX23418 */
+#define CX18_DEFAULT_MMIO_NDELAY 0 /* 0 ns = 0 PCI clock(s) / 33 MHz */
+
 #define CX18_MEM_OFFSET 0x00000000
 #define CX18_MEM_SIZE   0x04000000
 #define CX18_REG_OFFSET 0x02000000
@@ -77,7 +79,9 @@
 #define CX18_CARD_COMPRO_H900         2 /* Compro VideoMate H900 */
 #define CX18_CARD_YUAN_MPC718         3 /* Yuan MPC718 */
 #define CX18_CARD_CNXT_RAPTOR_PAL     4 /* Conexant Raptor PAL */
-#define CX18_CARD_LAST                4
+#define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/
+#define CX18_CARD_LEADTEK_PVR2100     6 /* Leadtek WinFast PVR2100 */
+#define CX18_CARD_LAST                6
 
 #define CX18_ENC_STREAM_TYPE_MPG  0
 #define CX18_ENC_STREAM_TYPE_TS   1
@@ -97,6 +101,8 @@
 #define CX18_PCI_ID_COMPRO              0x185b
 #define CX18_PCI_ID_YUAN                0x12ab
 #define CX18_PCI_ID_CONEXANT            0x14f1
+#define CX18_PCI_ID_TOSHIBA             0x1179
+#define CX18_PCI_ID_LEADTEK             0x107D
 
 /* ======================================================================== */
 /* ========================== START USER SETTABLE DMA VARIABLES =========== */
@@ -169,6 +175,7 @@
 
 #define CX18_MAX_PGM_INDEX (400)
 
+extern int cx18_retry_mmio;     /* enable check & retry of mmio accesses */
 extern int cx18_debug;
 
 
@@ -177,6 +184,7 @@ struct cx18_options {
         int cardtype;           /* force card type on load */
         int tuner;              /* set tuner on load */
         int radio;              /* enable/disable radio */
+        unsigned long mmio_ndelay; /* delay in ns after every PCI mmio access */
 };
 
 /* per-buffer bit flags */
@@ -216,8 +224,7 @@ struct cx18_buffer {
 
 struct cx18_queue {
         struct list_head list;
-        u32 buffers;
-        u32 length;
+        atomic_t buffers;
         u32 bytesused;
 };
 
@@ -237,6 +244,8 @@ struct cx18_dvb {
 struct cx18;     /* forward reference */
 struct cx18_scb; /* forward reference */
 
+#define CX18_INVALID_TASK_HANDLE 0xffffffff
+
 struct cx18_stream {
         /* These first four fields are always set, even if the stream
            is not actually created. */
@@ -259,7 +268,6 @@ struct cx18_stream {
         /* Buffer Stats */
         u32 buffers;
         u32 buf_size;
-        u32 buffers_stolen;
 
         /* Buffer Queues */
         struct cx18_queue q_free;       /* free buffers */
@@ -341,6 +349,13 @@ struct cx18_i2c_algo_callback_data {
         int bus_index;   /* 0 or 1 for the cx23418's 1st or 2nd I2C bus */
 };
 
+#define CX18_MAX_MMIO_RETRIES 10
+
+struct cx18_mmio_stats {
+        atomic_t retried_write[CX18_MAX_MMIO_RETRIES+1];
+        atomic_t retried_read[CX18_MAX_MMIO_RETRIES+1];
+};
+
 /* Struct to hold info about cx18 cards */
 struct cx18 {
         int num;                /* board number, -1 during init! */
@@ -430,6 +445,9 @@ struct cx18 {
         u32 gpio_val;
         struct mutex gpio_lock;
 
+        /* Statistics */
+        struct cx18_mmio_stats mmio_stats;
+
         /* v4l2 and User settings */
 
         /* codec settings */
@@ -458,47 +476,4 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv);
 /* First-open initialization: load firmware, etc. */
 int cx18_init_on_first_open(struct cx18 *cx);
 
-/* This is a PCI post thing, where if the pci register is not read, then
-   the write doesn't always take effect right away. By reading back the
-   register any pending PCI writes will be performed (in order), and so
-   you can be sure that the writes are guaranteed to be done.
-
-   Rarely needed, only in some timing sensitive cases.
-   Apparently if this is not done some motherboards seem
-   to kill the firmware and get into the broken state until computer is
-   rebooted. */
-#define write_sync(val, reg) \
-        do { writel(val, reg); readl(reg); } while (0)
-
-#define read_reg(reg) readl(cx->reg_mem + (reg))
-#define write_reg(val, reg) writel(val, cx->reg_mem + (reg))
-#define write_reg_sync(val, reg) \
-        do { write_reg(val, reg); read_reg(reg); } while (0)
-
-#define read_enc(addr) readl(cx->enc_mem + (u32)(addr))
-#define write_enc(val, addr) writel(val, cx->enc_mem + (u32)(addr))
-#define write_enc_sync(val, addr) \
-        do { write_enc(val, addr); read_enc(addr); } while (0)
-
-#define sw1_irq_enable(val) do { \
-        write_reg(val, SW1_INT_STATUS); \
-        write_reg(read_reg(SW1_INT_ENABLE_PCI) | (val), SW1_INT_ENABLE_PCI); \
-} while (0)
-
-#define sw1_irq_disable(val) \
-        write_reg(read_reg(SW1_INT_ENABLE_PCI) & ~(val), SW1_INT_ENABLE_PCI);
-
-#define sw2_irq_enable(val) do { \
-        write_reg(val, SW2_INT_STATUS); \
-        write_reg(read_reg(SW2_INT_ENABLE_PCI) | (val), SW2_INT_ENABLE_PCI); \
-} while (0)
-
-#define sw2_irq_disable(val) \
-        write_reg(read_reg(SW2_INT_ENABLE_PCI) & ~(val), SW2_INT_ENABLE_PCI);
-
-#define setup_page(addr) do { \
-    u32 val = read_reg(0xD000F8) & ~0x1f00; \
-    write_reg(val | (((addr) >> 17) & 0x1f00), 0xD000F8); \
-} while (0)
-
 #endif /* CX18_DRIVER_H */
diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c
index 1e420a804fc9..afc694e7bdb2 100644
--- a/drivers/media/video/cx18/cx18-dvb.c
+++ b/drivers/media/video/cx18/cx18-dvb.c
@@ -21,6 +21,7 @@
 
 #include "cx18-version.h"
 #include "cx18-dvb.h"
+#include "cx18-io.h"
 #include "cx18-streams.h"
 #include "cx18-cards.h"
 #include "s5h1409.h"
@@ -87,13 +88,13 @@ static int cx18_dvb_start_feed(struct dvb_demux_feed *feed)
         switch (cx->card->type) {
         case CX18_CARD_HVR_1600_ESMT:
         case CX18_CARD_HVR_1600_SAMSUNG:
-                v = read_reg(CX18_REG_DMUX_NUM_PORT_0_CONTROL);
+                v = cx18_read_reg(cx, CX18_REG_DMUX_NUM_PORT_0_CONTROL);
                 v |= 0x00400000; /* Serial Mode */
                 v |= 0x00002000; /* Data Length - Byte */
                 v |= 0x00010000; /* Error - Polarity */
                 v |= 0x00020000; /* Error - Passthru */
                 v |= 0x000c0000; /* Error - Ignore */
-                write_reg(v, CX18_REG_DMUX_NUM_PORT_0_CONTROL);
+                cx18_write_reg(cx, v, CX18_REG_DMUX_NUM_PORT_0_CONTROL);
                 break;
 
         default:
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 1e537fe04a23..5f9089907544 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -132,6 +132,7 @@ static void cx18_dualwatch(struct cx18 *cx)
         u16 new_stereo_mode;
         const u16 stereo_mask = 0x0300;
         const u16 dual = 0x0200;
+        u32 h;
 
         new_stereo_mode = cx->params.audio_properties & stereo_mask;
         memset(&vt, 0, sizeof(vt));
@@ -143,13 +144,21 @@ static void cx18_dualwatch(struct cx18 *cx)
         if (new_stereo_mode == cx->dualwatch_stereo_mode)
                 return;
 
-        new_bitmap = new_stereo_mode | (cx->params.audio_properties & ~stereo_mask);
+        new_bitmap = new_stereo_mode
+                        | (cx->params.audio_properties & ~stereo_mask);
 
-        CX18_DEBUG_INFO("dualwatch: change stereo flag from 0x%x to 0x%x. new audio_bitmask=0x%ux\n",
-                           cx->dualwatch_stereo_mode, new_stereo_mode, new_bitmap);
+        CX18_DEBUG_INFO("dualwatch: change stereo flag from 0x%x to 0x%x. "
+                        "new audio_bitmask=0x%ux\n",
+                        cx->dualwatch_stereo_mode, new_stereo_mode, new_bitmap);
 
-        if (cx18_vapi(cx, CX18_CPU_SET_AUDIO_PARAMETERS, 2,
-                                cx18_find_handle(cx), new_bitmap) == 0) {
+        h = cx18_find_handle(cx);
+        if (h == CX18_INVALID_TASK_HANDLE) {
+                CX18_DEBUG_INFO("dualwatch: can't find valid task handle\n");
+                return;
+        }
+
+        if (cx18_vapi(cx,
+                      CX18_CPU_SET_AUDIO_PARAMETERS, 2, h, new_bitmap) == 0) {
                 cx->dualwatch_stereo_mode = new_stereo_mode;
                 return;
         }
@@ -223,7 +232,7 @@ static struct cx18_buffer *cx18_get_buffer(struct cx18_stream *s, int non_block,
                 prepare_to_wait(&s->waitq, &wait, TASK_INTERRUPTIBLE);
                 /* New buffers might have become available before we were added
                    to the waitqueue */
-                if (!s->q_full.buffers)
+                if (!atomic_read(&s->q_full.buffers))
                         schedule();
                 finish_wait(&s->waitq, &wait);
                 if (signal_pending(current)) {
@@ -509,7 +518,7 @@ unsigned int cx18_v4l2_enc_poll(struct file *filp, poll_table *wait)
         CX18_DEBUG_HI_FILE("Encoder poll\n");
         poll_wait(filp, &s->waitq, wait);
 
-        if (s->q_full.length || s->q_io.length)
+        if (atomic_read(&s->q_full.buffers) || atomic_read(&s->q_io.buffers))
                 return POLLIN | POLLRDNORM;
         if (eof)
                 return POLLHUP;
@@ -695,20 +704,28 @@ int cx18_v4l2_open(struct inode *inode, struct file *filp)
 
 void cx18_mute(struct cx18 *cx)
 {
-        if (atomic_read(&cx->ana_capturing))
-                cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2,
-                                cx18_find_handle(cx), 1);
+        u32 h;
+        if (atomic_read(&cx->ana_capturing)) {
+                h = cx18_find_handle(cx);
+                if (h != CX18_INVALID_TASK_HANDLE)
+                        cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2, h, 1);
+                else
+                        CX18_ERR("Can't find valid task handle for mute\n");
+        }
         CX18_DEBUG_INFO("Mute\n");
 }
 
 void cx18_unmute(struct cx18 *cx)
 {
+        u32 h;
         if (atomic_read(&cx->ana_capturing)) {
-                cx18_msleep_timeout(100, 0);
-                cx18_vapi(cx, CX18_CPU_SET_MISC_PARAMETERS, 2,
-                                cx18_find_handle(cx), 12);
-                cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2,
-                                cx18_find_handle(cx), 0);
+                h = cx18_find_handle(cx);
+                if (h != CX18_INVALID_TASK_HANDLE) {
+                        cx18_msleep_timeout(100, 0);
+                        cx18_vapi(cx, CX18_CPU_SET_MISC_PARAMETERS, 2, h, 12);
+                        cx18_vapi(cx, CX18_CPU_SET_AUDIO_MUTE, 2, h, 0);
+                } else
+                        CX18_ERR("Can't find valid task handle for unmute\n");
         }
         CX18_DEBUG_INFO("Unmute\n");
 }
diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c
index 78fadd2ada5d..51534428cd00 100644
--- a/drivers/media/video/cx18/cx18-firmware.c
+++ b/drivers/media/video/cx18/cx18-firmware.c
@@ -20,6 +20,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-scb.h"
 #include "cx18-irq.h"
 #include "cx18-firmware.h"
@@ -113,11 +114,11 @@ static int load_cpu_fw_direct(const char *fn, u8 __iomem *mem, struct cx18 *cx)
         src = (const u32 *)fw->data;
 
         for (i = 0; i < fw->size; i += 4096) {
-                setup_page(i);
+                cx18_setup_page(cx, i);
                 for (j = i; j < fw->size && j < i + 4096; j += 4) {
                         /* no need for endianness conversion on the ppc */
-                        __raw_writel(*src, dst);
-                        if (__raw_readl(dst) != *src) {
+                        cx18_raw_writel(cx, *src, dst);
+                        if (cx18_raw_readl(cx, dst) != *src) {
                                 CX18_ERR("Mismatch at offset %x\n", i);
                                 release_firmware(fw);
                                 return -EIO;
@@ -170,12 +171,15 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx)
                 if (offset + seghdr.size > sz)
                         break;
                 for (i = 0; i < seghdr.size; i += 4096) {
-                        setup_page(offset + i);
+                        cx18_setup_page(cx, offset + i);
                         for (j = i; j < seghdr.size && j < i + 4096; j += 4) {
                                 /* no need for endianness conversion on the ppc */
-                                __raw_writel(src[(offset + j) / 4], dst + seghdr.addr + j);
-                                if (__raw_readl(dst + seghdr.addr + j) != src[(offset + j) / 4]) {
-                                        CX18_ERR("Mismatch at offset %x\n", offset + j);
+                                cx18_raw_writel(cx, src[(offset + j) / 4],
+                                                dst + seghdr.addr + j);
+                                if (cx18_raw_readl(cx, dst + seghdr.addr + j)
+                                    != src[(offset + j) / 4]) {
+                                        CX18_ERR("Mismatch at offset %x\n",
+                                                 offset + j);
                                         release_firmware(fw);
                                         return -EIO;
                                 }
@@ -189,43 +193,45 @@ static int load_apu_fw_direct(const char *fn, u8 __iomem *dst, struct cx18 *cx)
         size = fw->size;
         release_firmware(fw);
         /* Clear bit0 for APU to start from 0 */
-        write_reg(read_reg(0xc72030) & ~1, 0xc72030);
+        cx18_write_reg(cx, cx18_read_reg(cx, 0xc72030) & ~1, 0xc72030);
         return size;
 }
 
 void cx18_halt_firmware(struct cx18 *cx)
 {
         CX18_DEBUG_INFO("Preparing for firmware halt.\n");
-        write_reg(0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */
-        write_reg(0x00020002, CX18_ADEC_CONTROL);
+        cx18_write_reg(cx, 0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */
+        cx18_write_reg(cx, 0x00020002, CX18_ADEC_CONTROL);
 }
 
 void cx18_init_power(struct cx18 *cx, int lowpwr)
 {
         /* power-down Spare and AOM PLLs */
         /* power-up fast, slow and mpeg PLLs */
-        write_reg(0x00000008, CX18_PLL_POWER_DOWN);
+        cx18_write_reg(cx, 0x00000008, CX18_PLL_POWER_DOWN);
 
         /* ADEC out of sleep */
-        write_reg(0x00020000, CX18_ADEC_CONTROL);
+        cx18_write_reg(cx, 0x00020000, CX18_ADEC_CONTROL);
 
         /* The fast clock is at 200/245 MHz */
-        write_reg(lowpwr ? 0xD : 0x11, CX18_FAST_CLOCK_PLL_INT);
-        write_reg(lowpwr ? 0x1EFBF37 : 0x038E3D7, CX18_FAST_CLOCK_PLL_FRAC);
+        cx18_write_reg(cx, lowpwr ? 0xD : 0x11, CX18_FAST_CLOCK_PLL_INT);
+        cx18_write_reg(cx, lowpwr ? 0x1EFBF37 : 0x038E3D7,
+                                                CX18_FAST_CLOCK_PLL_FRAC);
 
-        write_reg(2, CX18_FAST_CLOCK_PLL_POST);
-        write_reg(1, CX18_FAST_CLOCK_PLL_PRESCALE);
-        write_reg(4, CX18_FAST_CLOCK_PLL_ADJUST_BANDWIDTH);
+        cx18_write_reg(cx, 2, CX18_FAST_CLOCK_PLL_POST);
+        cx18_write_reg(cx, 1, CX18_FAST_CLOCK_PLL_PRESCALE);
+        cx18_write_reg(cx, 4, CX18_FAST_CLOCK_PLL_ADJUST_BANDWIDTH);
 
         /* set slow clock to 125/120 MHz */
-        write_reg(lowpwr ? 0x11 : 0x10, CX18_SLOW_CLOCK_PLL_INT);
-        write_reg(lowpwr ? 0xEBAF05 : 0x18618A8, CX18_SLOW_CLOCK_PLL_FRAC);
-        write_reg(4, CX18_SLOW_CLOCK_PLL_POST);
+        cx18_write_reg(cx, lowpwr ? 0x11 : 0x10, CX18_SLOW_CLOCK_PLL_INT);
+        cx18_write_reg(cx, lowpwr ? 0xEBAF05 : 0x18618A8,
+                                                CX18_SLOW_CLOCK_PLL_FRAC);
+        cx18_write_reg(cx, 4, CX18_SLOW_CLOCK_PLL_POST);
 
         /* mpeg clock pll 54MHz */
-        write_reg(0xF, CX18_MPEG_CLOCK_PLL_INT);
-        write_reg(0x2BCFEF, CX18_MPEG_CLOCK_PLL_FRAC);
-        write_reg(8, CX18_MPEG_CLOCK_PLL_POST);
+        cx18_write_reg(cx, 0xF, CX18_MPEG_CLOCK_PLL_INT);
+        cx18_write_reg(cx, 0x2BCFEF, CX18_MPEG_CLOCK_PLL_FRAC);
+        cx18_write_reg(cx, 8, CX18_MPEG_CLOCK_PLL_POST);
 
         /* Defaults */
         /* APU = SC or SC/2 = 125/62.5 */
@@ -242,81 +248,84 @@ void cx18_init_power(struct cx18 *cx, int lowpwr)
         /* VFC = disabled */
         /* USB = disabled */
 
-        write_reg(lowpwr ? 0xFFFF0020 : 0x00060004, CX18_CLOCK_SELECT1);
-        write_reg(lowpwr ? 0xFFFF0004 : 0x00060006, CX18_CLOCK_SELECT2);
+        cx18_write_reg(cx, lowpwr ? 0xFFFF0020 : 0x00060004,
+                                                        CX18_CLOCK_SELECT1);
+        cx18_write_reg(cx, lowpwr ? 0xFFFF0004 : 0x00060006,
+                                                        CX18_CLOCK_SELECT2);
 
-        write_reg(0xFFFF0002, CX18_HALF_CLOCK_SELECT1);
-        write_reg(0xFFFF0104, CX18_HALF_CLOCK_SELECT2);
+        cx18_write_reg(cx, 0xFFFF0002, CX18_HALF_CLOCK_SELECT1);
+        cx18_write_reg(cx, 0xFFFF0104, CX18_HALF_CLOCK_SELECT2);
 
-        write_reg(0xFFFF9026, CX18_CLOCK_ENABLE1);
-        write_reg(0xFFFF3105, CX18_CLOCK_ENABLE2);
+        cx18_write_reg(cx, 0xFFFF9026, CX18_CLOCK_ENABLE1);
+        cx18_write_reg(cx, 0xFFFF3105, CX18_CLOCK_ENABLE2);
 }
 
 void cx18_init_memory(struct cx18 *cx)
 {
         cx18_msleep_timeout(10, 0);
-        write_reg(0x10000, CX18_DDR_SOFT_RESET);
+        cx18_write_reg(cx, 0x10000, CX18_DDR_SOFT_RESET);
         cx18_msleep_timeout(10, 0);
 
-        write_reg(cx->card->ddr.chip_config, CX18_DDR_CHIP_CONFIG);
+        cx18_write_reg(cx, cx->card->ddr.chip_config, CX18_DDR_CHIP_CONFIG);
 
         cx18_msleep_timeout(10, 0);
 
-        write_reg(cx->card->ddr.refresh, CX18_DDR_REFRESH);
-        write_reg(cx->card->ddr.timing1, CX18_DDR_TIMING1);
-        write_reg(cx->card->ddr.timing2, CX18_DDR_TIMING2);
+        cx18_write_reg(cx, cx->card->ddr.refresh, CX18_DDR_REFRESH);
+        cx18_write_reg(cx, cx->card->ddr.timing1, CX18_DDR_TIMING1);
+        cx18_write_reg(cx, cx->card->ddr.timing2, CX18_DDR_TIMING2);
 
         cx18_msleep_timeout(10, 0);
 
         /* Initialize DQS pad time */
-        write_reg(cx->card->ddr.tune_lane, CX18_DDR_TUNE_LANE);
-        write_reg(cx->card->ddr.initial_emrs, CX18_DDR_INITIAL_EMRS);
+        cx18_write_reg(cx, cx->card->ddr.tune_lane, CX18_DDR_TUNE_LANE);
+        cx18_write_reg(cx, cx->card->ddr.initial_emrs, CX18_DDR_INITIAL_EMRS);
 
         cx18_msleep_timeout(10, 0);
 
-        write_reg(0x20000, CX18_DDR_SOFT_RESET);
+        cx18_write_reg(cx, 0x20000, CX18_DDR_SOFT_RESET);
         cx18_msleep_timeout(10, 0);
 
         /* use power-down mode when idle */
-        write_reg(0x00000010, CX18_DDR_POWER_REG);
-
-        write_reg(0x10001, CX18_REG_BUS_TIMEOUT_EN);
-
-        write_reg(0x48, CX18_DDR_MB_PER_ROW_7);
-        write_reg(0xE0000, CX18_DDR_BASE_63_ADDR);
-
-        write_reg(0x00000101, CX18_WMB_CLIENT02);  /* AO */
-        write_reg(0x00000101, CX18_WMB_CLIENT09);  /* AI2 */
-        write_reg(0x00000101, CX18_WMB_CLIENT05);  /* VIM1 */
-        write_reg(0x00000101, CX18_WMB_CLIENT06);  /* AI1 */
-        write_reg(0x00000101, CX18_WMB_CLIENT07);  /* 3D comb */
-        write_reg(0x00000101, CX18_WMB_CLIENT10);  /* ME */
-        write_reg(0x00000101, CX18_WMB_CLIENT12);  /* ENC */
-        write_reg(0x00000101, CX18_WMB_CLIENT13);  /* PK */
-        write_reg(0x00000101, CX18_WMB_CLIENT11);  /* RC */
-        write_reg(0x00000101, CX18_WMB_CLIENT14);  /* AVO */
+        cx18_write_reg(cx, 0x00000010, CX18_DDR_POWER_REG);
+
+        cx18_write_reg(cx, 0x10001, CX18_REG_BUS_TIMEOUT_EN);
+
+        cx18_write_reg(cx, 0x48, CX18_DDR_MB_PER_ROW_7);
+        cx18_write_reg(cx, 0xE0000, CX18_DDR_BASE_63_ADDR);
+
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT02);  /* AO */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT09);  /* AI2 */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT05);  /* VIM1 */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT06);  /* AI1 */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT07);  /* 3D comb */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT10);  /* ME */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT12);  /* ENC */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT13);  /* PK */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT11);  /* RC */
+        cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT14);  /* AVO */
 }
 
 int cx18_firmware_init(struct cx18 *cx)
 {
         /* Allow chip to control CLKRUN */
-        write_reg(0x5, CX18_DSP0_INTERRUPT_MASK);
+        cx18_write_reg(cx, 0x5, CX18_DSP0_INTERRUPT_MASK);
 
-        write_reg(0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */
+        cx18_write_reg(cx, 0x000F000F, CX18_PROC_SOFT_RESET); /* stop the fw */
 
         cx18_msleep_timeout(1, 0);
 
-        sw1_irq_enable(IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);
-        sw2_irq_enable(IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);
+        cx18_sw1_irq_enable(cx, IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);
+        cx18_sw2_irq_enable(cx, IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);
 
         /* Only if the processor is not running */
-        if (read_reg(CX18_PROC_SOFT_RESET) & 8) {
+        if (cx18_read_reg(cx, CX18_PROC_SOFT_RESET) & 8) {
                 int sz = load_apu_fw_direct("v4l-cx23418-apu.fw",
                                cx->enc_mem, cx);
 
-                write_enc(0xE51FF004, 0);
-                write_enc(0xa00000, 4);  /* todo: not hardcoded */
-                write_reg(0x00010000, CX18_PROC_SOFT_RESET); /* Start APU */
+                cx18_write_enc(cx, 0xE51FF004, 0);
+                cx18_write_enc(cx, 0xa00000, 4);  /* todo: not hardcoded */
+                /* Start APU */
+                cx18_write_reg(cx, 0x00010000, CX18_PROC_SOFT_RESET);
                 cx18_msleep_timeout(500, 0);
 
                 sz = sz <= 0 ? sz : load_cpu_fw_direct("v4l-cx23418-cpu.fw",
@@ -326,9 +335,10 @@ int cx18_firmware_init(struct cx18 *cx)
                         int retries = 0;
 
                         /* start the CPU */
-                        write_reg(0x00080000, CX18_PROC_SOFT_RESET);
+                        cx18_write_reg(cx, 0x00080000, CX18_PROC_SOFT_RESET);
                         while (retries++ < 50) { /* Loop for max 500mS */
-                                if ((read_reg(CX18_PROC_SOFT_RESET) & 1) == 0)
+                                if ((cx18_read_reg(cx, CX18_PROC_SOFT_RESET)
+                                     & 1) == 0)
                                         break;
                                 cx18_msleep_timeout(10, 0);
                         }
@@ -342,6 +352,6 @@ int cx18_firmware_init(struct cx18 *cx)
                         return -EIO;
         }
         /* initialize GPIO */
-        write_reg(0x14001400, 0xC78110);
+        cx18_write_reg(cx, 0x14001400, 0xC78110);
         return 0;
 }
diff --git a/drivers/media/video/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c
index 3d495dba4983..0e560421989e 100644
--- a/drivers/media/video/cx18/cx18-gpio.c
+++ b/drivers/media/video/cx18/cx18-gpio.c
@@ -22,6 +22,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-cards.h"
 #include "cx18-gpio.h"
 #include "tuner-xc2028.h"
@@ -49,11 +50,11 @@ static void gpio_write(struct cx18 *cx)
         u32 dir = cx->gpio_dir;
         u32 val = cx->gpio_val;
 
-        write_reg((dir & 0xffff) << 16, CX18_REG_GPIO_DIR1);
-        write_reg(((dir & 0xffff) << 16) | (val & 0xffff),
+        cx18_write_reg(cx, (dir & 0xffff) << 16, CX18_REG_GPIO_DIR1);
+        cx18_write_reg(cx, ((dir & 0xffff) << 16) | (val & 0xffff),
                         CX18_REG_GPIO_OUT1);
-        write_reg(dir & 0xffff0000, CX18_REG_GPIO_DIR2);
-        write_reg_sync((dir & 0xffff0000) | ((val & 0xffff0000) >> 16),
+        cx18_write_reg(cx, dir & 0xffff0000, CX18_REG_GPIO_DIR2);
+        cx18_write_reg_sync(cx, (dir & 0xffff0000) | ((val & 0xffff0000) >> 16),
                         CX18_REG_GPIO_OUT2);
 }
 
@@ -141,15 +142,17 @@ void cx18_gpio_init(struct cx18 *cx)
         }
 
         CX18_DEBUG_INFO("GPIO initial dir: %08x/%08x out: %08x/%08x\n",
-                   read_reg(CX18_REG_GPIO_DIR1), read_reg(CX18_REG_GPIO_DIR2),
-                   read_reg(CX18_REG_GPIO_OUT1), read_reg(CX18_REG_GPIO_OUT2));
+                        cx18_read_reg(cx, CX18_REG_GPIO_DIR1),
+                        cx18_read_reg(cx, CX18_REG_GPIO_DIR2),
+                        cx18_read_reg(cx, CX18_REG_GPIO_OUT1),
+                        cx18_read_reg(cx, CX18_REG_GPIO_OUT2));
 
         gpio_write(cx);
         mutex_unlock(&cx->gpio_lock);
 }
 
 /* Xceive tuner reset function */
-int cx18_reset_tuner_gpio(void *dev, int cmd, int value)
+int cx18_reset_tuner_gpio(void *dev, int component, int cmd, int value)
 {
         struct i2c_algo_bit_data *algo = dev;
         struct cx18_i2c_algo_callback_data *cb_data = algo->data;
diff --git a/drivers/media/video/cx18/cx18-gpio.h b/drivers/media/video/cx18/cx18-gpio.h
index 22cd7ddf8554..beb7424b9944 100644
--- a/drivers/media/video/cx18/cx18-gpio.h
+++ b/drivers/media/video/cx18/cx18-gpio.h
@@ -23,5 +23,5 @@
 void cx18_gpio_init(struct cx18 *cx);
 void cx18_reset_i2c_slaves_gpio(struct cx18 *cx);
 void cx18_reset_ir_gpio(void *data);
-int cx18_reset_tuner_gpio(void *dev, int cmd, int value);
+int cx18_reset_tuner_gpio(void *dev, int component, int cmd, int value);
 int cx18_gpio(struct cx18 *cx, unsigned int command, void *arg);
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index 6023ba3bd3a6..aa09e557b195 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -22,13 +22,12 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-cards.h"
 #include "cx18-gpio.h"
 #include "cx18-av-core.h"
 #include "cx18-i2c.h"
 
-#include <media/ir-kbd-i2c.h>
-
 #define CX18_REG_I2C_1_WR   0xf15000
 #define CX18_REG_I2C_1_RD   0xf15008
 #define CX18_REG_I2C_2_WR   0xf25100
@@ -158,12 +157,12 @@ static void cx18_setscl(void *data, int state)
         struct cx18 *cx = ((struct cx18_i2c_algo_callback_data *)data)->cx;
         int bus_index = ((struct cx18_i2c_algo_callback_data *)data)->bus_index;
         u32 addr = bus_index ? CX18_REG_I2C_2_WR : CX18_REG_I2C_1_WR;
-        u32 r = read_reg(addr);
+        u32 r = cx18_read_reg(cx, addr);
 
         if (state)
-                write_reg_sync(r | SETSCL_BIT, addr);
+                cx18_write_reg_sync(cx, r | SETSCL_BIT, addr);
         else
-                write_reg_sync(r & ~SETSCL_BIT, addr);
+                cx18_write_reg_sync(cx, r & ~SETSCL_BIT, addr);
 }
 
 static void cx18_setsda(void *data, int state)
@@ -171,12 +170,12 @@ static void cx18_setsda(void *data, int state)
         struct cx18 *cx = ((struct cx18_i2c_algo_callback_data *)data)->cx;
         int bus_index = ((struct cx18_i2c_algo_callback_data *)data)->bus_index;
         u32 addr = bus_index ? CX18_REG_I2C_2_WR : CX18_REG_I2C_1_WR;
-        u32 r = read_reg(addr);
+        u32 r = cx18_read_reg(cx, addr);
 
         if (state)
-                write_reg_sync(r | SETSDL_BIT, addr);
+                cx18_write_reg_sync(cx, r | SETSDL_BIT, addr);
         else
-                write_reg_sync(r & ~SETSDL_BIT, addr);
+                cx18_write_reg_sync(cx, r & ~SETSDL_BIT, addr);
 }
 
 static int cx18_getscl(void *data)
@@ -185,7 +184,7 @@ static int cx18_getscl(void *data)
         int bus_index = ((struct cx18_i2c_algo_callback_data *)data)->bus_index;
         u32 addr = bus_index ? CX18_REG_I2C_2_RD : CX18_REG_I2C_1_RD;
 
-        return read_reg(addr) & GETSCL_BIT;
+        return cx18_read_reg(cx, addr) & GETSCL_BIT;
 }
 
 static int cx18_getsda(void *data)
@@ -194,7 +193,7 @@ static int cx18_getsda(void *data)
         int bus_index = ((struct cx18_i2c_algo_callback_data *)data)->bus_index;
         u32 addr = bus_index ? CX18_REG_I2C_2_RD : CX18_REG_I2C_1_RD;
 
-        return read_reg(addr) & GETSDL_BIT;
+        return cx18_read_reg(cx, addr) & GETSDL_BIT;
 }
 
 /* template for i2c-bit-algo */
@@ -394,29 +393,33 @@ int init_cx18_i2c(struct cx18 *cx)
                 cx->i2c_adap[i].dev.parent = &cx->dev->dev;
         }
 
-        if (read_reg(CX18_REG_I2C_2_WR) != 0x0003c02f) {
+        if (cx18_read_reg(cx, CX18_REG_I2C_2_WR) != 0x0003c02f) {
                 /* Reset/Unreset I2C hardware block */
-                write_reg(0x10000000, 0xc71004); /* Clock select 220MHz */
-                write_reg_sync(0x10001000, 0xc71024); /* Clock Enable */
+                /* Clock select 220MHz */
+                cx18_write_reg(cx, 0x10000000, 0xc71004);
+                /* Clock Enable */
+                cx18_write_reg_sync(cx, 0x10001000, 0xc71024);
         }
         /* courtesy of Steven Toth <stoth@hauppauge.com> */
-        write_reg_sync(0x00c00000, 0xc7001c);
+        cx18_write_reg_sync(cx, 0x00c00000, 0xc7001c);
         mdelay(10);
-        write_reg_sync(0x00c000c0, 0xc7001c);
+        cx18_write_reg_sync(cx, 0x00c000c0, 0xc7001c);
         mdelay(10);
-        write_reg_sync(0x00c00000, 0xc7001c);
+        cx18_write_reg_sync(cx, 0x00c00000, 0xc7001c);
         mdelay(10);
 
-        write_reg_sync(0x00c00000, 0xc730c8); /* Set to edge-triggered intrs. */
-        write_reg_sync(0x00c00000, 0xc730c4); /* Clear any stale intrs */
+        /* Set to edge-triggered intrs. */
+        cx18_write_reg_sync(cx, 0x00c00000, 0xc730c8);
+        /* Clear any stale intrs */
+        cx18_write_reg_sync(cx, 0x00c00000, 0xc730c4);
 
         /* Hw I2C1 Clock Freq ~100kHz */
-        write_reg_sync(0x00021c0f & ~4, CX18_REG_I2C_1_WR);
+        cx18_write_reg_sync(cx, 0x00021c0f & ~4, CX18_REG_I2C_1_WR);
         cx18_setscl(&cx->i2c_algo_cb_data[0], 1);
         cx18_setsda(&cx->i2c_algo_cb_data[0], 1);
 
         /* Hw I2C2 Clock Freq ~100kHz */
-        write_reg_sync(0x00021c0f & ~4, CX18_REG_I2C_2_WR);
+        cx18_write_reg_sync(cx, 0x00021c0f & ~4, CX18_REG_I2C_2_WR);
         cx18_setscl(&cx->i2c_algo_cb_data[1], 1);
         cx18_setsda(&cx->i2c_algo_cb_data[1], 1);
 
@@ -430,8 +433,10 @@ void exit_cx18_i2c(struct cx18 *cx)
 {
         int i;
         CX18_DEBUG_I2C("i2c exit\n");
-        write_reg(read_reg(CX18_REG_I2C_1_WR) | 4, CX18_REG_I2C_1_WR);
-        write_reg(read_reg(CX18_REG_I2C_2_WR) | 4, CX18_REG_I2C_2_WR);
+        cx18_write_reg(cx, cx18_read_reg(cx, CX18_REG_I2C_1_WR) | 4,
+                                                        CX18_REG_I2C_1_WR);
+        cx18_write_reg(cx, cx18_read_reg(cx, CX18_REG_I2C_2_WR) | 4,
+                                                        CX18_REG_I2C_2_WR);
 
         for (i = 0; i < 2; i++) {
                 i2c_del_adapter(&cx->i2c_adap[i]);
diff --git a/drivers/media/video/cx18/cx18-io.c b/drivers/media/video/cx18/cx18-io.c
new file mode 100644
index 000000000000..700ab9439c16
--- /dev/null
+++ b/drivers/media/video/cx18/cx18-io.c
@@ -0,0 +1,254 @@
+/*
+ *  cx18 driver PCI memory mapped IO access routines
+ *
+ *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
+ *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA
+ */
+
+#include "cx18-driver.h"
+#include "cx18-io.h"
+#include "cx18-irq.h"
+
+void cx18_log_statistics(struct cx18 *cx)
+{
+        int i;
+
+        if (!(cx18_debug & CX18_DBGFLG_INFO))
+                return;
+
+        for (i = 0; i <= CX18_MAX_MMIO_RETRIES; i++)
+                CX18_DEBUG_INFO("retried_write[%d] = %d\n", i,
+                                atomic_read(&cx->mmio_stats.retried_write[i]));
+        for (i = 0; i <= CX18_MAX_MMIO_RETRIES; i++)
+                CX18_DEBUG_INFO("retried_read[%d] = %d\n", i,
+                                atomic_read(&cx->mmio_stats.retried_read[i]));
+        return;
+}
+
+void cx18_raw_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        int i;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                cx18_raw_writel_noretry(cx, val, addr);
+                if (val == cx18_raw_readl_noretry(cx, addr))
+                        break;
+        }
+        cx18_log_write_retries(cx, i, addr);
+}
+
+u32 cx18_raw_readl_retry(struct cx18 *cx, const void __iomem *addr)
+{
+        int i;
+        u32 val;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                val = cx18_raw_readl_noretry(cx, addr);
+                if (val != 0xffffffff) /* PCI bus read error */
+                        break;
+        }
+        cx18_log_read_retries(cx, i, addr);
+        return val;
+}
+
+u16 cx18_raw_readw_retry(struct cx18 *cx, const void __iomem *addr)
+{
+        int i;
+        u16 val;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                val = cx18_raw_readw_noretry(cx, addr);
+                if (val != 0xffff) /* PCI bus read error */
+                        break;
+        }
+        cx18_log_read_retries(cx, i, addr);
+        return val;
+}
+
+void cx18_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        int i;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                cx18_writel_noretry(cx, val, addr);
+                if (val == cx18_readl_noretry(cx, addr))
+                        break;
+        }
+        cx18_log_write_retries(cx, i, addr);
+}
+
+void cx18_writew_retry(struct cx18 *cx, u16 val, void __iomem *addr)
+{
+        int i;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                cx18_writew_noretry(cx, val, addr);
+                if (val == cx18_readw_noretry(cx, addr))
+                        break;
+        }
+        cx18_log_write_retries(cx, i, addr);
+}
+
+void cx18_writeb_retry(struct cx18 *cx, u8 val, void __iomem *addr)
+{
+        int i;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                cx18_writeb_noretry(cx, val, addr);
+                if (val == cx18_readb_noretry(cx, addr))
+                        break;
+        }
+        cx18_log_write_retries(cx, i, addr);
+}
+
+u32 cx18_readl_retry(struct cx18 *cx, const void __iomem *addr)
+{
+        int i;
+        u32 val;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                val = cx18_readl_noretry(cx, addr);
+                if (val != 0xffffffff) /* PCI bus read error */
+                        break;
+        }
+        cx18_log_read_retries(cx, i, addr);
+        return val;
+}
+
+u16 cx18_readw_retry(struct cx18 *cx, const void __iomem *addr)
+{
+        int i;
+        u16 val;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                val = cx18_readw_noretry(cx, addr);
+                if (val != 0xffff) /* PCI bus read error */
+                        break;
+        }
+        cx18_log_read_retries(cx, i, addr);
+        return val;
+}
+
+u8 cx18_readb_retry(struct cx18 *cx, const void __iomem *addr)
+{
+        int i;
+        u8 val;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                val = cx18_readb_noretry(cx, addr);
+                if (val != 0xff) /* PCI bus read error */
+                        break;
+        }
+        cx18_log_read_retries(cx, i, addr);
+        return val;
+}
+
+void cx18_memcpy_fromio(struct cx18 *cx, void *to,
+                        const void __iomem *from, unsigned int len)
+{
+        const u8 __iomem *src = from;
+        u8 *dst = to;
+
+        /* Align reads on the CX23418's addresses */
+        if ((len > 0) && ((unsigned long) src & 1)) {
+                *dst = cx18_readb(cx, src);
+                len--;
+                dst++;
+                src++;
+        }
+        if ((len > 1) && ((unsigned long) src & 2)) {
+                *((u16 *)dst) = cx18_raw_readw(cx, src);
+                len -= 2;
+                dst += 2;
+                src += 2;
+        }
+        while (len > 3) {
+                *((u32 *)dst) = cx18_raw_readl(cx, src);
+                len -= 4;
+                dst += 4;
+                src += 4;
+        }
+        if (len > 1) {
+                *((u16 *)dst) = cx18_raw_readw(cx, src);
+                len -= 2;
+                dst += 2;
+                src += 2;
+        }
+        if (len > 0)
+                *dst = cx18_readb(cx, src);
+}
+
+void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count)
+{
+        u8 __iomem *dst = addr;
+        u16 val2 = val | (val << 8);
+        u32 val4 = val2 | (val2 << 16);
+
+        /* Align writes on the CX23418's addresses */
+        if ((count > 0) && ((unsigned long)dst & 1)) {
+                cx18_writeb(cx, (u8) val, dst);
+                count--;
+                dst++;
+        }
+        if ((count > 1) && ((unsigned long)dst & 2)) {
+                cx18_writew(cx, val2, dst);
+                count -= 2;
+                dst += 2;
+        }
+        while (count > 3) {
+                cx18_writel(cx, val4, dst);
+                count -= 4;
+                dst += 4;
+        }
+        if (count > 1) {
+                cx18_writew(cx, val2, dst);
+                count -= 2;
+                dst += 2;
+        }
+        if (count > 0)
+                cx18_writeb(cx, (u8) val, dst);
+}
+
+void cx18_sw1_irq_enable(struct cx18 *cx, u32 val)
+{
+        u32 r;
+        cx18_write_reg(cx, val, SW1_INT_STATUS);
+        r = cx18_read_reg(cx, SW1_INT_ENABLE_PCI);
+        cx18_write_reg(cx, r | val, SW1_INT_ENABLE_PCI);
+}
+
+void cx18_sw1_irq_disable(struct cx18 *cx, u32 val)
+{
+        u32 r;
+        r = cx18_read_reg(cx, SW1_INT_ENABLE_PCI);
+        cx18_write_reg(cx, r & ~val, SW1_INT_ENABLE_PCI);
+}
+
+void cx18_sw2_irq_enable(struct cx18 *cx, u32 val)
+{
+        u32 r;
+        cx18_write_reg(cx, val, SW2_INT_STATUS);
+        r = cx18_read_reg(cx, SW2_INT_ENABLE_PCI);
+        cx18_write_reg(cx, r | val, SW2_INT_ENABLE_PCI);
+}
+
+void cx18_sw2_irq_disable(struct cx18 *cx, u32 val)
+{
+        u32 r;
+        r = cx18_read_reg(cx, SW2_INT_ENABLE_PCI);
+        cx18_write_reg(cx, r & ~val, SW2_INT_ENABLE_PCI);
+}
+
+void cx18_setup_page(struct cx18 *cx, u32 addr)
+{
+        u32 val;
+        val = cx18_read_reg(cx, 0xD000F8);
+        val = (val & ~0x1f00) | ((addr >> 17) & 0x1f00);
+        cx18_write_reg(cx, val, 0xD000F8);
+}
diff --git a/drivers/media/video/cx18/cx18-io.h b/drivers/media/video/cx18/cx18-io.h
new file mode 100644
index 000000000000..197d4fbd9f95
--- /dev/null
+++ b/drivers/media/video/cx18/cx18-io.h
@@ -0,0 +1,378 @@
+/*
+ *  cx18 driver PCI memory mapped IO access routines
+ *
+ *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
+ *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA
+ */
+
+#ifndef CX18_IO_H
+#define CX18_IO_H
+
+#include "cx18-driver.h"
+
+static inline void cx18_io_delay(struct cx18 *cx)
+{
+        if (cx->options.mmio_ndelay)
+                ndelay(cx->options.mmio_ndelay);
+}
+
+/*
+ * Readback and retry of MMIO access for reliability:
+ * The concept was suggested by Steve Toth <stoth@linuxtv.org>.
+ * The implmentation is the fault of Andy Walls <awalls@radix.net>.
+ */
+
+/* Statistics gathering */
+static inline
+void cx18_log_write_retries(struct cx18 *cx, int i, const void *addr)
+{
+        if (i > CX18_MAX_MMIO_RETRIES)
+                i = CX18_MAX_MMIO_RETRIES;
+        atomic_inc(&cx->mmio_stats.retried_write[i]);
+        return;
+}
+
+static inline
+void cx18_log_read_retries(struct cx18 *cx, int i, const void *addr)
+{
+        if (i > CX18_MAX_MMIO_RETRIES)
+                i = CX18_MAX_MMIO_RETRIES;
+        atomic_inc(&cx->mmio_stats.retried_read[i]);
+        return;
+}
+
+void cx18_log_statistics(struct cx18 *cx);
+
+/* Non byteswapping memory mapped IO */
+static inline
+void cx18_raw_writel_noretry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        __raw_writel(val, addr);
+        cx18_io_delay(cx);
+}
+
+void cx18_raw_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr);
+
+static inline void cx18_raw_writel(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                cx18_raw_writel_retry(cx, val, addr);
+        else
+                cx18_raw_writel_noretry(cx, val, addr);
+}
+
+
+static inline
+u32 cx18_raw_readl_noretry(struct cx18 *cx, const void __iomem *addr)
+{
+        u32 ret = __raw_readl(addr);
+        cx18_io_delay(cx);
+        return ret;
+}
+
+u32 cx18_raw_readl_retry(struct cx18 *cx, const void __iomem *addr);
+
+static inline u32 cx18_raw_readl(struct cx18 *cx, const void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_raw_readl_retry(cx, addr);
+
+        return cx18_raw_readl_noretry(cx, addr);
+}
+
+
+static inline
+u16 cx18_raw_readw_noretry(struct cx18 *cx, const void __iomem *addr)
+{
+        u16 ret = __raw_readw(addr);
+        cx18_io_delay(cx);
+        return ret;
+}
+
+u16 cx18_raw_readw_retry(struct cx18 *cx, const void __iomem *addr);
+
+static inline u16 cx18_raw_readw(struct cx18 *cx, const void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_raw_readw_retry(cx, addr);
+
+        return cx18_raw_readw_noretry(cx, addr);
+}
+
+
+/* Normal memory mapped IO */
+static inline
+void cx18_writel_noretry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        writel(val, addr);
+        cx18_io_delay(cx);
+}
+
+void cx18_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr);
+
+static inline void cx18_writel(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                cx18_writel_retry(cx, val, addr);
+        else
+                cx18_writel_noretry(cx, val, addr);
+}
+
+
+static inline
+void cx18_writew_noretry(struct cx18 *cx, u16 val, void __iomem *addr)
+{
+        writew(val, addr);
+        cx18_io_delay(cx);
+}
+
+void cx18_writew_retry(struct cx18 *cx, u16 val, void __iomem *addr);
+
+static inline void cx18_writew(struct cx18 *cx, u16 val, void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                cx18_writew_retry(cx, val, addr);
+        else
+                cx18_writew_noretry(cx, val, addr);
+}
+
+
+static inline
+void cx18_writeb_noretry(struct cx18 *cx, u8 val, void __iomem *addr)
+{
+        writeb(val, addr);
+        cx18_io_delay(cx);
+}
+
+void cx18_writeb_retry(struct cx18 *cx, u8 val, void __iomem *addr);
+
+static inline void cx18_writeb(struct cx18 *cx, u8 val, void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                cx18_writeb_retry(cx, val, addr);
+        else
+                cx18_writeb_noretry(cx, val, addr);
+}
+
+
+static inline u32 cx18_readl_noretry(struct cx18 *cx, const void __iomem *addr)
+{
+        u32 ret = readl(addr);
+        cx18_io_delay(cx);
+        return ret;
+}
+
+u32 cx18_readl_retry(struct cx18 *cx, const void __iomem *addr);
+
+static inline u32 cx18_readl(struct cx18 *cx, const void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_readl_retry(cx, addr);
+
+        return cx18_readl_noretry(cx, addr);
+}
+
+
+static inline u16 cx18_readw_noretry(struct cx18 *cx, const void __iomem *addr)
+{
+        u16 ret = readw(addr);
+        cx18_io_delay(cx);
+        return ret;
+}
+
+u16 cx18_readw_retry(struct cx18 *cx, const void __iomem *addr);
+
+static inline u16 cx18_readw(struct cx18 *cx, const void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_readw_retry(cx, addr);
+
+        return cx18_readw_noretry(cx, addr);
+}
+
+
+static inline u8 cx18_readb_noretry(struct cx18 *cx, const void __iomem *addr)
+{
+        u8 ret = readb(addr);
+        cx18_io_delay(cx);
+        return ret;
+}
+
+u8 cx18_readb_retry(struct cx18 *cx, const void __iomem *addr);
+
+static inline u8 cx18_readb(struct cx18 *cx, const void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_readb_retry(cx, addr);
+
+        return cx18_readb_noretry(cx, addr);
+}
+
+
+static inline
+u32 cx18_write_sync_noretry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        cx18_writel_noretry(cx, val, addr);
+        return cx18_readl_noretry(cx, addr);
+}
+
+static inline
+u32 cx18_write_sync_retry(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        cx18_writel_retry(cx, val, addr);
+        return cx18_readl_retry(cx, addr);
+}
+
+static inline u32 cx18_write_sync(struct cx18 *cx, u32 val, void __iomem *addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_write_sync_retry(cx, val, addr);
+
+        return cx18_write_sync_noretry(cx, val, addr);
+}
+
+
+void cx18_memcpy_fromio(struct cx18 *cx, void *to,
+                        const void __iomem *from, unsigned int len);
+void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count);
+
+
+/* Access "register" region of CX23418 memory mapped I/O */
+static inline void cx18_write_reg_noretry(struct cx18 *cx, u32 val, u32 reg)
+{
+        cx18_writel_noretry(cx, val, cx->reg_mem + reg);
+}
+
+static inline void cx18_write_reg_retry(struct cx18 *cx, u32 val, u32 reg)
+{
+        cx18_writel_retry(cx, val, cx->reg_mem + reg);
+}
+
+static inline void cx18_write_reg(struct cx18 *cx, u32 val, u32 reg)
+{
+        if (cx18_retry_mmio)
+                cx18_write_reg_retry(cx, val, reg);
+        else
+                cx18_write_reg_noretry(cx, val, reg);
+}
+
+
+static inline u32 cx18_read_reg_noretry(struct cx18 *cx, u32 reg)
+{
+        return cx18_readl_noretry(cx, cx->reg_mem + reg);
+}
+
+static inline u32 cx18_read_reg_retry(struct cx18 *cx, u32 reg)
+{
+        return cx18_readl_retry(cx, cx->reg_mem + reg);
+}
+
+static inline u32 cx18_read_reg(struct cx18 *cx, u32 reg)
+{
+        if (cx18_retry_mmio)
+                return cx18_read_reg_retry(cx, reg);
+
+        return cx18_read_reg_noretry(cx, reg);
+}
+
+
+static inline u32 cx18_write_reg_sync_noretry(struct cx18 *cx, u32 val, u32 reg)
+{
+        return cx18_write_sync_noretry(cx, val, cx->reg_mem + reg);
+}
+
+static inline u32 cx18_write_reg_sync_retry(struct cx18 *cx, u32 val, u32 reg)
+{
+        return cx18_write_sync_retry(cx, val, cx->reg_mem + reg);
+}
+
+static inline u32 cx18_write_reg_sync(struct cx18 *cx, u32 val, u32 reg)
+{
+        if (cx18_retry_mmio)
+                return cx18_write_reg_sync_retry(cx, val, reg);
+
+        return cx18_write_reg_sync_noretry(cx, val, reg);
+}
+
+
+/* Access "encoder memory" region of CX23418 memory mapped I/O */
+static inline void cx18_write_enc_noretry(struct cx18 *cx, u32 val, u32 addr)
+{
+        cx18_writel_noretry(cx, val, cx->enc_mem + addr);
+}
+
+static inline void cx18_write_enc_retry(struct cx18 *cx, u32 val, u32 addr)
+{
+        cx18_writel_retry(cx, val, cx->enc_mem + addr);
+}
+
+static inline void cx18_write_enc(struct cx18 *cx, u32 val, u32 addr)
+{
+        if (cx18_retry_mmio)
+                cx18_write_enc_retry(cx, val, addr);
+        else
+                cx18_write_enc_noretry(cx, val, addr);
+}
+
+
+static inline u32 cx18_read_enc_noretry(struct cx18 *cx, u32 addr)
+{
+        return cx18_readl_noretry(cx, cx->enc_mem + addr);
+}
+
+static inline u32 cx18_read_enc_retry(struct cx18 *cx, u32 addr)
+{
+        return cx18_readl_retry(cx, cx->enc_mem + addr);
+}
+
+static inline u32 cx18_read_enc(struct cx18 *cx, u32 addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_read_enc_retry(cx, addr);
+
+        return cx18_read_enc_noretry(cx, addr);
+}
+
+static inline
+u32 cx18_write_enc_sync_noretry(struct cx18 *cx, u32 val, u32 addr)
+{
+        return cx18_write_sync_noretry(cx, val, cx->enc_mem + addr);
+}
+
+static inline
+u32 cx18_write_enc_sync_retry(struct cx18 *cx, u32 val, u32 addr)
+{
+        return cx18_write_sync_retry(cx, val, cx->enc_mem + addr);
+}
+
+static inline
+u32 cx18_write_enc_sync(struct cx18 *cx, u32 val, u32 addr)
+{
+        if (cx18_retry_mmio)
+                return cx18_write_enc_sync_retry(cx, val, addr);
+
+        return cx18_write_enc_sync_noretry(cx, val, addr);
+}
+
+void cx18_sw1_irq_enable(struct cx18 *cx, u32 val);
+void cx18_sw1_irq_disable(struct cx18 *cx, u32 val);
+void cx18_sw2_irq_enable(struct cx18 *cx, u32 val);
+void cx18_sw2_irq_disable(struct cx18 *cx, u32 val);
+void cx18_setup_page(struct cx18 *cx, u32 addr);
+
+#endif /* CX18_IO_H */
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index a7f839631d6a..f0ca50f5fdde 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -22,6 +22,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-version.h"
 #include "cx18-mailbox.h"
 #include "cx18-i2c.h"
@@ -170,7 +171,6 @@ static int cx18_try_fmt_vid_cap(struct file *file, void *fh,
 {
         struct cx18_open_id *id = fh;
         struct cx18 *cx = id->cx;
-
         int w = fmt->fmt.pix.width;
         int h = fmt->fmt.pix.height;
 
@@ -202,8 +202,7 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
         struct cx18_open_id *id = fh;
         struct cx18 *cx = id->cx;
         int ret;
-        int w = fmt->fmt.pix.width;
-        int h = fmt->fmt.pix.height;
+        int w, h;
 
         ret = v4l2_prio_check(&cx->prio, &id->prio);
         if (ret)
@@ -212,6 +211,8 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
         ret = cx18_try_fmt_vid_cap(file, fh, fmt);
         if (ret)
                 return ret;
+        w = fmt->fmt.pix.width;
+        h = fmt->fmt.pix.height;
 
         if (cx->params.width == w && cx->params.height == h)
                 return 0;
@@ -286,9 +287,9 @@ static int cx18_cxc(struct cx18 *cx, unsigned int cmd, void *arg)
 
         spin_lock_irqsave(&cx18_cards_lock, flags);
         if (cmd == VIDIOC_DBG_G_REGISTER)
-                regs->val = read_enc(regs->reg);
+                regs->val = cx18_read_enc(cx, regs->reg);
         else
-                write_enc(regs->val, regs->reg);
+                cx18_write_enc(cx, regs->val, regs->reg);
         spin_unlock_irqrestore(&cx18_cards_lock, flags);
         return 0;
 }
@@ -345,7 +346,7 @@ static int cx18_querycap(struct file *file, void *fh,
 
         strlcpy(vcap->driver, CX18_DRIVER_NAME, sizeof(vcap->driver));
         strlcpy(vcap->card, cx->card_name, sizeof(vcap->card));
-        strlcpy(vcap->bus_info, pci_name(cx->dev), sizeof(vcap->bus_info));
+        snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(cx->dev));
         vcap->version = CX18_DRIVER_VERSION;        /* version */
         vcap->capabilities = cx->v4l2_cap;          /* capabilities */
         return 0;
@@ -622,6 +623,7 @@ static int cx18_encoder_cmd(struct file *file, void *fh,
 {
         struct cx18_open_id *id = fh;
         struct cx18 *cx = id->cx;
+        u32 h;
 
         switch (enc->cmd) {
         case V4L2_ENC_CMD_START:
@@ -643,8 +645,14 @@ static int cx18_encoder_cmd(struct file *file, void *fh,
                         return -EPERM;
                 if (test_and_set_bit(CX18_F_I_ENC_PAUSED, &cx->i_flags))
                         return 0;
+                h = cx18_find_handle(cx);
+                if (h == CX18_INVALID_TASK_HANDLE) {
+                        CX18_ERR("Can't find valid task handle for "
+                                 "V4L2_ENC_CMD_PAUSE\n");
+                        return -EBADFD;
+                }
                 cx18_mute(cx);
-                cx18_vapi(cx, CX18_CPU_CAPTURE_PAUSE, 1, cx18_find_handle(cx));
+                cx18_vapi(cx, CX18_CPU_CAPTURE_PAUSE, 1, h);
                 break;
 
         case V4L2_ENC_CMD_RESUME:
@@ -654,7 +662,13 @@ static int cx18_encoder_cmd(struct file *file, void *fh,
                         return -EPERM;
                 if (!test_and_clear_bit(CX18_F_I_ENC_PAUSED, &cx->i_flags))
                         return 0;
-                cx18_vapi(cx, CX18_CPU_CAPTURE_RESUME, 1, cx18_find_handle(cx));
+                h = cx18_find_handle(cx);
+                if (h == CX18_INVALID_TASK_HANDLE) {
+                        CX18_ERR("Can't find valid task handle for "
+                                 "V4L2_ENC_CMD_RESUME\n");
+                        return -EBADFD;
+                }
+                cx18_vapi(cx, CX18_CPU_CAPTURE_RESUME, 1, h);
                 cx18_unmute(cx);
                 break;
 
@@ -731,12 +745,14 @@ static int cx18_log_status(struct file *file, void *fh)
                         continue;
                 CX18_INFO("Stream %s: status 0x%04lx, %d%% of %d KiB (%d buffers) in use\n",
                           s->name, s->s_flags,
-                          (s->buffers - s->q_free.buffers) * 100 / s->buffers,
+                          (s->buffers - atomic_read(&s->q_free.buffers))
+                                * 100 / s->buffers,
                           (s->buffers * s->buf_size) / 1024, s->buffers);
         }
         CX18_INFO("Read MPEG/VBI: %lld/%lld bytes\n",
                         (long long)cx->mpg_data_received,
                         (long long)cx->vbi_data_inserted);
+        cx18_log_statistics(cx);
         CX18_INFO("==================  END STATUS CARD #%d  ==================\n", cx->num);
         return 0;
 }
diff --git a/drivers/media/video/cx18/cx18-irq.c b/drivers/media/video/cx18/cx18-irq.c
index ab218315c84b..360330f5463f 100644
--- a/drivers/media/video/cx18/cx18-irq.c
+++ b/drivers/media/video/cx18/cx18-irq.c
@@ -20,6 +20,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-firmware.h"
 #include "cx18-fileops.h"
 #include "cx18-queue.h"
@@ -48,8 +49,8 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
                         break;
         }
         if (i == CX18_MAX_STREAMS) {
-                CX18_WARN("DMA done for unknown handle %d for stream %s\n",
-                        handle, s->name);
+                CX18_WARN("Got DMA done notification for unknown/inactive"
+                          " handle %d\n", handle);
                 mb->error = CXERR_NOT_OPEN;
                 mb->cmd = 0;
                 cx18_mb_ack(cx, mb);
@@ -60,8 +61,8 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
         if (mb->args[2] != 1)
                 CX18_WARN("Ack struct = %d for %s\n",
                         mb->args[2], s->name);
-        id = read_enc(off);
-        buf = cx18_queue_get_buf_irq(s, id, read_enc(off + 4));
+        id = cx18_read_enc(cx, off);
+        buf = cx18_queue_get_buf_irq(s, id, cx18_read_enc(cx, off + 4));
         CX18_DEBUG_HI_DMA("DMA DONE for %s (buffer %d)\n", s->name, id);
         if (buf) {
                 cx18_buf_sync_for_cpu(s, buf);
@@ -81,7 +82,7 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
                         set_bit(CX18_F_B_NEED_BUF_SWAP, &buf->b_flags);
         } else {
                 CX18_WARN("Could not find buf %d for stream %s\n",
-                                read_enc(off), s->name);
+                                cx18_read_enc(cx, off), s->name);
         }
         mb->error = 0;
         mb->cmd = 0;
@@ -97,8 +98,8 @@ static void epu_debug(struct cx18 *cx, struct cx18_mailbox *mb)
         char *p;
 
         if (mb->args[1]) {
-                setup_page(mb->args[1]);
-                memcpy_fromio(str, cx->enc_mem + mb->args[1], 252);
+                cx18_setup_page(cx, mb->args[1]);
+                cx18_memcpy_fromio(cx, str, cx->enc_mem + mb->args[1], 252);
                 str[252] = 0;
         }
         cx18_mb_ack(cx, mb);
@@ -113,7 +114,7 @@ static void hpu_cmd(struct cx18 *cx, u32 sw1)
         struct cx18_mailbox mb;
 
         if (sw1 & IRQ_CPU_TO_EPU) {
-                memcpy_fromio(&mb, &cx->scb->cpu2epu_mb, sizeof(mb));
+                cx18_memcpy_fromio(cx, &mb, &cx->scb->cpu2epu_mb, sizeof(mb));
                 mb.error = 0;
 
                 switch (mb.cmd) {
@@ -141,16 +142,16 @@ irqreturn_t cx18_irq_handler(int irq, void *dev_id)
 
         spin_lock(&cx->dma_reg_lock);
 
-        hw2_mask = read_reg(HW2_INT_MASK5_PCI);
-        hw2 = read_reg(HW2_INT_CLR_STATUS) & hw2_mask;
-        sw2_mask = read_reg(SW2_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU_ACK;
-        sw2 = read_reg(SW2_INT_STATUS) & sw2_mask;
-        sw1_mask = read_reg(SW1_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU;
-        sw1 = read_reg(SW1_INT_STATUS) & sw1_mask;
+        hw2_mask = cx18_read_reg(cx, HW2_INT_MASK5_PCI);
+        hw2 = cx18_read_reg(cx, HW2_INT_CLR_STATUS) & hw2_mask;
+        sw2_mask = cx18_read_reg(cx, SW2_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU_ACK;
+        sw2 = cx18_read_reg(cx, SW2_INT_STATUS) & sw2_mask;
+        sw1_mask = cx18_read_reg(cx, SW1_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU;
+        sw1 = cx18_read_reg(cx, SW1_INT_STATUS) & sw1_mask;
 
-        write_reg(sw2&sw2_mask, SW2_INT_STATUS);
-        write_reg(sw1&sw1_mask, SW1_INT_STATUS);
-        write_reg(hw2&hw2_mask, HW2_INT_CLR_STATUS);
+        cx18_write_reg(cx, sw2&sw2_mask, SW2_INT_STATUS);
+        cx18_write_reg(cx, sw1&sw1_mask, SW1_INT_STATUS);
+        cx18_write_reg(cx, hw2&hw2_mask, HW2_INT_CLR_STATUS);
 
         if (sw1 || sw2 || hw2)
                 CX18_DEBUG_HI_IRQ("SW1: %x  SW2: %x  HW2: %x\n", sw1, sw2, hw2);
@@ -161,15 +162,15 @@ irqreturn_t cx18_irq_handler(int irq, void *dev_id)
         */
 
         if (sw2) {
-                if (sw2 & (readl(&cx->scb->cpu2hpu_irq_ack) |
-                           readl(&cx->scb->cpu2epu_irq_ack)))
+                if (sw2 & (cx18_readl(cx, &cx->scb->cpu2hpu_irq_ack) |
+                           cx18_readl(cx, &cx->scb->cpu2epu_irq_ack)))
                         wake_up(&cx->mb_cpu_waitq);
-                if (sw2 & (readl(&cx->scb->apu2hpu_irq_ack) |
-                           readl(&cx->scb->apu2epu_irq_ack)))
+                if (sw2 & (cx18_readl(cx, &cx->scb->apu2hpu_irq_ack) |
+                           cx18_readl(cx, &cx->scb->apu2epu_irq_ack)))
                         wake_up(&cx->mb_apu_waitq);
-                if (sw2 & readl(&cx->scb->epu2hpu_irq_ack))
+                if (sw2 & cx18_readl(cx, &cx->scb->epu2hpu_irq_ack))
                         wake_up(&cx->mb_epu_waitq);
-                if (sw2 & readl(&cx->scb->hpu2epu_irq_ack))
+                if (sw2 & cx18_readl(cx, &cx->scb->hpu2epu_irq_ack))
                         wake_up(&cx->mb_hpu_waitq);
         }
 
diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c
index 93177514e846..9d18dd22de76 100644
--- a/drivers/media/video/cx18/cx18-mailbox.c
+++ b/drivers/media/video/cx18/cx18-mailbox.c
@@ -22,6 +22,7 @@
 #include <stdarg.h>
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-scb.h"
 #include "cx18-irq.h"
 #include "cx18-mailbox.h"
@@ -82,6 +83,7 @@ static const struct cx18_api_info api_info[] = {
         API_ENTRY(CPU, CX18_CPU_DE_SET_MDL_ACK,                 0),
         API_ENTRY(CPU, CX18_CPU_DE_SET_MDL,                     API_FAST),
         API_ENTRY(CPU, CX18_APU_RESETAI,                        API_FAST),
+        API_ENTRY(CPU, CX18_CPU_DE_RELEASE_MDL,                 0),
         API_ENTRY(0, 0,                                         0),
 };
 
@@ -105,20 +107,20 @@ static struct cx18_mailbox __iomem *cx18_mb_is_complete(struct cx18 *cx, int rpu
         switch (rpu) {
         case APU:
                 mb = &cx->scb->epu2apu_mb;
-                *state = readl(&cx->scb->apu_state);
-                *irq = readl(&cx->scb->epu2apu_irq);
+                *state = cx18_readl(cx, &cx->scb->apu_state);
+                *irq = cx18_readl(cx, &cx->scb->epu2apu_irq);
                 break;
 
         case CPU:
                 mb = &cx->scb->epu2cpu_mb;
-                *state = readl(&cx->scb->cpu_state);
-                *irq = readl(&cx->scb->epu2cpu_irq);
+                *state = cx18_readl(cx, &cx->scb->cpu_state);
+                *irq = cx18_readl(cx, &cx->scb->epu2cpu_irq);
                 break;
 
         case HPU:
                 mb = &cx->scb->epu2hpu_mb;
-                *state = readl(&cx->scb->hpu_state);
-                *irq = readl(&cx->scb->epu2hpu_irq);
+                *state = cx18_readl(cx, &cx->scb->hpu_state);
+                *irq = cx18_readl(cx, &cx->scb->epu2hpu_irq);
                 break;
         }
 
@@ -126,8 +128,8 @@ static struct cx18_mailbox __iomem *cx18_mb_is_complete(struct cx18 *cx, int rpu
                 return mb;
 
         do {
-                *req = readl(&mb->request);
-                ack = readl(&mb->ack);
+                *req = cx18_readl(cx, &mb->request);
+                ack = cx18_readl(cx, &mb->ack);
                 wait_count++;
         } while (*req != ack && wait_count < 600);
 
@@ -172,9 +174,9 @@ long cx18_mb_ack(struct cx18 *cx, const struct cx18_mailbox *mb)
                 return -EINVAL;
         }
 
-        setup_page(SCB_OFFSET);
-        write_sync(mb->request, &ack_mb->ack);
-        write_reg(ack_irq, SW2_INT_SET);
+        cx18_setup_page(cx, SCB_OFFSET);
+        cx18_write_sync(cx, mb->request, &ack_mb->ack);
+        cx18_write_reg(cx, ack_irq, SW2_INT_SET);
         return 0;
 }
 
@@ -199,7 +201,7 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])
                 CX18_DEBUG_HI_API("%s\n", info->name);
         else
                 CX18_DEBUG_API("%s\n", info->name);
-        setup_page(SCB_OFFSET);
+        cx18_setup_page(cx, SCB_OFFSET);
         mb = cx18_mb_is_complete(cx, info->rpu, &state, &irq, &req);
 
         if (mb == NULL) {
@@ -208,11 +210,11 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])
         }
 
         oldreq = req - 1;
-        writel(cmd, &mb->cmd);
+        cx18_writel(cx, cmd, &mb->cmd);
         for (i = 0; i < args; i++)
-                writel(data[i], &mb->args[i]);
-        writel(0, &mb->error);
-        writel(req, &mb->request);
+                cx18_writel(cx, data[i], &mb->args[i]);
+        cx18_writel(cx, 0, &mb->error);
+        cx18_writel(cx, req, &mb->request);
 
         switch (info->rpu) {
         case APU: waitq = &cx->mb_apu_waitq; break;
@@ -223,9 +225,10 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])
         }
         if (info->flags & API_FAST)
                 timeout /= 2;
-        write_reg(irq, SW1_INT_SET);
+        cx18_write_reg(cx, irq, SW1_INT_SET);
 
-        while (!sig && readl(&mb->ack) != readl(&mb->request) && cnt < 660) {
+        while (!sig && cx18_readl(cx, &mb->ack) != cx18_readl(cx, &mb->request)
+               && cnt < 660) {
                 if (cnt > 200 && !in_atomic())
                         sig = cx18_msleep_timeout(10, 1);
                 cnt++;
@@ -233,13 +236,13 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])
         if (sig)
                 return -EINTR;
         if (cnt == 660) {
-                writel(oldreq, &mb->request);
+                cx18_writel(cx, oldreq, &mb->request);
                 CX18_ERR("mb %s failed\n", info->name);
                 return -EINVAL;
         }
         for (i = 0; i < MAX_MB_ARGUMENTS; i++)
-                data[i] = readl(&mb->args[i]);
-        err = readl(&mb->error);
+                data[i] = cx18_readl(cx, &mb->args[i]);
+        err = cx18_readl(cx, &mb->error);
         if (!in_atomic() && (info->flags & API_SLOW))
                 cx18_msleep_timeout(300, 0);
         if (err)
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index dbe792ac3001..a33ba04a2686 100644
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -37,8 +37,7 @@ void cx18_buf_swap(struct cx18_buffer *buf)
 void cx18_queue_init(struct cx18_queue *q)
 {
         INIT_LIST_HEAD(&q->list);
-        q->buffers = 0;
-        q->length = 0;
+        atomic_set(&q->buffers, 0);
         q->bytesused = 0;
 }
 
@@ -55,8 +54,7 @@ void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf,
         }
         spin_lock_irqsave(&s->qlock, flags);
         list_add_tail(&buf->list, &q->list);
-        q->buffers++;
-        q->length += s->buf_size;
+        atomic_inc(&q->buffers);
         q->bytesused += buf->bytesused - buf->readpos;
         spin_unlock_irqrestore(&s->qlock, flags);
 }
@@ -70,8 +68,7 @@ struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q)
         if (!list_empty(&q->list)) {
                 buf = list_entry(q->list.next, struct cx18_buffer, list);
                 list_del_init(q->list.next);
-                q->buffers--;
-                q->length -= s->buf_size;
+                atomic_dec(&q->buffers);
                 q->bytesused -= buf->bytesused - buf->readpos;
         }
         spin_unlock_irqrestore(&s->qlock, flags);
@@ -95,10 +92,8 @@ struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id,
                 /* the transport buffers are handled differently,
                    they are not moved to the full queue */
                 if (s->type != CX18_ENC_STREAM_TYPE_TS) {
-                        s->q_free.buffers--;
-                        s->q_free.length -= s->buf_size;
-                        s->q_full.buffers++;
-                        s->q_full.length += s->buf_size;
+                        atomic_dec(&s->q_free.buffers);
+                        atomic_inc(&s->q_full.buffers);
                         s->q_full.bytesused += buf->bytesused;
                         list_move_tail(&buf->list, &s->q_full.list);
                 }
@@ -124,8 +119,7 @@ static void cx18_queue_flush(struct cx18_stream *s, struct cx18_queue *q)
                 buf = list_entry(q->list.next, struct cx18_buffer, list);
                 list_move_tail(q->list.next, &s->q_free.list);
                 buf->bytesused = buf->readpos = buf->b_flags = 0;
-                s->q_free.buffers++;
-                s->q_free.length += s->buf_size;
+                atomic_inc(&s->q_free.buffers);
         }
         cx18_queue_init(q);
         spin_unlock_irqrestore(&s->qlock, flags);
diff --git a/drivers/media/video/cx18/cx18-scb.c b/drivers/media/video/cx18/cx18-scb.c
index 30bc803e30da..f56d3772aa67 100644
--- a/drivers/media/video/cx18/cx18-scb.c
+++ b/drivers/media/video/cx18/cx18-scb.c
@@ -20,102 +20,103 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-scb.h"
 
 void cx18_init_scb(struct cx18 *cx)
 {
-        setup_page(SCB_OFFSET);
-        memset_io(cx->scb, 0, 0x10000);
+        cx18_setup_page(cx, SCB_OFFSET);
+        cx18_memset_io(cx, cx->scb, 0, 0x10000);
 
-        writel(IRQ_APU_TO_CPU,     &cx->scb->apu2cpu_irq);
-        writel(IRQ_CPU_TO_APU_ACK, &cx->scb->cpu2apu_irq_ack);
-        writel(IRQ_HPU_TO_CPU,     &cx->scb->hpu2cpu_irq);
-        writel(IRQ_CPU_TO_HPU_ACK, &cx->scb->cpu2hpu_irq_ack);
-        writel(IRQ_PPU_TO_CPU,     &cx->scb->ppu2cpu_irq);
-        writel(IRQ_CPU_TO_PPU_ACK, &cx->scb->cpu2ppu_irq_ack);
-        writel(IRQ_EPU_TO_CPU,     &cx->scb->epu2cpu_irq);
-        writel(IRQ_CPU_TO_EPU_ACK, &cx->scb->cpu2epu_irq_ack);
+        cx18_writel(cx, IRQ_APU_TO_CPU,     &cx->scb->apu2cpu_irq);
+        cx18_writel(cx, IRQ_CPU_TO_APU_ACK, &cx->scb->cpu2apu_irq_ack);
+        cx18_writel(cx, IRQ_HPU_TO_CPU,     &cx->scb->hpu2cpu_irq);
+        cx18_writel(cx, IRQ_CPU_TO_HPU_ACK, &cx->scb->cpu2hpu_irq_ack);
+        cx18_writel(cx, IRQ_PPU_TO_CPU,     &cx->scb->ppu2cpu_irq);
+        cx18_writel(cx, IRQ_CPU_TO_PPU_ACK, &cx->scb->cpu2ppu_irq_ack);
+        cx18_writel(cx, IRQ_EPU_TO_CPU,     &cx->scb->epu2cpu_irq);
+        cx18_writel(cx, IRQ_CPU_TO_EPU_ACK, &cx->scb->cpu2epu_irq_ack);
 
-        writel(IRQ_CPU_TO_APU,     &cx->scb->cpu2apu_irq);
-        writel(IRQ_APU_TO_CPU_ACK, &cx->scb->apu2cpu_irq_ack);
-        writel(IRQ_HPU_TO_APU,     &cx->scb->hpu2apu_irq);
-        writel(IRQ_APU_TO_HPU_ACK, &cx->scb->apu2hpu_irq_ack);
-        writel(IRQ_PPU_TO_APU,     &cx->scb->ppu2apu_irq);
-        writel(IRQ_APU_TO_PPU_ACK, &cx->scb->apu2ppu_irq_ack);
-        writel(IRQ_EPU_TO_APU,     &cx->scb->epu2apu_irq);
-        writel(IRQ_APU_TO_EPU_ACK, &cx->scb->apu2epu_irq_ack);
+        cx18_writel(cx, IRQ_CPU_TO_APU,     &cx->scb->cpu2apu_irq);
+        cx18_writel(cx, IRQ_APU_TO_CPU_ACK, &cx->scb->apu2cpu_irq_ack);
+        cx18_writel(cx, IRQ_HPU_TO_APU,     &cx->scb->hpu2apu_irq);
+        cx18_writel(cx, IRQ_APU_TO_HPU_ACK, &cx->scb->apu2hpu_irq_ack);
+        cx18_writel(cx, IRQ_PPU_TO_APU,     &cx->scb->ppu2apu_irq);
+        cx18_writel(cx, IRQ_APU_TO_PPU_ACK, &cx->scb->apu2ppu_irq_ack);
+        cx18_writel(cx, IRQ_EPU_TO_APU,     &cx->scb->epu2apu_irq);
+        cx18_writel(cx, IRQ_APU_TO_EPU_ACK, &cx->scb->apu2epu_irq_ack);
 
-        writel(IRQ_CPU_TO_HPU,     &cx->scb->cpu2hpu_irq);
-        writel(IRQ_HPU_TO_CPU_ACK, &cx->scb->hpu2cpu_irq_ack);
-        writel(IRQ_APU_TO_HPU,     &cx->scb->apu2hpu_irq);
-        writel(IRQ_HPU_TO_APU_ACK, &cx->scb->hpu2apu_irq_ack);
-        writel(IRQ_PPU_TO_HPU,     &cx->scb->ppu2hpu_irq);
-        writel(IRQ_HPU_TO_PPU_ACK, &cx->scb->hpu2ppu_irq_ack);
-        writel(IRQ_EPU_TO_HPU,     &cx->scb->epu2hpu_irq);
-        writel(IRQ_HPU_TO_EPU_ACK, &cx->scb->hpu2epu_irq_ack);
+        cx18_writel(cx, IRQ_CPU_TO_HPU,     &cx->scb->cpu2hpu_irq);
+        cx18_writel(cx, IRQ_HPU_TO_CPU_ACK, &cx->scb->hpu2cpu_irq_ack);
+        cx18_writel(cx, IRQ_APU_TO_HPU,     &cx->scb->apu2hpu_irq);
+        cx18_writel(cx, IRQ_HPU_TO_APU_ACK, &cx->scb->hpu2apu_irq_ack);
+        cx18_writel(cx, IRQ_PPU_TO_HPU,     &cx->scb->ppu2hpu_irq);
+        cx18_writel(cx, IRQ_HPU_TO_PPU_ACK, &cx->scb->hpu2ppu_irq_ack);
+        cx18_writel(cx, IRQ_EPU_TO_HPU,     &cx->scb->epu2hpu_irq);
+        cx18_writel(cx, IRQ_HPU_TO_EPU_ACK, &cx->scb->hpu2epu_irq_ack);
 
-        writel(IRQ_CPU_TO_PPU,     &cx->scb->cpu2ppu_irq);
-        writel(IRQ_PPU_TO_CPU_ACK, &cx->scb->ppu2cpu_irq_ack);
-        writel(IRQ_APU_TO_PPU,     &cx->scb->apu2ppu_irq);
-        writel(IRQ_PPU_TO_APU_ACK, &cx->scb->ppu2apu_irq_ack);
-        writel(IRQ_HPU_TO_PPU,     &cx->scb->hpu2ppu_irq);
-        writel(IRQ_PPU_TO_HPU_ACK, &cx->scb->ppu2hpu_irq_ack);
-        writel(IRQ_EPU_TO_PPU,     &cx->scb->epu2ppu_irq);
-        writel(IRQ_PPU_TO_EPU_ACK, &cx->scb->ppu2epu_irq_ack);
+        cx18_writel(cx, IRQ_CPU_TO_PPU,     &cx->scb->cpu2ppu_irq);
+        cx18_writel(cx, IRQ_PPU_TO_CPU_ACK, &cx->scb->ppu2cpu_irq_ack);
+        cx18_writel(cx, IRQ_APU_TO_PPU,     &cx->scb->apu2ppu_irq);
+        cx18_writel(cx, IRQ_PPU_TO_APU_ACK, &cx->scb->ppu2apu_irq_ack);
+        cx18_writel(cx, IRQ_HPU_TO_PPU,     &cx->scb->hpu2ppu_irq);
+        cx18_writel(cx, IRQ_PPU_TO_HPU_ACK, &cx->scb->ppu2hpu_irq_ack);
+        cx18_writel(cx, IRQ_EPU_TO_PPU,     &cx->scb->epu2ppu_irq);
+        cx18_writel(cx, IRQ_PPU_TO_EPU_ACK, &cx->scb->ppu2epu_irq_ack);
 
-        writel(IRQ_CPU_TO_EPU,     &cx->scb->cpu2epu_irq);
-        writel(IRQ_EPU_TO_CPU_ACK, &cx->scb->epu2cpu_irq_ack);
-        writel(IRQ_APU_TO_EPU,     &cx->scb->apu2epu_irq);
-        writel(IRQ_EPU_TO_APU_ACK, &cx->scb->epu2apu_irq_ack);
-        writel(IRQ_HPU_TO_EPU,     &cx->scb->hpu2epu_irq);
-        writel(IRQ_EPU_TO_HPU_ACK, &cx->scb->epu2hpu_irq_ack);
-        writel(IRQ_PPU_TO_EPU,     &cx->scb->ppu2epu_irq);
-        writel(IRQ_EPU_TO_PPU_ACK, &cx->scb->epu2ppu_irq_ack);
+        cx18_writel(cx, IRQ_CPU_TO_EPU,     &cx->scb->cpu2epu_irq);
+        cx18_writel(cx, IRQ_EPU_TO_CPU_ACK, &cx->scb->epu2cpu_irq_ack);
+        cx18_writel(cx, IRQ_APU_TO_EPU,     &cx->scb->apu2epu_irq);
+        cx18_writel(cx, IRQ_EPU_TO_APU_ACK, &cx->scb->epu2apu_irq_ack);
+        cx18_writel(cx, IRQ_HPU_TO_EPU,     &cx->scb->hpu2epu_irq);
+        cx18_writel(cx, IRQ_EPU_TO_HPU_ACK, &cx->scb->epu2hpu_irq_ack);
+        cx18_writel(cx, IRQ_PPU_TO_EPU,     &cx->scb->ppu2epu_irq);
+        cx18_writel(cx, IRQ_EPU_TO_PPU_ACK, &cx->scb->epu2ppu_irq_ack);
 
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2cpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2cpu_mb),
                         &cx->scb->apu2cpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2cpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2cpu_mb),
                         &cx->scb->hpu2cpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2cpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2cpu_mb),
                         &cx->scb->ppu2cpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2cpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2cpu_mb),
                         &cx->scb->epu2cpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2apu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2apu_mb),
                         &cx->scb->cpu2apu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2apu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2apu_mb),
                         &cx->scb->hpu2apu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2apu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2apu_mb),
                         &cx->scb->ppu2apu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2apu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2apu_mb),
                         &cx->scb->epu2apu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2hpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2hpu_mb),
                         &cx->scb->cpu2hpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2hpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2hpu_mb),
                         &cx->scb->apu2hpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2hpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2hpu_mb),
                         &cx->scb->ppu2hpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2hpu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2hpu_mb),
                         &cx->scb->epu2hpu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2ppu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2ppu_mb),
                         &cx->scb->cpu2ppu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2ppu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2ppu_mb),
                         &cx->scb->apu2ppu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2ppu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2ppu_mb),
                         &cx->scb->hpu2ppu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, epu2ppu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, epu2ppu_mb),
                         &cx->scb->epu2ppu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu2epu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu2epu_mb),
                         &cx->scb->cpu2epu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, apu2epu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, apu2epu_mb),
                         &cx->scb->apu2epu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, hpu2epu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, hpu2epu_mb),
                         &cx->scb->hpu2epu_mb_offset);
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, ppu2epu_mb),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, ppu2epu_mb),
                         &cx->scb->ppu2epu_mb_offset);
 
-        writel(SCB_OFFSET + offsetof(struct cx18_scb, cpu_state),
+        cx18_writel(cx, SCB_OFFSET + offsetof(struct cx18_scb, cpu_state),
                         &cx->scb->ipc_offset);
 
-        writel(1, &cx->scb->hpu_state);
-        writel(1, &cx->scb->epu_state);
+        cx18_writel(cx, 1, &cx->scb->hpu_state);
+        cx18_writel(cx, 1, &cx->scb->epu_state);
 }
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c
index 0da57f583bf7..0c8e7542cf60 100644
--- a/drivers/media/video/cx18/cx18-streams.c
+++ b/drivers/media/video/cx18/cx18-streams.c
@@ -22,6 +22,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include "cx18-fileops.h"
 #include "cx18-mailbox.h"
 #include "cx18-i2c.h"
@@ -56,7 +57,7 @@ static struct file_operations cx18_v4l2_enc_fops = {
 static struct {
         const char *name;
         int vfl_type;
-        int minor_offset;
+        int num_offset;
         int dma;
         enum v4l2_buf_type buf_type;
         struct file_operations *fops;
@@ -119,7 +120,7 @@ static void cx18_stream_init(struct cx18 *cx, int type)
         s->cx = cx;
         s->type = type;
         s->name = cx18_stream_info[type].name;
-        s->handle = 0xffffffff;
+        s->handle = CX18_INVALID_TASK_HANDLE;
 
         s->dma = cx18_stream_info[type].dma;
         s->buf_size = cx->stream_buf_size[type];
@@ -143,8 +144,8 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
 {
         struct cx18_stream *s = &cx->streams[type];
         u32 cap = cx->v4l2_cap;
-        int minor_offset = cx18_stream_info[type].minor_offset;
-        int minor;
+        int num_offset = cx18_stream_info[type].num_offset;
+        int num = cx->num + cx18_first_minor + num_offset;
 
         /* These four fields are always initialized. If v4l2dev == NULL, then
            this stream is not in use. In that case no other fields but these
@@ -163,9 +164,6 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
             !(cap & (V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE)))
                 return 0;
 
-        /* card number + user defined offset + device offset */
-        minor = cx->num + cx18_first_minor + minor_offset;
-
         /* User explicitly selected 0 buffers for these streams, so don't
            create them. */
         if (cx18_stream_info[type].dma != PCI_DMA_NONE &&
@@ -176,7 +174,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
 
         cx18_stream_init(cx, type);
 
-        if (minor_offset == -1)
+        if (num_offset == -1)
                 return 0;
 
         /* allocate and initialize the v4l2 video device structure */
@@ -190,7 +188,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
         snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "cx18-%d",
                         cx->num);
 
-        s->v4l2dev->minor = minor;
+        s->v4l2dev->num = num;
         s->v4l2dev->parent = &cx->dev->dev;
         s->v4l2dev->fops = cx18_stream_info[type].fops;
         s->v4l2dev->release = video_device_release;
@@ -226,7 +224,7 @@ static int cx18_reg_dev(struct cx18 *cx, int type)
 {
         struct cx18_stream *s = &cx->streams[type];
         int vfl_type = cx18_stream_info[type].vfl_type;
-        int minor;
+        int num;
 
         /* TODO: Shouldn't this be a VFL_TYPE_TRANSPORT or something?
          * We need a VFL_TYPE_TS defined.
@@ -244,38 +242,44 @@ static int cx18_reg_dev(struct cx18 *cx, int type)
         if (s->v4l2dev == NULL)
                 return 0;
 
-        minor = s->v4l2dev->minor;
+        num = s->v4l2dev->num;
+        /* card number + user defined offset + device offset */
+        if (type != CX18_ENC_STREAM_TYPE_MPG) {
+                struct cx18_stream *s_mpg = &cx->streams[CX18_ENC_STREAM_TYPE_MPG];
+
+                if (s_mpg->v4l2dev)
+                        num = s_mpg->v4l2dev->num + cx18_stream_info[type].num_offset;
+        }
 
         /* Register device. First try the desired minor, then any free one. */
-        if (video_register_device(s->v4l2dev, vfl_type, minor) &&
-                        video_register_device(s->v4l2dev, vfl_type, -1)) {
-                CX18_ERR("Couldn't register v4l2 device for %s minor %d\n",
-                        s->name, minor);
+        if (video_register_device(s->v4l2dev, vfl_type, num)) {
+                CX18_ERR("Couldn't register v4l2 device for %s kernel number %d\n",
+                        s->name, num);
                 video_device_release(s->v4l2dev);
                 s->v4l2dev = NULL;
                 return -ENOMEM;
         }
-        minor = s->v4l2dev->minor;
+        num = s->v4l2dev->num;
 
         switch (vfl_type) {
         case VFL_TYPE_GRABBER:
                 CX18_INFO("Registered device video%d for %s (%d MB)\n",
-                        minor, s->name, cx->options.megabytes[type]);
+                        num, s->name, cx->options.megabytes[type]);
                 break;
 
         case VFL_TYPE_RADIO:
                 CX18_INFO("Registered device radio%d for %s\n",
-                        minor - MINOR_VFL_TYPE_RADIO_MIN, s->name);
+                        num, s->name);
                 break;
 
         case VFL_TYPE_VBI:
                 if (cx->options.megabytes[type])
                         CX18_INFO("Registered device vbi%d for %s (%d MB)\n",
-                                minor - MINOR_VFL_TYPE_VBI_MIN,
+                                num,
                                 s->name, cx->options.megabytes[type]);
                 else
                         CX18_INFO("Registered device vbi%d for %s\n",
-                                minor - MINOR_VFL_TYPE_VBI_MIN, s->name);
+                                num, s->name);
                 break;
         }
 
@@ -432,7 +436,6 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
         default:
                 return -EINVAL;
         }
-        s->buffers_stolen = 0;
 
         /* mute/unmute video */
         cx18_vapi(cx, CX18_CPU_SET_VIDEO_MUTE, 2,
@@ -470,7 +473,7 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
 
         if (atomic_read(&cx->tot_capturing) == 0) {
                 clear_bit(CX18_F_I_EOS, &cx->i_flags);
-                write_reg(7, CX18_DSP0_INTERRUPT_MASK);
+                cx18_write_reg(cx, 7, CX18_DSP0_INTERRUPT_MASK);
         }
 
         cx18_vapi(cx, CX18_CPU_DE_SET_MDL_ACK, 3, s->handle,
@@ -480,8 +483,9 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
         list_for_each(p, &s->q_free.list) {
                 struct cx18_buffer *buf = list_entry(p, struct cx18_buffer, list);
 
-                writel(buf->dma_handle, &cx->scb->cpu_mdl[buf->id].paddr);
-                writel(s->buf_size, &cx->scb->cpu_mdl[buf->id].length);
+                cx18_writel(cx, buf->dma_handle,
+                                        &cx->scb->cpu_mdl[buf->id].paddr);
+                cx18_writel(cx, s->buf_size, &cx->scb->cpu_mdl[buf->id].length);
                 cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s->handle,
                         (void __iomem *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem,
                         1, buf->id, s->buf_size);
@@ -489,7 +493,14 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
         /* begin_capture */
         if (cx18_vapi(cx, CX18_CPU_CAPTURE_START, 1, s->handle)) {
                 CX18_DEBUG_WARN("Error starting capture!\n");
+                /* Ensure we're really not capturing before releasing MDLs */
+                if (s->type == CX18_ENC_STREAM_TYPE_MPG)
+                        cx18_vapi(cx, CX18_CPU_CAPTURE_STOP, 2, s->handle, 1);
+                else
+                        cx18_vapi(cx, CX18_CPU_CAPTURE_STOP, 1, s->handle);
+                cx18_vapi(cx, CX18_CPU_DE_RELEASE_MDL, 1, s->handle);
                 cx18_vapi(cx, CX18_DESTROY_TASK, 1, s->handle);
+                /* FIXME - clean-up DSP0_INT mask, i_flags, s_flags, etc. */
                 return -EINVAL;
         }
 
@@ -541,6 +552,9 @@ int cx18_stop_v4l2_encode_stream(struct cx18_stream *s, int gop_end)
                 CX18_INFO("ignoring gop_end: not (yet?) supported by the firmware\n");
         }
 
+        /* Tell the CX23418 it can't use our buffers anymore */
+        cx18_vapi(cx, CX18_CPU_DE_RELEASE_MDL, 1, s->handle);
+
         if (s->type != CX18_ENC_STREAM_TYPE_TS)
                 atomic_dec(&cx->ana_capturing);
         atomic_dec(&cx->tot_capturing);
@@ -549,12 +563,12 @@ int cx18_stop_v4l2_encode_stream(struct cx18_stream *s, int gop_end)
         clear_bit(CX18_F_S_STREAMING, &s->s_flags);
 
         cx18_vapi(cx, CX18_DESTROY_TASK, 1, s->handle);
-        s->handle = 0xffffffff;
+        s->handle = CX18_INVALID_TASK_HANDLE;
 
         if (atomic_read(&cx->tot_capturing) > 0)
                 return 0;
 
-        write_reg(5, CX18_DSP0_INTERRUPT_MASK);
+        cx18_write_reg(cx, 5, CX18_DSP0_INTERRUPT_MASK);
         wake_up(&s->waitq);
 
         return 0;
@@ -568,8 +582,8 @@ u32 cx18_find_handle(struct cx18 *cx)
         for (i = 0; i < CX18_MAX_STREAMS; i++) {
                 struct cx18_stream *s = &cx->streams[i];
 
-                if (s->v4l2dev && s->handle)
+                if (s->v4l2dev && (s->handle != CX18_INVALID_TASK_HANDLE))
                         return s->handle;
         }
-        return 0;
+        return CX18_INVALID_TASK_HANDLE;
 }
diff --git a/drivers/media/video/cx18/cx18-version.h b/drivers/media/video/cx18/cx18-version.h
index d5c7a6f968dd..9f6be2d457fb 100644
--- a/drivers/media/video/cx18/cx18-version.h
+++ b/drivers/media/video/cx18/cx18-version.h
@@ -25,7 +25,7 @@
 #define CX18_DRIVER_NAME "cx18"
 #define CX18_DRIVER_VERSION_MAJOR 1
 #define CX18_DRIVER_VERSION_MINOR 0
-#define CX18_DRIVER_VERSION_PATCHLEVEL 0
+#define CX18_DRIVER_VERSION_PATCHLEVEL 1
 
 #define CX18_VERSION __stringify(CX18_DRIVER_VERSION_MAJOR) "." __stringify(CX18_DRIVER_VERSION_MINOR) "." __stringify(CX18_DRIVER_VERSION_PATCHLEVEL)
 #define CX18_DRIVER_VERSION KERNEL_VERSION(CX18_DRIVER_VERSION_MAJOR, \
diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h
index e7ed053059a8..668f968d7761 100644
--- a/drivers/media/video/cx18/cx23418.h
+++ b/drivers/media/video/cx18/cx23418.h
@@ -351,7 +351,7 @@
    Descriptor Lists to the driver
    IN[0] - Task handle. Handle of the task to start
    ReturnCode - One of the ERR_DE_... */
-/* #define CX18_CPU_DE_ReleaseMDL               (CPU_CMD_MASK_DE | 0x0006) */
+#define CX18_CPU_DE_RELEASE_MDL                 (CPU_CMD_MASK_DE | 0x0006)
 
 /* Description: This command signals the cpu that the dat buffer has been
    consumed and ready for re-use.
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c
index 22847a0444f5..cbbe47fb87b7 100644
--- a/drivers/media/video/cx2341x.c
+++ b/drivers/media/video/cx2341x.c
@@ -508,7 +508,10 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params,
                 /* this setting is read-only for the cx2341x since the
                    V4L2_CID_MPEG_STREAM_TYPE really determines the
                    MPEG-1/2 setting */
-                err = v4l2_ctrl_query_fill_std(qctrl);
+                err = v4l2_ctrl_query_fill(qctrl,
+                                           V4L2_MPEG_VIDEO_ENCODING_MPEG_1,
+                                           V4L2_MPEG_VIDEO_ENCODING_MPEG_2, 1,
+                                           V4L2_MPEG_VIDEO_ENCODING_MPEG_2);
                 if (err == 0)
                         qctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
                 return err;
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index e60bd31b51a3..8c1b7fa47a41 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -15,6 +15,7 @@ config VIDEO_CX23885
         select DVB_S5H1409 if !DVB_FE_CUSTOMISE
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
+        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 7b0e8c01692e..395c11fa47ce 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -36,7 +36,6 @@
 #include <media/cx2341x.h>
 
 #include "cx23885.h"
-#include "media/cx2341x.h"
 
 #define CX23885_FIRM_IMAGE_SIZE 376836
 #define CX23885_FIRM_IMAGE_NAME "v4l-cx23885-enc.fw"
@@ -632,7 +631,7 @@ int mc417_memory_read(struct cx23885_dev *dev, u32 address, u32 *value)
 /* ------------------------------------------------------------------ */
 
 /* MPEG encoder API */
-char *cmd_to_str(int cmd)
+static char *cmd_to_str(int cmd)
 {
         switch (cmd) {
         case CX2341X_ENC_PING_FW:
@@ -1583,6 +1582,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
 
         dprintk(2, "%s()\n", __func__);
 
+        lock_kernel();
         list_for_each(list, &cx23885_devlist) {
                 h = list_entry(list, struct cx23885_dev, devlist);
                 if (h->v4l_device->minor == minor) {
@@ -1591,13 +1591,17 @@ static int mpeg_open(struct inode *inode, struct file *file)
                 }
         }
 
-        if (dev == NULL)
+        if (dev == NULL) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
 
         file->private_data = fh;
         fh->dev      = dev;
@@ -1608,6 +1612,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
                             V4L2_FIELD_INTERLACED,
                             sizeof(struct cx23885_buffer),
                             fh);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index c36d3f632104..2cda15f829fd 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -26,6 +26,7 @@
 #include <media/cx25840.h>
 
 #include "cx23885.h"
+#include "tuner-xc2028.h"
 
 /* ------------------------------------------------------------------ */
 /* board config info                                                  */
@@ -148,6 +149,15 @@ struct cx23885_board cx23885_boards[] = {
                 .portb          = CX23885_MPEG_DVB,
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP] = {
+                .name           = "DViCO FusionHDTV DVB-T Dual Express",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H] = {
+                .name           = "Leadtek Winfast PxDVR3200 H",
+                .portc          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -219,6 +229,14 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x18ac,
                 .subdevice = 0xd618,
                 .card      = CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP,
+        },{
+                .subvendor = 0x18ac,
+                .subdevice = 0xdb78,
+                .card      = CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP,
+        }, {
+                .subvendor = 0x107d,
+                .subdevice = 0x6681,
+                .card      = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -319,15 +337,15 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
                         dev->name, tv.model);
 }
 
-/* Tuner callback function for cx23885 boards. Currently only needed
- * for HVR1500Q, which has an xc5000 tuner.
- */
-int cx23885_tuner_callback(void *priv, int command, int arg)
+int cx23885_tuner_callback(void *priv, int component, int command, int arg)
 {
-        struct cx23885_i2c *bus = priv;
-        struct cx23885_dev *dev = bus->dev;
+        struct cx23885_tsport *port = priv;
+        struct cx23885_dev *dev = port->dev;
         u32 bitmask = 0;
 
+        if (command == XC2028_RESET_CLK)
+                return 0;
+
         if (command != 0) {
                 printk(KERN_ERR "%s(): Unknown command 0x%x.\n",
                         __func__, command);
@@ -335,21 +353,21 @@ int cx23885_tuner_callback(void *priv, int command, int arg)
         }
 
         switch(dev->board) {
+        case CX23885_BOARD_HAUPPAUGE_HVR1400:
+        case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
-                /* Tuner Reset Command from xc5000 */
-                if (command == 0)
-                        bitmask = 0x04;
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+                /* Tuner Reset Command */
+                bitmask = 0x04;
                 break;
         case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:
-                if (command == 0) {
-
-                        /* Two identical tuners on two different i2c buses,
-                         * we need to reset the correct gpio. */
-                        if (bus->nr == 0)
-                                bitmask = 0x01;
-                        else if (bus->nr == 1)
-                                bitmask = 0x04;
-                }
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
+                /* Two identical tuners on two different i2c buses,
+                 * we need to reset the correct gpio. */
+                if (port->nr == 0)
+                        bitmask = 0x01;
+                else if (port->nr == 1)
+                        bitmask = 0x04;
                 break;
         }
 
@@ -465,6 +483,32 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 mdelay(20);
                 cx_set(GP0_IO, 0x000f000f);
                 break;
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
+                /* GPIO-0 portb xc3028 reset */
+                /* GPIO-1 portb zl10353 reset */
+                /* GPIO-2 portc xc3028 reset */
+                /* GPIO-3 portc zl10353 reset */
+
+                /* Put the parts into reset and back */
+                cx_set(GP0_IO, 0x000f0000);
+                mdelay(20);
+                cx_clear(GP0_IO, 0x0000000f);
+                mdelay(20);
+                cx_set(GP0_IO, 0x000f000f);
+                break;
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+                /* GPIO-2  xc3028 tuner reset */
+
+                /* The following GPIO's are on the internal AVCore (cx25840) */
+                /* GPIO-?  zl10353 demod reset */
+
+                /* Put the parts into reset and back */
+                cx_set(GP0_IO, 0x00040000);
+                mdelay(20);
+                cx_clear(GP0_IO, 0x00000004);
+                mdelay(20);
+                cx_set(GP0_IO, 0x00040004);
+                break;
         }
 }
 
@@ -479,6 +523,9 @@ int cx23885_ir_init(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
                 /* FIXME: Implement me */
                 break;
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
+                request_module("ir-kbd-i2c");
+                break;
         }
 
         return 0;
@@ -516,6 +563,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
 
         switch (dev->board) {
         case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
                 ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
@@ -548,6 +596,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1200:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
         default:
                 ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -561,6 +610,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
                 request_module("cx25840");
                 break;
         }
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 25fb09938744..beb3e61669a3 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1442,7 +1442,7 @@ void cx23885_cancel_buffers(struct cx23885_tsport *port)
         struct cx23885_dev *dev = port->dev;
         struct cx23885_dmaqueue *q = &port->mpegq;
 
-        dprintk(1, "%s()\n", __FUNCTION__);
+        dprintk(1, "%s()\n", __func__);
         del_timer_sync(&q->timeout);
         cx23885_stop_dma(port);
         do_cancel_buffers(port, "cancel", 0);
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 291b9d008da8..24bd18327aa0 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -42,6 +42,7 @@
 #include "tuner-simple.h"
 #include "dib7000p.h"
 #include "dibx000_common.h"
+#include "zl10353.h"
 
 static unsigned int debug;
 
@@ -188,13 +189,11 @@ static struct s5h1411_config dvico_s5h1411_config = {
 static struct xc5000_config hauppauge_hvr1500q_tunerconfig = {
         .i2c_address      = 0x61,
         .if_khz           = 5380,
-        .tuner_callback   = cx23885_tuner_callback
 };
 
 static struct xc5000_config dvico_xc5000_tunerconfig = {
         .i2c_address      = 0x64,
         .if_khz           = 5380,
-        .tuner_callback   = cx23885_tuner_callback
 };
 
 static struct tda829x_config tda829x_no_probe = {
@@ -303,35 +302,11 @@ static struct dib7000p_config hauppauge_hvr1400_dib7000_config = {
         .output_mode = OUTMODE_MPEG2_SERIAL,
 };
 
-static int cx23885_hvr1500_xc3028_callback(void *ptr, int command, int arg)
-{
-        struct cx23885_tsport *port = ptr;
-        struct cx23885_dev *dev = port->dev;
-
-        switch (command) {
-        case XC2028_TUNER_RESET:
-                /* Send the tuner in then out of reset */
-                /* GPIO-2 xc3028 tuner */
-                dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __func__, arg);
-
-                cx_set(GP0_IO, 0x00040000);
-                cx_clear(GP0_IO, 0x00000004);
-                msleep(5);
-
-                cx_set(GP0_IO, 0x00040004);
-                msleep(5);
-                break;
-        case XC2028_RESET_CLK:
-                dprintk(1, "%s: XC2028_RESET_CLK %d\n", __func__, arg);
-                break;
-        default:
-                dprintk(1, "%s: unknown command %d, arg %d\n", __func__,
-                        command, arg);
-                return -EINVAL;
-        }
-
-        return 0;
-}
+static struct zl10353_config dvico_fusionhdtv_xc3028 = {
+        .demod_address = 0x0f,
+        .if2           = 45600,
+        .no_tuner      = 1,
+};
 
 static int dvb_register(struct cx23885_tsport *port)
 {
@@ -413,8 +388,8 @@ static int dvb_register(struct cx23885_tsport *port)
                                                 &dev->i2c_bus[0].i2c_adap);
                 if (port->dvb.frontend != NULL)
                         dvb_attach(xc5000_attach, port->dvb.frontend,
-                                &i2c_bus->i2c_adap,
-                                &hauppauge_hvr1500q_tunerconfig, i2c_bus);
+                                   &i2c_bus->i2c_adap,
+                                   &hauppauge_hvr1500q_tunerconfig);
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
                 i2c_bus = &dev->i2c_bus[1];
@@ -426,10 +401,9 @@ static int dvb_register(struct cx23885_tsport *port)
                         struct xc2028_config cfg = {
                                 .i2c_adap  = &i2c_bus->i2c_adap,
                                 .i2c_addr  = 0x61,
-                                .callback  = cx23885_hvr1500_xc3028_callback,
                         };
                         static struct xc2028_ctrl ctl = {
-                                .fname       = "xc3028-v27.fw",
+                                .fname       = XC2028_DEFAULT_FIRMWARE,
                                 .max_len     = 64,
                                 .scode_table = XC3028_FE_OREN538,
                         };
@@ -465,13 +439,13 @@ static int dvb_register(struct cx23885_tsport *port)
                         struct xc2028_config cfg = {
                                 .i2c_adap  = &dev->i2c_bus[1].i2c_adap,
                                 .i2c_addr  = 0x64,
-                                .callback  = cx23885_hvr1500_xc3028_callback,
                         };
                         static struct xc2028_ctrl ctl = {
-                                .fname   = "xc3028L-v36.fw",
+                                .fname   = XC3028L_DEFAULT_FIRMWARE,
                                 .max_len = 64,
                                 .demod   = 5000,
-                                .d2633   = 1
+                                /* This is true for all demods with v36 firmware? */
+                                .type    = XC2028_D2633,
                         };
 
                         fe = dvb_attach(xc2028_attach,
@@ -492,8 +466,57 @@ static int dvb_register(struct cx23885_tsport *port)
                                                         &i2c_bus->i2c_adap);
                 if (port->dvb.frontend != NULL)
                         dvb_attach(xc5000_attach, port->dvb.frontend,
-                                &i2c_bus->i2c_adap,
-                                &dvico_xc5000_tunerconfig, i2c_bus);
+                                   &i2c_bus->i2c_adap,
+                                   &dvico_xc5000_tunerconfig);
+                break;
+        case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP: {
+                i2c_bus = &dev->i2c_bus[port->nr - 1];
+
+                port->dvb.frontend = dvb_attach(zl10353_attach,
+                                               &dvico_fusionhdtv_xc3028,
+                                               &i2c_bus->i2c_adap);
+                if (port->dvb.frontend != NULL) {
+                        struct dvb_frontend      *fe;
+                        struct xc2028_config      cfg = {
+                                .i2c_adap  = &i2c_bus->i2c_adap,
+                                .i2c_addr  = 0x61,
+                        };
+                        static struct xc2028_ctrl ctl = {
+                                .fname       = XC2028_DEFAULT_FIRMWARE,
+                                .max_len     = 64,
+                                .demod       = XC3028_FE_ZARLINK456,
+                        };
+
+                        fe = dvb_attach(xc2028_attach, port->dvb.frontend,
+                                        &cfg);
+                        if (fe != NULL && fe->ops.tuner_ops.set_config != NULL)
+                                fe->ops.tuner_ops.set_config(fe, &ctl);
+                }
+                break;
+        }
+        case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+                i2c_bus = &dev->i2c_bus[0];
+
+                port->dvb.frontend = dvb_attach(zl10353_attach,
+                        &dvico_fusionhdtv_xc3028,
+                        &i2c_bus->i2c_adap);
+                if (port->dvb.frontend != NULL) {
+                        struct dvb_frontend      *fe;
+                        struct xc2028_config      cfg = {
+                                .i2c_adap  = &dev->i2c_bus[1].i2c_adap,
+                                .i2c_addr  = 0x61,
+                        };
+                        static struct xc2028_ctrl ctl = {
+                                .fname       = XC2028_DEFAULT_FIRMWARE,
+                                .max_len     = 64,
+                                .demod       = XC3028_FE_ZARLINK456,
+                        };
+
+                        fe = dvb_attach(xc2028_attach, port->dvb.frontend,
+                                &cfg);
+                        if (fe != NULL && fe->ops.tuner_ops.set_config != NULL)
+                                fe->ops.tuner_ops.set_config(fe, &ctl);
+                }
                 break;
         default:
                 printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
@@ -504,6 +527,8 @@ static int dvb_register(struct cx23885_tsport *port)
                 printk("%s: frontend initialization failed\n", dev->name);
                 return -1;
         }
+        /* define general-purpose callback pointer */
+        port->dvb.frontend->callback = cx23885_tuner_callback;
 
         /* Put the analog decoder in standby to keep it quiet */
         cx23885_call_i2c_clients(i2c_bus, TUNER_SET_STANDBY, NULL);
diff --git a/drivers/media/video/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c
index 35e61cd112fc..5b297f0323b6 100644
--- a/drivers/media/video/cx23885/cx23885-vbi.c
+++ b/drivers/media/video/cx23885/cx23885-vbi.c
@@ -85,18 +85,8 @@ static int cx23885_start_vbi_dma(struct cx23885_dev    *dev,
         return 0;
 }
 
-int cx23885_stop_vbi_dma(struct cx23885_dev *dev)
-{
-        /* stop dma */
-        cx_clear(VID_A_DMA_CTL, 0x00000022);
-
-        /* disable irqs */
-        cx_clear(PCI_INT_MSK, 0x000001);
-        cx_clear(VID_A_INT_MSK, 0x00000022);
-        return 0;
-}
 
-int cx23885_restart_vbi_queue(struct cx23885_dev    *dev,
+static int cx23885_restart_vbi_queue(struct cx23885_dev    *dev,
                              struct cx23885_dmaqueue *q)
 {
         struct cx23885_buffer *buf;
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 6047c78d84bf..f75ed1c9b71a 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -244,7 +244,7 @@ static struct cx23885_ctrl cx23885_ctls[] = {
 };
 static const int CX23885_CTLS = ARRAY_SIZE(cx23885_ctls);
 
-const u32 cx23885_user_ctrls[] = {
+static const u32 cx23885_user_ctrls[] = {
         V4L2_CID_USER_CLASS,
         V4L2_CID_BRIGHTNESS,
         V4L2_CID_CONTRAST,
@@ -254,14 +254,13 @@ const u32 cx23885_user_ctrls[] = {
         V4L2_CID_AUDIO_MUTE,
         0
 };
-EXPORT_SYMBOL(cx23885_user_ctrls);
 
 static const u32 *ctrl_classes[] = {
         cx23885_user_ctrls,
         NULL
 };
 
-void cx23885_video_wakeup(struct cx23885_dev *dev,
+static void cx23885_video_wakeup(struct cx23885_dev *dev,
                  struct cx23885_dmaqueue *q, u32 count)
 {
         struct cx23885_buffer *buf;
@@ -296,7 +295,7 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,
                         __func__, bc);
 }
 
-int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
+static int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
 {
         dprintk(1, "%s(norm = 0x%08x) name: [%s]\n",
                 __func__,
@@ -314,7 +313,7 @@ int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
         return 0;
 }
 
-struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
+static struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
                                     struct pci_dev *pci,
                                     struct video_device *template,
                                     char *type)
@@ -334,7 +333,7 @@ struct video_device *cx23885_vdev_init(struct cx23885_dev *dev,
         return vfd;
 }
 
-int cx23885_ctrl_query(struct v4l2_queryctrl *qctrl)
+static int cx23885_ctrl_query(struct v4l2_queryctrl *qctrl)
 {
         int i;
 
@@ -351,7 +350,6 @@ int cx23885_ctrl_query(struct v4l2_queryctrl *qctrl)
         *qctrl = cx23885_ctls[i].v;
         return 0;
 }
-EXPORT_SYMBOL(cx23885_ctrl_query);
 
 /* ------------------------------------------------------------------- */
 /* resource management                                                 */
@@ -402,7 +400,7 @@ static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh,
         mutex_unlock(&dev->lock);
 }
 
-int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
+static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
 {
         struct v4l2_routing route;
         memset(&route, 0, sizeof(route));
@@ -422,10 +420,9 @@ int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
 
         return 0;
 }
-EXPORT_SYMBOL(cx23885_video_mux);
 
 /* ------------------------------------------------------------------ */
-int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width,
+static int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width,
         unsigned int height, enum v4l2_field field)
 {
         dprintk(1, "%s()\n", __func__);
@@ -731,6 +728,7 @@ static int video_open(struct inode *inode, struct file *file)
         enum v4l2_buf_type type = 0;
         int radio = 0;
 
+        lock_kernel();
         list_for_each(list, &cx23885_devlist) {
                 h = list_entry(list, struct cx23885_dev, devlist);
                 if (h->video_dev->minor == minor) {
@@ -748,16 +746,20 @@ static int video_open(struct inode *inode, struct file *file)
                         dev   = h;
                 }
         }
-        if (NULL == dev)
+        if (NULL == dev) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         dprintk(1, "open minor=%d radio=%d type=%s\n",
                 minor, radio, v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh), GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -775,6 +777,7 @@ static int video_open(struct inode *inode, struct file *file)
 
         dprintk(1, "post videobuf_queue_init()\n");
 
+        unlock_kernel();
 
         return 0;
 }
@@ -884,21 +887,19 @@ static int video_mmap(struct file *file, struct vm_area_struct *vma)
 /* ------------------------------------------------------------------ */
 /* VIDEO CTRL IOCTLS                                                  */
 
-int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
+static int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
 {
         dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __func__);
         cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_G_CTRL, ctl);
         return 0;
 }
-EXPORT_SYMBOL(cx23885_get_control);
 
-int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
+static int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
 {
         dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)"
                 " (disabled - no action)\n", __func__);
         return 0;
 }
-EXPORT_SYMBOL(cx23885_set_control);
 
 static void init_controls(struct cx23885_dev *dev)
 {
@@ -1146,7 +1147,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *tvnorms)
         return 0;
 }
 
-int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
+static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
 {
         static const char *iname[] = {
                 [CX23885_VMUX_COMPOSITE1] = "Composite1",
@@ -1179,7 +1180,6 @@ int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
                 i->std = CX23885_NORMS;
         return 0;
 }
-EXPORT_SYMBOL(cx23885_enum_input);
 
 static int vidioc_enum_input(struct file *file, void *priv,
                                 struct v4l2_input *i)
@@ -1288,7 +1288,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
         return 0;
 }
 
-int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)
+static int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)
 {
         if (unlikely(UNSET == dev->tuner_type))
                 return -EINVAL;
@@ -1307,7 +1307,6 @@ int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f)
 
         return 0;
 }
-EXPORT_SYMBOL(cx23885_set_freq);
 
 static int vidioc_s_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index e23d97c071e0..ba4e0aaed463 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -64,6 +64,8 @@
 #define CX23885_BOARD_HAUPPAUGE_HVR1700        8
 #define CX23885_BOARD_HAUPPAUGE_HVR1400        9
 #define CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP 10
+#define CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP 11
+#define CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H 12
 
 /* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
 #define CX23885_NORMS (\
@@ -409,7 +411,7 @@ extern const unsigned int cx23885_bcount;
 extern struct cx23885_subid cx23885_subids[];
 extern const unsigned int cx23885_idcount;
 
-extern int cx23885_tuner_callback(void *priv, int command, int arg);
+extern int cx23885_tuner_callback(void *priv, int component, int command, int arg);
 extern void cx23885_card_list(struct cx23885_dev *dev);
 extern int  cx23885_ir_init(struct cx23885_dev *dev);
 extern void cx23885_gpio_setup(struct cx23885_dev *dev);
diff --git a/drivers/media/video/cx25840/cx25840-vbi.c b/drivers/media/video/cx25840/cx25840-vbi.c
index 69f2bbdbb929..58e6ef1c28a0 100644
--- a/drivers/media/video/cx25840/cx25840-vbi.c
+++ b/drivers/media/video/cx25840/cx25840-vbi.c
@@ -141,10 +141,11 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
                 u8 lcr[24];
 
                 fmt = arg;
-                if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
+                if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE &&
+                    fmt->type != V4L2_BUF_TYPE_VBI_CAPTURE)
                         return -EINVAL;
                 svbi = &fmt->fmt.sliced;
-                if (svbi->service_set == 0) {
+                if (fmt->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
                         /* raw VBI */
                         memset(svbi, 0, sizeof(*svbi));
 
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 9dd7bdf659b9..0b9e5fac6239 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -58,6 +58,10 @@ config VIDEO_CX88_DVB
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
+        select DVB_CX24116 if !DVB_FE_CUSTOMISE
+        select DVB_STV0299 if !DVB_FE_CUSTOMISE
+        select DVB_STV0288 if !DVB_FE_CUSTOMISE
+        select DVB_STB6000 if !DVB_FE_CUSTOMISE
         ---help---
           This adds support for DVB/ATSC cards based on the
           Conexant 2388x chip.
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 9a1374a38ec7..e71369754305 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1057,12 +1057,15 @@ static int mpeg_open(struct inode *inode, struct file *file)
         struct cx8802_driver *drv = NULL;
         int err;
 
+        lock_kernel();
         dev = cx8802_get_device(inode);
 
         dprintk( 1, "%s\n", __func__);
 
-        if (dev == NULL)
+        if (dev == NULL) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         /* Make sure we can acquire the hardware */
         drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);
@@ -1070,6 +1073,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
                 err = drv->request_acquire(drv);
                 if(err != 0) {
                         dprintk(1,"%s: Unable to acquire hardware, %d\n", __func__, err);
+                        unlock_kernel();
                         return err;
                 }
         }
@@ -1077,6 +1081,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         if (blackbird_initialize_codec(dev) < 0) {
                 if (drv)
                         drv->request_release(drv);
+                unlock_kernel();
                 return -EINVAL;
         }
         dprintk(1,"open minor=%d\n",minor);
@@ -1086,6 +1091,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         if (NULL == fh) {
                 if (drv)
                         drv->request_release(drv);
+                unlock_kernel();
                 return -ENOMEM;
         }
         file->private_data = fh;
@@ -1101,6 +1107,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         /* FIXME: locking against other video device */
         cx88_set_scale(dev->core, dev->width, dev->height,
                         fh->mpegq.field);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index de199a206a15..5da04e811ca2 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1349,27 +1349,30 @@ static const struct cx88_board cx88_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
                 .audio_chip     = V4L2_IDENT_WM8775,
+                /*
+                 * gpio0 as reported by Mike Crash <mike AT mikecrash.com>
+                 */
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
-                        .gpio0  = 0xe780,
+                        .gpio0  = 0xef88,
                         .audioroute = 1,
                 },{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
-                        .gpio0  = 0xe780,
+                        .gpio0  = 0xef88,
                         .audioroute = 2,
                 },{
                         .type   = CX88_VMUX_SVIDEO,
                         .vmux   = 2,
-                        .gpio0  = 0xe780,
+                        .gpio0  = 0xef88,
                         .audioroute = 2,
                 }},
                 /* fixme: Add radio support */
                 .mpeg           = CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD,
                 .radio = {
                         .type   = CX88_RADIO,
-                        .gpio0  = 0xe780,
+                        .gpio0  = 0xef88,
                 },
         },
         [CX88_BOARD_ADSTECH_PTV_390] = {
@@ -1446,15 +1449,26 @@ static const struct cx88_board cx88_boards[] = {
                 .name           = "Pinnacle Hybrid PCTV",
                 .tuner_type     = TUNER_XC2028,
                 .tuner_addr     = 0x61,
+                .radio_type     = TUNER_XC2028,
+                .radio_addr     = 0x61,
                 .input          = { {
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
+                        .gpio0  = 0x004ff,
+                        .gpio1  = 0x010ff,
+                        .gpio2  = 0x00001,
                 }, {
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
+                        .gpio0  = 0x004fb,
+                        .gpio1  = 0x010ef,
+                        .audioroute = 1,
                 }, {
                         .type   = CX88_VMUX_SVIDEO,
                         .vmux   = 2,
+                        .gpio0  = 0x004fb,
+                        .gpio1  = 0x010ef,
+                        .audioroute = 1,
                 } },
                 .radio = {
                         .type   = CX88_RADIO,
@@ -1462,6 +1476,7 @@ static const struct cx88_board cx88_boards[] = {
                         .gpio1  = 0x010ff,
                         .gpio2  = 0x0ff,
                 },
+                .mpeg           = CX88_MPEG_DVB,
         },
         [CX88_BOARD_WINFAST_TV2000_XP_GLOBAL] = {
                 .name           = "Winfast TV2000 XP Global",
@@ -1566,9 +1581,9 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO] = {
                 .name           = "DViCO FusionHDTV DVB-T PRO",
-                .tuner_type     = TUNER_ABSENT, /* XXX: Has XC3028 */
+                .tuner_type     = TUNER_XC2028,
+                .tuner_addr     = 0x61,
                 .radio_type     = UNSET,
-                .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .input          = { {
                         .type   = CX88_VMUX_COMPOSITE1,
@@ -1625,6 +1640,36 @@ static const struct cx88_board cx88_boards[] = {
                         .gpio2 = 0x0cfb,
                 },
         },
+        [CX88_BOARD_PROLINK_PV_GLOBAL_XTREME] = {
+                .name           = "Prolink Pixelview Global Extreme",
+                .tuner_type     = TUNER_XC2028,
+                .tuner_addr     = 0x61,
+                .input          = { {
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0 = 0x04fb,
+                        .gpio1 = 0x04080,
+                        .gpio2 = 0x0cf7,
+                }, {
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0 = 0x04fb,
+                        .gpio1 = 0x04080,
+                        .gpio2 = 0x0cfb,
+                }, {
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0 = 0x04fb,
+                        .gpio1 = 0x04080,
+                        .gpio2 = 0x0cfb,
+                } },
+                .radio = {
+                        .type   = CX88_RADIO,
+                        .gpio0 = 0x04ff,
+                        .gpio1 = 0x04080,
+                        .gpio2 = 0x0cf7,
+                },
+        },
         /* Both radio, analog and ATSC work with this board.
            However, for analog to work, s5h1409 gate should be open,
            otherwise, tuner-xc3028 won't be detected.
@@ -1664,6 +1709,131 @@ static const struct cx88_board cx88_boards[] = {
                 },
                 .mpeg           = CX88_MPEG_DVB,
         },
+        [CX88_BOARD_HAUPPAUGE_HVR4000] = {
+                .name           = "Hauppauge WinTV-HVR4000 DVB-S/S2/T/Hybrid",
+                .tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                /*
+                 * GPIO0 (WINTV2000)
+                 *
+                 * Analogue     SAT     DVB-T
+                 * Antenna      0xc4bf  0xc4bb
+                 * Composite    0xc4bf  0xc4bb
+                 * S-Video      0xc4bf  0xc4bb
+                 * Composite1   0xc4ff  0xc4fb
+                 * S-Video1     0xc4ff  0xc4fb
+                 *
+                 * BIT  VALUE   FUNCTION GP{x}_IO
+                 * 0    1       I:?
+                 * 1    1       I:?
+                 * 2    1       O:DVB-T DEMOD ENABLE LOW/ANALOG DEMOD ENABLE HIGH
+                 * 3    1       I:?
+                 * 4    1       I:?
+                 * 5    1       I:?
+                 * 6    0       O:INPUT SELECTOR 0=INTERNAL 1=EXPANSION
+                 * 7    1       O:DVB-T DEMOD RESET LOW
+                 *
+                 * BIT  VALUE   FUNCTION GP{x}_OE
+                 * 8    0       I
+                 * 9    0       I
+                 * a    1       O
+                 * b    0       I
+                 * c    0       I
+                 * d    0       I
+                 * e    1       O
+                 * f    1       O
+                 */
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0xc4bf,
+                }, {
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                        .gpio0  = 0xc4bf,
+                }, {
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                        .gpio0  = 0xc4bf,
+                } },
+                /* fixme: Add radio support */
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_HAUPPAUGE_HVR4000LITE] = {
+                .name           = "Hauppauge WinTV-HVR4000(Lite) DVB-S/S2",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_TEVII_S420] = {
+                .name           = "TeVii S420 DVB-S",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_TEVII_S460] = {
+                .name           = "TeVii S460 DVB-S/S2",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_OMICOM_SS4_PCI] = {
+                .name           = "Omicom SS4 DVB-S/S2 PCI",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_TBS_8920] = {
+                .name           = "TBS 8920 DVB-S/S2",
+                .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 1,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
+        [CX88_BOARD_PROF_7300] = {
+                .name           = "PROF 7300 DVB-S/S2",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
 };
 
 /* ------------------------------------------------------------------ */
@@ -2010,9 +2180,53 @@ static const struct cx88_subid cx88_subids[] = {
                 .subdevice = 0x4935,
                 .card      = CX88_BOARD_PROLINK_PV_8000GT,
         }, {
+                .subvendor = 0x1554,
+                .subdevice = 0x4976,
+                .card      = CX88_BOARD_PROLINK_PV_GLOBAL_XTREME,
+        }, {
                 .subvendor = 0x17de,
                 .subdevice = 0x08c1,
                 .card      = CX88_BOARD_KWORLD_ATSC_120,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x6900,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR4000,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x6904,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR4000,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x6902,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR4000,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x6905,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR4000LITE,
+        }, {
+                .subvendor = 0x0070,
+                .subdevice = 0x6906,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR4000LITE,
+        }, {
+                .subvendor = 0xd420,
+                .subdevice = 0x9022,
+                .card      = CX88_BOARD_TEVII_S420,
+        }, {
+                .subvendor = 0xd460,
+                .subdevice = 0x9022,
+                .card      = CX88_BOARD_TEVII_S460,
+        }, {
+                .subvendor = 0xA044,
+                .subdevice = 0x2011,
+                .card      = CX88_BOARD_OMICOM_SS4_PCI,
+        }, {
+                .subvendor = 0x8920,
+                .subdevice = 0x8888,
+                .card      = CX88_BOARD_TBS_8920,
+        }, {
+                .subvendor = 0xB033,
+                .subdevice = 0x3033,
+                .card      = CX88_BOARD_PROF_7300,
         },
 };
 
@@ -2065,6 +2279,13 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
         case 14669: /* WinTV-HVR3000 (OEM, no IR, no b/panel video - Low profile) */
         case 28552: /* WinTV-PVR 'Roslyn' (No IR) */
         case 34519: /* WinTV-PCI-FM */
+        case 69009:
+                /* WinTV-HVR4000 (DVBS/S2/T, Video and IR, back panel inputs) */
+        case 69100: /* WinTV-HVR4000LITE (DVBS/S2, IR) */
+        case 69500: /* WinTV-HVR4000LITE (DVBS/S2, No IR) */
+        case 69559:
+                /* WinTV-HVR4000 (DVBS/S2/T, Video no IR, back panel inputs) */
+        case 69569: /* WinTV-HVR4000 (DVBS/S2/T, Video no IR) */
         case 90002: /* Nova-T-PCI (9002) */
         case 92001: /* Nova-S-Plus (Video and IR) */
         case 92002: /* Nova-S-Plus (Video and IR) */
@@ -2149,9 +2370,21 @@ static int cx88_dvico_xc2028_callback(struct cx88_core *core,
 {
         switch (command) {
         case XC2028_TUNER_RESET:
-                cx_write(MO_GP0_IO, 0x101000);
-                mdelay(5);
-                cx_set(MO_GP0_IO, 0x101010);
+                switch (core->boardnr) {
+                case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
+                        /* GPIO-4 xc3028 tuner */
+
+                        cx_set(MO_GP0_IO, 0x00001000);
+                        cx_clear(MO_GP0_IO, 0x00000010);
+                        msleep(100);
+                        cx_set(MO_GP0_IO, 0x00000010);
+                        msleep(100);
+                        break;
+                default:
+                        cx_write(MO_GP0_IO, 0x101000);
+                        mdelay(5);
+                        cx_set(MO_GP0_IO, 0x101010);
+                }
                 break;
         default:
                 return -EINVAL;
@@ -2258,8 +2491,10 @@ static int cx88_xc2028_tuner_callback(struct cx88_core *core,
                 return cx88_xc3028_geniatech_tuner_callback(core,
                                                         command, arg);
         case CX88_BOARD_PROLINK_PV_8000GT:
+        case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:
                 return cx88_pv_8000gt_callback(core, command, arg);
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
+        case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
                 return cx88_dvico_xc2028_callback(core, command, arg);
         }
 
@@ -2327,7 +2562,7 @@ static int cx88_xc5000_tuner_callback(struct cx88_core *core,
         return 0; /* Should never be here */
 }
 
-int cx88_tuner_callback(void *priv, int command, int arg)
+int cx88_tuner_callback(void *priv, int component, int command, int arg)
 {
         struct i2c_algo_bit_data *i2c_algo = priv;
         struct cx88_core *core;
@@ -2344,6 +2579,9 @@ int cx88_tuner_callback(void *priv, int command, int arg)
                 return -EINVAL;
         }
 
+        if (component != DVB_FRONTEND_COMPONENT_TUNER)
+                return -EINVAL;
+
         switch (core->board.tuner_type) {
                 case TUNER_XC2028:
                         info_printk(core, "Calling XC2028/3028 callback\n");
@@ -2392,16 +2630,22 @@ static void cx88_card_setup_pre_i2c(struct cx88_core *core)
 {
         switch (core->boardnr) {
         case CX88_BOARD_HAUPPAUGE_HVR1300:
-                /* Bring the 702 demod up before i2c scanning/attach or devices are hidden */
-                /* We leave here with the 702 on the bus */
-                cx_write(MO_GP0_IO, 0x0000e780);
+                /*
+                 * Bring the 702 demod up before i2c scanning/attach or devices are hidden
+                 * We leave here with the 702 on the bus
+                 *
+                 * "reset the IR receiver on GPIO[3]"
+                 * Reported by Mike Crash <mike AT mikecrash.com>
+                 */
+                cx_write(MO_GP0_IO, 0x0000ef88);
                 udelay(1000);
-                cx_clear(MO_GP0_IO, 0x00000080);
+                cx_clear(MO_GP0_IO, 0x00000088);
                 udelay(50);
-                cx_set(MO_GP0_IO, 0x00000080); /* 702 out of reset */
+                cx_set(MO_GP0_IO, 0x00000088); /* 702 out of reset */
                 udelay(1000);
                 break;
 
+        case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:
         case CX88_BOARD_PROLINK_PV_8000GT:
                 cx_write(MO_GP2_IO, 0xcf7);
                 mdelay(50);
@@ -2411,10 +2655,18 @@ static void cx88_card_setup_pre_i2c(struct cx88_core *core)
                 msleep(10);
                 break;
 
-         case CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD:
+        case CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD:
                 /* Enable the xc5000 tuner */
                 cx_set(MO_GP0_IO, 0x00001010);
                 break;
+
+        case CX88_BOARD_HAUPPAUGE_HVR3000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
+                /* Init GPIO */
+                cx_write(MO_GP0_IO, core->board.input[0].gpio0);
+                udelay(1000);
+                break;
         }
 }
 
@@ -2435,17 +2687,22 @@ void cx88_setup_xc3028(struct cx88_core *core, struct xc2028_ctrl *ctl)
                         core->i2c_algo.udelay = 16;
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
-                ctl->scode_table = XC3028_FE_ZARLINK456;
+                ctl->demod = XC3028_FE_ZARLINK456;
                 break;
         case CX88_BOARD_KWORLD_ATSC_120:
         case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
                 ctl->demod = XC3028_FE_OREN538;
                 break;
+        case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:
         case CX88_BOARD_PROLINK_PV_8000GT:
                 /*
-                 * This board uses non-MTS firmware
+                 * Those boards uses non-MTS firmware
                  */
                 break;
+        case CX88_BOARD_PINNACLE_HYBRID_PCTV:
+                ctl->demod = XC3028_FE_ZARLINK456;
+                ctl->mts = 1;
+                break;
         default:
                 ctl->demod = XC3028_FE_OREN538;
                 ctl->mts = 1;
@@ -2489,6 +2746,8 @@ static void cx88_card_setup(struct cx88_core *core)
         case CX88_BOARD_HAUPPAUGE_HVR1100LP:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
         case CX88_BOARD_HAUPPAUGE_HVR1300:
+        case CX88_BOARD_HAUPPAUGE_HVR4000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
                 if (0 == core->i2c_rc)
                         hauppauge_eeprom(core, eeprom);
                 break;
@@ -2570,7 +2829,18 @@ static void cx88_card_setup(struct cx88_core *core)
                 tea5767_cfg.priv  = &ctl;
 
                 cx88_call_i2c_clients(core, TUNER_SET_CONFIG, &tea5767_cfg);
+                break;
         }
+        case  CX88_BOARD_TEVII_S420:
+        case  CX88_BOARD_TEVII_S460:
+        case  CX88_BOARD_OMICOM_SS4_PCI:
+        case  CX88_BOARD_TBS_8920:
+        case  CX88_BOARD_PROF_7300:
+                cx_write(MO_SRST_IO, 0);
+                msleep(100);
+                cx_write(MO_SRST_IO, 1);
+                msleep(100);
+                break;
         } /*end switch() */
 
 
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d96173ff1dba..344ed2626e59 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -48,6 +48,11 @@
 #include "tuner-simple.h"
 #include "tda9887.h"
 #include "s5h1411.h"
+#include "stv0299.h"
+#include "z0194a.h"
+#include "stv0288.h"
+#include "stb6000.h"
+#include "cx24116.h"
 
 MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
@@ -375,37 +380,28 @@ static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe,
         return 0;
 }
 
-static int cx88_pci_nano_callback(void *ptr, int command, int arg)
+static int tevii_dvbs_set_voltage(struct dvb_frontend *fe,
+                                      fe_sec_voltage_t voltage)
 {
-        struct cx88_core *core = ptr;
-
-        switch (command) {
-        case XC2028_TUNER_RESET:
-                /* Send the tuner in then out of reset */
-                dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __func__, arg);
-
-                switch (core->boardnr) {
-                case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
-                        /* GPIO-4 xc3028 tuner */
-
-                        cx_set(MO_GP0_IO, 0x00001000);
-                        cx_clear(MO_GP0_IO, 0x00000010);
-                        msleep(100);
-                        cx_set(MO_GP0_IO, 0x00000010);
-                        msleep(100);
-                        break;
-                }
+        struct cx8802_dev *dev= fe->dvb->priv;
+        struct cx88_core *core = dev->core;
 
-                break;
-        case XC2028_RESET_CLK:
-                dprintk(1, "%s: XC2028_RESET_CLK %d\n", __func__, arg);
-                break;
-        default:
-                dprintk(1, "%s: unknown command %d, arg %d\n", __func__,
-                        command, arg);
-                return -EINVAL;
+        switch (voltage) {
+                case SEC_VOLTAGE_13:
+                        printk("LNB Voltage SEC_VOLTAGE_13\n");
+                        cx_write(MO_GP0_IO, 0x00006040);
+                        break;
+                case SEC_VOLTAGE_18:
+                        printk("LNB Voltage SEC_VOLTAGE_18\n");
+                        cx_write(MO_GP0_IO, 0x00006060);
+                        break;
+                case SEC_VOLTAGE_OFF:
+                        printk("LNB Voltage SEC_VOLTAGE_off\n");
+                        break;
         }
 
+        if (core->prev_set_voltage)
+                return core->prev_set_voltage(fe, voltage);
         return 0;
 }
 
@@ -456,7 +452,12 @@ static struct s5h1409_config kworld_atsc_120_config = {
 static struct xc5000_config pinnacle_pctv_hd_800i_tuner_config = {
         .i2c_address    = 0x64,
         .if_khz         = 5380,
-        .tuner_callback = cx88_tuner_callback,
+};
+
+static struct zl10353_config cx88_pinnacle_hybrid_pctv = {
+        .demod_address = (0x1e >> 1),
+        .no_tuner      = 1,
+        .if2           = 45600,
 };
 
 static struct zl10353_config cx88_geniatech_x8000_mt = {
@@ -477,7 +478,6 @@ static struct s5h1411_config dvico_fusionhdtv7_config = {
 static struct xc5000_config dvico_fusionhdtv7_tuner_config = {
         .i2c_address    = 0xc2 >> 1,
         .if_khz         = 5380,
-        .tuner_callback = cx88_tuner_callback,
 };
 
 static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
@@ -488,7 +488,6 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
                 .i2c_adap  = &dev->core->i2c_adap,
                 .i2c_addr  = addr,
                 .ctrl      = &ctl,
-                .callback  = cx88_tuner_callback,
         };
 
         if (!dev->dvb.frontend) {
@@ -518,6 +517,60 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
         return 0;
 }
 
+static int cx24116_set_ts_param(struct dvb_frontend *fe,
+        int is_punctured)
+{
+        struct cx8802_dev *dev = fe->dvb->priv;
+        dev->ts_gen_cntrl = 0x2;
+
+        return 0;
+}
+
+static int cx24116_reset_device(struct dvb_frontend *fe)
+{
+        struct cx8802_dev *dev = fe->dvb->priv;
+        struct cx88_core *core = dev->core;
+
+        /* Reset the part */
+        cx_write(MO_SRST_IO, 0);
+        msleep(10);
+        cx_write(MO_SRST_IO, 1);
+        msleep(10);
+
+        return 0;
+}
+
+static struct cx24116_config hauppauge_hvr4000_config = {
+        .demod_address          = 0x05,
+        .set_ts_params          = cx24116_set_ts_param,
+        .reset_device           = cx24116_reset_device,
+};
+
+static struct cx24116_config tevii_s460_config = {
+        .demod_address = 0x55,
+        .set_ts_params = cx24116_set_ts_param,
+        .reset_device  = cx24116_reset_device,
+};
+
+static struct stv0299_config tevii_tuner_sharp_config = {
+        .demod_address = 0x68,
+        .inittab = sharp_z0194a__inittab,
+        .mclk = 88000000UL,
+        .invert = 1,
+        .skip_reinit = 0,
+        .lock_output = 1,
+        .volt13_op0_op1 = STV0299_VOLT13_OP1,
+        .min_delay_ms = 100,
+        .set_symbol_rate = sharp_z0194a__set_symbol_rate,
+        .set_ts_params = cx24116_set_ts_param,
+};
+
+static struct stv0288_config tevii_tuner_earda_config = {
+        .demod_address = 0x68,
+        .min_delay_ms = 100,
+        .set_ts_params = cx24116_set_ts_param,
+};
+
 static int dvb_register(struct cx8802_dev *dev)
 {
         struct cx88_core *core = dev->core;
@@ -786,7 +839,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &core->i2c_adap);
                 if (dev->dvb.frontend) {
                         if (!dvb_attach(isl6421_attach, dev->dvb.frontend,
-                                        &core->i2c_adap, 0x08, 0x00, 0x00))
+                                        &core->i2c_adap, 0x08, ISL6421_DCL, 0x00))
                                 goto frontend_detach;
                 }
                 break;
@@ -813,13 +866,9 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &pinnacle_pctv_hd_800i_config,
                                                &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        /* tuner_config.video_dev must point to
-                         * i2c_adap.algo_data
-                         */
                         if (!dvb_attach(xc5000_attach, dev->dvb.frontend,
                                         &core->i2c_adap,
-                                        &pinnacle_pctv_hd_800i_tuner_config,
-                                        core->i2c_adap.algo_data))
+                                        &pinnacle_pctv_hd_800i_tuner_config))
                                 goto frontend_detach;
                 }
                 break;
@@ -832,10 +881,9 @@ static int dvb_register(struct cx8802_dev *dev)
                         struct xc2028_config cfg = {
                                 .i2c_adap  = &core->i2c_adap,
                                 .i2c_addr  = 0x61,
-                                .callback  = cx88_pci_nano_callback,
                         };
                         static struct xc2028_ctrl ctl = {
-                                .fname       = "xc3028-v27.fw",
+                                .fname       = XC2028_DEFAULT_FIRMWARE,
                                 .max_len     = 64,
                                 .scode_table = XC3028_FE_OREN538,
                         };
@@ -848,10 +896,13 @@ static int dvb_register(struct cx8802_dev *dev)
                 break;
          case CX88_BOARD_PINNACLE_HYBRID_PCTV:
                 dev->dvb.frontend = dvb_attach(zl10353_attach,
-                                               &cx88_geniatech_x8000_mt,
+                                               &cx88_pinnacle_hybrid_pctv,
                                                &core->i2c_adap);
-                if (attach_xc3028(0x61, dev) < 0)
-                        goto frontend_detach;
+                if (dev->dvb.frontend) {
+                        dev->dvb.frontend->ops.i2c_gate_ctrl = NULL;
+                        if (attach_xc3028(0x61, dev) < 0)
+                                goto frontend_detach;
+                }
                 break;
          case CX88_BOARD_GENIATECH_X8000_MT:
                 dev->ts_gen_cntrl = 0x00;
@@ -874,16 +925,69 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &dvico_fusionhdtv7_config,
                                                &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        /* tuner_config.video_dev must point to
-                         * i2c_adap.algo_data
-                         */
                         if (!dvb_attach(xc5000_attach, dev->dvb.frontend,
                                         &core->i2c_adap,
-                                        &dvico_fusionhdtv7_tuner_config,
-                                        core->i2c_adap.algo_data))
+                                        &dvico_fusionhdtv7_tuner_config))
                                 goto frontend_detach;
                 }
                 break;
+        case CX88_BOARD_HAUPPAUGE_HVR4000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
+                /* Support for DVB-S only, not DVB-T support */
+                dev->dvb.frontend = dvb_attach(cx24116_attach,
+                        &hauppauge_hvr4000_config,
+                        &dev->core->i2c_adap);
+                if (dev->dvb.frontend) {
+                        dvb_attach(isl6421_attach, dev->dvb.frontend,
+                                &dev->core->i2c_adap,
+                                0x08, ISL6421_DCL, 0x00);
+                }
+                break;
+        case CX88_BOARD_TEVII_S420:
+                dev->dvb.frontend = dvb_attach(stv0299_attach,
+                                                &tevii_tuner_sharp_config,
+                                                &core->i2c_adap);
+                if (dev->dvb.frontend != NULL) {
+                        if (!dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
+                                        &core->i2c_adap, DVB_PLL_OPERA1))
+                                goto frontend_detach;
+                        core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                        dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
+
+                } else {
+                        dev->dvb.frontend = dvb_attach(stv0288_attach,
+                                                            &tevii_tuner_earda_config,
+                                                            &core->i2c_adap);
+                                if (dev->dvb.frontend != NULL) {
+                                        if (!dvb_attach(stb6000_attach, dev->dvb.frontend, 0x61,
+                                                &core->i2c_adap))
+                                        goto frontend_detach;
+                                core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                                dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
+
+                        }
+                }
+                break;
+        case CX88_BOARD_TEVII_S460:
+                dev->dvb.frontend = dvb_attach(cx24116_attach,
+                                               &tevii_s460_config,
+                                               &core->i2c_adap);
+                if (dev->dvb.frontend != NULL) {
+                        core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                        dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
+                }
+                break;
+        case CX88_BOARD_OMICOM_SS4_PCI:
+        case CX88_BOARD_TBS_8920:
+        case CX88_BOARD_PROF_7300:
+                dev->dvb.frontend = dvb_attach(cx24116_attach,
+                                               &hauppauge_hvr4000_config,
+                                               &core->i2c_adap);
+                if (dev->dvb.frontend != NULL) {
+                        core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                        dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
+                }
+                break;
         default:
                 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",
                        core->name);
@@ -895,6 +999,8 @@ static int dvb_register(struct cx8802_dev *dev)
                        core->name);
                 return -EINVAL;
         }
+        /* define general-purpose callback pointer */
+        dev->dvb.frontend->callback = cx88_tuner_callback;
 
         /* Ensure all frontends negotiate bus access */
         dev->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index d7406a994f09..8e74d64fdcd2 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -201,7 +201,23 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
 
         core->i2c_rc = i2c_bit_add_bus(&core->i2c_adap);
         if (0 == core->i2c_rc) {
+                static u8 tuner_data[] =
+                        { 0x0b, 0xdc, 0x86, 0x52 };
+                static struct i2c_msg tuner_msg =
+                        { .flags = 0, .addr = 0xc2 >> 1, .buf = tuner_data, .len = 4 };
+
                 dprintk(1, "i2c register ok\n");
+                switch( core->boardnr ) {
+                        case CX88_BOARD_HAUPPAUGE_HVR1300:
+                        case CX88_BOARD_HAUPPAUGE_HVR3000:
+                        case CX88_BOARD_HAUPPAUGE_HVR4000:
+                                printk("%s: i2c init: enabling analog demod on HVR1300/3000/4000 tuner\n",
+                                        core->name);
+                                i2c_transfer(core->i2c_client.adapter, &tuner_msg, 1);
+                                break;
+                        default:
+                                break;
+                }
                 if (i2c_scan)
                         do_i2c_scan(core->name,&core->i2c_client);
         } else
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 53526d997a4e..8683d104de72 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -224,6 +224,8 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
                 ir_codes = ir_codes_hauppauge_new;
                 ir_type = IR_TYPE_RC5;
                 ir->sampling = 1;
@@ -259,6 +261,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 ir->polling = 1; /* ms */
                 break;
         case CX88_BOARD_PROLINK_PV_8000GT:
+        case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:
                 ir_codes = ir_codes_pixelview_new;
                 ir->gpio_addr = MO_GP1_IO;
                 ir->mask_keycode = 0x3f;
@@ -392,7 +395,7 @@ void cx88_ir_irq(struct cx88_core *core)
 {
         struct cx88_IR *ir = core->ir;
         u32 samples, ircode;
-        int i;
+        int i, start, range, toggle, dev, code;
 
         if (NULL == ir)
                 return;
@@ -461,6 +464,34 @@ void cx88_ir_irq(struct cx88_core *core)
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000:
+        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
+                ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
+                ir_dprintk("biphase decoded: %x\n", ircode);
+                /*
+                 * RC5 has an extension bit which adds a new range
+                 * of available codes, this is detected here. Also
+                 * hauppauge remotes (black/silver) always use
+                 * specific device ids. If we do not filter the
+                 * device ids then messages destined for devices
+                 * such as TVs (id=0) will get through to the
+                 * device causing mis-fired events.
+                 */
+                /* split rc5 data block ... */
+                start = (ircode & 0x2000) >> 13;
+                range = (ircode & 0x1000) >> 12;
+                toggle= (ircode & 0x0800) >> 11;
+                dev   = (ircode & 0x07c0) >> 6;
+                code  = (ircode & 0x003f) | ((range << 6) ^ 0x0040);
+                if( start != 1)
+                        /* no key pressed */
+                        break;
+                if ( dev != 0x1e && dev != 0x1f )
+                        /* not a hauppauge remote */
+                        break;
+                ir_input_keydown(ir->input, &ir->ir, code, ircode);
+                ir->release = jiffies + msecs_to_jiffies(120);
+                break;
         case CX88_BOARD_PINNACLE_PCTV_HD_800i:
                 ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
                 ir_dprintk("biphase decoded: %x\n", ircode);
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index ef4d56ea0027..be45955dff68 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -773,6 +773,7 @@ static int video_open(struct inode *inode, struct file *file)
         enum v4l2_buf_type type = 0;
         int radio = 0;
 
+        lock_kernel();
         list_for_each_entry(h, &cx8800_devlist, devlist) {
                 if (h->video_dev->minor == minor) {
                         dev  = h;
@@ -788,8 +789,10 @@ static int video_open(struct inode *inode, struct file *file)
                         dev   = h;
                 }
         }
-        if (NULL == dev)
+        if (NULL == dev) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         core = dev->core;
 
@@ -798,8 +801,10 @@ static int video_open(struct inode *inode, struct file *file)
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -832,6 +837,9 @@ static int video_open(struct inode *inode, struct file *file)
                 cx88_set_stereo(core,V4L2_TUNER_MODE_STEREO,1);
                 cx88_call_i2c_clients(core,AUDC_SET_RADIO,NULL);
         }
+        unlock_kernel();
+
+        atomic_inc(&core->users);
 
         return 0;
 }
@@ -920,7 +928,8 @@ static int video_release(struct inode *inode, struct file *file)
         file->private_data = NULL;
         kfree(fh);
 
-        cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
+        if(atomic_dec_and_test(&dev->core->users))
+                cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
 
         return 0;
 }
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 54fe65094711..dbf01b8b57a5 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -221,6 +221,14 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD 65
 #define CX88_BOARD_PROLINK_PV_8000GT       66
 #define CX88_BOARD_KWORLD_ATSC_120         67
+#define CX88_BOARD_HAUPPAUGE_HVR4000       68
+#define CX88_BOARD_HAUPPAUGE_HVR4000LITE   69
+#define CX88_BOARD_TEVII_S460              70
+#define CX88_BOARD_OMICOM_SS4_PCI          71
+#define CX88_BOARD_TBS_8920                72
+#define CX88_BOARD_TEVII_S420              73
+#define CX88_BOARD_PROLINK_PV_GLOBAL_XTREME 74
+#define CX88_BOARD_PROF_7300               75
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,
@@ -342,6 +350,7 @@ struct cx88_core {
         struct mutex               lock;
         /* various v4l controls */
         u32                        freq;
+        atomic_t                   users;
 
         /* cx88-video needs to access cx8802 for hybrid tuner pll access. */
         struct cx8802_dev          *dvbdev;
@@ -601,7 +610,7 @@ extern void cx88_call_i2c_clients(struct cx88_core *core,
 /* ----------------------------------------------------------- */
 /* cx88-cards.c                                                */
 
-extern int cx88_tuner_callback(void *dev, int command, int arg);
+extern int cx88_tuner_callback(void *dev, int component, int command, int arg);
 extern int cx88_get_resources(const struct cx88_core *core,
                               struct pci_dev *pci);
 extern struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr);
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index 79faedf58521..3aa538afcc0b 100644
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -866,7 +866,8 @@ static int __init dabusb_init (void)
 
         dbg("dabusb_init: driver registered");
 
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
 out:
         return retval;
diff --git a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c
deleted file mode 100644
index 88d6df71d051..000000000000
--- a/drivers/media/video/dpc7146.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
-    dpc7146.c - v4l2 driver for the dpc7146 demonstration board
-
-    Copyright (C) 2000-2003 Michael Hunold <michael@mihu.de>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#define DEBUG_VARIABLE debug
-
-#include <media/saa7146_vv.h>
-#include <linux/video_decoder.h>        /* for saa7111a */
-
-#define I2C_SAA7111A            0x24
-
-/* All unused bytes are reserverd. */
-#define SAA711X_CHIP_VERSION            0x00
-#define SAA711X_ANALOG_INPUT_CONTROL_1  0x02
-#define SAA711X_ANALOG_INPUT_CONTROL_2  0x03
-#define SAA711X_ANALOG_INPUT_CONTROL_3  0x04
-#define SAA711X_ANALOG_INPUT_CONTROL_4  0x05
-#define SAA711X_HORIZONTAL_SYNC_START   0x06
-#define SAA711X_HORIZONTAL_SYNC_STOP    0x07
-#define SAA711X_SYNC_CONTROL            0x08
-#define SAA711X_LUMINANCE_CONTROL       0x09
-#define SAA711X_LUMINANCE_BRIGHTNESS    0x0A
-#define SAA711X_LUMINANCE_CONTRAST      0x0B
-#define SAA711X_CHROMA_SATURATION       0x0C
-#define SAA711X_CHROMA_HUE_CONTROL      0x0D
-#define SAA711X_CHROMA_CONTROL          0x0E
-#define SAA711X_FORMAT_DELAY_CONTROL    0x10
-#define SAA711X_OUTPUT_CONTROL_1        0x11
-#define SAA711X_OUTPUT_CONTROL_2        0x12
-#define SAA711X_OUTPUT_CONTROL_3        0x13
-#define SAA711X_V_GATE_1_START          0x15
-#define SAA711X_V_GATE_1_STOP           0x16
-#define SAA711X_V_GATE_1_MSB            0x17
-#define SAA711X_TEXT_SLICER_STATUS      0x1A
-#define SAA711X_DECODED_BYTES_OF_TS_1   0x1B
-#define SAA711X_DECODED_BYTES_OF_TS_2   0x1C
-#define SAA711X_STATUS_BYTE             0x1F
-
-#define DPC_BOARD_CAN_DO_VBI(dev)   (dev->revision != 0)
-
-static int debug;
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug, "debug verbosity");
-
-static int dpc_num;
-
-#define DPC_INPUTS      2
-static struct v4l2_input dpc_inputs[DPC_INPUTS] = {
-        { 0, "Port A",  V4L2_INPUT_TYPE_CAMERA, 2, 0, V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, 0 },
-        { 1, "Port B",  V4L2_INPUT_TYPE_CAMERA, 2, 0, V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, 0 },
-};
-
-#define DPC_AUDIOS      0
-
-static struct saa7146_extension_ioctls ioctls[] = {
-        { VIDIOC_G_INPUT,       SAA7146_EXCLUSIVE },
-        { VIDIOC_S_INPUT,       SAA7146_EXCLUSIVE },
-        { VIDIOC_ENUMINPUT,     SAA7146_EXCLUSIVE },
-        { VIDIOC_S_STD,         SAA7146_AFTER },
-        { 0,                    0 }
-};
-
-struct dpc
-{
-        struct video_device     *video_dev;
-        struct video_device     *vbi_dev;
-
-        struct i2c_adapter      i2c_adapter;
-        struct i2c_client       *saa7111a;
-
-        int cur_input;  /* current input */
-};
-
-static int dpc_check_clients(struct device *dev, void *data)
-{
-        struct dpc* dpc = data;
-        struct i2c_client *client = i2c_verify_client(dev);
-
-        if( !client )
-                return 0;
-
-        if( I2C_SAA7111A == client->addr )
-                dpc->saa7111a = client;
-
-        return 0;
-}
-
-/* fixme: add vbi stuff here */
-static int dpc_probe(struct saa7146_dev* dev)
-{
-        struct dpc* dpc = NULL;
-
-        dpc = kzalloc(sizeof(struct dpc), GFP_KERNEL);
-        if( NULL == dpc ) {
-                printk("dpc_v4l2.o: dpc_probe: not enough kernel memory.\n");
-                return -ENOMEM;
-        }
-
-        /* FIXME: enable i2c-port pins, video-port-pins
-           video port pins should be enabled here ?! */
-        saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
-
-        dpc->i2c_adapter = (struct i2c_adapter) {
-                .class = I2C_CLASS_TV_ANALOG,
-                .name = "dpc7146",
-        };
-        saa7146_i2c_adapter_prepare(dev, &dpc->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
-        if(i2c_add_adapter(&dpc->i2c_adapter) < 0) {
-                DEB_S(("cannot register i2c-device. skipping.\n"));
-                kfree(dpc);
-                return -EFAULT;
-        }
-
-        /* loop through all i2c-devices on the bus and look who is there */
-        device_for_each_child(&dpc->i2c_adapter.dev, dpc, dpc_check_clients);
-
-        /* check if all devices are present */
-        if (!dpc->saa7111a) {
-                DEB_D(("dpc_v4l2.o: dpc_attach failed for this device.\n"));
-                i2c_del_adapter(&dpc->i2c_adapter);
-                kfree(dpc);
-                return -ENODEV;
-        }
-
-        /* all devices are present, probe was successful */
-        DEB_D(("dpc_v4l2.o: dpc_probe succeeded for this device.\n"));
-
-        /* we store the pointer in our private data field */
-        dev->ext_priv = dpc;
-
-        return 0;
-}
-
-/* bring hardware to a sane state. this has to be done, just in case someone
-   wants to capture from this device before it has been properly initialized.
-   the capture engine would badly fail, because no valid signal arrives on the
-   saa7146, thus leading to timeouts and stuff. */
-static int dpc_init_done(struct saa7146_dev* dev)
-{
-        struct dpc* dpc = (struct dpc*)dev->ext_priv;
-
-        DEB_D(("dpc_v4l2.o: dpc_init_done called.\n"));
-
-        /* initialize the helper ics to useful values */
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x00, 0x11);
-
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x02, 0xc0);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x03, 0x30);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x04, 0x00);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x05, 0x00);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x06, 0xde);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x07, 0xad);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x08, 0xa8);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x09, 0x00);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x0a, 0x80);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x0b, 0x47);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x0c, 0x40);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x0d, 0x00);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x0e, 0x03);
-
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x10, 0xd0);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x11, 0x1c);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x12, 0xc1);
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x13, 0x30);
-
-        i2c_smbus_write_byte_data(dpc->saa7111a, 0x1f, 0x81);
-
-        return 0;
-}
-
-static struct saa7146_ext_vv vv_data;
-
-/* this function only gets called when the probing was successful */
-static int dpc_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
-{
-        struct dpc* dpc = (struct dpc*)dev->ext_priv;
-
-        DEB_D(("dpc_v4l2.o: dpc_attach called.\n"));
-
-        /* checking for i2c-devices can be omitted here, because we
-           already did this in "dpc_vl42_probe" */
-
-        saa7146_vv_init(dev,&vv_data);
-        if( 0 != saa7146_register_device(&dpc->video_dev, dev, "dpc", VFL_TYPE_GRABBER)) {
-                ERR(("cannot register capture v4l2 device. skipping.\n"));
-                return -1;
-        }
-
-        /* initialization stuff (vbi) (only for revision > 0 and for extensions which want it)*/
-        if( 0 != DPC_BOARD_CAN_DO_VBI(dev)) {
-                if( 0 != saa7146_register_device(&dpc->vbi_dev, dev, "dpc", VFL_TYPE_VBI)) {
-                        ERR(("cannot register vbi v4l2 device. skipping.\n"));
-                }
-        }
-
-        i2c_use_client(dpc->saa7111a);
-
-        printk("dpc: found 'dpc7146 demonstration board'-%d.\n",dpc_num);
-        dpc_num++;
-
-        /* the rest */
-        dpc->cur_input = 0;
-        dpc_init_done(dev);
-
-        return 0;
-}
-
-static int dpc_detach(struct saa7146_dev* dev)
-{
-        struct dpc* dpc = (struct dpc*)dev->ext_priv;
-
-        DEB_EE(("dev:%p\n",dev));
-
-        i2c_release_client(dpc->saa7111a);
-
-        saa7146_unregister_device(&dpc->video_dev,dev);
-        if( 0 != DPC_BOARD_CAN_DO_VBI(dev)) {
-                saa7146_unregister_device(&dpc->vbi_dev,dev);
-        }
-        saa7146_vv_release(dev);
-
-        dpc_num--;
-
-        i2c_del_adapter(&dpc->i2c_adapter);
-        kfree(dpc);
-        return 0;
-}
-
-#ifdef axa
-int dpc_vbi_bypass(struct saa7146_dev* dev)
-{
-        struct dpc* dpc = (struct dpc*)dev->ext_priv;
-
-        int i = 1;
-
-        /* switch bypass in saa7111a */
-        if ( 0 != dpc->saa7111a->driver->command(dpc->saa7111a,SAA711X_VBI_BYPASS, &i)) {
-                printk("dpc_v4l2.o: VBI_BYPASS: could not address saa7111a.\n");
-                return -1;
-        }
-
-        return 0;
-}
-#endif
-
-static int dpc_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
-{
-        struct saa7146_dev *dev = fh->dev;
-        struct dpc* dpc = (struct dpc*)dev->ext_priv;
-/*
-        struct saa7146_vv *vv = dev->vv_data;
-*/
-        switch(cmd)
-        {
-        case VIDIOC_ENUMINPUT:
-        {
-                struct v4l2_input *i = arg;
-                DEB_EE(("VIDIOC_ENUMINPUT %d.\n",i->index));
-
-                if( i->index < 0 || i->index >= DPC_INPUTS) {
-                        return -EINVAL;
-                }
-
-                memcpy(i, &dpc_inputs[i->index], sizeof(struct v4l2_input));
-
-                DEB_D(("dpc_v4l2.o: v4l2_ioctl: VIDIOC_ENUMINPUT %d.\n",i->index));
-                return 0;
-        }
-        case VIDIOC_G_INPUT:
-        {
-                int *input = (int *)arg;
-                *input = dpc->cur_input;
-
-                DEB_D(("dpc_v4l2.o: VIDIOC_G_INPUT: %d\n",*input));
-                return 0;
-        }
-        case VIDIOC_S_INPUT:
-        {
-                int     input = *(int *)arg;
-
-                if (input < 0 || input >= DPC_INPUTS) {
-                        return -EINVAL;
-                }
-
-                dpc->cur_input = input;
-
-                /* fixme: switch input here, switch audio, too! */
-//              saa7146_set_hps_source_and_sync(dev, input_port_selection[input].hps_source, input_port_selection[input].hps_sync);
-                printk("dpc_v4l2.o: VIDIOC_S_INPUT: fixme switch input.\n");
-
-                return 0;
-        }
-        default:
-/*
-                DEB_D(("dpc_v4l2.o: v4l2_ioctl does not handle this ioctl.\n"));
-*/
-                return -ENOIOCTLCMD;
-        }
-        return 0;
-}
-
-static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
-{
-        return 0;
-}
-
-static struct saa7146_standard standard[] = {
-        {
-                .name   = "PAL",        .id     = V4L2_STD_PAL,
-                .v_offset       = 0x17, .v_field        = 288,
-                .h_offset       = 0x14, .h_pixels       = 680,
-                .v_max_out      = 576,  .h_max_out      = 768,
-        }, {
-                .name   = "NTSC",       .id     = V4L2_STD_NTSC,
-                .v_offset       = 0x16, .v_field        = 240,
-                .h_offset       = 0x06, .h_pixels       = 708,
-                .v_max_out      = 480,  .h_max_out      = 640,
-        }, {
-                .name   = "SECAM",      .id     = V4L2_STD_SECAM,
-                .v_offset       = 0x14, .v_field        = 288,
-                .h_offset       = 0x14, .h_pixels       = 720,
-                .v_max_out      = 576,  .h_max_out      = 768,
-        }
-};
-
-static struct saa7146_extension extension;
-
-static struct saa7146_pci_extension_data dpc = {
-        .ext_priv = "Multimedia eXtension Board",
-        .ext = &extension,
-};
-
-static struct pci_device_id pci_tbl[] = {
-        {
-                .vendor    = PCI_VENDOR_ID_PHILIPS,
-                .device    = PCI_DEVICE_ID_PHILIPS_SAA7146,
-                .subvendor = 0x0000,
-                .subdevice = 0x0000,
-                .driver_data = (unsigned long)&dpc,
-        }, {
-                .vendor = 0,
-        }
-};
-
-MODULE_DEVICE_TABLE(pci, pci_tbl);
-
-static struct saa7146_ext_vv vv_data = {
-        .inputs         = DPC_INPUTS,
-        .capabilities   = V4L2_CAP_VBI_CAPTURE,
-        .stds           = &standard[0],
-        .num_stds       = sizeof(standard)/sizeof(struct saa7146_standard),
-        .std_callback   = &std_callback,
-        .ioctls         = &ioctls[0],
-        .ioctl          = dpc_ioctl,
-};
-
-static struct saa7146_extension extension = {
-        .name           = "dpc7146 demonstration board",
-        .flags          = SAA7146_USE_I2C_IRQ,
-
-        .pci_tbl        = &pci_tbl[0],
-        .module         = THIS_MODULE,
-
-        .probe          = dpc_probe,
-        .attach         = dpc_attach,
-        .detach         = dpc_detach,
-
-        .irq_mask       = 0,
-        .irq_func       = NULL,
-};
-
-static int __init dpc_init_module(void)
-{
-        if( 0 != saa7146_register_extension(&extension)) {
-                DEB_S(("failed to register extension.\n"));
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
-static void __exit dpc_cleanup_module(void)
-{
-        saa7146_unregister_extension(&extension);
-}
-
-module_init(dpc_init_module);
-module_exit(dpc_cleanup_module);
-
-MODULE_DESCRIPTION("video4linux-2 driver for the 'dpc7146 demonstration board'");
-MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index de943cf6c169..d65d0572403b 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1101,7 +1101,7 @@ struct usb_device_id em28xx_id_table [] = {
         { USB_DEVICE(0xeb1a, 0x2820),
                         .driver_info = EM2820_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2821),
-                        .driver_info = EM2820_BOARD_UNKNOWN },
+                        .driver_info = EM2820_BOARD_PROLINK_PLAYTV_USB2 },
         { USB_DEVICE(0xeb1a, 0x2860),
                         .driver_info = EM2820_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2861),
@@ -1271,7 +1271,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {
         {0x1ba50080, EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA, TUNER_ABSENT},
 };
 
-int em28xx_tuner_callback(void *ptr, int command, int arg)
+int em28xx_tuner_callback(void *ptr, int component, int command, int arg)
 {
         int rc = 0;
         struct em28xx *dev = ptr;
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index d2b1a1a52689..c99e2383b7ec 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -249,7 +249,6 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
         memset(&cfg, 0, sizeof(cfg));
         cfg.i2c_adap  = &dev->i2c_adap;
         cfg.i2c_addr  = addr;
-        cfg.callback  = em28xx_tuner_callback;
 
         if (!dev->dvb->frontend) {
                 printk(KERN_ERR "%s/2: dvb frontend not attached. "
@@ -274,7 +273,7 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
 
 /* ------------------------------------------------------------------ */
 
-int register_dvb(struct em28xx_dvb *dvb,
+static int register_dvb(struct em28xx_dvb *dvb,
                  struct module *module,
                  struct em28xx *dev,
                  struct device *device)
@@ -422,6 +421,8 @@ static int dvb_init(struct em28xx *dev)
                 }
                 break;
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
+        case EM2880_BOARD_TERRATEC_HYBRID_XS:
+        case EM2880_BOARD_KWORLD_DVB_310U:
                 dvb->frontend = dvb_attach(zl10353_attach,
                                            &em28xx_zl10353_with_xc3028,
                                            &dev->i2c_adap);
@@ -443,24 +444,6 @@ static int dvb_init(struct em28xx *dev)
                 }
                 break;
 #endif
-        case EM2880_BOARD_TERRATEC_HYBRID_XS:
-                dvb->frontend = dvb_attach(zl10353_attach,
-                                                &em28xx_zl10353_with_xc3028,
-                                                &dev->i2c_adap);
-                if (attach_xc3028(0x61, dev) < 0) {
-                         result = -EINVAL;
-                        goto out_free;
-                }
-                break;
-        case EM2880_BOARD_KWORLD_DVB_310U:
-                dvb->frontend = dvb_attach(zl10353_attach,
-                                                &em28xx_zl10353_with_xc3028,
-                                                &dev->i2c_adap);
-                if (attach_xc3028(0x61, dev) < 0) {
-                        result = -EINVAL;
-                        goto out_free;
-                }
-                break;
         default:
                 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
                                 " isn't supported yet\n",
@@ -474,6 +457,8 @@ static int dvb_init(struct em28xx *dev)
                 result = -EINVAL;
                 goto out_free;
         }
+        /* define general-purpose callback pointer */
+        dvb->frontend->callback = em28xx_tuner_callback;
 
         /* register everything */
         result = register_dvb(dvb, THIS_MODULE, dev, &dev->udev->dev);
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 97853384c943..3bab56b997fc 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -143,10 +143,11 @@ static int em2800_i2c_check_for_device(struct em28xx *dev, unsigned char addr)
         }
         for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0;
              write_timeout -= 5) {
-                unsigned msg = dev->em28xx_read_reg(dev, 0x5);
-                if (msg == 0x94)
+                unsigned reg = dev->em28xx_read_reg(dev, 0x5);
+
+                if (reg == 0x94)
                         return -ENODEV;
-                else if (msg == 0x84)
+                else if (reg == 0x84)
                         return 0;
                 msleep(5);
         }
@@ -335,8 +336,11 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
 
         /* Check if board has eeprom */
         err = i2c_master_recv(&dev->i2c_client, &buf, 0);
-        if (err < 0)
-                return -1;
+        if (err < 0) {
+                em28xx_errdev("%s: i2c_master_recv failed! err [%d]\n",
+                        __func__, err);
+                return err;
+        }
 
         buf = 0;
 
@@ -344,7 +348,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
         if (err != 1) {
                 printk(KERN_INFO "%s: Huh, no eeprom present (err=%d)?\n",
                        dev->name, err);
-                return -1;
+                return err;
         }
         while (size > 0) {
                 if (size > 16)
@@ -357,7 +361,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
                         printk(KERN_WARNING
                                "%s: i2c eeprom read error (err=%d)\n",
                                dev->name, err);
-                        return -1;
+                        return err;
                 }
                 size -= block;
                 p += block;
@@ -585,18 +589,31 @@ void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg)
  */
 int em28xx_i2c_register(struct em28xx *dev)
 {
+        int retval;
+
         BUG_ON(!dev->em28xx_write_regs || !dev->em28xx_read_reg);
         BUG_ON(!dev->em28xx_write_regs_req || !dev->em28xx_read_reg_req);
         dev->i2c_adap = em28xx_adap_template;
         dev->i2c_adap.dev.parent = &dev->udev->dev;
         strcpy(dev->i2c_adap.name, dev->name);
         dev->i2c_adap.algo_data = dev;
-        i2c_add_adapter(&dev->i2c_adap);
+
+        retval = i2c_add_adapter(&dev->i2c_adap);
+        if (retval < 0) {
+                em28xx_errdev("%s: i2c_add_adapter failed! retval [%d]\n",
+                        __func__, retval);
+                return retval;
+        }
 
         dev->i2c_client = em28xx_client_template;
         dev->i2c_client.adapter = &dev->i2c_adap;
 
-        em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
+        retval = em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
+        if (retval < 0) {
+                em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n",
+                        __func__, retval);
+                return retval;
+        }
 
         if (i2c_scan)
                 em28xx_do_i2c_scan(dev);
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 49ab0629702e..c53649e5315b 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -513,10 +513,17 @@ static struct videobuf_queue_ops em28xx_video_qops = {
  */
 static int em28xx_config(struct em28xx *dev)
 {
+        int retval;
 
         /* Sets I2C speed to 100 KHz */
-        if (!dev->is_em2800)
-                em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
+        if (!dev->is_em2800) {
+                retval = em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
+                if (retval < 0) {
+                        em28xx_errdev("%s: em28xx_write_regs_req failed! retval [%d]\n",
+                                __func__, retval);
+                        return retval;
+                }
+        }
 
         /* enable vbi capturing */
 
@@ -1512,6 +1519,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         struct em28xx_fh *fh;
         enum v4l2_buf_type fh_type = 0;
 
+        lock_kernel();
         list_for_each_entry(h, &em28xx_devlist, devlist) {
                 if (h->vdev->minor == minor) {
                         dev  = h;
@@ -1527,8 +1535,10 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                         dev   = h;
                 }
         }
-        if (NULL == dev)
+        if (NULL == dev) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         em28xx_videodbg("open minor=%d type=%s users=%d\n",
                                 minor, v4l2_type_names[fh_type], dev->users);
@@ -1537,6 +1547,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
         if (!fh) {
                 em28xx_errdev("em28xx-video.c: Out of memory?!\n");
+                unlock_kernel();
                 return -ENOMEM;
         }
         mutex_lock(&dev->lock);
@@ -1573,6 +1584,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                         sizeof(struct em28xx_buffer), fh);
 
         mutex_unlock(&dev->lock);
+        unlock_kernel();
 
         return errCode;
 }
@@ -1588,8 +1600,7 @@ static void em28xx_release_resources(struct em28xx *dev)
         /*FIXME: I2C IR should be disconnected */
 
         em28xx_info("V4L2 devices /dev/video%d and /dev/vbi%d deregistered\n",
-                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
-                                dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
+                                dev->vdev->num, dev->vbi_dev->num);
         list_del(&dev->devlist);
         if (dev->sbutton_input_dev)
                 em28xx_deregister_snapshot_button(dev);
@@ -1948,13 +1959,23 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         }
 
         /* register i2c bus */
-        em28xx_i2c_register(dev);
+        errCode = em28xx_i2c_register(dev);
+        if (errCode < 0) {
+                em28xx_errdev("%s: em28xx_i2c_register - errCode [%d]!\n",
+                        __func__, errCode);
+                return errCode;
+        }
 
         /* Do board specific init and eeprom reading */
         em28xx_card_setup(dev);
 
         /* Configure audio */
-        em28xx_audio_analog_set(dev);
+        errCode = em28xx_audio_analog_set(dev);
+        if (errCode < 0) {
+                em28xx_errdev("%s: em28xx_audio_analog_set - errCode [%d]!\n",
+                        __func__, errCode);
+                return errCode;
+        }
 
         /* configure the device */
         em28xx_config_i2c(dev);
@@ -1974,6 +1995,11 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         dev->ctl_input = 2;
 
         errCode = em28xx_config(dev);
+        if (errCode < 0) {
+                em28xx_errdev("%s: em28xx_config - errCode [%d]!\n",
+                        __func__, errCode);
+                return errCode;
+        }
 
         list_add_tail(&dev->devlist, &em28xx_devlist);
 
@@ -2026,17 +2052,27 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
 
         if (dev->has_msp34xx) {
                 /* Send a reset to other chips via gpio */
-                em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1);
+                errCode = em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1);
+                if (errCode < 0) {
+                        em28xx_errdev("%s: em28xx_write_regs_req - msp34xx(1) failed! errCode [%d]\n",
+                                __func__, errCode);
+                        return errCode;
+                }
                 msleep(3);
-                em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1);
+
+                errCode = em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1);
+                if (errCode < 0) {
+                        em28xx_errdev("%s: em28xx_write_regs_req - msp34xx(2) failed! errCode [%d]\n",
+                                __func__, errCode);
+                        return errCode;
+                }
                 msleep(3);
         }
 
         video_mux(dev, 0);
 
         em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
-                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
-                                dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
+                                dev->vdev->num, dev->vbi_dev->num);
 
         mutex_lock(&em28xx_extension_devlist_lock);
         if (!list_empty(&em28xx_extension_devlist)) {
@@ -2236,7 +2272,7 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
                 em28xx_warn
                     ("device /dev/video%d is open! Deregistration and memory "
                      "deallocation are deferred on close.\n",
-                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN);
+                                dev->vdev->num);
 
                 dev->state |= DEV_MISCONFIGURED;
                 em28xx_uninit_isoc(dev);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 9a3310748685..82781178e0a3 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -411,8 +411,8 @@ struct em28xx {
         /* frame properties */
         int width;              /* current frame width */
         int height;             /* current frame height */
-        int hscale;             /* horizontal scale factor (see datasheet) */
-        int vscale;             /* vertical scale factor (see datasheet) */
+        unsigned hscale;        /* horizontal scale factor (see datasheet) */
+        unsigned vscale;        /* vertical scale factor (see datasheet) */
         int interlaced;         /* 1=interlace fileds, 0=just top fileds */
         unsigned int video_bytesread;   /* Number of bytes read */
 
@@ -528,7 +528,7 @@ extern struct em28xx_board em28xx_boards[];
 extern struct usb_device_id em28xx_id_table[];
 extern const unsigned int em28xx_bcount;
 void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir);
-int em28xx_tuner_callback(void *ptr, int command, int arg);
+int em28xx_tuner_callback(void *ptr, int component, int command, int arg);
 
 /* Provided by em28xx-input.c */
 /* TODO: Check if the standard get_key handlers on ir-common can be used */
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 8db2a05bf9c5..7a85c41b0eea 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -1214,7 +1214,7 @@ static int et61x251_open(struct inode* inode, struct file* filp)
         if (!down_read_trylock(&et61x251_dev_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         if (wait_for_completion_interruptible(&cam->probe)) {
                 up_read(&et61x251_dev_lock);
@@ -1297,7 +1297,7 @@ static int et61x251_release(struct inode* inode, struct file* filp)
 
         down_write(&et61x251_dev_lock);
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         et61x251_stop_transfer(cam);
         et61x251_release_buffers(cam);
@@ -1318,7 +1318,7 @@ static ssize_t
 et61x251_read(struct file* filp, char __user * buf,
               size_t count, loff_t* f_pos)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device *cam = video_drvdata(filp);
         struct et61x251_frame_t* f, * i;
         unsigned long lock_flags;
         long timeout;
@@ -1426,7 +1426,7 @@ exit:
 
 static unsigned int et61x251_poll(struct file *filp, poll_table *wait)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device *cam = video_drvdata(filp);
         struct et61x251_frame_t* f;
         unsigned long lock_flags;
         unsigned int mask = 0;
@@ -1502,7 +1502,7 @@ static struct vm_operations_struct et61x251_vm_ops = {
 
 static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device *cam = video_drvdata(filp);
         unsigned long size = vma->vm_end - vma->vm_start,
                       start = vma->vm_start;
         void *pos;
@@ -2395,7 +2395,7 @@ et61x251_vidioc_s_parm(struct et61x251_device* cam, void __user * arg)
 static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,
                                unsigned int cmd, void __user * arg)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device *cam = video_drvdata(filp);
 
         switch (cmd) {
 
@@ -2490,7 +2490,7 @@ static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,
 static int et61x251_ioctl(struct inode* inode, struct file* filp,
                          unsigned int cmd, unsigned long arg)
 {
-        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_device *cam = video_drvdata(filp);
         int err = 0;
 
         if (mutex_lock_interruptible(&cam->fileop_mutex))
diff --git a/drivers/media/video/gspca/Kconfig b/drivers/media/video/gspca/Kconfig
index 42b90742b40b..4d0817471c9f 100644
--- a/drivers/media/video/gspca/Kconfig
+++ b/drivers/media/video/gspca/Kconfig
@@ -1,13 +1,212 @@
-config USB_GSPCA
-        tristate "USB GSPCA driver"
+menuconfig USB_GSPCA
+        tristate "GSPCA based webcams"
         depends on VIDEO_V4L2
+        default m
         ---help---
-          Say Y here if you want support for various USB webcams.
+        Say Y here if you want to enable selecting webcams based
+        on the GSPCA framework.
 
-          See <file:Documentation/video4linux/gspca.txt> for more info.
+        See <file:Documentation/video4linux/gspca.txt> for more info.
 
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" to use this driver.
+        This driver uses the Video For Linux API. You must say Y or M to
+        "Video For Linux" to use this driver.
 
-          To compile this driver as modules, choose M here: the
-          modules will be called gspca_xxxx.
+        To compile this driver as modules, choose M here: the
+        modules will be called gspca_main.
+
+
+if USB_GSPCA && VIDEO_V4L2
+
+source "drivers/media/video/gspca/m5602/Kconfig"
+
+config USB_GSPCA_CONEX
+        tristate "Conexant Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the Conexant chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_conex.
+
+config USB_GSPCA_ETOMS
+        tristate "Etoms USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the Etoms chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_etoms.
+
+config USB_GSPCA_FINEPIX
+        tristate "Fujifilm FinePix USB V4L2 driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the FinePix chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_finepix.
+
+config USB_GSPCA_MARS
+        tristate "Mars USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the Mars chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_mars.
+
+config USB_GSPCA_OV519
+        tristate "OV519 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the OV519 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_ov519.
+
+config USB_GSPCA_PAC207
+        tristate "Pixart PAC207 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the PAC207 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_pac207.
+
+config USB_GSPCA_PAC7311
+        tristate "Pixart PAC7311 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the PAC7311 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_pac7311.
+
+config USB_GSPCA_SONIXB
+        tristate "SN9C102 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SONIXB chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_sonixb.
+
+config USB_GSPCA_SONIXJ
+        tristate "SONIX JPEG USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SONIXJ chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_sonixj
+
+config USB_GSPCA_SPCA500
+        tristate "SPCA500 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA500 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca500.
+
+config USB_GSPCA_SPCA501
+        tristate "SPCA501 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA501 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca501.
+
+config USB_GSPCA_SPCA505
+        tristate "SPCA505 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA505 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca505.
+
+config USB_GSPCA_SPCA506
+        tristate "SPCA506 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA506 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca506.
+
+config USB_GSPCA_SPCA508
+        tristate "SPCA508 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA508 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca508.
+
+config USB_GSPCA_SPCA561
+        tristate "SPCA561 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the SPCA561 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca561.
+
+config USB_GSPCA_STK014
+        tristate "Syntek DV4000 (STK014) USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the STK014 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_stk014.
+
+config USB_GSPCA_SUNPLUS
+        tristate "SUNPLUS USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the Sunplus
+        SPCA504(abc) SPCA533 SPCA536 chips.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_spca5xx.
+
+config USB_GSPCA_T613
+        tristate "T613 (JPEG Compliance) USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the T613 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_t613.
+
+config USB_GSPCA_TV8532
+        tristate "TV8532 USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the TV8531 chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_tv8532.
+
+config USB_GSPCA_VC032X
+        tristate "VC032X USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the VC032X chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_vc032x.
+
+config USB_GSPCA_ZC3XX
+        tristate "VC3xx USB Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+        Say Y here if you want support for cameras based on the ZC3XX chip.
+
+        To compile this driver as a module, choose M here: the
+        module will be called gspca_zc3xx.
+
+endif
diff --git a/drivers/media/video/gspca/Makefile b/drivers/media/video/gspca/Makefile
index e68a8965297a..22734f5a6c32 100644
--- a/drivers/media/video/gspca/Makefile
+++ b/drivers/media/video/gspca/Makefile
@@ -1,29 +1,48 @@
-obj-$(CONFIG_USB_GSPCA) += gspca_main.o \
-        gspca_conex.o gspca_etoms.o gspca_mars.o \
-        gspca_ov519.o gspca_pac207.o gspca_pac7311.o \
-        gspca_sonixb.o gspca_sonixj.o gspca_spca500.o gspca_spca501.o \
-        gspca_spca505.o gspca_spca506.o gspca_spca508.o gspca_spca561.o \
-        gspca_sunplus.o gspca_stk014.o gspca_t613.o gspca_tv8532.o \
-        gspca_vc032x.o gspca_zc3xx.o
+obj-$(CONFIG_USB_GSPCA)         += gspca_main.o
+obj-$(CONFIG_USB_GSPCA_CONEX)   += gspca_conex.o
+obj-$(CONFIG_USB_GSPCA_ETOMS)   += gspca_etoms.o
+obj-$(CONFIG_USB_GSPCA_FINEPIX) += gspca_finepix.o
+obj-$(CONFIG_USB_GSPCA_MARS)    += gspca_mars.o
+obj-$(CONFIG_USB_GSPCA_OV519)   += gspca_ov519.o
+obj-$(CONFIG_USB_GSPCA_PAC207)  += gspca_pac207.o
+obj-$(CONFIG_USB_GSPCA_PAC7311) += gspca_pac7311.o
+obj-$(CONFIG_USB_GSPCA_SONIXB)  += gspca_sonixb.o
+obj-$(CONFIG_USB_GSPCA_SONIXJ)  += gspca_sonixj.o
+obj-$(CONFIG_USB_GSPCA_SPCA500) += gspca_spca500.o
+obj-$(CONFIG_USB_GSPCA_SPCA501) += gspca_spca501.o
+obj-$(CONFIG_USB_GSPCA_SPCA505) += gspca_spca505.o
+obj-$(CONFIG_USB_GSPCA_SPCA506) += gspca_spca506.o
+obj-$(CONFIG_USB_GSPCA_SPCA508) += gspca_spca508.o
+obj-$(CONFIG_USB_GSPCA_SPCA561) += gspca_spca561.o
+obj-$(CONFIG_USB_GSPCA_SUNPLUS) += gspca_sunplus.o
+obj-$(CONFIG_USB_GSPCA_STK014)  += gspca_stk014.o
+obj-$(CONFIG_USB_GSPCA_T613)    += gspca_t613.o
+obj-$(CONFIG_USB_GSPCA_TV8532)  += gspca_tv8532.o
+obj-$(CONFIG_USB_GSPCA_VC032X)  += gspca_vc032x.o
+obj-$(CONFIG_USB_GSPCA_ZC3XX)   += gspca_zc3xx.o
+
+gspca_main-objs                 := gspca.o
+gspca_conex-objs                := conex.o
+gspca_etoms-objs                := etoms.o
+gspca_finepix-objs              := finepix.o
+gspca_mars-objs                 := mars.o
+gspca_ov519-objs                := ov519.o
+gspca_pac207-objs               := pac207.o
+gspca_pac7311-objs              := pac7311.o
+gspca_sonixb-objs               := sonixb.o
+gspca_sonixj-objs               := sonixj.o
+gspca_spca500-objs              := spca500.o
+gspca_spca501-objs              := spca501.o
+gspca_spca505-objs              := spca505.o
+gspca_spca506-objs              := spca506.o
+gspca_spca508-objs              := spca508.o
+gspca_spca561-objs              := spca561.o
+gspca_stk014-objs               := stk014.o
+gspca_sunplus-objs              := sunplus.o
+gspca_t613-objs                 := t613.o
+gspca_tv8532-objs               := tv8532.o
+gspca_vc032x-objs               := vc032x.o
+gspca_zc3xx-objs                := zc3xx.o
+
+obj-$(CONFIG_USB_M5602)         += m5602/
 
-gspca_main-objs := gspca.o
-gspca_conex-objs := conex.o
-gspca_etoms-objs := etoms.o
-gspca_mars-objs := mars.o
-gspca_ov519-objs := ov519.o
-gspca_pac207-objs := pac207.o
-gspca_pac7311-objs := pac7311.o
-gspca_sonixb-objs := sonixb.o
-gspca_sonixj-objs := sonixj.o
-gspca_spca500-objs := spca500.o
-gspca_spca501-objs := spca501.o
-gspca_spca505-objs := spca505.o
-gspca_spca506-objs := spca506.o
-gspca_spca508-objs := spca508.o
-gspca_spca561-objs := spca561.o
-gspca_stk014-objs := stk014.o
-gspca_sunplus-objs := sunplus.o
-gspca_t613-objs := t613.o
-gspca_tv8532-objs := tv8532.o
-gspca_vc032x-objs := vc032x.o
-gspca_zc3xx-objs := zc3xx.o
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index 4d9f4cc255a9..a9d51ba7c57c 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -837,12 +837,13 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         cx11646_initsize(gspca_dev);
         cx11646_fw(gspca_dev);
         cx_sensor(gspca_dev);
         cx11646_jpeg(gspca_dev);
+        return 0;
 }
 
 static void sd_stop0(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index 4ff0e386914b..3be30b420a26 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -691,7 +691,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -704,6 +704,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
         reg_w_val(gspca_dev, ET_RESET_ALL, 0x08);
         et_video(gspca_dev, 1);         /* video on */
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
new file mode 100644
index 000000000000..65d3cbfe6b27
--- /dev/null
+++ b/drivers/media/video/gspca/finepix.c
@@ -0,0 +1,466 @@
+/*
+ * Fujifilm Finepix subdriver
+ *
+ * Copyright (C) 2008 Frank Zago
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#define MODULE_NAME "finepix"
+
+#include "gspca.h"
+
+MODULE_AUTHOR("Frank Zago <frank@zago.net>");
+MODULE_DESCRIPTION("Fujifilm FinePix USB V4L2 driver");
+MODULE_LICENSE("GPL");
+
+/* Default timeout, in ms */
+#define FPIX_TIMEOUT (HZ / 10)
+
+/* Maximum transfer size to use. The windows driver reads by chunks of
+ * 0x2000 bytes, so do the same. Note: reading more seems to work
+ * too. */
+#define FPIX_MAX_TRANSFER 0x2000
+
+/* Structure to hold all of our device specific stuff */
+struct usb_fpix {
+        struct gspca_dev gspca_dev;     /* !! must be the first item */
+
+        /*
+         * USB stuff
+         */
+        struct usb_ctrlrequest ctrlreq;
+        struct urb *control_urb;
+        struct timer_list bulk_timer;
+
+        enum {
+                FPIX_NOP,       /* inactive, else streaming */
+                FPIX_RESET,     /* must reset */
+                FPIX_REQ_FRAME, /* requesting a frame */
+                FPIX_READ_FRAME,        /* reading frame */
+        } state;
+
+        /*
+         * Driver stuff
+         */
+        struct delayed_work wqe;
+        struct completion can_close;
+        int streaming;
+};
+
+/* Delay after which claim the next frame. If the delay is too small,
+ * the camera will return old frames. On the 4800Z, 20ms is bad, 25ms
+ * will fail every 4 or 5 frames, but 30ms is perfect. */
+#define NEXT_FRAME_DELAY  (((HZ * 30) + 999) / 1000)
+
+#define dev_new_state(new_state) {                              \
+                PDEBUG(D_STREAM, "new state from %d to %d at %s:%d",    \
+                        dev->state, new_state, __func__, __LINE__);     \
+                dev->state = new_state;                                 \
+}
+
+/* These cameras only support 320x200. */
+static struct v4l2_pix_format fpix_mode[1] = {
+        { 320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+                .bytesperline = 320,
+                .sizeimage = 320 * 240 * 3 / 8 + 590,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 0}
+};
+
+/* Reads part of a frame */
+static void read_frame_part(struct usb_fpix *dev)
+{
+        int ret;
+
+        PDEBUG(D_STREAM, "read_frame_part");
+
+        /* Reads part of a frame */
+        ret = usb_submit_urb(dev->gspca_dev.urb[0], GFP_ATOMIC);
+        if (ret) {
+                dev_new_state(FPIX_RESET);
+                schedule_delayed_work(&dev->wqe, 1);
+                PDEBUG(D_STREAM, "usb_submit_urb failed with %d",
+                        ret);
+        } else {
+                /* Sometimes we never get a callback, so use a timer.
+                 * Is this masking a bug somewhere else? */
+                dev->bulk_timer.expires = jiffies + msecs_to_jiffies(150);
+                add_timer(&dev->bulk_timer);
+        }
+}
+
+/* Callback for URBs. */
+static void urb_callback(struct urb *urb)
+{
+        struct gspca_dev *gspca_dev = urb->context;
+        struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
+
+        PDEBUG(D_PACK,
+                "enter urb_callback - status=%d, length=%d",
+                urb->status, urb->actual_length);
+
+        if (dev->state == FPIX_READ_FRAME)
+                del_timer(&dev->bulk_timer);
+
+        if (urb->status != 0) {
+                /* We kill a stuck urb every 50 frames on average, so don't
+                 * display a log message for that. */
+                if (urb->status != -ECONNRESET)
+                        PDEBUG(D_STREAM, "bad URB status %d", urb->status);
+                dev_new_state(FPIX_RESET);
+                schedule_delayed_work(&dev->wqe, 1);
+        }
+
+        switch (dev->state) {
+        case FPIX_REQ_FRAME:
+                dev_new_state(FPIX_READ_FRAME);
+                read_frame_part(dev);
+                break;
+
+        case FPIX_READ_FRAME: {
+                unsigned char *data = urb->transfer_buffer;
+                struct gspca_frame *frame;
+
+                frame = gspca_get_i_frame(&dev->gspca_dev);
+                if (frame == NULL)
+                        gspca_dev->last_packet_type = DISCARD_PACKET;
+                if (urb->actual_length < FPIX_MAX_TRANSFER ||
+                        (data[urb->actual_length-2] == 0xff &&
+                                data[urb->actual_length-1] == 0xd9)) {
+
+                        /* If the result is less than what was asked
+                         * for, then it's the end of the
+                         * frame. Sometime the jpeg is not complete,
+                         * but there's nothing we can do. We also end
+                         * here if the the jpeg ends right at the end
+                         * of the frame. */
+                        if (frame)
+                                gspca_frame_add(gspca_dev, LAST_PACKET,
+                                                frame,
+                                                data, urb->actual_length);
+                        dev_new_state(FPIX_REQ_FRAME);
+                        schedule_delayed_work(&dev->wqe, NEXT_FRAME_DELAY);
+                } else {
+
+                        /* got a partial image */
+                        if (frame)
+                                gspca_frame_add(gspca_dev,
+                                                gspca_dev->last_packet_type
+                                                                == LAST_PACKET
+                                                ? FIRST_PACKET : INTER_PACKET,
+                                                frame,
+                                        data, urb->actual_length);
+                        read_frame_part(dev);
+                }
+                break;
+            }
+
+        case FPIX_NOP:
+        case FPIX_RESET:
+                PDEBUG(D_STREAM, "invalid state %d", dev->state);
+                break;
+        }
+}
+
+/* Request a new frame */
+static void request_frame(struct usb_fpix *dev)
+{
+        int ret;
+        struct gspca_dev *gspca_dev = &dev->gspca_dev;
+
+        /* Setup command packet */
+        memset(gspca_dev->usb_buf, 0, 12);
+        gspca_dev->usb_buf[0] = 0xd3;
+        gspca_dev->usb_buf[7] = 0x01;
+
+        /* Request a frame */
+        dev->ctrlreq.bRequestType =
+                USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE;
+        dev->ctrlreq.bRequest = USB_REQ_GET_STATUS;
+        dev->ctrlreq.wValue = 0;
+        dev->ctrlreq.wIndex = 0;
+        dev->ctrlreq.wLength = cpu_to_le16(12);
+
+        usb_fill_control_urb(dev->control_urb,
+                             gspca_dev->dev,
+                             usb_sndctrlpipe(gspca_dev->dev, 0),
+                             (unsigned char *) &dev->ctrlreq,
+                             gspca_dev->usb_buf,
+                             12, urb_callback, gspca_dev);
+
+        ret = usb_submit_urb(dev->control_urb, GFP_ATOMIC);
+        if (ret) {
+                dev_new_state(FPIX_RESET);
+                schedule_delayed_work(&dev->wqe, 1);
+                PDEBUG(D_STREAM, "usb_submit_urb failed with %d", ret);
+        }
+}
+
+/*--------------------------------------------------------------------------*/
+
+/* State machine. */
+static void fpix_sm(struct work_struct *work)
+{
+        struct usb_fpix *dev = container_of(work, struct usb_fpix, wqe.work);
+
+        PDEBUG(D_STREAM, "fpix_sm state %d", dev->state);
+
+        /* verify that the device wasn't unplugged */
+        if (!dev->gspca_dev.present) {
+                PDEBUG(D_STREAM, "device is gone");
+                dev_new_state(FPIX_NOP);
+                complete(&dev->can_close);
+                return;
+        }
+
+        if (!dev->streaming) {
+                PDEBUG(D_STREAM, "stopping state machine");
+                dev_new_state(FPIX_NOP);
+                complete(&dev->can_close);
+                return;
+        }
+
+        switch (dev->state) {
+        case FPIX_RESET:
+                dev_new_state(FPIX_REQ_FRAME);
+                schedule_delayed_work(&dev->wqe, HZ / 10);
+                break;
+
+        case FPIX_REQ_FRAME:
+                /* get an image */
+                request_frame(dev);
+                break;
+
+        case FPIX_NOP:
+        case FPIX_READ_FRAME:
+                PDEBUG(D_STREAM, "invalid state %d", dev->state);
+                break;
+        }
+}
+
+/* this function is called at probe time */
+static int sd_config(struct gspca_dev *gspca_dev,
+                const struct usb_device_id *id)
+{
+        struct cam *cam = &gspca_dev->cam;
+
+        cam->cam_mode = fpix_mode;
+        cam->nmodes = 1;
+        cam->epaddr = 0x01;     /* todo: correct for all cams? */
+        cam->bulk_size = FPIX_MAX_TRANSFER;
+
+/*      gspca_dev->nbalt = 1;    * use bulk transfer */
+        return 0;
+}
+
+/* Stop streaming and free the ressources allocated by sd_start. */
+static void sd_stopN(struct gspca_dev *gspca_dev)
+{
+        struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
+
+        dev->streaming = 0;
+
+        /* Stop the state machine */
+        if (dev->state != FPIX_NOP)
+                wait_for_completion(&dev->can_close);
+
+        usb_free_urb(dev->control_urb);
+        dev->control_urb = NULL;
+}
+
+/* Kill an URB that hasn't completed. */
+static void timeout_kill(unsigned long data)
+{
+        struct urb *urb = (struct urb *) data;
+
+        usb_unlink_urb(urb);
+}
+
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
+{
+        struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
+
+        INIT_DELAYED_WORK(&dev->wqe, fpix_sm);
+
+        init_timer(&dev->bulk_timer);
+        dev->bulk_timer.function = timeout_kill;
+
+        return 0;
+}
+
+static int sd_start(struct gspca_dev *gspca_dev)
+{
+        struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
+        int ret;
+        int size_ret;
+
+        /* Reset bulk in endpoint */
+        usb_clear_halt(gspca_dev->dev, gspca_dev->cam.epaddr);
+
+        /* Init the device */
+        memset(gspca_dev->usb_buf, 0, 12);
+        gspca_dev->usb_buf[0] = 0xc6;
+        gspca_dev->usb_buf[8] = 0x20;
+
+        ret = usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
+                        USB_REQ_GET_STATUS,
+                        USB_DIR_OUT | USB_TYPE_CLASS |
+                        USB_RECIP_INTERFACE, 0, 0, gspca_dev->usb_buf,
+                        12, FPIX_TIMEOUT);
+
+        if (ret != 12) {
+                PDEBUG(D_STREAM, "usb_control_msg failed (%d)", ret);
+                ret = -EIO;
+                goto error;
+        }
+
+        /* Read the result of the command. Ignore the result, for it
+         * varies with the device. */
+        ret = usb_bulk_msg(gspca_dev->dev,
+                        usb_rcvbulkpipe(gspca_dev->dev,
+                                        gspca_dev->cam.epaddr),
+                        gspca_dev->usb_buf, FPIX_MAX_TRANSFER, &size_ret,
+                        FPIX_TIMEOUT);
+        if (ret != 0) {
+                PDEBUG(D_STREAM, "usb_bulk_msg failed (%d)", ret);
+                ret = -EIO;
+                goto error;
+        }
+
+        /* Request a frame, but don't read it */
+        memset(gspca_dev->usb_buf, 0, 12);
+        gspca_dev->usb_buf[0] = 0xd3;
+        gspca_dev->usb_buf[7] = 0x01;
+
+        ret = usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
+                        USB_REQ_GET_STATUS,
+                        USB_DIR_OUT | USB_TYPE_CLASS |
+                        USB_RECIP_INTERFACE, 0, 0, gspca_dev->usb_buf,
+                        12, FPIX_TIMEOUT);
+        if (ret != 12) {
+                PDEBUG(D_STREAM, "usb_control_msg failed (%d)", ret);
+                ret = -EIO;
+                goto error;
+        }
+
+        /* Again, reset bulk in endpoint */
+        usb_clear_halt(gspca_dev->dev, gspca_dev->cam.epaddr);
+
+        /* Allocate a control URB */
+        dev->control_urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!dev->control_urb) {
+                PDEBUG(D_STREAM, "No free urbs available");
+                ret = -EIO;
+                goto error;
+        }
+
+        /* Various initializations. */
+        init_completion(&dev->can_close);
+        dev->bulk_timer.data = (unsigned long)dev->gspca_dev.urb[0];
+        dev->gspca_dev.urb[0]->complete = urb_callback;
+        dev->streaming = 1;
+
+        /* Schedule a frame request. */
+        dev_new_state(FPIX_REQ_FRAME);
+        schedule_delayed_work(&dev->wqe, 1);
+
+        return 0;
+
+error:
+        /* Free the ressources */
+        sd_stopN(gspca_dev);
+        return ret;
+}
+
+/* Table of supported USB devices */
+static const __devinitdata struct usb_device_id device_table[] = {
+        {USB_DEVICE(0x04cb, 0x0104)},
+        {USB_DEVICE(0x04cb, 0x0109)},
+        {USB_DEVICE(0x04cb, 0x010b)},
+        {USB_DEVICE(0x04cb, 0x010f)},
+        {USB_DEVICE(0x04cb, 0x0111)},
+        {USB_DEVICE(0x04cb, 0x0113)},
+        {USB_DEVICE(0x04cb, 0x0115)},
+        {USB_DEVICE(0x04cb, 0x0117)},
+        {USB_DEVICE(0x04cb, 0x0119)},
+        {USB_DEVICE(0x04cb, 0x011b)},
+        {USB_DEVICE(0x04cb, 0x011d)},
+        {USB_DEVICE(0x04cb, 0x0121)},
+        {USB_DEVICE(0x04cb, 0x0123)},
+        {USB_DEVICE(0x04cb, 0x0125)},
+        {USB_DEVICE(0x04cb, 0x0127)},
+        {USB_DEVICE(0x04cb, 0x0129)},
+        {USB_DEVICE(0x04cb, 0x012b)},
+        {USB_DEVICE(0x04cb, 0x012d)},
+        {USB_DEVICE(0x04cb, 0x012f)},
+        {USB_DEVICE(0x04cb, 0x0131)},
+        {USB_DEVICE(0x04cb, 0x013b)},
+        {USB_DEVICE(0x04cb, 0x013d)},
+        {USB_DEVICE(0x04cb, 0x013f)},
+        {}
+};
+
+MODULE_DEVICE_TABLE(usb, device_table);
+
+/* sub-driver description */
+static const struct sd_desc sd_desc = {
+        .name = MODULE_NAME,
+        .config = sd_config,
+        .init = sd_init,
+        .start = sd_start,
+        .stopN = sd_stopN,
+};
+
+/* -- device connect -- */
+static int sd_probe(struct usb_interface *intf,
+                const struct usb_device_id *id)
+{
+        return gspca_dev_probe(intf, id,
+                        &sd_desc,
+                        sizeof(struct usb_fpix),
+                        THIS_MODULE);
+}
+
+static struct usb_driver sd_driver = {
+        .name = MODULE_NAME,
+        .id_table = device_table,
+        .probe = sd_probe,
+        .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
+};
+
+/* -- module insert / remove -- */
+static int __init sd_mod_init(void)
+{
+        if (usb_register(&sd_driver) < 0)
+                return -1;
+        PDEBUG(D_PROBE, "registered");
+        return 0;
+}
+static void __exit sd_mod_exit(void)
+{
+        usb_deregister(&sd_driver);
+        PDEBUG(D_PROBE, "deregistered");
+}
+
+module_init(sd_mod_init);
+module_exit(sd_mod_exit);
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index ac95c55887df..c21af312ee7c 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -29,6 +29,7 @@
 #include <linux/string.h>
 #include <linux/pagemap.h>
 #include <linux/io.h>
+#include <linux/kref.h>
 #include <asm/page.h>
 #include <linux/uaccess.h>
 #include <linux/jiffies.h>
@@ -43,7 +44,7 @@ MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
 MODULE_DESCRIPTION("GSPCA USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 2, 0)
+#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 3, 0)
 
 static int video_nr = -1;
 
@@ -102,6 +103,22 @@ static struct vm_operations_struct gspca_vm_ops = {
         .close          = gspca_vm_close,
 };
 
+/* get the current input frame buffer */
+struct gspca_frame *gspca_get_i_frame(struct gspca_dev *gspca_dev)
+{
+        struct gspca_frame *frame;
+        int i;
+
+        i = gspca_dev->fr_i;
+        i = gspca_dev->fr_queue[i];
+        frame = &gspca_dev->frame[i];
+        if ((frame->v4l2_buf.flags & BUF_ALL_FLAGS)
+                                != V4L2_BUF_FLAG_QUEUED)
+                return NULL;
+        return frame;
+}
+EXPORT_SYMBOL(gspca_get_i_frame);
+
 /*
  * fill a video frame from an URB and resubmit
  */
@@ -110,7 +127,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
 {
         struct gspca_frame *frame;
         __u8 *data;             /* address of data in the iso message */
-        int i, j, len, st;
+        int i, len, st;
         cam_pkt_op pkt_scan;
 
         if (urb->status != 0) {
@@ -124,11 +141,8 @@ static void fill_frame(struct gspca_dev *gspca_dev,
         for (i = 0; i < urb->number_of_packets; i++) {
 
                 /* check the availability of the frame buffer */
-                j = gspca_dev->fr_i;
-                j = gspca_dev->fr_queue[j];
-                frame = &gspca_dev->frame[j];
-                if ((frame->v4l2_buf.flags & BUF_ALL_FLAGS)
-                                        != V4L2_BUF_FLAG_QUEUED) {
+                frame = gspca_get_i_frame(gspca_dev);
+                if (!frame) {
                         gspca_dev->last_packet_type = DISCARD_PACKET;
                         break;
                 }
@@ -178,6 +192,39 @@ static void isoc_irq(struct urb *urb
 }
 
 /*
+ * bulk message interrupt from the USB device
+ */
+static void bulk_irq(struct urb *urb
+)
+{
+        struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;
+        struct gspca_frame *frame;
+
+        PDEBUG(D_PACK, "bulk irq");
+        if (!gspca_dev->streaming)
+                return;
+        if (urb->status != 0 && urb->status != -ECONNRESET) {
+#ifdef CONFIG_PM
+                if (!gspca_dev->frozen)
+#endif
+                        PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
+                return;         /* disconnection ? */
+        }
+
+        /* check the availability of the frame buffer */
+        frame = gspca_get_i_frame(gspca_dev);
+        if (!frame) {
+                gspca_dev->last_packet_type = DISCARD_PACKET;
+        } else {
+                PDEBUG(D_PACK, "packet l:%d", urb->actual_length);
+                gspca_dev->sd_desc->pkt_scan(gspca_dev,
+                                        frame,
+                                        urb->transfer_buffer,
+                                        urb->actual_length);
+        }
+}
+
+/*
  * add data to the current frame
  *
  * This function is called by the subdrivers at interrupt level.
@@ -190,7 +237,7 @@ static void isoc_irq(struct urb *urb
  * On LAST_PACKET, a new frame is returned.
  */
 struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
-                                    int packet_type,
+                                    enum gspca_packet_type packet_type,
                                     struct gspca_frame *frame,
                                     const __u8 *data,
                                     int len)
@@ -232,7 +279,7 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
         }
         gspca_dev->last_packet_type = packet_type;
 
-        /* if last packet, wake the application and advance in the queue */
+        /* if last packet, wake up the application and advance in the queue */
         if (packet_type == LAST_PACKET) {
                 frame->v4l2_buf.bytesused = frame->data_end - frame->data;
                 frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_QUEUED;
@@ -270,7 +317,6 @@ static void *rvmalloc(unsigned long size)
         void *mem;
         unsigned long adr;
 
-/*      size = PAGE_ALIGN(size);        (already done) */
         mem = vmalloc_32(size);
         if (mem != NULL) {
                 adr = (unsigned long) mem;
@@ -374,10 +420,11 @@ static void destroy_urbs(struct gspca_dev *gspca_dev)
 }
 
 /*
- * search an input isochronous endpoint in an alternate setting
+ * look for an input transfer endpoint in an alternate setting
  */
-static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,
-                                          __u8 epaddr)
+static struct usb_host_endpoint *alt_xfer(struct usb_host_interface *alt,
+                                          __u8 epaddr,
+                                          __u8 xfer)
 {
         struct usb_host_endpoint *ep;
         int i, attr;
@@ -388,7 +435,7 @@ static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,
                 if (ep->desc.bEndpointAddress == epaddr) {
                         attr = ep->desc.bmAttributes
                                                 & USB_ENDPOINT_XFERTYPE_MASK;
-                        if (attr == USB_ENDPOINT_XFER_ISOC)
+                        if (attr == xfer)
                                 return ep;
                         break;
                 }
@@ -397,14 +444,14 @@ static struct usb_host_endpoint *alt_isoc(struct usb_host_interface *alt,
 }
 
 /*
- * search an input isochronous endpoint
+ * look for an input (isoc or bulk) endpoint
  *
  * The endpoint is defined by the subdriver.
  * Use only the first isoc (some Zoran - 0x0572:0x0001 - have two such ep).
  * This routine may be called many times when the bandwidth is too small
  * (the bandwidth is checked on urb submit).
  */
-static struct usb_host_endpoint *get_isoc_ep(struct gspca_dev *gspca_dev)
+static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)
 {
         struct usb_interface *intf;
         struct usb_host_endpoint *ep;
@@ -413,28 +460,41 @@ static struct usb_host_endpoint *get_isoc_ep(struct gspca_dev *gspca_dev)
         intf = usb_ifnum_to_if(gspca_dev->dev, gspca_dev->iface);
         ep = NULL;
         i = gspca_dev->alt;                     /* previous alt setting */
+
+        /* try isoc */
         while (--i > 0) {                       /* alt 0 is unusable */
-                ep = alt_isoc(&intf->altsetting[i], gspca_dev->cam.epaddr);
+                ep = alt_xfer(&intf->altsetting[i],
+                                gspca_dev->cam.epaddr,
+                                USB_ENDPOINT_XFER_ISOC);
                 if (ep)
                         break;
         }
+
+        /* if no isoc, try bulk */
         if (ep == NULL) {
-                err("no ISOC endpoint found");
-                return NULL;
+                ep = alt_xfer(&intf->altsetting[0],
+                                gspca_dev->cam.epaddr,
+                                USB_ENDPOINT_XFER_BULK);
+                if (ep == NULL) {
+                        err("no transfer endpoint found");
+                        return NULL;
+                }
         }
-        PDEBUG(D_STREAM, "use ISOC alt %d ep 0x%02x",
+        PDEBUG(D_STREAM, "use alt %d ep 0x%02x",
                         i, ep->desc.bEndpointAddress);
-        ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, i);
-        if (ret < 0) {
-                err("set interface err %d", ret);
-                return NULL;
+        if (i > 0) {
+                ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, i);
+                if (ret < 0) {
+                        err("set interface err %d", ret);
+                        return NULL;
+                }
         }
         gspca_dev->alt = i;             /* memorize the current alt setting */
         return ep;
 }
 
 /*
- * create the isochronous URBs
+ * create the URBs for image transfer
  */
 static int create_urbs(struct gspca_dev *gspca_dev,
                         struct usb_host_endpoint *ep)
@@ -445,15 +505,27 @@ static int create_urbs(struct gspca_dev *gspca_dev,
         /* calculate the packet size and the number of packets */
         psize = le16_to_cpu(ep->desc.wMaxPacketSize);
 
-        /* See paragraph 5.9 / table 5-11 of the usb 2.0 spec. */
-        psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3));
-        npkt = ISO_MAX_SIZE / psize;
-        if (npkt > ISO_MAX_PKT)
-                npkt = ISO_MAX_PKT;
-        bsize = psize * npkt;
-        PDEBUG(D_STREAM,
-                "isoc %d pkts size %d (bsize:%d)", npkt, psize, bsize);
-        nurbs = DEF_NURBS;
+        if (gspca_dev->alt != 0) {              /* isoc */
+
+                /* See paragraph 5.9 / table 5-11 of the usb 2.0 spec. */
+                psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3));
+                npkt = ISO_MAX_SIZE / psize;
+                if (npkt > ISO_MAX_PKT)
+                        npkt = ISO_MAX_PKT;
+                bsize = psize * npkt;
+                PDEBUG(D_STREAM,
+                        "isoc %d pkts size %d = bsize:%d",
+                        npkt, psize, bsize);
+                nurbs = DEF_NURBS;
+        } else {                                /* bulk */
+                npkt = 0;
+                bsize = gspca_dev->cam. bulk_size;
+                if (bsize == 0)
+                        bsize = psize;
+                PDEBUG(D_STREAM, "bulk bsize:%d", bsize);
+                nurbs = 1;
+        }
+
         gspca_dev->nurbs = nurbs;
         for (n = 0; n < nurbs; n++) {
                 urb = usb_alloc_urb(npkt, GFP_KERNEL);
@@ -476,17 +548,24 @@ static int create_urbs(struct gspca_dev *gspca_dev,
                 gspca_dev->urb[n] = urb;
                 urb->dev = gspca_dev->dev;
                 urb->context = gspca_dev;
-                urb->pipe = usb_rcvisocpipe(gspca_dev->dev,
-                                            ep->desc.bEndpointAddress);
-                urb->transfer_flags = URB_ISO_ASAP
-                                        | URB_NO_TRANSFER_DMA_MAP;
-                urb->interval = ep->desc.bInterval;
-                urb->complete = isoc_irq;
-                urb->number_of_packets = npkt;
                 urb->transfer_buffer_length = bsize;
-                for (i = 0; i < npkt; i++) {
-                        urb->iso_frame_desc[i].length = psize;
-                        urb->iso_frame_desc[i].offset = psize * i;
+                if (npkt != 0) {                /* ISOC */
+                        urb->pipe = usb_rcvisocpipe(gspca_dev->dev,
+                                                    ep->desc.bEndpointAddress);
+                        urb->transfer_flags = URB_ISO_ASAP
+                                        | URB_NO_TRANSFER_DMA_MAP;
+                        urb->interval = ep->desc.bInterval;
+                        urb->complete = isoc_irq;
+                        urb->number_of_packets = npkt;
+                        for (i = 0; i < npkt; i++) {
+                                urb->iso_frame_desc[i].length = psize;
+                                urb->iso_frame_desc[i].offset = psize * i;
+                        }
+                } else {                /* bulk */
+                        urb->pipe = usb_rcvbulkpipe(gspca_dev->dev,
+                                                ep->desc.bEndpointAddress),
+                        urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
+                        urb->complete = bulk_irq;
                 }
         }
         return 0;
@@ -508,7 +587,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
         gspca_dev->alt = gspca_dev->nbalt;
         for (;;) {
                 PDEBUG(D_STREAM, "init transfer alt %d", gspca_dev->alt);
-                ep = get_isoc_ep(gspca_dev);
+                ep = get_ep(gspca_dev);
                 if (ep == NULL) {
                         ret = -EIO;
                         goto out;
@@ -518,10 +597,18 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
                         goto out;
 
                 /* start the cam */
-                gspca_dev->sd_desc->start(gspca_dev);
+                ret = gspca_dev->sd_desc->start(gspca_dev);
+                if (ret < 0) {
+                        destroy_urbs(gspca_dev);
+                        goto out;
+                }
                 gspca_dev->streaming = 1;
                 atomic_set(&gspca_dev->nevent, 0);
 
+                /* bulk transfers are started by the subdriver */
+                if (gspca_dev->alt == 0)
+                        break;
+
                 /* submit the URBs */
                 for (n = 0; n < gspca_dev->nurbs; n++) {
                         ret = usb_submit_urb(gspca_dev->urb[n], GFP_KERNEL);
@@ -553,7 +640,7 @@ static int gspca_set_alt0(struct gspca_dev *gspca_dev)
         return ret;
 }
 
-/* Note both the queue and the usb lock should be hold when calling this */
+/* Note: both the queue and the usb locks should be held when calling this */
 static void gspca_stream_off(struct gspca_dev *gspca_dev)
 {
         gspca_dev->streaming = 0;
@@ -759,6 +846,16 @@ out:
         return ret;
 }
 
+static void gspca_delete(struct kref *kref)
+{
+        struct gspca_dev *gspca_dev = container_of(kref, struct gspca_dev, kref);
+
+        PDEBUG(D_STREAM, "device deleted");
+
+        kfree(gspca_dev->usb_buf);
+        kfree(gspca_dev);
+}
+
 static int dev_open(struct inode *inode, struct file *file)
 {
         struct gspca_dev *gspca_dev;
@@ -778,13 +875,19 @@ static int dev_open(struct inode *inode, struct file *file)
                 goto out;
         }
         gspca_dev->users++;
+
+        /* one more user */
+        kref_get(&gspca_dev->kref);
+
         file->private_data = gspca_dev;
 #ifdef GSPCA_DEBUG
         /* activate the v4l2 debug */
         if (gspca_debug & D_V4L2)
-                gspca_dev->vdev.debug |= 3;
+                gspca_dev->vdev.debug |= V4L2_DEBUG_IOCTL
+                                        | V4L2_DEBUG_IOCTL_ARG;
         else
-                gspca_dev->vdev.debug &= ~3;
+                gspca_dev->vdev.debug &= ~(V4L2_DEBUG_IOCTL
+                                        | V4L2_DEBUG_IOCTL_ARG);
 #endif
         ret = 0;
 out:
@@ -818,7 +921,11 @@ static int dev_close(struct inode *inode, struct file *file)
         }
         file->private_data = NULL;
         mutex_unlock(&gspca_dev->queue_lock);
+
         PDEBUG(D_STREAM, "close done");
+
+        kref_put(&gspca_dev->kref, gspca_delete);
+
         return 0;
 }
 
@@ -829,7 +936,6 @@ static int vidioc_querycap(struct file *file, void  *priv,
 
         memset(cap, 0, sizeof *cap);
         strncpy(cap->driver, gspca_dev->sd_desc->name, sizeof cap->driver);
-/*      strncpy(cap->card, gspca_dev->cam.dev_name, sizeof cap->card); */
         if (gspca_dev->dev->product != NULL) {
                 strncpy(cap->card, gspca_dev->dev->product,
                         sizeof cap->card);
@@ -1463,7 +1569,6 @@ static int vidioc_qbuf(struct file *file, void *priv,
         }
 
         frame->v4l2_buf.flags |= V4L2_BUF_FLAG_QUEUED;
-/*      frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_DONE; */
 
         if (frame->v4l2_buf.memory == V4L2_MEMORY_USERPTR) {
                 frame->v4l2_buf.m.userptr = v4l2_buf->m.userptr;
@@ -1610,7 +1715,7 @@ static ssize_t dev_read(struct file *file, char __user *data,
                 }
 
                 /* if the process slept for more than 1 second,
-                 * get anewer frame */
+                 * get a newer frame */
                 frame = &gspca_dev->frame[v4l2_buf.index];
                 if (--n < 0)
                         break;                  /* avoid infinite loop */
@@ -1728,21 +1833,21 @@ int gspca_dev_probe(struct usb_interface *intf,
         if (dev_size < sizeof *gspca_dev)
                 dev_size = sizeof *gspca_dev;
         gspca_dev = kzalloc(dev_size, GFP_KERNEL);
-        if (gspca_dev == NULL) {
+        if (!gspca_dev) {
                 err("couldn't kzalloc gspca struct");
-                return -EIO;
+                return -ENOMEM;
         }
+        kref_init(&gspca_dev->kref);
         gspca_dev->usb_buf = kmalloc(USB_BUF_SZ, GFP_KERNEL);
         if (!gspca_dev->usb_buf) {
                 err("out of memory");
-                ret = -EIO;
+                ret = -ENOMEM;
                 goto out;
         }
         gspca_dev->dev = dev;
         gspca_dev->iface = interface->bInterfaceNumber;
         gspca_dev->nbalt = intf->num_altsetting;
         gspca_dev->sd_desc = sd_desc;
-/*      gspca_dev->users = 0;                   (done by kzalloc) */
         gspca_dev->nbufread = 2;
 
         /* configure the subdriver and initialize the USB device */
@@ -1781,8 +1886,7 @@ int gspca_dev_probe(struct usb_interface *intf,
         PDEBUG(D_PROBE, "probe ok");
         return 0;
 out:
-        kfree(gspca_dev->usb_buf);
-        kfree(gspca_dev);
+        kref_put(&gspca_dev->kref, gspca_delete);
         return ret;
 }
 EXPORT_SYMBOL(gspca_dev_probe);
@@ -1797,25 +1901,16 @@ void gspca_disconnect(struct usb_interface *intf)
 {
         struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
 
-        if (!gspca_dev)
-                return;
-        gspca_dev->present = 0;
-        mutex_lock(&gspca_dev->queue_lock);
-        mutex_lock(&gspca_dev->usb_lock);
-        gspca_dev->streaming = 0;
-        destroy_urbs(gspca_dev);
-        mutex_unlock(&gspca_dev->usb_lock);
-        mutex_unlock(&gspca_dev->queue_lock);
-        while (gspca_dev->users != 0) {         /* wait until fully closed */
-                atomic_inc(&gspca_dev->nevent);
-                wake_up_interruptible(&gspca_dev->wq);  /* wake processes */
-                schedule();
-        }
+        usb_set_intfdata(intf, NULL);
+
 /* We don't want people trying to open up the device */
         video_unregister_device(&gspca_dev->vdev);
-/* Free the memory */
-        kfree(gspca_dev->usb_buf);
-        kfree(gspca_dev);
+
+        gspca_dev->present = 0;
+        gspca_dev->streaming = 0;
+
+        kref_put(&gspca_dev->kref, gspca_delete);
+
         PDEBUG(D_PROBE, "disconnect complete");
 }
 EXPORT_SYMBOL(gspca_disconnect);
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index c17625cff9ba..4779dd0b06da 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -49,13 +49,14 @@ extern int gspca_debug;
         } while (0)
 
 #define GSPCA_MAX_FRAMES 16     /* maximum number of video frame buffers */
-/* ISOC transfers */
-#define MAX_NURBS 16            /* max number of URBs */
+/* image transfers */
+#define MAX_NURBS 4             /* max number of URBs */
 #define ISO_MAX_PKT 32          /* max number of packets in an ISOC transfer */
 #define ISO_MAX_SIZE 0x8000     /* max size of one URB buffer (32 Kb) */
 
 /* device information - set at probe time */
 struct cam {
+        int bulk_size;          /* buffer size when image transfer by bulk */
         struct v4l2_pix_format *cam_mode;       /* size nmodes */
         char nmodes;
         __u8 epaddr;
@@ -93,7 +94,7 @@ struct sd_desc {
 /* mandatory operations */
         cam_cf_op config;       /* called on probe */
         cam_op init;            /* called on probe and resume */
-        cam_v_op start;         /* called on stream on */
+        cam_op start;           /* called on stream on */
         cam_pkt_op pkt_scan;
 /* optional operations */
         cam_v_op stopN;         /* called on stream off - main alt */
@@ -105,10 +106,12 @@ struct sd_desc {
 };
 
 /* packet types when moving from iso buf to frame buf */
-#define DISCARD_PACKET  0
-#define FIRST_PACKET    1
-#define INTER_PACKET    2
-#define LAST_PACKET     3
+enum gspca_packet_type {
+        DISCARD_PACKET,
+        FIRST_PACKET,
+        INTER_PACKET,
+        LAST_PACKET
+};
 
 struct gspca_frame {
         __u8 *data;                     /* frame buffer */
@@ -121,6 +124,7 @@ struct gspca_dev {
         struct video_device vdev;       /* !! must be the first item */
         struct file_operations fops;
         struct usb_device *dev;
+        struct kref kref;
         struct file *capt_file;         /* file doing video capture */
 
         struct cam cam;                         /* device information */
@@ -173,10 +177,11 @@ int gspca_dev_probe(struct usb_interface *intf,
                 struct module *module);
 void gspca_disconnect(struct usb_interface *intf);
 struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
-                                    int packet_type,
+                                    enum gspca_packet_type packet_type,
                                     struct gspca_frame *frame,
                                     const __u8 *data,
                                     int len);
+struct gspca_frame *gspca_get_i_frame(struct gspca_dev *gspca_dev);
 #ifdef CONFIG_PM
 int gspca_suspend(struct usb_interface *intf, pm_message_t message);
 int gspca_resume(struct usb_interface *intf);
diff --git a/drivers/media/video/gspca/m5602/Kconfig b/drivers/media/video/gspca/m5602/Kconfig
new file mode 100644
index 000000000000..5a69016ed75f
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/Kconfig
@@ -0,0 +1,11 @@
+config USB_M5602
+        tristate "ALi USB m5602 Camera Driver"
+        depends on VIDEO_V4L2 && USB_GSPCA
+        help
+          Say Y here if you want support for cameras based on the
+          ALi m5602 connected to various image sensors.
+
+          See <file:Documentation/video4linux/m5602.txt> for more info.
+
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_m5602.
diff --git a/drivers/media/video/gspca/m5602/Makefile b/drivers/media/video/gspca/m5602/Makefile
new file mode 100644
index 000000000000..226ab4fc9d60
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/Makefile
@@ -0,0 +1,11 @@
+obj-$(CONFIG_USB_M5602) += gspca_m5602.o
+
+gspca_m5602-objs := m5602_core.o \
+                    m5602_ov9650.o \
+                    m5602_mt9m111.o \
+                    m5602_po1030.o \
+                    m5602_s5k83a.o \
+                    m5602_s5k4aa.o
+
+EXTRA_CFLAGS += -Idrivers/media/video/gspca
+
diff --git a/drivers/media/video/gspca/m5602/m5602_bridge.h b/drivers/media/video/gspca/m5602/m5602_bridge.h
new file mode 100644
index 000000000000..c786d7d3d44a
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_bridge.h
@@ -0,0 +1,170 @@
+/*
+ * USB Driver for ALi m5602 based webcams
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#ifndef M5602_BRIDGE_H_
+#define M5602_BRIDGE_H_
+
+#include "gspca.h"
+
+#define MODULE_NAME "ALi m5602"
+
+/*****************************************************************************/
+
+#undef PDEBUG
+#undef info
+#undef err
+
+#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \
+        format "\n" , ## arg)
+#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " \
+        format "\n" , ## arg)
+
+/* Debug parameters */
+#define DBG_INIT 0x1
+#define DBG_PROBE 0x2
+#define DBG_V4L2 0x4
+#define DBG_TRACE 0x8
+#define DBG_DATA 0x10
+#define DBG_V4L2_CID 0x20
+#define DBG_GSPCA 0x40
+
+#define PDEBUG(level, fmt, args...) \
+        do { \
+                if (m5602_debug & level)     \
+                        info("[%s:%d] " fmt, __func__, __LINE__ , \
+                        ## args); \
+        } while (0)
+
+/*****************************************************************************/
+
+#define M5602_XB_SENSOR_TYPE 0x00
+#define M5602_XB_SENSOR_CTRL 0x01
+#define M5602_XB_LINE_OF_FRAME_H 0x02
+#define M5602_XB_LINE_OF_FRAME_L 0x03
+#define M5602_XB_PIX_OF_LINE_H 0x04
+#define M5602_XB_PIX_OF_LINE_L 0x05
+#define M5602_XB_VSYNC_PARA 0x06
+#define M5602_XB_HSYNC_PARA 0x07
+#define M5602_XB_TEST_MODE_1 0x08
+#define M5602_XB_TEST_MODE_2 0x09
+#define M5602_XB_SIG_INI 0x0a
+#define M5602_XB_DS_PARA 0x0e
+#define M5602_XB_TRIG_PARA 0x0f
+#define M5602_XB_CLK_PD 0x10
+#define M5602_XB_MCU_CLK_CTRL 0x12
+#define M5602_XB_MCU_CLK_DIV 0x13
+#define M5602_XB_SEN_CLK_CTRL 0x14
+#define M5602_XB_SEN_CLK_DIV 0x15
+#define M5602_XB_AUD_CLK_CTRL 0x16
+#define M5602_XB_AUD_CLK_DIV 0x17
+#define M5602_XB_DEVCTR1 0x41
+#define M5602_XB_EPSETR0 0x42
+#define M5602_XB_EPAFCTR 0x47
+#define M5602_XB_EPBFCTR 0x49
+#define M5602_XB_EPEFCTR 0x4f
+#define M5602_XB_TEST_REG 0x53
+#define M5602_XB_ALT2SIZE 0x54
+#define M5602_XB_ALT3SIZE 0x55
+#define M5602_XB_OBSFRAME 0x56
+#define M5602_XB_PWR_CTL 0x59
+#define M5602_XB_ADC_CTRL 0x60
+#define M5602_XB_ADC_DATA 0x61
+#define M5602_XB_MISC_CTRL 0x62
+#define M5602_XB_SNAPSHOT 0x63
+#define M5602_XB_SCRATCH_1 0x64
+#define M5602_XB_SCRATCH_2 0x65
+#define M5602_XB_SCRATCH_3 0x66
+#define M5602_XB_SCRATCH_4 0x67
+#define M5602_XB_I2C_CTRL 0x68
+#define M5602_XB_I2C_CLK_DIV 0x69
+#define M5602_XB_I2C_DEV_ADDR 0x6a
+#define M5602_XB_I2C_REG_ADDR 0x6b
+#define M5602_XB_I2C_DATA 0x6c
+#define M5602_XB_I2C_STATUS 0x6d
+#define M5602_XB_GPIO_DAT_H 0x70
+#define M5602_XB_GPIO_DAT_L 0x71
+#define M5602_XB_GPIO_DIR_H 0x72
+#define M5602_XB_GPIO_DIR_L 0x73
+#define M5602_XB_GPIO_EN_H 0x74
+#define M5602_XB_GPIO_EN_L 0x75
+#define M5602_XB_GPIO_DAT 0x76
+#define M5602_XB_GPIO_DIR 0x77
+#define M5602_XB_MISC_CTL 0x70
+
+#define I2C_BUSY 0x80
+
+/*****************************************************************************/
+
+/* Driver info */
+#define DRIVER_AUTHOR "ALi m5602 Linux Driver Project"
+#define DRIVER_DESC "ALi m5602 webcam driver"
+
+#define M5602_ISOC_ENDPOINT_ADDR 0x81
+#define M5602_INTR_ENDPOINT_ADDR 0x82
+
+#define M5602_MAX_FRAMES        32
+#define M5602_URBS              2
+#define M5602_ISOC_PACKETS      14
+
+#define M5602_URB_TIMEOUT       msecs_to_jiffies(2 * M5602_ISOC_PACKETS)
+#define M5602_URB_MSG_TIMEOUT   5000
+#define M5602_FRAME_TIMEOUT     2
+
+/*****************************************************************************/
+
+/* A skeleton used for sending messages to the m5602 bridge */
+static const unsigned char bridge_urb_skeleton[] = {
+        0x13, 0x00, 0x81, 0x00
+};
+
+/* A skeleton used for sending messages to the sensor */
+static const unsigned char sensor_urb_skeleton[] = {
+        0x23, M5602_XB_GPIO_EN_H, 0x81, 0x06,
+        0x23, M5602_XB_MISC_CTRL, 0x81, 0x80,
+        0x13, M5602_XB_I2C_DEV_ADDR, 0x81, 0x00,
+        0x13, M5602_XB_I2C_REG_ADDR, 0x81, 0x00,
+        0x13, M5602_XB_I2C_DATA, 0x81, 0x00,
+        0x13, M5602_XB_I2C_CTRL, 0x81, 0x11
+};
+
+/* m5602 device descriptor, currently it just wraps the m5602_camera struct */
+struct sd {
+        struct gspca_dev gspca_dev;
+
+        /* The name of the m5602 camera */
+        char *name;
+
+        /* A pointer to the currently connected sensor */
+        struct m5602_sensor *sensor;
+
+        struct sd_desc *desc;
+
+        /* The current frame's id, used to detect frame boundaries */
+        u8 frame_id;
+
+        /* The current frame count */
+        u32 frame_count;
+};
+
+int m5602_read_bridge(
+        struct sd *sd, u8 address, u8 *i2c_data);
+
+int m5602_write_bridge(
+        struct sd *sd, u8 address, u8 i2c_data);
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
new file mode 100644
index 000000000000..19d5e351ccc1
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -0,0 +1,313 @@
+/*
+ * USB Driver for ALi m5602 based webcams
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#include "m5602_ov9650.h"
+#include "m5602_mt9m111.h"
+#include "m5602_po1030.h"
+#include "m5602_s5k83a.h"
+#include "m5602_s5k4aa.h"
+
+/* Kernel module parameters */
+int force_sensor;
+int dump_bridge;
+int dump_sensor;
+unsigned int m5602_debug;
+
+static const __devinitdata struct usb_device_id m5602_table[] = {
+        {USB_DEVICE(0x0402, 0x5602)},
+        {}
+};
+
+MODULE_DEVICE_TABLE(usb, m5602_table);
+
+/* Reads a byte from the m5602 */
+int m5602_read_bridge(struct sd *sd, u8 address, u8 *i2c_data)
+{
+        int err;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        err = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                              0x04, 0xc0, 0x14,
+                              0x8100 + address, buf,
+                              1, M5602_URB_MSG_TIMEOUT);
+        *i2c_data = buf[0];
+
+        PDEBUG(DBG_TRACE, "Reading bridge register 0x%x containing 0x%x",
+               address, *i2c_data);
+
+        /* usb_control_msg(...) returns the number of bytes sent upon success,
+        mask that and return zero upon success instead*/
+        return (err < 0) ? err : 0;
+}
+
+/* Writes a byte to to the m5602 */
+int m5602_write_bridge(struct sd *sd, u8 address, u8 i2c_data)
+{
+        int err;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        PDEBUG(DBG_TRACE, "Writing bridge register 0x%x with 0x%x",
+               address, i2c_data);
+
+        memcpy(buf, bridge_urb_skeleton,
+               sizeof(bridge_urb_skeleton));
+        buf[1] = address;
+        buf[3] = i2c_data;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                                0x04, 0x40, 0x19,
+                                0x0000, buf,
+                                4, M5602_URB_MSG_TIMEOUT);
+
+        /* usb_control_msg(...) returns the number of bytes sent upon success,
+           mask that and return zero upon success instead */
+        return (err < 0) ? err : 0;
+}
+
+/* Dump all the registers of the m5602 bridge,
+   unfortunately this breaks the camera until it's power cycled */
+static void m5602_dump_bridge(struct sd *sd)
+{
+        int i;
+        for (i = 0; i < 0x80; i++) {
+                unsigned char val = 0;
+                m5602_read_bridge(sd, i, &val);
+                info("ALi m5602 address 0x%x contains 0x%x", i, val);
+        }
+        info("Warning: The camera probably won't work until it's power cycled");
+}
+
+static int m5602_probe_sensor(struct sd *sd)
+{
+        /* Try the po1030 */
+        sd->sensor = &po1030;
+        if (!sd->sensor->probe(sd))
+                return 0;
+
+        /* Try the mt9m111 sensor */
+        sd->sensor = &mt9m111;
+        if (!sd->sensor->probe(sd))
+                return 0;
+
+        /* Try the s5k4aa */
+        sd->sensor = &s5k4aa;
+        if (!sd->sensor->probe(sd))
+                return 0;
+
+        /* Try the ov9650 */
+        sd->sensor = &ov9650;
+        if (!sd->sensor->probe(sd))
+                return 0;
+
+        /* Try the s5k83a */
+        sd->sensor = &s5k83a;
+        if (!sd->sensor->probe(sd))
+                return 0;
+
+        /* More sensor probe function goes here */
+        info("Failed to find a sensor");
+        sd->sensor = NULL;
+        return -ENODEV;
+}
+
+static int m5602_configure(struct gspca_dev *gspca_dev,
+                           const struct usb_device_id *id);
+
+static int m5602_init(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        int err;
+
+        PDEBUG(DBG_TRACE, "Initializing ALi m5602 webcam");
+        /* Run the init sequence */
+        err = sd->sensor->init(sd);
+
+        return err;
+}
+
+static int m5602_start_transfer(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* Send start command to the camera */
+        const u8 buffer[4] = {0x13, 0xf9, 0x0f, 0x01};
+        memcpy(buf, buffer, sizeof(buffer));
+        usb_control_msg(gspca_dev->dev, usb_sndctrlpipe(gspca_dev->dev, 0),
+                        0x04, 0x40, 0x19, 0x0000, buf,
+                        4, M5602_URB_MSG_TIMEOUT);
+
+        PDEBUG(DBG_V4L2, "Transfer started");
+        return 0;
+}
+
+static void m5602_urb_complete(struct gspca_dev *gspca_dev,
+                        struct gspca_frame *frame,
+                        __u8 *data, int len)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        if (len < 6) {
+                PDEBUG(DBG_DATA, "Packet is less than 6 bytes");
+                return;
+        }
+
+        /* Frame delimiter: ff xx xx xx ff ff */
+        if (data[0] == 0xff && data[4] == 0xff && data[5] == 0xff &&
+            data[2] != sd->frame_id) {
+                PDEBUG(DBG_DATA, "Frame delimiter detected");
+                sd->frame_id = data[2];
+
+                /* Remove the extra fluff appended on each header */
+                data += 6;
+                len -= 6;
+
+                /* Complete the last frame (if any) */
+                frame = gspca_frame_add(gspca_dev, LAST_PACKET,
+                                        frame, data, 0);
+                sd->frame_count++;
+
+                /* Create a new frame */
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);
+
+                PDEBUG(DBG_V4L2, "Starting new frame %d",
+                       sd->frame_count);
+
+        } else {
+                int cur_frame_len = frame->data_end - frame->data;
+
+                /* Remove urb header */
+                data += 4;
+                len -= 4;
+
+                if (cur_frame_len + len <= frame->v4l2_buf.length) {
+                        PDEBUG(DBG_DATA, "Continuing frame %d copying %d bytes",
+                               sd->frame_count, len);
+
+                        gspca_frame_add(gspca_dev, INTER_PACKET, frame,
+                                        data, len);
+                } else if (frame->v4l2_buf.length - cur_frame_len > 0) {
+                        /* Add the remaining data up to frame size */
+                        gspca_frame_add(gspca_dev, INTER_PACKET, frame, data,
+                                        frame->v4l2_buf.length - cur_frame_len);
+                }
+        }
+}
+
+static void m5602_stop_transfer(struct gspca_dev *gspca_dev)
+{
+        /* Is there are a command to stop a data transfer? */
+}
+
+/* sub-driver description, the ctrl and nctrl is filled at probe time */
+static struct sd_desc sd_desc = {
+        .name           = MODULE_NAME,
+        .config         = m5602_configure,
+        .init           = m5602_init,
+        .start          = m5602_start_transfer,
+        .stopN          = m5602_stop_transfer,
+        .pkt_scan       = m5602_urb_complete
+};
+
+/* this function is called at probe time */
+static int m5602_configure(struct gspca_dev *gspca_dev,
+                           const struct usb_device_id *id)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        struct cam *cam;
+        int err;
+
+        PDEBUG(DBG_GSPCA, "m5602_configure start");
+
+        cam = &gspca_dev->cam;
+        cam->epaddr = M5602_ISOC_ENDPOINT_ADDR;
+        sd->desc = &sd_desc;
+
+        if (dump_bridge)
+                m5602_dump_bridge(sd);
+
+        /* Probe sensor */
+        err = m5602_probe_sensor(sd);
+        if (err)
+                goto fail;
+
+        PDEBUG(DBG_GSPCA, "m5602_configure end");
+        return 0;
+
+fail:
+        PDEBUG(DBG_GSPCA, "m5602_configure failed");
+        cam->cam_mode = NULL;
+        cam->nmodes = 0;
+
+        return err;
+}
+
+static int m5602_probe(struct usb_interface *intf,
+                       const struct usb_device_id *id)
+{
+        return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
+                               THIS_MODULE);
+}
+
+static struct usb_driver sd_driver = {
+        .name = MODULE_NAME,
+        .id_table = m5602_table,
+        .probe = m5602_probe,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
+        .disconnect = gspca_disconnect
+};
+
+/* -- module insert / remove -- */
+static int __init mod_m5602_init(void)
+{
+        if (usb_register(&sd_driver) < 0)
+                return -1;
+        PDEBUG(D_PROBE, "m5602 module registered");
+        return 0;
+}
+static void __exit mod_m5602_exit(void)
+{
+        usb_deregister(&sd_driver);
+        PDEBUG(D_PROBE, "m5602 module deregistered");
+}
+
+module_init(mod_m5602_init);
+module_exit(mod_m5602_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+module_param_named(debug, m5602_debug, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "toggles debug on/off");
+
+module_param(force_sensor, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(force_sensor,
+                "force detection of sensor, "
+                "1 = OV9650, 2 = S5K83A, 3 = S5K4AA, 4 = MT9M111, 5 = PO1030");
+
+module_param(dump_bridge, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(dump_bridge, "Dumps all usb bridge registers at startup");
+
+module_param(dump_sensor, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(dump_sensor, "Dumps all usb sensor registers "
+                "at startup providing a sensor is found");
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
new file mode 100644
index 000000000000..566d4925a0e8
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
@@ -0,0 +1,345 @@
+/*
+ * Driver for the mt9m111 sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#include "m5602_mt9m111.h"
+
+int mt9m111_probe(struct sd *sd)
+{
+        u8 data[2] = {0x00, 0x00};
+        int i;
+
+        if (force_sensor) {
+                if (force_sensor == MT9M111_SENSOR) {
+                        info("Forcing a %s sensor", mt9m111.name);
+                        goto sensor_found;
+                }
+                /* If we want to force another sensor, don't try to probe this
+                 * one */
+                return -ENODEV;
+        }
+
+        info("Probing for a mt9m111 sensor");
+
+        /* Do the preinit */
+        for (i = 0; i < ARRAY_SIZE(preinit_mt9m111); i++) {
+                if (preinit_mt9m111[i][0] == BRIDGE) {
+                        m5602_write_bridge(sd,
+                                preinit_mt9m111[i][1],
+                                preinit_mt9m111[i][2]);
+                } else {
+                        data[0] = preinit_mt9m111[i][2];
+                        data[1] = preinit_mt9m111[i][3];
+                        mt9m111_write_sensor(sd,
+                                preinit_mt9m111[i][1], data, 2);
+                }
+        }
+
+        if (mt9m111_read_sensor(sd, MT9M111_SC_CHIPVER, data, 2))
+                return -ENODEV;
+
+        if ((data[0] == 0x14) && (data[1] == 0x3a)) {
+                info("Detected a mt9m111 sensor");
+                goto sensor_found;
+        }
+
+        return -ENODEV;
+
+sensor_found:
+        sd->gspca_dev.cam.cam_mode = mt9m111.modes;
+        sd->gspca_dev.cam.nmodes = mt9m111.nmodes;
+        sd->desc->ctrls = mt9m111.ctrls;
+        sd->desc->nctrls = mt9m111.nctrls;
+        return 0;
+}
+
+int mt9m111_init(struct sd *sd)
+{
+        int i, err = 0;
+
+        /* Init the sensor */
+        for (i = 0; i < ARRAY_SIZE(init_mt9m111); i++) {
+                u8 data[2];
+
+                if (init_mt9m111[i][0] == BRIDGE) {
+                        err = m5602_write_bridge(sd,
+                                init_mt9m111[i][1],
+                                init_mt9m111[i][2]);
+                } else {
+                        data[0] = init_mt9m111[i][2];
+                        data[1] = init_mt9m111[i][3];
+                        err = mt9m111_write_sensor(sd,
+                                init_mt9m111[i][1], data, 2);
+                }
+        }
+
+        if (dump_sensor)
+                mt9m111_dump_registers(sd);
+
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_power_down(struct sd *sd)
+{
+        return 0;
+}
+
+int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
+                                  data, 2);
+        *val = data[0] & MT9M111_RMB_MIRROR_ROWS;
+        PDEBUG(DBG_V4L2_CID, "Read vertical flip %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set vertical flip to %d", val);
+
+        /* Set the correct page map */
+        err = mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
+        if (err < 0)
+                goto out;
+
+        err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2);
+        if (err < 0)
+                goto out;
+
+        data[0] = (data[0] & 0xfe) | val;
+        err = mt9m111_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
+                                   data, 2);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
+                                  data, 2);
+        *val = data[0] & MT9M111_RMB_MIRROR_COLS;
+        PDEBUG(DBG_V4L2_CID, "Read horizontal flip %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set horizontal flip to %d", val);
+
+        /* Set the correct page map */
+        err = mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
+        if (err < 0)
+                goto out;
+
+        err = mt9m111_read_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2);
+        if (err < 0)
+                goto out;
+
+        data[0] = (data[0] & 0xfd) | ((val << 1) & 0x02);
+        err = mt9m111_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B,
+                                        data, 2);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err, tmp;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = mt9m111_read_sensor(sd, MT9M111_SC_GLOBAL_GAIN, data, 2);
+        tmp = ((data[1] << 8) | data[0]);
+
+        *val = ((tmp & (1 << 10)) * 2) |
+              ((tmp & (1 <<  9)) * 2) |
+              ((tmp & (1 <<  8)) * 2) |
+               (tmp & 0x7f);
+
+        PDEBUG(DBG_V4L2_CID, "Read gain %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err, tmp;
+        u8 data[2] = {0x00, 0x00};
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        /* Set the correct page map */
+        err = mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, data, 2);
+        if (err < 0)
+                goto out;
+
+        if (val >= INITIAL_MAX_GAIN * 2 * 2 * 2)
+                return -EINVAL;
+
+        if ((val >= INITIAL_MAX_GAIN * 2 * 2) &&
+            (val < (INITIAL_MAX_GAIN - 1) * 2 * 2 * 2))
+                tmp = (1 << 10) | (val << 9) |
+                                (val << 8) | (val / 8);
+        else if ((val >= INITIAL_MAX_GAIN * 2) &&
+                 (val <  INITIAL_MAX_GAIN * 2 * 2))
+                tmp = (1 << 9) | (1 << 8) | (val / 4);
+        else if ((val >= INITIAL_MAX_GAIN) &&
+                 (val < INITIAL_MAX_GAIN * 2))
+                tmp = (1 << 8) | (val / 2);
+        else
+                tmp = val;
+
+        data[1] = (tmp & 0xff00) >> 8;
+        data[0] = (tmp & 0xff);
+        PDEBUG(DBG_V4L2_CID, "tmp=%d, data[1]=%d, data[0]=%d", tmp,
+               data[1], data[0]);
+
+        err = mt9m111_write_sensor(sd, MT9M111_SC_GLOBAL_GAIN,
+                                   data, 2);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_read_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len) {
+        int err, i;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                                 sd->sensor->i2c_slave_id);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x1a);
+        if (err < 0)
+                goto out;
+
+        for (i = 0; i < len && !err; i++) {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+                PDEBUG(DBG_TRACE, "Reading sensor register "
+                       "0x%x contains 0x%x ", address, *i2c_data);
+        }
+out:
+        return (err < 0) ? err : 0;
+}
+
+int mt9m111_write_sensor(struct sd *sd, const u8 address,
+                                u8 *i2c_data, const u8 len)
+{
+        int err, i;
+        u8 *p;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* No sensor with a data width larger
+           than 16 bits has yet been seen, nor with 0 :p*/
+        if (len > 2 || !len)
+                return -EINVAL;
+
+        memcpy(buf, sensor_urb_skeleton,
+               sizeof(sensor_urb_skeleton));
+
+        buf[11] = sd->sensor->i2c_slave_id;
+        buf[15] = address;
+
+        p = buf + 16;
+
+        /* Copy a four byte write sequence for each byte to be written to */
+        for (i = 0; i < len; i++) {
+                memcpy(p, sensor_urb_skeleton + 16, 4);
+                p[3] = i2c_data[i];
+                p += 4;
+                PDEBUG(DBG_TRACE, "Writing sensor register 0x%x with 0x%x",
+                       address, i2c_data[i]);
+        }
+
+        /* Copy the tailer */
+        memcpy(p, sensor_urb_skeleton + 20, 4);
+
+        /* Set the total length */
+        p[3] = 0x10 + len;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              0x04, 0x40, 0x19,
+                              0x0000, buf,
+                              20 + len * 4, M5602_URB_MSG_TIMEOUT);
+
+        return (err < 0) ? err : 0;
+}
+
+void mt9m111_dump_registers(struct sd *sd)
+{
+        u8 address, value[2] = {0x00, 0x00};
+
+        info("Dumping the mt9m111 register state");
+
+        info("Dumping the mt9m111 sensor core registers");
+        value[1] = MT9M111_SENSOR_CORE;
+        mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, value, 2);
+        for (address = 0; address < 0xff; address++) {
+                mt9m111_read_sensor(sd, address, value, 2);
+                info("register 0x%x contains 0x%x%x",
+                     address, value[0], value[1]);
+        }
+
+        info("Dumping the mt9m111 color pipeline registers");
+        value[1] = MT9M111_COLORPIPE;
+        mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, value, 2);
+        for (address = 0; address < 0xff; address++) {
+                mt9m111_read_sensor(sd, address, value, 2);
+                info("register 0x%x contains 0x%x%x",
+                     address, value[0], value[1]);
+        }
+
+        info("Dumping the mt9m111 camera control registers");
+        value[1] = MT9M111_CAMERA_CONTROL;
+        mt9m111_write_sensor(sd, MT9M111_PAGE_MAP, value, 2);
+        for (address = 0; address < 0xff; address++) {
+                mt9m111_read_sensor(sd, address, value, 2);
+                info("register 0x%x contains 0x%x%x",
+                     address, value[0], value[1]);
+        }
+
+        info("mt9m111 register state dump complete");
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
new file mode 100644
index 000000000000..79a5d8878190
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
@@ -0,0 +1,1020 @@
+/*
+ * Driver for the mt9m111 sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * Some defines taken from the mt9m111 sensor driver
+ * Copyright (C) 2008, Robert Jarzmik <robert.jarzmik@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#ifndef M5602_MT9M111_H_
+#define M5602_MT9M111_H_
+
+#include "m5602_sensor.h"
+
+/*****************************************************************************/
+
+#define MT9M111_SC_CHIPVER                      0x00
+#define MT9M111_SC_ROWSTART                     0x01
+#define MT9M111_SC_COLSTART                     0x02
+#define MT9M111_SC_WINDOW_HEIGHT                0x03
+#define MT9M111_SC_WINDOW_WIDTH                 0x04
+#define MT9M111_SC_HBLANK_CONTEXT_B             0x05
+#define MT9M111_SC_VBLANK_CONTEXT_B             0x06
+#define MT9M111_SC_HBLANK_CONTEXT_A             0x07
+#define MT9M111_SC_VBLANK_CONTEXT_A             0x08
+#define MT9M111_SC_SHUTTER_WIDTH                0x09
+#define MT9M111_SC_ROW_SPEED                    0x0a
+
+#define MT9M111_SC_EXTRA_DELAY                  0x0b
+#define MT9M111_SC_SHUTTER_DELAY                0x0c
+#define MT9M111_SC_RESET                        0x0d
+#define MT9M111_SC_R_MODE_CONTEXT_B             0x20
+#define MT9M111_SC_R_MODE_CONTEXT_A             0x21
+#define MT9M111_SC_FLASH_CONTROL                0x23
+#define MT9M111_SC_GREEN_1_GAIN                 0x2b
+#define MT9M111_SC_BLUE_GAIN                    0x2c
+#define MT9M111_SC_RED_GAIN                     0x2d
+#define MT9M111_SC_GREEN_2_GAIN                 0x2e
+#define MT9M111_SC_GLOBAL_GAIN                  0x2f
+
+#define MT9M111_RMB_MIRROR_ROWS                 (1 << 0)
+#define MT9M111_RMB_MIRROR_COLS                 (1 << 1)
+
+#define MT9M111_CONTEXT_CONTROL                 0xc8
+#define MT9M111_PAGE_MAP                        0xf0
+#define MT9M111_BYTEWISE_ADDRESS                0xf1
+
+#define MT9M111_CP_OPERATING_MODE_CTL           0x06
+#define MT9M111_CP_LUMA_OFFSET                  0x34
+#define MT9M111_CP_LUMA_CLIP                    0x35
+#define MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A 0x3a
+#define MT9M111_CP_LENS_CORRECTION_1            0x3b
+#define MT9M111_CP_DEFECT_CORR_CONTEXT_A        0x4c
+#define MT9M111_CP_DEFECT_CORR_CONTEXT_B        0x4d
+#define MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B 0x9b
+#define MT9M111_CP_GLOBAL_CLK_CONTROL           0xb3
+
+#define MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18   0x65
+#define MT9M111_CC_AWB_PARAMETER_7              0x28
+
+#define MT9M111_SENSOR_CORE                     0x00
+#define MT9M111_COLORPIPE                       0x01
+#define MT9M111_CAMERA_CONTROL                  0x02
+
+#define INITIAL_MAX_GAIN                        64
+#define DEFAULT_GAIN                            283
+
+/*****************************************************************************/
+
+/* Kernel module parameters */
+extern int force_sensor;
+extern int dump_sensor;
+extern unsigned int m5602_debug;
+
+int mt9m111_probe(struct sd *sd);
+int mt9m111_init(struct sd *sd);
+int mt9m111_power_down(struct sd *sd);
+
+int mt9m111_read_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len);
+
+int mt9m111_write_sensor(struct sd *sd, const u8 address,
+                         u8 *i2c_data, const u8 len);
+
+void mt9m111_dump_registers(struct sd *sd);
+
+int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+int mt9m111_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+int mt9m111_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+
+static struct m5602_sensor mt9m111 = {
+        .name = "MT9M111",
+
+        .i2c_slave_id = 0xba,
+
+        .probe = mt9m111_probe,
+        .init = mt9m111_init,
+        .power_down = mt9m111_power_down,
+
+        .read_sensor = mt9m111_read_sensor,
+        .write_sensor = mt9m111_write_sensor,
+
+        .nctrls = 3,
+        .ctrls = {
+        {
+                {
+                        .id             = V4L2_CID_VFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "vertical flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = mt9m111_set_vflip,
+                .get = mt9m111_get_vflip
+        }, {
+                {
+                        .id             = V4L2_CID_HFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "horizontal flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = mt9m111_set_hflip,
+                .get = mt9m111_get_hflip
+        }, {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "gain",
+                        .minimum        = 0,
+                        .maximum        = (INITIAL_MAX_GAIN - 1) * 2 * 2 * 2,
+                        .step           = 1,
+                        .default_value  = DEFAULT_GAIN,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = mt9m111_set_hflip,
+                .get = mt9m111_get_hflip
+        }
+        },
+
+        .nmodes = 1,
+        .modes = {
+        {
+                M5602_DEFAULT_FRAME_WIDTH,
+                M5602_DEFAULT_FRAME_HEIGHT,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
+                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1
+        }
+        }
+};
+
+static const unsigned char preinit_mt9m111[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xf7},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00}
+};
+
+static const unsigned char init_mt9m111[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xff},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xff},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xde},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xff},
+        {SENSOR, MT9M111_SC_RESET, 0xff, 0xf7},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},
+
+        {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0xff, 0xff},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},
+        {SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
+        {SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},
+
+        {SENSOR, 0xcd, 0x00, 0x0e},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},
+        {SENSOR, 0xd0, 0x00, 0x40},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
+        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {SENSOR, 0x33, 0x03, 0x49},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+
+        {SENSOR, 0x33, 0x03, 0x49},
+        {SENSOR, 0x34, 0xc0, 0x19},
+        {SENSOR, 0x3f, 0x20, 0x20},
+        {SENSOR, 0x40, 0x20, 0x20},
+        {SENSOR, 0x5a, 0xc0, 0x0a},
+        {SENSOR, 0x70, 0x7b, 0x0a},
+        {SENSOR, 0x71, 0xff, 0x00},
+        {SENSOR, 0x72, 0x19, 0x0e},
+        {SENSOR, 0x73, 0x18, 0x0f},
+        {SENSOR, 0x74, 0x57, 0x32},
+        {SENSOR, 0x75, 0x56, 0x34},
+        {SENSOR, 0x76, 0x73, 0x35},
+        {SENSOR, 0x77, 0x30, 0x12},
+        {SENSOR, 0x78, 0x79, 0x02},
+        {SENSOR, 0x79, 0x75, 0x06},
+        {SENSOR, 0x7a, 0x77, 0x0a},
+        {SENSOR, 0x7b, 0x78, 0x09},
+        {SENSOR, 0x7c, 0x7d, 0x06},
+        {SENSOR, 0x7d, 0x31, 0x10},
+        {SENSOR, 0x7e, 0x00, 0x7e},
+        {SENSOR, 0x80, 0x59, 0x04},
+        {SENSOR, 0x81, 0x59, 0x04},
+        {SENSOR, 0x82, 0x57, 0x0a},
+        {SENSOR, 0x83, 0x58, 0x0b},
+        {SENSOR, 0x84, 0x47, 0x0c},
+        {SENSOR, 0x85, 0x48, 0x0e},
+        {SENSOR, 0x86, 0x5b, 0x02},
+        {SENSOR, 0x87, 0x00, 0x5c},
+        {SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},
+        {SENSOR, 0x60, 0x00, 0x80},
+        {SENSOR, 0x61, 0x00, 0x00},
+        {SENSOR, 0x62, 0x00, 0x00},
+        {SENSOR, 0x63, 0x00, 0x00},
+        {SENSOR, 0x64, 0x00, 0x00},
+
+        {SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},
+        {SENSOR, MT9M111_SC_COLSTART, 0x00, 0x18},
+        {SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x04},
+        {SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x08},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x03},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x03},
+        {SENSOR, 0x30, 0x04, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0xf4},
+        {SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xea},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x09},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},
+        {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},
+        {SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
+        {SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},
+        {SENSOR, 0xcd, 0x00, 0x0e},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},
+        {SENSOR, 0xd0, 0x00, 0x40},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
+        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {SENSOR, 0x33, 0x03, 0x49},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+
+        {SENSOR, 0x33, 0x03, 0x49},
+        {SENSOR, 0x34, 0xc0, 0x19},
+        {SENSOR, 0x3f, 0x20, 0x20},
+        {SENSOR, 0x40, 0x20, 0x20},
+        {SENSOR, 0x5a, 0xc0, 0x0a},
+        {SENSOR, 0x70, 0x7b, 0x0a},
+        {SENSOR, 0x71, 0xff, 0x00},
+        {SENSOR, 0x72, 0x19, 0x0e},
+        {SENSOR, 0x73, 0x18, 0x0f},
+        {SENSOR, 0x74, 0x57, 0x32},
+        {SENSOR, 0x75, 0x56, 0x34},
+        {SENSOR, 0x76, 0x73, 0x35},
+        {SENSOR, 0x77, 0x30, 0x12},
+        {SENSOR, 0x78, 0x79, 0x02},
+        {SENSOR, 0x79, 0x75, 0x06},
+        {SENSOR, 0x7a, 0x77, 0x0a},
+        {SENSOR, 0x7b, 0x78, 0x09},
+        {SENSOR, 0x7c, 0x7d, 0x06},
+        {SENSOR, 0x7d, 0x31, 0x10},
+        {SENSOR, 0x7e, 0x00, 0x7e},
+        {SENSOR, 0x80, 0x59, 0x04},
+        {SENSOR, 0x81, 0x59, 0x04},
+        {SENSOR, 0x82, 0x57, 0x0a},
+        {SENSOR, 0x83, 0x58, 0x0b},
+        {SENSOR, 0x84, 0x47, 0x0c},
+        {SENSOR, 0x85, 0x48, 0x0e},
+        {SENSOR, 0x86, 0x5b, 0x02},
+        {SENSOR, 0x87, 0x00, 0x5c},
+        {SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},
+        {SENSOR, 0x60, 0x00, 0x80},
+        {SENSOR, 0x61, 0x00, 0x00},
+        {SENSOR, 0x62, 0x00, 0x00},
+        {SENSOR, 0x63, 0x00, 0x00},
+        {SENSOR, 0x64, 0x00, 0x00},
+
+        {SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},
+        {SENSOR, MT9M111_SC_COLSTART, 0x00, 0x18},
+        {SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x04},
+        {SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x08},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x03},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x03},
+        {SENSOR, 0x30, 0x04, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0xf4},
+        {SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xea},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x09},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},
+        {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},
+        {SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
+        {SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},
+        {SENSOR, 0xcd, 0x00, 0x0e},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},
+        {SENSOR, 0xd0, 0x00, 0x40},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
+        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {SENSOR, 0x33, 0x03, 0x49},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+
+        {SENSOR, 0x33, 0x03, 0x49},
+        {SENSOR, 0x34, 0xc0, 0x19},
+        {SENSOR, 0x3f, 0x20, 0x20},
+        {SENSOR, 0x40, 0x20, 0x20},
+        {SENSOR, 0x5a, 0xc0, 0x0a},
+        {SENSOR, 0x70, 0x7b, 0x0a},
+        {SENSOR, 0x71, 0xff, 0x00},
+        {SENSOR, 0x72, 0x19, 0x0e},
+        {SENSOR, 0x73, 0x18, 0x0f},
+        {SENSOR, 0x74, 0x57, 0x32},
+        {SENSOR, 0x75, 0x56, 0x34},
+        {SENSOR, 0x76, 0x73, 0x35},
+        {SENSOR, 0x77, 0x30, 0x12},
+        {SENSOR, 0x78, 0x79, 0x02},
+        {SENSOR, 0x79, 0x75, 0x06},
+        {SENSOR, 0x7a, 0x77, 0x0a},
+        {SENSOR, 0x7b, 0x78, 0x09},
+        {SENSOR, 0x7c, 0x7d, 0x06},
+        {SENSOR, 0x7d, 0x31, 0x10},
+        {SENSOR, 0x7e, 0x00, 0x7e},
+        {SENSOR, 0x80, 0x59, 0x04},
+        {SENSOR, 0x81, 0x59, 0x04},
+        {SENSOR, 0x82, 0x57, 0x0a},
+        {SENSOR, 0x83, 0x58, 0x0b},
+        {SENSOR, 0x84, 0x47, 0x0c},
+        {SENSOR, 0x85, 0x48, 0x0e},
+        {SENSOR, 0x86, 0x5b, 0x02},
+        {SENSOR, 0x87, 0x00, 0x5c},
+        {SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},
+        {SENSOR, 0x60, 0x00, 0x80},
+        {SENSOR, 0x61, 0x00, 0x00},
+        {SENSOR, 0x62, 0x00, 0x00},
+        {SENSOR, 0x63, 0x00, 0x00},
+        {SENSOR, 0x64, 0x00, 0x00},
+
+        {SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},
+        {SENSOR, MT9M111_SC_COLSTART, 0x00, 0x18},
+        {SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x04},
+        {SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x08},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x38},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x03},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x03},
+        {SENSOR, 0x30, 0x04, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x04, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x05, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x07, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0xf4},
+        {SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xea},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x09},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},
+        {SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
+        {SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0xcd, 0x00, 0x0e},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0xd0, 0x00, 0x40},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
+        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0x33, 0x03, 0x49},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+
+        {SENSOR, 0x33, 0x03, 0x49},
+        {SENSOR, 0x34, 0xc0, 0x19},
+        {SENSOR, 0x3f, 0x20, 0x20},
+        {SENSOR, 0x40, 0x20, 0x20},
+        {SENSOR, 0x5a, 0xc0, 0x0a},
+        {SENSOR, 0x70, 0x7b, 0x0a},
+        {SENSOR, 0x71, 0xff, 0x00},
+        {SENSOR, 0x72, 0x19, 0x0e},
+        {SENSOR, 0x73, 0x18, 0x0f},
+        {SENSOR, 0x74, 0x57, 0x32},
+        {SENSOR, 0x75, 0x56, 0x34},
+        {SENSOR, 0x76, 0x73, 0x35},
+        {SENSOR, 0x77, 0x30, 0x12},
+        {SENSOR, 0x78, 0x79, 0x02},
+        {SENSOR, 0x79, 0x75, 0x06},
+        {SENSOR, 0x7a, 0x77, 0x0a},
+        {SENSOR, 0x7b, 0x78, 0x09},
+        {SENSOR, 0x7c, 0x7d, 0x06},
+        {SENSOR, 0x7d, 0x31, 0x10},
+        {SENSOR, 0x7e, 0x00, 0x7e},
+        {SENSOR, 0x80, 0x59, 0x04},
+        {SENSOR, 0x81, 0x59, 0x04},
+        {SENSOR, 0x82, 0x57, 0x0a},
+        {SENSOR, 0x83, 0x58, 0x0b},
+        {SENSOR, 0x84, 0x47, 0x0c},
+        {SENSOR, 0x85, 0x48, 0x0e},
+        {SENSOR, 0x86, 0x5b, 0x02},
+        {SENSOR, 0x87, 0x00, 0x5c},
+        {SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},
+        {SENSOR, 0x60, 0x00, 0x80},
+        {SENSOR, 0x61, 0x00, 0x00},
+        {SENSOR, 0x62, 0x00, 0x00},
+        {SENSOR, 0x63, 0x00, 0x00},
+        {SENSOR, 0x64, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},
+        {SENSOR, MT9M111_SC_COLSTART, 0x00, 0x12},
+        {SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x00},
+        {SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x10},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x60},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x60},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x0f},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x0f},
+        {SENSOR, 0x30, 0x04, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe3, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x87, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0x90},
+        {SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x00, 0xe6},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x09},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xb3, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3e, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x07, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x0b, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x29},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_SC_RESET, 0x00, 0x08},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00, 0x10},
+        {SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, 0x01},
+        {SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
+        {SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},
+        {SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_B, 0x14, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xcd, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0xcd, 0x00, 0x0e},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0xd0, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0xd0, 0x00, 0x40},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
+        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x07},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x28, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+        {SENSOR, 0x33, 0x03, 0x49},
+        {BRIDGE, M5602_XB_I2C_DEV_ADDR, 0xba, 0x00},
+        {BRIDGE, M5602_XB_I2C_REG_ADDR, 0x33, 0x00},
+        {BRIDGE, M5602_XB_I2C_CTRL, 0x1a, 0x00},
+
+        {SENSOR, 0x33, 0x03, 0x49},
+        {SENSOR, 0x34, 0xc0, 0x19},
+        {SENSOR, 0x3f, 0x20, 0x20},
+        {SENSOR, 0x40, 0x20, 0x20},
+        {SENSOR, 0x5a, 0xc0, 0x0a},
+        {SENSOR, 0x70, 0x7b, 0x0a},
+        {SENSOR, 0x71, 0xff, 0x00},
+        {SENSOR, 0x72, 0x19, 0x0e},
+        {SENSOR, 0x73, 0x18, 0x0f},
+        {SENSOR, 0x74, 0x57, 0x32},
+        {SENSOR, 0x75, 0x56, 0x34},
+        {SENSOR, 0x76, 0x73, 0x35},
+        {SENSOR, 0x77, 0x30, 0x12},
+        {SENSOR, 0x78, 0x79, 0x02},
+        {SENSOR, 0x79, 0x75, 0x06},
+        {SENSOR, 0x7a, 0x77, 0x0a},
+        {SENSOR, 0x7b, 0x78, 0x09},
+        {SENSOR, 0x7c, 0x7d, 0x06},
+        {SENSOR, 0x7d, 0x31, 0x10},
+        {SENSOR, 0x7e, 0x00, 0x7e},
+        {SENSOR, 0x80, 0x59, 0x04},
+        {SENSOR, 0x81, 0x59, 0x04},
+        {SENSOR, 0x82, 0x57, 0x0a},
+        {SENSOR, 0x83, 0x58, 0x0b},
+        {SENSOR, 0x84, 0x47, 0x0c},
+        {SENSOR, 0x85, 0x48, 0x0e},
+        {SENSOR, 0x86, 0x5b, 0x02},
+        {SENSOR, 0x87, 0x00, 0x5c},
+        {SENSOR, MT9M111_CONTEXT_CONTROL, 0x00, 0x08},
+        {SENSOR, 0x60, 0x00, 0x80},
+        {SENSOR, 0x61, 0x00, 0x00},
+        {SENSOR, 0x62, 0x00, 0x00},
+        {SENSOR, 0x63, 0x00, 0x00},
+        {SENSOR, 0x64, 0x00, 0x00},
+
+        {SENSOR, MT9M111_SC_ROWSTART, 0x00, 0x0d},
+        {SENSOR, MT9M111_SC_COLSTART, 0x00, 0x12},
+        {SENSOR, MT9M111_SC_WINDOW_HEIGHT, 0x04, 0x00},
+        {SENSOR, MT9M111_SC_WINDOW_WIDTH, 0x05, 0x10},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_B, 0x01, 0x60},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_B, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_HBLANK_CONTEXT_A, 0x01, 0x60},
+        {SENSOR, MT9M111_SC_VBLANK_CONTEXT_A, 0x00, 0x11},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_B, 0x01, 0x0f},
+        {SENSOR, MT9M111_SC_R_MODE_CONTEXT_A, 0x01, 0x0f},
+        {SENSOR, 0x30, 0x04, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe0, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x7f, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
+        /* Set number of blank rows chosen to 400 */
+        {SENSOR, MT9M111_SC_SHUTTER_WIDTH, 0x01, 0x90},
+        /* Set the global gain to 283 (of 512) */
+        {SENSOR, MT9M111_SC_GLOBAL_GAIN, 0x03, 0x63}
+};
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/video/gspca/m5602/m5602_ov9650.c
new file mode 100644
index 000000000000..31c5896250e7
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.c
@@ -0,0 +1,546 @@
+/*
+ * Driver for the ov9650 sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#include "m5602_ov9650.h"
+
+int ov9650_read_sensor(struct sd *sd, const u8 address,
+                      u8 *i2c_data, const u8 len)
+{
+        int err, i;
+
+        /* The ov9650 registers have a max depth of one byte */
+        if (len > 1 || !len)
+                return -EINVAL;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+
+        m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                           ov9650.i2c_slave_id);
+        m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+        m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);
+        m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
+
+        for (i = 0; i < len; i++) {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+                PDEBUG(DBG_TRACE, "Reading sensor register "
+                                "0x%x containing 0x%x ", address, *i2c_data);
+        }
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_write_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len)
+{
+        int err, i;
+        u8 *p;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* The ov9650 only supports one byte writes */
+        if (len > 1 || !len)
+                return -EINVAL;
+
+        memcpy(buf, sensor_urb_skeleton,
+               sizeof(sensor_urb_skeleton));
+
+        buf[11] = sd->sensor->i2c_slave_id;
+        buf[15] = address;
+
+        /* Special case larger sensor writes */
+        p = buf + 16;
+
+        /* Copy a four byte write sequence for each byte to be written to */
+        for (i = 0; i < len; i++) {
+                memcpy(p, sensor_urb_skeleton + 16, 4);
+                p[3] = i2c_data[i];
+                p += 4;
+                PDEBUG(DBG_TRACE, "Writing sensor register 0x%x with 0x%x",
+                       address, i2c_data[i]);
+        }
+
+        /* Copy the tailer */
+        memcpy(p, sensor_urb_skeleton + 20, 4);
+
+        /* Set the total length */
+        p[3] = 0x10 + len;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              0x04, 0x40, 0x19,
+                              0x0000, buf,
+                              20 + len * 4, M5602_URB_MSG_TIMEOUT);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_probe(struct sd *sd)
+{
+        u8 prod_id = 0, ver_id = 0, i;
+
+        if (force_sensor) {
+                if (force_sensor == OV9650_SENSOR) {
+                        info("Forcing an %s sensor", ov9650.name);
+                        goto sensor_found;
+                }
+                /* If we want to force another sensor,
+                   don't try to probe this one */
+                return -ENODEV;
+        }
+
+        info("Probing for an ov9650 sensor");
+
+        /* Run the pre-init to actually probe the unit */
+        for (i = 0; i < ARRAY_SIZE(preinit_ov9650); i++) {
+                u8 data = preinit_ov9650[i][2];
+                if (preinit_ov9650[i][0] == SENSOR)
+                        ov9650_write_sensor(sd,
+                                            preinit_ov9650[i][1], &data, 1);
+                else
+                        m5602_write_bridge(sd, preinit_ov9650[i][1], data);
+        }
+
+        if (ov9650_read_sensor(sd, OV9650_PID, &prod_id, 1))
+                return -ENODEV;
+
+        if (ov9650_read_sensor(sd, OV9650_VER, &ver_id, 1))
+                return -ENODEV;
+
+        if ((prod_id == 0x96) && (ver_id == 0x52)) {
+                info("Detected an ov9650 sensor");
+                goto sensor_found;
+        }
+
+        return -ENODEV;
+
+sensor_found:
+        sd->gspca_dev.cam.cam_mode = ov9650.modes;
+        sd->gspca_dev.cam.nmodes = ov9650.nmodes;
+        sd->desc->ctrls = ov9650.ctrls;
+        sd->desc->nctrls = ov9650.nctrls;
+        return 0;
+}
+
+int ov9650_init(struct sd *sd)
+{
+        int i, err = 0;
+        u8 data;
+
+        if (dump_sensor)
+                ov9650_dump_registers(sd);
+
+        for (i = 0; i < ARRAY_SIZE(init_ov9650) && !err; i++) {
+                data = init_ov9650[i][2];
+                if (init_ov9650[i][0] == SENSOR)
+                        err = ov9650_write_sensor(sd, init_ov9650[i][1],
+                                                  &data, 1);
+                else
+                        err = m5602_write_bridge(sd, init_ov9650[i][1], data);
+        }
+
+        if (!err && dmi_check_system(ov9650_flip_dmi_table)) {
+                info("vflip quirk active");
+                data = 0x30;
+                err = ov9650_write_sensor(sd, OV9650_MVFP, &data, 1);
+        }
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_power_down(struct sd *sd)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(power_down_ov9650); i++) {
+                u8 data = power_down_ov9650[i][2];
+                if (power_down_ov9650[i][0] == SENSOR)
+                        ov9650_write_sensor(sd,
+                                            power_down_ov9650[i][1], &data, 1);
+                else
+                        m5602_write_bridge(sd, power_down_ov9650[i][1], data);
+        }
+
+        return 0;
+}
+
+int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        err = ov9650_read_sensor(sd, OV9650_COM1, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+        *val = i2c_data & 0x03;
+
+        err = ov9650_read_sensor(sd, OV9650_AECH, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+        *val |= (i2c_data << 2);
+
+        err = ov9650_read_sensor(sd, OV9650_AECHM, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+        *val |= (i2c_data & 0x3f) << 10;
+
+        PDEBUG(DBG_V4L2_CID, "Read exposure %d", *val);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        PDEBUG(DBG_V4L2_CID, "Set exposure to %d",
+               val & 0xffff);
+
+        /* The 6 MSBs */
+        i2c_data = (val >> 10) & 0x3f;
+        err = ov9650_write_sensor(sd, OV9650_AECHM,
+                                  &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        /* The 8 middle bits */
+        i2c_data = (val >> 2) & 0xff;
+        err = ov9650_write_sensor(sd, OV9650_AECH,
+                                  &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        /* The 2 LSBs */
+        i2c_data = val & 0x03;
+        err = ov9650_write_sensor(sd, OV9650_COM1, &i2c_data, 1);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        ov9650_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        *val = (i2c_data & 0x03) << 8;
+
+        err = ov9650_read_sensor(sd, OV9650_GAIN, &i2c_data, 1);
+        *val |= i2c_data;
+        PDEBUG(DBG_V4L2_CID, "Read gain %d", *val);
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        /* The 2 MSB */
+        /* Read the OV9650_VREF register first to avoid
+           corrupting the VREF high and low bits */
+        ov9650_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        /* Mask away all uninteresting bits */
+        i2c_data = ((val & 0x0300) >> 2) |
+                        (i2c_data & 0x3F);
+        err = ov9650_write_sensor(sd, OV9650_VREF, &i2c_data, 1);
+
+        /* The 8 LSBs */
+        i2c_data = val & 0xff;
+        err = ov9650_write_sensor(sd, OV9650_GAIN, &i2c_data, 1);
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_RED, &i2c_data, 1);
+        *val = i2c_data;
+
+        PDEBUG(DBG_V4L2_CID, "Read red gain %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set red gain to %d",
+                             val & 0xff);
+
+        i2c_data = val & 0xff;
+        err = ov9650_write_sensor(sd, OV9650_RED, &i2c_data, 1);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_BLUE, &i2c_data, 1);
+        *val = i2c_data;
+
+        PDEBUG(DBG_V4L2_CID, "Read blue gain %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set blue gain to %d",
+               val & 0xff);
+
+        i2c_data = val & 0xff;
+        err = ov9650_write_sensor(sd, OV9650_BLUE, &i2c_data, 1);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+        if (dmi_check_system(ov9650_flip_dmi_table))
+                *val = ((i2c_data & OV9650_HFLIP) >> 5) ? 0 : 1;
+        else
+                *val = (i2c_data & OV9650_HFLIP) >> 5;
+        PDEBUG(DBG_V4L2_CID, "Read horizontal flip %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set horizontal flip to %d", val);
+        err = ov9650_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        if (dmi_check_system(ov9650_flip_dmi_table))
+                i2c_data = ((i2c_data & 0xdf) |
+                                (((val ? 0 : 1) & 0x01) << 5));
+        else
+                i2c_data = ((i2c_data & 0xdf) |
+                                ((val & 0x01) << 5));
+
+        err = ov9650_write_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+        if (dmi_check_system(ov9650_flip_dmi_table))
+                *val = ((i2c_data & 0x10) >> 4) ? 0 : 1;
+        else
+                *val = (i2c_data & 0x10) >> 4;
+        PDEBUG(DBG_V4L2_CID, "Read vertical flip %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set vertical flip to %d", val);
+        err = ov9650_read_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        if (dmi_check_system(ov9650_flip_dmi_table))
+                i2c_data = ((i2c_data & 0xef) |
+                                (((val ? 0 : 1) & 0x01) << 4));
+        else
+                i2c_data = ((i2c_data & 0xef) |
+                                ((val & 0x01) << 4));
+
+        err = ov9650_write_sensor(sd, OV9650_MVFP, &i2c_data, 1);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_brightness(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+        *val = (i2c_data & 0x03) << 8;
+
+        err = ov9650_read_sensor(sd, OV9650_GAIN, &i2c_data, 1);
+        *val |= i2c_data;
+        PDEBUG(DBG_V4L2_CID, "Read gain %d", *val);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set gain to %d", val & 0x3ff);
+
+        /* Read the OV9650_VREF register first to avoid
+                corrupting the VREF high and low bits */
+        err = ov9650_read_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        /* Mask away all uninteresting bits */
+        i2c_data = ((val & 0x0300) >> 2) | (i2c_data & 0x3F);
+        err = ov9650_write_sensor(sd, OV9650_VREF, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        /* The 8 LSBs */
+        i2c_data = val & 0xff;
+        err = ov9650_write_sensor(sd, OV9650_GAIN, &i2c_data, 1);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_auto_white_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
+        *val = (i2c_data & OV9650_AWB_EN) >> 1;
+        PDEBUG(DBG_V4L2_CID, "Read auto white balance %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_auto_white_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set auto white balance to %d", val);
+        err = ov9650_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        i2c_data = ((i2c_data & 0xfd) | ((val & 0x01) << 1));
+        err = ov9650_write_sensor(sd, OV9650_COM8, &i2c_data, 1);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = ov9650_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
+        *val = (i2c_data & OV9650_AGC_EN) >> 2;
+        PDEBUG(DBG_V4L2_CID, "Read auto gain control %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int ov9650_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(DBG_V4L2_CID, "Set auto gain control to %d", val);
+        err = ov9650_read_sensor(sd, OV9650_COM8, &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        i2c_data = ((i2c_data & 0xfb) | ((val & 0x01) << 2));
+        err = ov9650_write_sensor(sd, OV9650_COM8, &i2c_data, 1);
+out:
+        return (err < 0) ? err : 0;
+}
+
+void ov9650_dump_registers(struct sd *sd)
+{
+        int address;
+        info("Dumping the ov9650 register state");
+        for (address = 0; address < 0xa9; address++) {
+                u8 value;
+                ov9650_read_sensor(sd, address, &value, 1);
+                info("register 0x%x contains 0x%x",
+                     address, value);
+        }
+
+        info("ov9650 register state dump complete");
+
+        info("Probing for which registers that are read/write");
+        for (address = 0; address < 0xff; address++) {
+                u8 old_value, ctrl_value;
+                u8 test_value[2] = {0xff, 0xff};
+
+                ov9650_read_sensor(sd, address, &old_value, 1);
+                ov9650_write_sensor(sd, address, test_value, 1);
+                ov9650_read_sensor(sd, address, &ctrl_value, 1);
+
+                if (ctrl_value == test_value[0])
+                        info("register 0x%x is writeable", address);
+                else
+                        info("register 0x%x is read only", address);
+
+                /* Restore original value */
+                ov9650_write_sensor(sd, address, &old_value, 1);
+        }
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h
new file mode 100644
index 000000000000..2f29cb056f30
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.h
@@ -0,0 +1,503 @@
+/*
+ * Driver for the ov9650 sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#ifndef M5602_OV9650_H_
+#define M5602_OV9650_H_
+
+#include <linux/dmi.h>
+
+#include "m5602_sensor.h"
+
+/*****************************************************************************/
+
+#define OV9650_GAIN                     0x00
+#define OV9650_BLUE                     0x01
+#define OV9650_RED                      0x02
+#define OV9650_VREF                     0x03
+#define OV9650_COM1                     0x04
+#define OV9650_BAVE                     0x05
+#define OV9650_GEAVE                    0x06
+#define OV9650_RSVD7                    0x07
+#define OV9650_PID                      0x0a
+#define OV9650_VER                      0x0b
+#define OV9650_COM3                     0x0c
+#define OV9650_COM5                     0x0e
+#define OV9650_COM6                     0x0f
+#define OV9650_AECH                     0x10
+#define OV9650_CLKRC                    0x11
+#define OV9650_COM7                     0x12
+#define OV9650_COM8                     0x13
+#define OV9650_COM9                     0x14
+#define OV9650_COM10                    0x15
+#define OV9650_RSVD16                   0x16
+#define OV9650_HSTART                   0x17
+#define OV9650_HSTOP                    0x18
+#define OV9650_VSTRT                    0x19
+#define OV9650_VSTOP                    0x1a
+#define OV9650_PSHFT                    0x1b
+#define OV9650_MVFP                     0x1e
+#define OV9650_AEW                      0x24
+#define OV9650_AEB                      0x25
+#define OV9650_VPT                      0x26
+#define OV9650_BBIAS                    0x27
+#define OV9650_GbBIAS                   0x28
+#define OV9650_Gr_COM                   0x29
+#define OV9650_RBIAS                    0x2c
+#define OV9650_HREF                     0x32
+#define OV9650_CHLF                     0x33
+#define OV9650_ARBLM                    0x34
+#define OV9650_RSVD35                   0x35
+#define OV9650_RSVD36                   0x36
+#define OV9650_ADC                      0x37
+#define OV9650_ACOM38                   0x38
+#define OV9650_OFON                     0x39
+#define OV9650_TSLB                     0x3a
+#define OV9650_COM12                    0x3c
+#define OV9650_COM13                    0x3d
+#define OV9650_COM15                    0x40
+#define OV9650_COM16                    0x41
+#define OV9650_LCC1                     0x62
+#define OV9650_LCC2                     0x63
+#define OV9650_LCC3                     0x64
+#define OV9650_LCC4                     0x65
+#define OV9650_LCC5                     0x66
+#define OV9650_HV                       0x69
+#define OV9650_DBLV                     0x6b
+#define OV9650_COM21                    0x8b
+#define OV9650_COM22                    0x8c
+#define OV9650_COM24                    0x8e
+#define OV9650_DBLC1                    0x8f
+#define OV9650_RSVD94                   0x94
+#define OV9650_RSVD95                   0x95
+#define OV9650_RSVD96                   0x96
+#define OV9650_LCCFB                    0x9d
+#define OV9650_LCCFR                    0x9e
+#define OV9650_AECHM                    0xa1
+#define OV9650_COM26                    0xa5
+#define OV9650_ACOMA8                   0xa8
+#define OV9650_ACOMA9                   0xa9
+
+#define OV9650_REGISTER_RESET           (1 << 7)
+#define OV9650_VGA_SELECT               (1 << 6)
+#define OV9650_RGB_SELECT               (1 << 2)
+#define OV9650_RAW_RGB_SELECT           (1 << 0)
+
+#define OV9650_FAST_AGC_AEC             (1 << 7)
+#define OV9650_AEC_UNLIM_STEP_SIZE      (1 << 6)
+#define OV9650_BANDING                  (1 << 5)
+#define OV9650_AGC_EN                   (1 << 2)
+#define OV9650_AWB_EN                   (1 << 1)
+#define OV9650_AEC_EN                   (1 << 0)
+
+#define OV9650_VARIOPIXEL               (1 << 2)
+#define OV9650_SYSTEM_CLK_SEL           (1 << 7)
+#define OV9650_SLAM_MODE                (1 << 4)
+
+#define OV9650_VFLIP                    (1 << 4)
+#define OV9650_HFLIP                    (1 << 5)
+
+#define GAIN_DEFAULT                    0x14
+#define RED_GAIN_DEFAULT                0x70
+#define BLUE_GAIN_DEFAULT               0x20
+#define EXPOSURE_DEFAULT                0x5003
+
+/*****************************************************************************/
+
+/* Kernel module parameters */
+extern int force_sensor;
+extern int dump_sensor;
+extern unsigned int m5602_debug;
+
+int ov9650_probe(struct sd *sd);
+int ov9650_init(struct sd *sd);
+int ov9650_power_down(struct sd *sd);
+
+int ov9650_read_sensor(struct sd *sd, const u8 address,
+                       u8 *i2c_data, const u8 len);
+int ov9650_write_sensor(struct sd *sd, const u8 address,
+                       u8 *i2c_data, const u8 len);
+
+void ov9650_dump_registers(struct sd *sd);
+
+int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_red_balance(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_brightness(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_brightness(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_auto_white_balance(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_auto_white_balance(struct gspca_dev *gspca_dev, __s32 val);
+int ov9650_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int ov9650_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val);
+
+static struct m5602_sensor ov9650 = {
+        .name = "OV9650",
+        .i2c_slave_id = 0x60,
+        .probe = ov9650_probe,
+        .init = ov9650_init,
+        .power_down = ov9650_power_down,
+        .read_sensor = ov9650_read_sensor,
+        .write_sensor = ov9650_write_sensor,
+
+        .nctrls = 8,
+        .ctrls = {
+        {
+                {
+                        .id             = V4L2_CID_EXPOSURE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "exposure",
+                        .minimum        = 0x00,
+                        .maximum        = 0xffff,
+                        .step           = 0x1,
+                        .default_value  = EXPOSURE_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_exposure,
+                .get = ov9650_get_exposure
+        }, {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "gain",
+                        .minimum        = 0x00,
+                        .maximum        = 0x3ff,
+                        .step           = 0x1,
+                        .default_value  = GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_gain,
+                .get = ov9650_get_gain
+        }, {
+                {
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "red balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = RED_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_red_balance,
+                .get = ov9650_get_red_balance
+        }, {
+                {
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "blue balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = BLUE_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = ov9650_set_blue_balance,
+                .get = ov9650_get_blue_balance
+        }, {
+                {
+                        .id             = V4L2_CID_HFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "horizontal flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = ov9650_set_hflip,
+                .get = ov9650_get_hflip
+        }, {
+                {
+                        .id             = V4L2_CID_VFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "vertical flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = ov9650_set_vflip,
+                .get = ov9650_get_vflip
+        }, {
+                {
+                        .id             = V4L2_CID_AUTO_WHITE_BALANCE,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "auto white balance",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = ov9650_set_auto_white_balance,
+                .get = ov9650_get_auto_white_balance
+        }, {
+                {
+                        .id             = V4L2_CID_AUTOGAIN,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "auto gain control",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = ov9650_set_auto_gain,
+                .get = ov9650_get_auto_gain
+        }
+        },
+
+        .nmodes = 1,
+        .modes = {
+        {
+                M5602_DEFAULT_FRAME_WIDTH,
+                M5602_DEFAULT_FRAME_HEIGHT,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
+                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1
+        }
+        }
+};
+
+static const unsigned char preinit_ov9650[][3] =
+{
+        /* [INITCAM] */
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
+
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a},
+        /* Reset chip */
+        {SENSOR, OV9650_COM7, OV9650_REGISTER_RESET},
+        /* Enable double clock */
+        {SENSOR, OV9650_CLKRC, 0x80},
+        /* Do something out of spec with the power */
+        {SENSOR, OV9650_OFON, 0x40}
+};
+
+static const unsigned char init_ov9650[][3] =
+{
+        /* [INITCAM] */
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
+
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a},
+        /* Reset chip */
+        {SENSOR, OV9650_COM7, OV9650_REGISTER_RESET},
+        /* Enable double clock */
+        {SENSOR, OV9650_CLKRC, 0x80},
+        /* Do something out of spec with the power */
+        {SENSOR, OV9650_OFON, 0x40},
+
+        /* Set QQVGA */
+        {SENSOR, OV9650_COM1, 0x20},
+        /* Set fast AGC/AEC algorithm with unlimited step size */
+        {SENSOR, OV9650_COM8, OV9650_FAST_AGC_AEC |
+                              OV9650_AEC_UNLIM_STEP_SIZE |
+                              OV9650_AWB_EN | OV9650_AGC_EN},
+
+        {SENSOR, OV9650_CHLF, 0x10},
+        {SENSOR, OV9650_ARBLM, 0xbf},
+        {SENSOR, OV9650_ACOM38, 0x81},
+        /* Turn off color matrix coefficient double option */
+        {SENSOR, OV9650_COM16, 0x00},
+                /* Enable color matrix for RGB/YUV, Delay Y channel,
+        set output Y/UV delay to 1 */
+        {SENSOR, OV9650_COM13, 0x19},
+        /* Enable digital BLC, Set output mode to U Y V Y */
+        {SENSOR, OV9650_TSLB, 0x0c},
+        /* Limit the AGC/AEC stable upper region */
+        {SENSOR, OV9650_COM24, 0x00},
+        /* Enable HREF and some out of spec things */
+        {SENSOR, OV9650_COM12, 0x73},
+                /* Set all DBLC offset signs to positive and
+        do some out of spec stuff */
+        {SENSOR, OV9650_DBLC1, 0xdf},
+        {SENSOR, OV9650_COM21, 0x06},
+        {SENSOR, OV9650_RSVD35, 0x91},
+        /* Necessary, no camera stream without it */
+        {SENSOR, OV9650_RSVD16, 0x06},
+        {SENSOR, OV9650_RSVD94, 0x99},
+        {SENSOR, OV9650_RSVD95, 0x99},
+        {SENSOR, OV9650_RSVD96, 0x04},
+        /* Enable full range output */
+        {SENSOR, OV9650_COM15, 0x0},
+                /* Enable HREF at optical black, enable ADBLC bias,
+        enable ADBLC, reset timings at format change */
+        {SENSOR, OV9650_COM6, 0x4b},
+        /* Subtract 32 from the B channel bias */
+        {SENSOR, OV9650_BBIAS, 0xa0},
+        /* Subtract 32 from the Gb channel bias */
+        {SENSOR, OV9650_GbBIAS, 0xa0},
+        /* Do not bypass the analog BLC and to some out of spec stuff */
+        {SENSOR, OV9650_Gr_COM, 0x00},
+        /* Subtract 32 from the R channel bias */
+        {SENSOR, OV9650_RBIAS, 0xa0},
+        /* Subtract 32 from the R channel bias */
+        {SENSOR, OV9650_RBIAS, 0x0},
+        {SENSOR, OV9650_COM26, 0x80},
+        {SENSOR, OV9650_ACOMA9, 0x98},
+        /* Set the AGC/AEC stable region upper limit */
+        {SENSOR, OV9650_AEW, 0x68},
+        /* Set the AGC/AEC stable region lower limit */
+        {SENSOR, OV9650_AEB, 0x5c},
+        /* Set the high and low limit nibbles to 3 */
+        {SENSOR, OV9650_VPT, 0xc3},
+                /* Set the Automatic Gain Ceiling (AGC) to 128x,
+        drop VSYNC at frame drop,
+        limit exposure timing,
+        drop frame when the AEC step is larger than the exposure gap */
+        {SENSOR, OV9650_COM9, 0x6e},
+        /* Set VSYNC negative, Set RESET to SLHS (slave mode horizontal sync)
+        and set PWDN to SLVS (slave mode vertical sync) */
+        {SENSOR, OV9650_COM10, 0x42},
+        /* Set horizontal column start high to default value */
+        {SENSOR, OV9650_HSTART, 0x1a},
+        /* Set horizontal column end */
+        {SENSOR, OV9650_HSTOP, 0xbf},
+        /* Complementing register to the two writes above */
+        {SENSOR, OV9650_HREF, 0xb2},
+        /* Set vertical row start high bits */
+        {SENSOR, OV9650_VSTRT, 0x02},
+        /* Set vertical row end low bits */
+        {SENSOR, OV9650_VSTOP, 0x7e},
+        /* Set complementing vertical frame control */
+        {SENSOR, OV9650_VREF, 0x10},
+        /* Set raw RGB output format with VGA resolution */
+        {SENSOR, OV9650_COM7, OV9650_VGA_SELECT |
+                              OV9650_RGB_SELECT |
+                              OV9650_RAW_RGB_SELECT},
+        {SENSOR, OV9650_ADC, 0x04},
+        {SENSOR, OV9650_HV, 0x40},
+        /* Enable denoise, and white-pixel erase */
+        {SENSOR, OV9650_COM22, 0x23},
+
+        /* Set the high bits of the exposure value */
+        {SENSOR, OV9650_AECH, ((EXPOSURE_DEFAULT & 0xff00) >> 8)},
+
+        /* Set the low bits of the exposure value */
+        {SENSOR, OV9650_COM1, (EXPOSURE_DEFAULT & 0xff)},
+        {SENSOR, OV9650_GAIN, GAIN_DEFAULT},
+        {SENSOR, OV9650_BLUE, BLUE_GAIN_DEFAULT},
+        {SENSOR, OV9650_RED, RED_GAIN_DEFAULT},
+
+        {SENSOR, OV9650_COM3, OV9650_VARIOPIXEL},
+        {SENSOR, OV9650_COM5, OV9650_SYSTEM_CLK_SEL},
+
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x82},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_L, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_L, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x09},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe0},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x5e},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0xde}
+};
+
+static const unsigned char power_down_ov9650[][3] =
+{
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {SENSOR, OV9650_COM7, 0x80},
+        {SENSOR, OV9650_OFON, 0xf4},
+        {SENSOR, OV9650_MVFP, 0x80},
+        {SENSOR, OV9650_DBLV, 0x3f},
+        {SENSOR, OV9650_RSVD36, 0x49},
+        {SENSOR, OV9650_COM7, 0x05},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0}
+};
+
+/* Vertically and horizontally flips the image if matched, needed for machines
+   where the sensor is mounted upside down */
+static
+    const
+        struct dmi_system_id ov9650_flip_dmi_table[] = {
+        {
+                .ident = "ASUS A6VC",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A6VC")
+                }
+        },
+        {
+                .ident = "ASUS A6VM",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A6VM")
+                }
+        },
+        {
+                .ident = "ASUS A6JC",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A6JC")
+                }
+        },
+        {
+                .ident = "ASUS A6Kt",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "A6Kt")
+                }
+        },
+        { }
+};
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.c b/drivers/media/video/gspca/m5602/m5602_po1030.c
new file mode 100644
index 000000000000..08c015bde115
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.c
@@ -0,0 +1,336 @@
+/*
+ * Driver for the po1030 sensor
+ *
+ * Copyright (c) 2008 Erik Andren
+ * Copyright (c) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (c) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#include "m5602_po1030.h"
+
+int po1030_probe(struct sd *sd)
+{
+        u8 prod_id = 0, ver_id = 0, i;
+
+        if (force_sensor) {
+                if (force_sensor == PO1030_SENSOR) {
+                        info("Forcing a %s sensor", po1030.name);
+                        goto sensor_found;
+                }
+                /* If we want to force another sensor, don't try to probe this
+                 * one */
+                return -ENODEV;
+        }
+
+        info("Probing for a po1030 sensor");
+
+        /* Run the pre-init to actually probe the unit */
+        for (i = 0; i < ARRAY_SIZE(preinit_po1030); i++) {
+                u8 data = preinit_po1030[i][2];
+                if (preinit_po1030[i][0] == SENSOR)
+                        po1030_write_sensor(sd,
+                                preinit_po1030[i][1], &data, 1);
+                else
+                        m5602_write_bridge(sd, preinit_po1030[i][1], data);
+        }
+
+        if (po1030_read_sensor(sd, 0x3, &prod_id, 1))
+                return -ENODEV;
+
+        if (po1030_read_sensor(sd, 0x4, &ver_id, 1))
+                return -ENODEV;
+
+        if ((prod_id == 0x02) && (ver_id == 0xef)) {
+                info("Detected a po1030 sensor");
+                goto sensor_found;
+        }
+        return -ENODEV;
+
+sensor_found:
+        sd->gspca_dev.cam.cam_mode = po1030.modes;
+        sd->gspca_dev.cam.nmodes = po1030.nmodes;
+        sd->desc->ctrls = po1030.ctrls;
+        sd->desc->nctrls = po1030.nctrls;
+        return 0;
+}
+
+int po1030_read_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len)
+{
+        int err, i;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+
+        m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                           sd->sensor->i2c_slave_id);
+        m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+        m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);
+        m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
+
+        for (i = 0; i < len; i++) {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+                PDEBUG(DBG_TRACE, "Reading sensor register "
+                                "0x%x containing 0x%x ", address, *i2c_data);
+        }
+        return (err < 0) ? err : 0;
+}
+
+int po1030_write_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len)
+{
+        int err, i;
+        u8 *p;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* The po1030 only supports one byte writes */
+        if (len > 1 || !len)
+                return -EINVAL;
+
+        memcpy(buf, sensor_urb_skeleton, sizeof(sensor_urb_skeleton));
+
+        buf[11] = sd->sensor->i2c_slave_id;
+        buf[15] = address;
+
+        p = buf + 16;
+
+        /* Copy a four byte write sequence for each byte to be written to */
+        for (i = 0; i < len; i++) {
+                memcpy(p, sensor_urb_skeleton + 16, 4);
+                p[3] = i2c_data[i];
+                p += 4;
+                PDEBUG(DBG_TRACE, "Writing sensor register 0x%x with 0x%x",
+                       address, i2c_data[i]);
+        }
+
+        /* Copy the footer */
+        memcpy(p, sensor_urb_skeleton + 20, 4);
+
+        /* Set the total length */
+        p[3] = 0x10 + len;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              0x04, 0x40, 0x19,
+                              0x0000, buf,
+                              20 + len * 4, M5602_URB_MSG_TIMEOUT);
+
+        return (err < 0) ? err : 0;
+}
+
+int po1030_init(struct sd *sd)
+{
+        int i, err = 0;
+
+        /* Init the sensor */
+        for (i = 0; i < ARRAY_SIZE(init_po1030); i++) {
+                u8 data[2] = {0x00, 0x00};
+
+                switch (init_po1030[i][0]) {
+                case BRIDGE:
+                        err = m5602_write_bridge(sd,
+                                init_po1030[i][1],
+                                init_po1030[i][2]);
+                        break;
+
+                case SENSOR:
+                        data[0] = init_po1030[i][2];
+                        err = po1030_write_sensor(sd,
+                                init_po1030[i][1], data, 1);
+                        break;
+
+                case SENSOR_LONG:
+                        data[0] = init_po1030[i][2];
+                        data[1] = init_po1030[i][3];
+                        err = po1030_write_sensor(sd,
+                                init_po1030[i][1], data, 2);
+                        break;
+                default:
+                        info("Invalid stream command, exiting init");
+                        return -EINVAL;
+                }
+        }
+
+        if (dump_sensor)
+                po1030_dump_registers(sd);
+
+        return (err < 0) ? err : 0;
+}
+
+int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        err = po1030_read_sensor(sd, PO1030_REG_INTEGLINES_H,
+                                 &i2c_data, 1);
+        if (err < 0)
+                goto out;
+        *val = (i2c_data << 8);
+
+        err = po1030_read_sensor(sd, PO1030_REG_INTEGLINES_M,
+                                 &i2c_data, 1);
+        *val |= i2c_data;
+
+        PDEBUG(DBG_V4L2_CID, "Exposure read as %d", *val);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        PDEBUG(DBG_V4L2, "Set exposure to %d", val & 0xffff);
+
+        i2c_data = ((val & 0xff00) >> 8);
+        PDEBUG(DBG_V4L2, "Set exposure to high byte to 0x%x",
+               i2c_data);
+
+        err = po1030_write_sensor(sd, PO1030_REG_INTEGLINES_H,
+                                  &i2c_data, 1);
+        if (err < 0)
+                goto out;
+
+        i2c_data = (val & 0xff);
+        PDEBUG(DBG_V4L2, "Set exposure to low byte to 0x%x",
+               i2c_data);
+        err = po1030_write_sensor(sd, PO1030_REG_INTEGLINES_M,
+                                  &i2c_data, 1);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        err = po1030_read_sensor(sd, PO1030_REG_GLOBALGAIN,
+                                 &i2c_data, 1);
+        *val = i2c_data;
+        PDEBUG(DBG_V4L2_CID, "Read global gain %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        i2c_data = val & 0xff;
+        PDEBUG(DBG_V4L2, "Set global gain to %d", i2c_data);
+        err = po1030_write_sensor(sd, PO1030_REG_GLOBALGAIN,
+                                  &i2c_data, 1);
+        return (err < 0) ? err : 0;
+}
+
+int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        err = po1030_read_sensor(sd, PO1030_REG_RED_GAIN,
+                                 &i2c_data, 1);
+        *val = i2c_data;
+        PDEBUG(DBG_V4L2_CID, "Read red gain %d", *val);
+        return (err < 0) ? err : 0;
+}
+
+int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        i2c_data = val & 0xff;
+        PDEBUG(DBG_V4L2, "Set red gain to %d", i2c_data);
+        err = po1030_write_sensor(sd, PO1030_REG_RED_GAIN,
+                                  &i2c_data, 1);
+        return (err < 0) ? err : 0;
+}
+
+int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+
+        err = po1030_read_sensor(sd, PO1030_REG_BLUE_GAIN,
+                                 &i2c_data, 1);
+        *val = i2c_data;
+        PDEBUG(DBG_V4L2_CID, "Read blue gain %d", *val);
+
+        return (err < 0) ? err : 0;
+}
+
+int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 i2c_data;
+        int err;
+        i2c_data = val & 0xff;
+        PDEBUG(DBG_V4L2, "Set blue gain to %d", i2c_data);
+        err = po1030_write_sensor(sd, PO1030_REG_BLUE_GAIN,
+                                  &i2c_data, 1);
+
+        return (err < 0) ? err : 0;
+}
+
+int po1030_power_down(struct sd *sd)
+{
+        return 0;
+}
+
+void po1030_dump_registers(struct sd *sd)
+{
+        int address;
+        u8 value = 0;
+
+        info("Dumping the po1030 sensor core registers");
+        for (address = 0; address < 0x7f; address++) {
+                po1030_read_sensor(sd, address, &value, 1);
+                info("register 0x%x contains 0x%x",
+                     address, value);
+        }
+
+        info("po1030 register state dump complete");
+
+        info("Probing for which registers that are read/write");
+        for (address = 0; address < 0xff; address++) {
+                u8 old_value, ctrl_value;
+                u8 test_value[2] = {0xff, 0xff};
+
+                po1030_read_sensor(sd, address, &old_value, 1);
+                po1030_write_sensor(sd, address, test_value, 1);
+                po1030_read_sensor(sd, address, &ctrl_value, 1);
+
+                if (ctrl_value == test_value[0])
+                        info("register 0x%x is writeable", address);
+                else
+                        info("register 0x%x is read only", address);
+
+                /* Restore original value */
+                po1030_write_sensor(sd, address, &old_value, 1);
+        }
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.h b/drivers/media/video/gspca/m5602/m5602_po1030.h
new file mode 100644
index 000000000000..68f34c97bf44
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.h
@@ -0,0 +1,478 @@
+/*
+ * Driver for the po1030 sensor.
+ * This is probably a pixel plus sensor but we haven't identified it yet
+ *
+ * Copyright (c) 2008 Erik Andren
+ * Copyright (c) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (c) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * Register defines taken from Pascal Stangs Proxycon Armlib
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#ifndef M5602_PO1030_H_
+#define M5602_PO1030_H_
+
+#include "m5602_sensor.h"
+
+/*****************************************************************************/
+
+#define PO1030_REG_DEVID_H              0x00
+#define PO1030_REG_DEVID_L              0x01
+#define PO1030_REG_FRAMEWIDTH_H         0x04
+#define PO1030_REG_FRAMEWIDTH_L         0x05
+#define PO1030_REG_FRAMEHEIGHT_H        0x06
+#define PO1030_REG_FRAMEHEIGHT_L        0x07
+#define PO1030_REG_WINDOWX_H            0x08
+#define PO1030_REG_WINDOWX_L            0x09
+#define PO1030_REG_WINDOWY_H            0x0a
+#define PO1030_REG_WINDOWY_L            0x0b
+#define PO1030_REG_WINDOWWIDTH_H        0x0c
+#define PO1030_REG_WINDOWWIDTH_L        0x0d
+#define PO1030_REG_WINDOWHEIGHT_H       0x0e
+#define PO1030_REG_WINDOWHEIGHT_L       0x0f
+
+#define PO1030_REG_GLOBALIBIAS          0x12
+#define PO1030_REG_PIXELIBIAS           0x13
+
+#define PO1030_REG_GLOBALGAIN           0x15
+#define PO1030_REG_RED_GAIN             0x16
+#define PO1030_REG_GREEN_1_GAIN         0x17
+#define PO1030_REG_BLUE_GAIN            0x18
+#define PO1030_REG_GREEN_2_GAIN         0x19
+
+#define PO1030_REG_INTEGLINES_H         0x1a
+#define PO1030_REG_INTEGLINES_M         0x1b
+#define PO1030_REG_INTEGLINES_L         0x1c
+
+#define PO1030_REG_CONTROL1             0x1d
+#define PO1030_REG_CONTROL2             0x1e
+#define PO1030_REG_CONTROL3             0x1f
+#define PO1030_REG_CONTROL4             0x20
+
+#define PO1030_REG_PERIOD50_H           0x23
+#define PO1030_REG_PERIOD50_L           0x24
+#define PO1030_REG_PERIOD60_H           0x25
+#define PO1030_REG_PERIOD60_L           0x26
+#define PO1030_REG_REGCLK167            0x27
+#define PO1030_REG_DELTA50              0x28
+#define PO1030_REG_DELTA60              0x29
+
+#define PO1030_REG_ADCOFFSET            0x2c
+
+/* Gamma Correction Coeffs */
+#define PO1030_REG_GC0                  0x2d
+#define PO1030_REG_GC1                  0x2e
+#define PO1030_REG_GC2                  0x2f
+#define PO1030_REG_GC3                  0x30
+#define PO1030_REG_GC4                  0x31
+#define PO1030_REG_GC5                  0x32
+#define PO1030_REG_GC6                  0x33
+#define PO1030_REG_GC7                  0x34
+
+/* Color Transform Matrix */
+#define PO1030_REG_CT0                  0x35
+#define PO1030_REG_CT1                  0x36
+#define PO1030_REG_CT2                  0x37
+#define PO1030_REG_CT3                  0x38
+#define PO1030_REG_CT4                  0x39
+#define PO1030_REG_CT5                  0x3a
+#define PO1030_REG_CT6                  0x3b
+#define PO1030_REG_CT7                  0x3c
+#define PO1030_REG_CT8                  0x3d
+
+#define PO1030_REG_AUTOCTRL1            0x3e
+#define PO1030_REG_AUTOCTRL2            0x3f
+
+#define PO1030_REG_YTARGET              0x40
+#define PO1030_REG_GLOBALGAINMIN        0x41
+#define PO1030_REG_GLOBALGAINMAX        0x42
+
+/* Output format control */
+#define PO1030_REG_OUTFORMCTRL1         0x5a
+#define PO1030_REG_OUTFORMCTRL2         0x5b
+#define PO1030_REG_OUTFORMCTRL3         0x5c
+#define PO1030_REG_OUTFORMCTRL4         0x5d
+#define PO1030_REG_OUTFORMCTRL5         0x5e
+
+/* Imaging coefficients */
+#define PO1030_REG_YBRIGHT              0x73
+#define PO1030_REG_YCONTRAST            0x74
+#define PO1030_REG_YSATURATION          0x75
+
+/*****************************************************************************/
+
+#define PO1030_GLOBAL_GAIN_DEFAULT      0x12
+#define PO1030_EXPOSURE_DEFAULT         0xf0ff
+#define PO1030_BLUE_GAIN_DEFAULT        0x40
+#define PO1030_RED_GAIN_DEFAULT         0x40
+
+/*****************************************************************************/
+
+/* Kernel module parameters */
+extern int force_sensor;
+extern int dump_sensor;
+extern unsigned int m5602_debug;
+
+int po1030_probe(struct sd *sd);
+int po1030_init(struct sd *sd);
+int po1030_power_down(struct sd *sd);
+
+void po1030_dump_registers(struct sd *sd);
+
+int po1030_read_sensor(struct sd *sd, const u8 address,
+                              u8 *i2c_data, const u8 len);
+int po1030_write_sensor(struct sd *sd, const u8 address,
+                               u8 *i2c_data, const u8 len);
+
+int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
+int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val);
+int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val);
+int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val);
+int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val);
+
+static struct m5602_sensor po1030 = {
+        .name = "PO1030",
+
+        .i2c_slave_id = 0xdc,
+
+        .probe = po1030_probe,
+        .init = po1030_init,
+        .power_down = po1030_power_down,
+
+        .nctrls = 4,
+        .ctrls = {
+        {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "gain",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_GLOBAL_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_gain,
+                .get = po1030_get_gain
+        }, {
+                {
+                        .id             = V4L2_CID_EXPOSURE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "exposure",
+                        .minimum        = 0x00,
+                        .maximum        = 0xffff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_EXPOSURE_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_exposure,
+                .get = po1030_get_exposure
+        }, {
+                {
+                        .id             = V4L2_CID_RED_BALANCE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "red balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_RED_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_red_balance,
+                .get = po1030_get_red_balance
+        }, {
+                {
+                        .id             = V4L2_CID_BLUE_BALANCE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "blue balance",
+                        .minimum        = 0x00,
+                        .maximum        = 0xff,
+                        .step           = 0x1,
+                        .default_value  = PO1030_BLUE_GAIN_DEFAULT,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = po1030_set_blue_balance,
+                .get = po1030_get_blue_balance
+        }
+        },
+        .nmodes = 1,
+        .modes = {
+        {
+                M5602_DEFAULT_FRAME_WIDTH,
+                M5602_DEFAULT_FRAME_HEIGHT,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
+                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1
+        }
+        }
+};
+
+static const unsigned char preinit_po1030[][3] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+
+        {SENSOR, PO1030_REG_AUTOCTRL2, 0x24},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xec},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x87},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+
+        {SENSOR, PO1030_REG_AUTOCTRL2, 0x24},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00}
+};
+
+static const unsigned char init_po1030[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0},
+        /*sequence 1*/
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d},
+
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        /*end of sequence 1*/
+
+        /*sequence 2 (same as stop sequence)*/
+        {SENSOR, PO1030_REG_AUTOCTRL2, 0x24},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        /*end of sequence 2*/
+
+        /*sequence 5*/
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xec},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x87},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        /*end of sequence 5*/
+
+        /*sequence 2 stop */
+        {SENSOR, PO1030_REG_AUTOCTRL2, 0x24},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x04},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x02},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x04},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        /*end of sequence 2 stop */
+
+/* ---------------------------------
+ * end of init - begin of start
+ * --------------------------------- */
+
+        /*sequence 3*/
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        /*end of sequence 3*/
+        /*sequence 4*/
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x05},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00},
+
+        {SENSOR, PO1030_REG_AUTOCTRL2, 0x04},
+
+        /* Set the width to 751 */
+        {SENSOR, PO1030_REG_FRAMEWIDTH_H, 0x02},
+        {SENSOR, PO1030_REG_FRAMEWIDTH_L, 0xef},
+
+        /* Set the height to 540 */
+        {SENSOR, PO1030_REG_FRAMEHEIGHT_H, 0x02},
+        {SENSOR, PO1030_REG_FRAMEHEIGHT_L, 0x1c},
+
+        /* Set the x window to 1 */
+        {SENSOR, PO1030_REG_WINDOWX_H, 0x00},
+        {SENSOR, PO1030_REG_WINDOWX_L, 0x01},
+
+        /* Set the y window to 1 */
+        {SENSOR, PO1030_REG_WINDOWY_H, 0x00},
+        {SENSOR, PO1030_REG_WINDOWX_L, 0x01},
+
+        {SENSOR, PO1030_REG_WINDOWWIDTH_H, 0x02},
+        {SENSOR, PO1030_REG_WINDOWWIDTH_L, 0x87},
+        {SENSOR, PO1030_REG_WINDOWHEIGHT_H, 0x01},
+        {SENSOR, PO1030_REG_WINDOWHEIGHT_L, 0xe3},
+
+        {SENSOR, PO1030_REG_OUTFORMCTRL2, 0x04},
+        {SENSOR, PO1030_REG_OUTFORMCTRL2, 0x04},
+        {SENSOR, PO1030_REG_AUTOCTRL1, 0x08},
+        {SENSOR, PO1030_REG_CONTROL2, 0x03},
+        {SENSOR, 0x21, 0x90},
+        {SENSOR, PO1030_REG_YTARGET, 0x60},
+        {SENSOR, 0x59, 0x13},
+        {SENSOR, PO1030_REG_OUTFORMCTRL1, 0x40},
+        {SENSOR, 0x5f, 0x00},
+        {SENSOR, 0x60, 0x80},
+        {SENSOR, 0x78, 0x14},
+        {SENSOR, 0x6f, 0x01},
+        {SENSOR, PO1030_REG_CONTROL1, 0x18},
+        {SENSOR, PO1030_REG_GLOBALGAINMAX, 0x14},
+        {SENSOR, 0x63, 0x38},
+        {SENSOR, 0x64, 0x38},
+        {SENSOR, PO1030_REG_CONTROL1, 0x58},
+        {SENSOR, PO1030_REG_RED_GAIN, 0x30},
+        {SENSOR, PO1030_REG_GREEN_1_GAIN, 0x30},
+        {SENSOR, PO1030_REG_BLUE_GAIN, 0x30},
+        {SENSOR, PO1030_REG_GREEN_2_GAIN, 0x30},
+        {SENSOR, PO1030_REG_GC0, 0x10},
+        {SENSOR, PO1030_REG_GC1, 0x20},
+        {SENSOR, PO1030_REG_GC2, 0x40},
+        {SENSOR, PO1030_REG_GC3, 0x60},
+        {SENSOR, PO1030_REG_GC4, 0x80},
+        {SENSOR, PO1030_REG_GC5, 0xa0},
+        {SENSOR, PO1030_REG_GC6, 0xc0},
+        {SENSOR, PO1030_REG_GC7, 0xff},
+        /*end of sequence 4*/
+        /*sequence 5*/
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0c},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xec},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x7e},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00},
+        /*end of sequence 5*/
+
+        /*sequence 6*/
+        /* Changing 40 in f0 the image becomes green in bayer mode and red in
+         * rgb mode */
+        {SENSOR, PO1030_REG_RED_GAIN, PO1030_RED_GAIN_DEFAULT},
+        /* in changing 40 in f0 the image becomes green in bayer mode and red in
+         * rgb mode */
+        {SENSOR, PO1030_REG_BLUE_GAIN, PO1030_BLUE_GAIN_DEFAULT},
+
+        /* with a very low lighted environment increase the exposure but
+         * decrease the FPS (Frame Per Second) */
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
+
+        /* Controls high exposure more than SENSOR_LOW_EXPOSURE, use only in
+         * low lighted environment (f0 is more than ff ?)*/
+        {SENSOR, PO1030_REG_INTEGLINES_H, ((PO1030_EXPOSURE_DEFAULT >> 2)
+                & 0xff)},
+
+        /* Controls middle exposure, use only in high lighted environment */
+        {SENSOR, PO1030_REG_INTEGLINES_M, PO1030_EXPOSURE_DEFAULT & 0xff},
+
+        /* Controls clarity (not sure) */
+        {SENSOR, PO1030_REG_INTEGLINES_L, 0x00},
+        /* Controls gain (the image is more lighted) */
+        {SENSOR, PO1030_REG_GLOBALGAIN, PO1030_GLOBAL_GAIN_DEFAULT},
+
+        /* Sets the width */
+        {SENSOR, PO1030_REG_FRAMEWIDTH_H, 0x02},
+        {SENSOR, PO1030_REG_FRAMEWIDTH_L, 0xef}
+        /*end of sequence 6*/
+};
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
new file mode 100644
index 000000000000..68202565325d
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -0,0 +1,463 @@
+/*
+ * Driver for the s5k4aa sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#include "m5602_s5k4aa.h"
+
+int s5k4aa_probe(struct sd *sd)
+{
+        u8 prod_id[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        const u8 expected_prod_id[6] = {0x00, 0x10, 0x00, 0x4b, 0x33, 0x75};
+        int i, err = 0;
+
+        if (force_sensor) {
+                if (force_sensor == S5K4AA_SENSOR) {
+                        info("Forcing a %s sensor", s5k4aa.name);
+                        goto sensor_found;
+                }
+                /* If we want to force another sensor, don't try to probe this
+                 * one */
+                return -ENODEV;
+        }
+
+        info("Probing for a s5k4aa sensor");
+
+        /* Preinit the sensor */
+        for (i = 0; i < ARRAY_SIZE(preinit_s5k4aa) && !err; i++) {
+                u8 data[2] = {0x00, 0x00};
+
+                switch (preinit_s5k4aa[i][0]) {
+                case BRIDGE:
+                        err = m5602_write_bridge(sd,
+                                                 preinit_s5k4aa[i][1],
+                                                 preinit_s5k4aa[i][2]);
+                        break;
+
+                case SENSOR:
+                        data[0] = preinit_s5k4aa[i][2];
+                        err = s5k4aa_write_sensor(sd,
+                                                  preinit_s5k4aa[i][1],
+                                                  data, 1);
+                        break;
+
+                case SENSOR_LONG:
+                        data[0] = preinit_s5k4aa[i][2];
+                        data[1] = preinit_s5k4aa[i][3];
+                        err = s5k4aa_write_sensor(sd,
+                                                  preinit_s5k4aa[i][1],
+                                                  data, 2);
+                        break;
+                default:
+                        info("Invalid stream command, exiting init");
+                        return -EINVAL;
+                }
+        }
+
+        /* Test some registers, but we don't know their exact meaning yet */
+        if (s5k4aa_read_sensor(sd, 0x00, prod_id, sizeof(prod_id)))
+                return -ENODEV;
+
+        if (memcmp(prod_id, expected_prod_id, sizeof(prod_id)))
+                return -ENODEV;
+        else
+                info("Detected a s5k4aa sensor");
+sensor_found:
+        sd->gspca_dev.cam.cam_mode = s5k4aa.modes;
+        sd->gspca_dev.cam.nmodes = s5k4aa.nmodes;
+        sd->desc->ctrls = s5k4aa.ctrls;
+        sd->desc->nctrls = s5k4aa.nctrls;
+
+        return 0;
+}
+
+int s5k4aa_read_sensor(struct sd *sd, const u8 address,
+                       u8 *i2c_data, const u8 len)
+{
+        int err, i;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                                 sd->sensor->i2c_slave_id);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);
+        if (err < 0)
+                goto out;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+        if (err < 0)
+                goto out;
+
+        for (i = 0; (i < len) & !err; i++) {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+                PDEBUG(DBG_TRACE, "Reading sensor register "
+                                  "0x%x containing 0x%x ", address, *i2c_data);
+        }
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_write_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len)
+{
+        int err, i;
+        u8 *p;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* No sensor with a data width larger than 16 bits has yet been seen */
+        if (len > 2 || !len)
+                return -EINVAL;
+
+        memcpy(buf, sensor_urb_skeleton,
+               sizeof(sensor_urb_skeleton));
+
+        buf[11] = sd->sensor->i2c_slave_id;
+        buf[15] = address;
+
+        /* Special case larger sensor writes */
+        p = buf + 16;
+
+        /* Copy a four byte write sequence for each byte to be written to */
+        for (i = 0; i < len; i++) {
+                memcpy(p, sensor_urb_skeleton + 16, 4);
+                p[3] = i2c_data[i];
+                p += 4;
+                PDEBUG(DBG_TRACE, "Writing sensor register 0x%x with 0x%x",
+                       address, i2c_data[i]);
+        }
+
+        /* Copy the tailer */
+        memcpy(p, sensor_urb_skeleton + 20, 4);
+
+        /* Set the total length */
+        p[3] = 0x10 + len;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              0x04, 0x40, 0x19,
+                              0x0000, buf,
+                              20 + len * 4, M5602_URB_MSG_TIMEOUT);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_init(struct sd *sd)
+{
+        int i, err = 0;
+
+        for (i = 0; i < ARRAY_SIZE(init_s5k4aa) && !err; i++) {
+                u8 data[2] = {0x00, 0x00};
+
+                switch (init_s5k4aa[i][0]) {
+                case BRIDGE:
+                        err = m5602_write_bridge(sd,
+                                init_s5k4aa[i][1],
+                                init_s5k4aa[i][2]);
+                        break;
+
+                case SENSOR:
+                        data[0] = init_s5k4aa[i][2];
+                        err = s5k4aa_write_sensor(sd,
+                                init_s5k4aa[i][1], data, 1);
+                        break;
+
+                case SENSOR_LONG:
+                        data[0] = init_s5k4aa[i][2];
+                        data[1] = init_s5k4aa[i][3];
+                        err = s5k4aa_write_sensor(sd,
+                                init_s5k4aa[i][1], data, 2);
+                        break;
+                default:
+                        info("Invalid stream command, exiting init");
+                        return -EINVAL;
+                }
+        }
+
+        if (dump_sensor)
+                s5k4aa_dump_registers(sd);
+
+        if (!err && dmi_check_system(s5k4aa_vflip_dmi_table)) {
+                u8 data = 0x02;
+                info("vertical flip quirk active");
+                s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+                s5k4aa_read_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+                data |= S5K4AA_RM_V_FLIP;
+                data &= ~S5K4AA_RM_H_FLIP;
+                s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+
+                /* Decrement COLSTART to preserve color order (BGGR) */
+                s5k4aa_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+                data--;
+                s5k4aa_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+
+                /* Increment ROWSTART to preserve color order (BGGR) */
+                s5k4aa_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+                data++;
+                s5k4aa_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+        }
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_power_down(struct sd *sd)
+{
+        return 0;
+}
+
+int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+
+        err = s5k4aa_read_sensor(sd, S5K4AA_EXPOSURE_HI, &data, 1);
+        if (err < 0)
+                goto out;
+
+        *val = data << 8;
+        err = s5k4aa_read_sensor(sd, S5K4AA_EXPOSURE_LO, &data, 1);
+        *val |= data;
+        PDEBUG(DBG_V4L2_CID, "Read exposure %d", *val);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        PDEBUG(DBG_V4L2_CID, "Set exposure to %d", val);
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+        data = (val >> 8) & 0xff;
+        err = s5k4aa_write_sensor(sd, S5K4AA_EXPOSURE_HI, &data, 1);
+        if (err < 0)
+                goto out;
+        data = val & 0xff;
+        err = s5k4aa_write_sensor(sd, S5K4AA_EXPOSURE_LO, &data, 1);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+
+        err = s5k4aa_read_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        *val = (data & S5K4AA_RM_V_FLIP) >> 7;
+        PDEBUG(DBG_V4L2_CID, "Read vertical flip %d", *val);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        PDEBUG(DBG_V4L2_CID, "Set vertical flip to %d", val);
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+        err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+        if (err < 0)
+                goto out;
+        data = ((data & ~S5K4AA_RM_V_FLIP)
+                        | ((val & 0x01) << 7));
+        err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+        if (err < 0)
+                goto out;
+
+        if (val) {
+                err = s5k4aa_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+                if (err < 0)
+                        goto out;
+
+                data++;
+                err = s5k4aa_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+        } else {
+                err = s5k4aa_read_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+                if (err < 0)
+                        goto out;
+
+                data--;
+                err = s5k4aa_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
+        }
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+
+        err = s5k4aa_read_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        *val = (data & S5K4AA_RM_H_FLIP) >> 6;
+        PDEBUG(DBG_V4L2_CID, "Read horizontal flip %d", *val);
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        PDEBUG(DBG_V4L2_CID, "Set horizontal flip to %d",
+               val);
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+        err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+        if (err < 0)
+                goto out;
+
+        data = ((data & ~S5K4AA_RM_H_FLIP) | ((val & 0x01) << 6));
+        err = s5k4aa_write_sensor(sd, S5K4AA_READ_MODE, &data, 1);
+        if (err < 0)
+                goto out;
+
+        if (val) {
+                err = s5k4aa_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+                if (err < 0)
+                        goto out;
+                data++;
+                err = s5k4aa_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+                if (err < 0)
+                        goto out;
+        } else {
+                err = s5k4aa_read_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+                if (err < 0)
+                        goto out;
+                data--;
+                err = s5k4aa_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
+        }
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+
+        err = s5k4aa_read_sensor(sd, S5K4AA_GAIN_2, &data, 1);
+        *val = data;
+        PDEBUG(DBG_V4L2_CID, "Read gain %d", *val);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        u8 data = S5K4AA_PAGE_MAP_2;
+        int err;
+
+        PDEBUG(DBG_V4L2_CID, "Set gain to %d", val);
+        err = s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &data, 1);
+        if (err < 0)
+                goto out;
+
+        data = val & 0xff;
+        err = s5k4aa_write_sensor(sd, S5K4AA_GAIN_2, &data, 1);
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+void s5k4aa_dump_registers(struct sd *sd)
+{
+        int address;
+        u8 page, old_page;
+        s5k4aa_read_sensor(sd, S5K4AA_PAGE_MAP, &old_page, 1);
+        for (page = 0; page < 16; page++) {
+                s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &page, 1);
+                info("Dumping the s5k4aa register state for page 0x%x", page);
+                for (address = 0; address <= 0xff; address++) {
+                        u8 value = 0;
+                        s5k4aa_read_sensor(sd, address, &value, 1);
+                        info("register 0x%x contains 0x%x",
+                             address, value);
+                }
+        }
+        info("s5k4aa register state dump complete");
+
+        for (page = 0; page < 16; page++) {
+                s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &page, 1);
+                info("Probing for which registers that are "
+                     "read/write for page 0x%x", page);
+                for (address = 0; address <= 0xff; address++) {
+                        u8 old_value, ctrl_value, test_value = 0xff;
+
+                        s5k4aa_read_sensor(sd, address, &old_value, 1);
+                        s5k4aa_write_sensor(sd, address, &test_value, 1);
+                        s5k4aa_read_sensor(sd, address, &ctrl_value, 1);
+
+                        if (ctrl_value == test_value)
+                                info("register 0x%x is writeable", address);
+                        else
+                                info("register 0x%x is read only", address);
+
+                        /* Restore original value */
+                        s5k4aa_write_sensor(sd, address, &old_value, 1);
+                }
+        }
+        info("Read/write register probing complete");
+        s5k4aa_write_sensor(sd, S5K4AA_PAGE_MAP, &old_page, 1);
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
new file mode 100644
index 000000000000..bb7f7e3e90af
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
@@ -0,0 +1,370 @@
+/*
+ * Driver for the s5k4aa sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#ifndef M5602_S5K4AA_H_
+#define M5602_S5K4AA_H_
+
+#include <linux/dmi.h>
+
+#include "m5602_sensor.h"
+
+/*****************************************************************************/
+
+#define S5K4AA_PAGE_MAP                 0xec
+
+#define S5K4AA_PAGE_MAP_0               0x00
+#define S5K4AA_PAGE_MAP_1               0x01
+#define S5K4AA_PAGE_MAP_2               0x02
+
+/* Sensor register definitions for page 0x02 */
+#define S5K4AA_READ_MODE                0x03
+#define S5K4AA_ROWSTART_HI              0x04
+#define S5K4AA_ROWSTART_LO              0x05
+#define S5K4AA_COLSTART_HI              0x06
+#define S5K4AA_COLSTART_LO              0x07
+#define S5K4AA_WINDOW_HEIGHT_HI         0x08
+#define S5K4AA_WINDOW_HEIGHT_LO         0x09
+#define S5K4AA_WINDOW_WIDTH_HI          0x0a
+#define S5K4AA_WINDOW_WIDTH_LO          0x0b
+#define S5K4AA_GLOBAL_GAIN__            0x0f /* Only a guess ATM !!! */
+#define S5K4AA_H_BLANK_HI__             0x1d /* Only a guess ATM !!! sync lost
+                                                if too low, reduces frame rate
+                                                if too high */
+#define S5K4AA_H_BLANK_LO__             0x1e /* Only a guess ATM !!! */
+#define S5K4AA_EXPOSURE_HI              0x17
+#define S5K4AA_EXPOSURE_LO              0x18
+#define S5K4AA_GAIN_1                   0x1f /* (digital?) gain : 5 bits */
+#define S5K4AA_GAIN_2                   0x20 /* (analogue?) gain : 7 bits */
+
+#define S5K4AA_RM_ROW_SKIP_4X           0x08
+#define S5K4AA_RM_ROW_SKIP_2X           0x04
+#define S5K4AA_RM_COL_SKIP_4X           0x02
+#define S5K4AA_RM_COL_SKIP_2X           0x01
+#define S5K4AA_RM_H_FLIP                0x40
+#define S5K4AA_RM_V_FLIP                0x80
+
+/*****************************************************************************/
+
+/* Kernel module parameters */
+extern int force_sensor;
+extern int dump_sensor;
+extern unsigned int m5602_debug;
+
+int s5k4aa_probe(struct sd *sd);
+int s5k4aa_init(struct sd *sd);
+int s5k4aa_power_down(struct sd *sd);
+
+void s5k4aa_dump_registers(struct sd *sd);
+
+int s5k4aa_read_sensor(struct sd *sd, const u8 address,
+                       u8 *i2c_data, const u8 len);
+int s5k4aa_write_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len);
+
+int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
+int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int s5k4aa_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+
+static struct m5602_sensor s5k4aa = {
+        .name = "S5K4AA",
+        .probe = s5k4aa_probe,
+        .init = s5k4aa_init,
+        .power_down = s5k4aa_power_down,
+        .read_sensor = s5k4aa_read_sensor,
+        .write_sensor = s5k4aa_write_sensor,
+        .i2c_slave_id = 0x5a,
+        .nctrls = 4,
+        .ctrls = {
+        {
+                {
+                        .id             = V4L2_CID_VFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "vertical flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = s5k4aa_set_vflip,
+                .get = s5k4aa_get_vflip
+
+        }, {
+                {
+                        .id             = V4L2_CID_HFLIP,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "horizontal flip",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 0
+                },
+                .set = s5k4aa_set_hflip,
+                .get = s5k4aa_get_hflip
+
+        }, {
+                {
+                        .id             = V4L2_CID_GAIN,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "Gain",
+                        .minimum        = 0,
+                        .maximum        = 127,
+                        .step           = 1,
+                        .default_value  = 0xa0,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = s5k4aa_set_gain,
+                .get = s5k4aa_get_gain
+        }, {
+                {
+                        .id             = V4L2_CID_EXPOSURE,
+                        .type           = V4L2_CTRL_TYPE_INTEGER,
+                        .name           = "Exposure",
+                        .minimum        = 13,
+                        .maximum        = 0xfff,
+                        .step           = 1,
+                        .default_value  = 0x100,
+                        .flags          = V4L2_CTRL_FLAG_SLIDER
+                },
+                .set = s5k4aa_set_exposure,
+                .get = s5k4aa_get_exposure
+        }
+        },
+
+        .nmodes = 1,
+        .modes = {
+        {
+                M5602_DEFAULT_FRAME_WIDTH,
+                M5602_DEFAULT_FRAME_HEIGHT,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
+                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1
+        }
+        }
+};
+
+static const unsigned char preinit_s5k4aa[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08, 0x00},
+
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x14, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},
+
+        {SENSOR, S5K4AA_PAGE_MAP, 0x00, 0x00}
+};
+
+static const unsigned char init_s5k4aa[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08, 0x00},
+
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x14, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},
+
+        {SENSOR, S5K4AA_PAGE_MAP, 0x07, 0x00},
+        {SENSOR, 0x36, 0x01, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, 0x7b, 0xff, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+        {SENSOR, 0x0c, 0x05, 0x00},
+        {SENSOR, 0x02, 0x0e, 0x00},
+        {SENSOR, S5K4AA_GAIN_1, 0x0f, 0x00},
+        {SENSOR, S5K4AA_GAIN_2, 0x00, 0x00},
+        {SENSOR, S5K4AA_GLOBAL_GAIN__, 0x01, 0x00},
+        {SENSOR, 0x11, 0x00, 0x00},
+        {SENSOR, 0x12, 0x00, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+        {SENSOR, S5K4AA_READ_MODE, 0xa0, 0x00},
+        {SENSOR, 0x37, 0x00, 0x00},
+        {SENSOR, S5K4AA_ROWSTART_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_ROWSTART_LO, 0x2a, 0x00},
+        {SENSOR, S5K4AA_COLSTART_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_COLSTART_LO, 0x0b, 0x00},
+        {SENSOR, S5K4AA_WINDOW_HEIGHT_HI, 0x03, 0x00},
+        {SENSOR, S5K4AA_WINDOW_HEIGHT_LO, 0xc4, 0x00},
+        {SENSOR, S5K4AA_WINDOW_WIDTH_HI, 0x05, 0x00},
+        {SENSOR, S5K4AA_WINDOW_WIDTH_LO, 0x08, 0x00},
+        {SENSOR, S5K4AA_H_BLANK_HI__, 0x00, 0x00},
+        {SENSOR, S5K4AA_H_BLANK_LO__, 0x48, 0x00},
+        {SENSOR, S5K4AA_EXPOSURE_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_EXPOSURE_LO, 0x43, 0x00},
+        {SENSOR, 0x11, 0x04, 0x00},
+        {SENSOR, 0x12, 0xc3, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x08, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        /* VSYNC_PARA, VSYNC_PARA : img height 480 = 0x01e0 */
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe0, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        /* HSYNC_PARA, HSYNC_PARA : img width 640 = 0x0280 */
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x80, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00}, /* 48 MHz */
+
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+        {SENSOR, S5K4AA_READ_MODE, S5K4AA_RM_H_FLIP | S5K4AA_RM_ROW_SKIP_2X
+                | S5K4AA_RM_COL_SKIP_2X, 0x00},
+        /* 0x37 : Fix image stability when light is too bright and improves
+         * image quality in 640x480, but worsens it in 1280x1024 */
+        {SENSOR, 0x37, 0x01, 0x00},
+        /* ROWSTART_HI, ROWSTART_LO : 10 + (1024-960)/2 = 42 = 0x002a */
+        {SENSOR, S5K4AA_ROWSTART_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_ROWSTART_LO, 0x2a, 0x00},
+        {SENSOR, S5K4AA_COLSTART_HI, 0x00, 0x00},
+        {SENSOR, S5K4AA_COLSTART_LO, 0x0c, 0x00},
+        /* window_height_hi, window_height_lo : 960 = 0x03c0 */
+        {SENSOR, S5K4AA_WINDOW_HEIGHT_HI, 0x03, 0x00},
+        {SENSOR, S5K4AA_WINDOW_HEIGHT_LO, 0xc0, 0x00},
+        /* window_width_hi, window_width_lo : 1280 = 0x0500 */
+        {SENSOR, S5K4AA_WINDOW_WIDTH_HI, 0x05, 0x00},
+        {SENSOR, S5K4AA_WINDOW_WIDTH_LO, 0x00, 0x00},
+        {SENSOR, S5K4AA_H_BLANK_HI__, 0x00, 0x00},
+        {SENSOR, S5K4AA_H_BLANK_LO__, 0xa8, 0x00}, /* helps to sync... */
+        {SENSOR, S5K4AA_EXPOSURE_HI, 0x01, 0x00},
+        {SENSOR, S5K4AA_EXPOSURE_LO, 0x00, 0x00},
+        {SENSOR, 0x11, 0x04, 0x00},
+        {SENSOR, 0x12, 0xc3, 0x00},
+        {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00},
+        {SENSOR, 0x02, 0x0e, 0x00},
+        {SENSOR_LONG, S5K4AA_GLOBAL_GAIN__, 0x0f, 0x00},
+        {SENSOR, S5K4AA_GAIN_1, 0x0b, 0x00},
+        {SENSOR, S5K4AA_GAIN_2, 0xa0, 0x00}
+};
+
+static
+    const
+        struct dmi_system_id s5k4aa_vflip_dmi_table[] = {
+        {
+                .ident = "Fujitsu-Siemens Amilo Xa 2528",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xa 2528")
+                }
+        },
+        {
+                .ident = "Fujitsu-Siemens Amilo Xi 2550",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 2550")
+                }
+        },
+                {
+                .ident = "MSI GX700",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "GX700"),
+                        DMI_MATCH(DMI_BIOS_DATE, "07/26/2007")
+                }
+        },
+        { }
+};
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
new file mode 100644
index 000000000000..b4b33c2d0499
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
@@ -0,0 +1,423 @@
+/*
+ * Driver for the s5k83a sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#include "m5602_s5k83a.h"
+
+int s5k83a_probe(struct sd *sd)
+{
+        u8 prod_id = 0, ver_id = 0;
+        int i, err = 0;
+
+        if (force_sensor) {
+                if (force_sensor == S5K83A_SENSOR) {
+                        info("Forcing a %s sensor", s5k83a.name);
+                        goto sensor_found;
+                }
+                /* If we want to force another sensor, don't try to probe this
+                 * one */
+                return -ENODEV;
+        }
+
+        info("Probing for a s5k83a sensor");
+
+        /* Preinit the sensor */
+        for (i = 0; i < ARRAY_SIZE(preinit_s5k83a) && !err; i++) {
+                u8 data[2] = {preinit_s5k83a[i][2], preinit_s5k83a[i][3]};
+                if (preinit_s5k83a[i][0] == SENSOR)
+                        err = s5k83a_write_sensor(sd, preinit_s5k83a[i][1],
+                                data, 2);
+                else
+                        err = m5602_write_bridge(sd, preinit_s5k83a[i][1],
+                                data[0]);
+        }
+
+        /* We don't know what register (if any) that contain the product id
+         * Just pick the first addresses that seem to produce the same results
+         * on multiple machines */
+        if (s5k83a_read_sensor(sd, 0x00, &prod_id, 1))
+                return -ENODEV;
+
+        if (s5k83a_read_sensor(sd, 0x01, &ver_id, 1))
+                return -ENODEV;
+
+        if ((prod_id == 0xff) || (ver_id == 0xff))
+                return -ENODEV;
+        else
+                info("Detected a s5k83a sensor");
+
+sensor_found:
+        sd->gspca_dev.cam.cam_mode = s5k83a.modes;
+        sd->gspca_dev.cam.nmodes = s5k83a.nmodes;
+        sd->desc->ctrls = s5k83a.ctrls;
+        sd->desc->nctrls = s5k83a.nctrls;
+        return 0;
+}
+
+int s5k83a_read_sensor(struct sd *sd, const u8 address,
+                              u8 *i2c_data, const u8 len)
+{
+        int err, i;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
+                                 sd->sensor->i2c_slave_id);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
+        if (err < 0)
+                goto out;
+
+        err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);
+        if (err < 0)
+                goto out;
+
+        do {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
+        } while ((*i2c_data & I2C_BUSY) && !err);
+
+        if (err < 0)
+                goto out;
+        for (i = 0; i < len && !len; i++) {
+                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
+
+                PDEBUG(DBG_TRACE, "Reading sensor register "
+                                  "0x%x containing 0x%x ", address, *i2c_data);
+        }
+
+out:
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_write_sensor(struct sd *sd, const u8 address,
+                               u8 *i2c_data, const u8 len)
+{
+        int err, i;
+        u8 *p;
+        struct usb_device *udev = sd->gspca_dev.dev;
+        __u8 *buf = sd->gspca_dev.usb_buf;
+
+        /* No sensor with a data width larger than 16 bits has yet been seen */
+        if (len > 2 || !len)
+                return -EINVAL;
+
+        memcpy(buf, sensor_urb_skeleton,
+               sizeof(sensor_urb_skeleton));
+
+        buf[11] = sd->sensor->i2c_slave_id;
+        buf[15] = address;
+
+        /* Special case larger sensor writes */
+        p = buf + 16;
+
+        /* Copy a four byte write sequence for each byte to be written to */
+        for (i = 0; i < len; i++) {
+                memcpy(p, sensor_urb_skeleton + 16, 4);
+                p[3] = i2c_data[i];
+                p += 4;
+                PDEBUG(DBG_TRACE, "Writing sensor register 0x%x with 0x%x",
+                       address, i2c_data[i]);
+        }
+
+        /* Copy the tailer */
+        memcpy(p, sensor_urb_skeleton + 20, 4);
+
+        /* Set the total length */
+        p[3] = 0x10 + len;
+
+        err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+                              0x04, 0x40, 0x19,
+                              0x0000, buf,
+                              20 + len * 4, M5602_URB_MSG_TIMEOUT);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_init(struct sd *sd)
+{
+        int i, err = 0;
+
+        for (i = 0; i < ARRAY_SIZE(init_s5k83a) && !err; i++) {
+                u8 data[2] = {0x00, 0x00};
+
+                switch (init_s5k83a[i][0]) {
+                case BRIDGE:
+                        err = m5602_write_bridge(sd,
+                                        init_s5k83a[i][1],
+                                        init_s5k83a[i][2]);
+                        break;
+
+                case SENSOR:
+                        data[0] = init_s5k83a[i][2];
+                        err = s5k83a_write_sensor(sd,
+                                init_s5k83a[i][1], data, 1);
+                        break;
+
+                case SENSOR_LONG:
+                        data[0] = init_s5k83a[i][2];
+                        data[1] = init_s5k83a[i][3];
+                        err = s5k83a_write_sensor(sd,
+                                init_s5k83a[i][1], data, 2);
+                        break;
+                default:
+                        info("Invalid stream command, exiting init");
+                        return -EINVAL;
+                }
+        }
+
+        if (dump_sensor)
+                s5k83a_dump_registers(sd);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_power_down(struct sd *sd)
+{
+        return 0;
+}
+
+void s5k83a_dump_registers(struct sd *sd)
+{
+        int address;
+        u8 page, old_page;
+        s5k83a_read_sensor(sd, S5K83A_PAGE_MAP, &old_page, 1);
+
+        for (page = 0; page < 16; page++) {
+                s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, &page, 1);
+                info("Dumping the s5k83a register state for page 0x%x", page);
+                for (address = 0; address <= 0xff; address++) {
+                        u8 val = 0;
+                        s5k83a_read_sensor(sd, address, &val, 1);
+                        info("register 0x%x contains 0x%x",
+                             address, val);
+                }
+        }
+        info("s5k83a register state dump complete");
+
+        for (page = 0; page < 16; page++) {
+                s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, &page, 1);
+                info("Probing for which registers that are read/write "
+                      "for page 0x%x", page);
+                for (address = 0; address <= 0xff; address++) {
+                        u8 old_val, ctrl_val, test_val = 0xff;
+
+                        s5k83a_read_sensor(sd, address, &old_val, 1);
+                        s5k83a_write_sensor(sd, address, &test_val, 1);
+                        s5k83a_read_sensor(sd, address, &ctrl_val, 1);
+
+                        if (ctrl_val == test_val)
+                                info("register 0x%x is writeable", address);
+                        else
+                                info("register 0x%x is read only", address);
+
+                        /* Restore original val */
+                        s5k83a_write_sensor(sd, address, &old_val, 1);
+                }
+        }
+        info("Read/write register probing complete");
+        s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, &old_page, 1);
+}
+
+int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[2];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = s5k83a_read_sensor(sd, S5K83A_BRIGHTNESS, data, 2);
+        data[1] = data[1] << 1;
+        *val = data[1];
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[2];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0x00;
+        data[1] = 0x20;
+        err = s5k83a_write_sensor(sd, 0x14, data, 2);
+        if (err < 0)
+                return err;
+
+        data[0] = 0x01;
+        data[1] = 0x00;
+        err = s5k83a_write_sensor(sd, 0x0d, data, 2);
+        if (err < 0)
+                return err;
+
+        /* FIXME: This is not sane, we need to figure out the composition
+                  of these registers */
+        data[0] = val >> 3; /* brightness, high 5 bits */
+        data[1] = val >> 1; /* brightness, high 7 bits */
+        err = s5k83a_write_sensor(sd, S5K83A_BRIGHTNESS, data, 2);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_get_whiteness(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data;
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = s5k83a_read_sensor(sd, S5K83A_WHITENESS, &data, 1);
+
+        *val = data;
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_set_whiteness(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[1];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = val;
+        err = s5k83a_write_sensor(sd, S5K83A_WHITENESS, data, 1);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[2];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        err = s5k83a_read_sensor(sd, S5K83A_GAIN, data, 2);
+
+        data[1] = data[1] & 0x3f;
+        if (data[1] > S5K83A_MAXIMUM_GAIN)
+                data[1] = S5K83A_MAXIMUM_GAIN;
+
+        *val = data[1];
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[2];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0;
+        data[1] = val;
+        err = s5k83a_write_sensor(sd, S5K83A_GAIN, data, 2);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[1];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0x05;
+        err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
+        if (err < 0)
+                return err;
+
+        err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);
+        *val = (data[0] | 0x40) ? 1 : 0;
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[1];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0x05;
+        err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
+        if (err < 0)
+                return err;
+
+        err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);
+        if (err < 0)
+                return err;
+
+        /* set or zero six bit, seven is hflip */
+        data[0] = (val) ? (data[0] & 0x80) | 0x40 | S5K83A_FLIP_MASK
+                        : (data[0] & 0x80) | S5K83A_FLIP_MASK;
+        err = s5k83a_write_sensor(sd, S5K83A_FLIP, data, 1);
+        if (err < 0)
+                return err;
+
+        data[0] = (val) ? 0x0b : 0x0a;
+        err = s5k83a_write_sensor(sd, S5K83A_VFLIP_TUNE, data, 1);
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        int err;
+        u8 data[1];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0x05;
+        err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
+        if (err < 0)
+                return err;
+
+        err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);
+        *val = (data[0] | 0x80) ? 1 : 0;
+
+        return (err < 0) ? err : 0;
+}
+
+int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        int err;
+        u8 data[1];
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        data[0] = 0x05;
+        err = s5k83a_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
+        if (err < 0)
+                return err;
+
+        err = s5k83a_read_sensor(sd, S5K83A_FLIP, data, 1);
+        if (err < 0)
+                return err;
+
+        /* set or zero seven bit, six is vflip */
+        data[0] = (val) ? (data[0] & 0x40) | 0x80 | S5K83A_FLIP_MASK
+                        : (data[0] & 0x40) | S5K83A_FLIP_MASK;
+        err = s5k83a_write_sensor(sd, S5K83A_FLIP, data, 1);
+        if (err < 0)
+                return err;
+
+        data[0] = (val) ? 0x0a : 0x0b;
+        err = s5k83a_write_sensor(sd, S5K83A_HFLIP_TUNE, data, 1);
+
+        return (err < 0) ? err : 0;
+}
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
new file mode 100644
index 000000000000..833708eb5a42
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
@@ -0,0 +1,484 @@
+/*
+ * Driver for the s5k83a sensor
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#ifndef M5602_S5K83A_H_
+#define M5602_S5K83A_H_
+
+#include "m5602_sensor.h"
+
+#define S5K83A_FLIP                             0x01
+#define S5K83A_HFLIP_TUNE               0x03
+#define S5K83A_VFLIP_TUNE               0x05
+#define S5K83A_WHITENESS                0x0a
+#define S5K83A_GAIN                             0x18
+#define S5K83A_BRIGHTNESS               0x1b
+#define S5K83A_PAGE_MAP                 0xec
+
+#define S5K83A_DEFAULT_BRIGHTNESS       0x71
+#define S5K83A_DEFAULT_WHITENESS        0x7e
+#define S5K83A_DEFAULT_GAIN                     0x00
+#define S5K83A_MAXIMUM_GAIN                     0x3c
+#define S5K83A_FLIP_MASK                        0x10
+
+
+/*****************************************************************************/
+
+/* Kernel module parameters */
+extern int force_sensor;
+extern int dump_sensor;
+extern unsigned int m5602_debug;
+
+
+int s5k83a_probe(struct sd *sd);
+int s5k83a_init(struct sd *sd);
+int s5k83a_power_down(struct sd *sd);
+
+void s5k83a_dump_registers(struct sd *sd);
+
+int s5k83a_read_sensor(struct sd *sd, const u8 address,
+                       u8 *i2c_data, const u8 len);
+int s5k83a_write_sensor(struct sd *sd, const u8 address,
+                        u8 *i2c_data, const u8 len);
+
+int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val);
+int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k83a_set_whiteness(struct gspca_dev *gspca_dev, __s32 val);
+int s5k83a_get_whiteness(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k83a_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int s5k83a_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+
+
+static struct m5602_sensor s5k83a = {
+        .name = "S5K83A",
+        .probe = s5k83a_probe,
+        .init = s5k83a_init,
+        .power_down = s5k83a_power_down,
+        .read_sensor = s5k83a_read_sensor,
+        .write_sensor = s5k83a_write_sensor,
+        .i2c_slave_id = 0x5a,
+        .nctrls = 5,
+        .ctrls = {
+        {
+                {
+                        .id = V4L2_CID_BRIGHTNESS,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "brightness",
+                        .minimum = 0x00,
+                        .maximum = 0xff,
+                        .step = 0x01,
+                        .default_value = S5K83A_DEFAULT_BRIGHTNESS,
+                        .flags = V4L2_CTRL_FLAG_SLIDER
+                },
+                        .set = s5k83a_set_brightness,
+                        .get = s5k83a_get_brightness
+
+        }, {
+                {
+                        .id = V4L2_CID_WHITENESS,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "whiteness",
+                        .minimum = 0x00,
+                        .maximum = 0xff,
+                        .step = 0x01,
+                        .default_value = S5K83A_DEFAULT_WHITENESS,
+                        .flags = V4L2_CTRL_FLAG_SLIDER
+                },
+                        .set = s5k83a_set_whiteness,
+                        .get = s5k83a_get_whiteness,
+        }, {
+                {
+                        .id = V4L2_CID_GAIN,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "gain",
+                        .minimum = 0x00,
+                        .maximum = S5K83A_MAXIMUM_GAIN,
+                        .step = 0x01,
+                        .default_value = S5K83A_DEFAULT_GAIN,
+                        .flags = V4L2_CTRL_FLAG_SLIDER
+                },
+                        .set = s5k83a_set_gain,
+                        .get = s5k83a_get_gain
+        }, {
+                {
+                        .id         = V4L2_CID_HFLIP,
+                        .type       = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name       = "horizontal flip",
+                        .minimum    = 0,
+                        .maximum    = 1,
+                        .step       = 1,
+                        .default_value  = 0
+                },
+                        .set = s5k83a_set_hflip,
+                        .get = s5k83a_get_hflip
+        }, {
+                {
+                 .id         = V4L2_CID_VFLIP,
+                .type       = V4L2_CTRL_TYPE_BOOLEAN,
+                .name       = "vertical flip",
+                .minimum    = 0,
+                .maximum    = 1,
+                .step       = 1,
+                .default_value  = 0
+                },
+                .set = s5k83a_set_vflip,
+                .get = s5k83a_get_vflip
+                }
+        },
+        .nmodes = 1,
+        .modes = {
+        {
+                M5602_DEFAULT_FRAME_WIDTH,
+                M5602_DEFAULT_FRAME_HEIGHT,
+                V4L2_PIX_FMT_SBGGR8,
+                V4L2_FIELD_NONE,
+                .sizeimage =
+                        M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
+                .bytesperline = M5602_DEFAULT_FRAME_WIDTH,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1
+        }
+        }
+};
+
+static const unsigned char preinit_s5k83a[][4] =
+{
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x0d, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_CTRL, 0x00, 0x00},
+
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x00, 0x00}
+};
+
+/* This could probably be considerably shortened.
+   I don't have the hardware to experiment with it, patches welcome
+*/
+static const unsigned char init_s5k83a[][4] =
+{
+        {SENSOR, S5K83A_PAGE_MAP, 0x04, 0x00},
+        {SENSOR, 0xaf, 0x01, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, 0x7b, 0xff, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x01, 0x50, 0x00},
+        {SENSOR, 0x12, 0x20, 0x00},
+        {SENSOR, 0x17, 0x40, 0x00},
+        {SENSOR, S5K83A_BRIGHTNESS, 0x0f, 0x00},
+        {SENSOR, 0x1c, 0x00, 0x00},
+        {SENSOR, 0x02, 0x70, 0x00},
+        {SENSOR, 0x03, 0x0b, 0x00},
+        {SENSOR, 0x04, 0xf0, 0x00},
+        {SENSOR, 0x05, 0x0b, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x87, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x06, 0x71, 0x00},
+        {SENSOR, 0x07, 0xe8, 0x00},
+        {SENSOR, 0x08, 0x02, 0x00},
+        {SENSOR, 0x09, 0x88, 0x00},
+        {SENSOR, 0x14, 0x00, 0x00},
+        {SENSOR, 0x15, 0x20, 0x00},
+        {SENSOR, 0x19, 0x00, 0x00},
+        {SENSOR, 0x1a, 0x98, 0x00},
+        {SENSOR, 0x0f, 0x02, 0x00},
+        {SENSOR, 0x10, 0xe5, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR_LONG, 0x14, 0x00, 0x20},
+        {SENSOR_LONG, 0x0d, 0x00, 0x7d},
+        {SENSOR_LONG, 0x1b, 0x0d, 0x05},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x87, 0x00},
+
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x04, 0x00},
+        {SENSOR, 0xaf, 0x01, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        /* ff ( init value )is very dark) || 71 and f0 better */
+        {SENSOR, 0x7b, 0xff, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x01, 0x50, 0x00},
+        {SENSOR, 0x12, 0x20, 0x00},
+        {SENSOR, 0x17, 0x40, 0x00},
+        {SENSOR, S5K83A_BRIGHTNESS, 0x0f, 0x00},
+        {SENSOR, 0x1c, 0x00, 0x00},
+        {SENSOR, 0x02, 0x70, 0x00},
+        /* some values like 0x10 give a blue-purple image */
+        {SENSOR, 0x03, 0x0b, 0x00},
+        {SENSOR, 0x04, 0xf0, 0x00},
+        {SENSOR, 0x05, 0x0b, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        /* under 80 don't work, highter depend on value */
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x7f, 0x00},
+
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x06, 0x71, 0x00},
+        {SENSOR, 0x07, 0xe8, 0x00},
+        {SENSOR, 0x08, 0x02, 0x00},
+        {SENSOR, 0x09, 0x88, 0x00},
+        {SENSOR, 0x14, 0x00, 0x00},
+        {SENSOR, 0x15, 0x20, 0x00},
+        {SENSOR, 0x19, 0x00, 0x00},
+        {SENSOR, 0x1a, 0x98, 0x00},
+        {SENSOR, 0x0f, 0x02, 0x00},
+        {SENSOR, 0x10, 0xe5, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR_LONG, 0x14, 0x00, 0x20},
+        {SENSOR_LONG, 0x0d, 0x00, 0x7d},
+        {SENSOR_LONG, 0x1b, 0x0d, 0x05},
+
+        /* The following sequence is useless after a clean boot
+           but is necessary after resume from suspend */
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x08, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x3f, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_L, 0xff, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0x80, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_DIV, 0x02, 0x00},
+        {BRIDGE, M5602_XB_MCU_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xf0, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR, 0x1d, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT, 0x1c, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DIR_H, 0x06, 0x00},
+        {BRIDGE, M5602_XB_GPIO_DAT_H, 0x00, 0x00},
+        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
+        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x20, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x04, 0x00},
+        {SENSOR, 0xaf, 0x01, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x00, 0x00},
+        {SENSOR, 0x7b, 0xff, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x01, 0x50, 0x00},
+        {SENSOR, 0x12, 0x20, 0x00},
+        {SENSOR, 0x17, 0x40, 0x00},
+        {SENSOR, S5K83A_BRIGHTNESS, 0x0f, 0x00},
+        {SENSOR, 0x1c, 0x00, 0x00},
+        {SENSOR, 0x02, 0x70, 0x00},
+        {SENSOR, 0x03, 0x0b, 0x00},
+        {SENSOR, 0x04, 0xf0, 0x00},
+        {SENSOR, 0x05, 0x0b, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x06, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+        {BRIDGE, M5602_XB_ADC_CTRL, 0xc0, 0x00},
+        {BRIDGE, M5602_XB_SENSOR_TYPE, 0x09, 0x00},
+        {BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x81, 0x00},
+        {BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x01, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0xe4, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_VSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x00, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x02, 0x00},
+        {BRIDGE, M5602_XB_HSYNC_PARA, 0x7f, 0x00},
+        {BRIDGE, M5602_XB_SIG_INI, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x00, 0x00},
+        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0, 0x00},
+
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, 0x06, 0x71, 0x00},
+        {SENSOR, 0x07, 0xe8, 0x00},
+        {SENSOR, 0x08, 0x02, 0x00},
+        {SENSOR, 0x09, 0x88, 0x00},
+        {SENSOR, 0x14, 0x00, 0x00},
+        {SENSOR, 0x15, 0x20, 0x00},
+        {SENSOR, 0x19, 0x00, 0x00},
+        {SENSOR, 0x1a, 0x98, 0x00},
+        {SENSOR, 0x0f, 0x02, 0x00},
+
+        {SENSOR, 0x10, 0xe5, 0x00},
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR_LONG, 0x14, 0x00, 0x20},
+        {SENSOR_LONG, 0x0d, 0x00, 0x7d},
+        {SENSOR_LONG, 0x1b, 0x0d, 0x05},
+
+        /* normal colors
+           (this is value after boot, but after tries can be different) */
+        {SENSOR, 0x00, 0x06, 0x00},
+
+        /* set default brightness */
+        {SENSOR_LONG, 0x14, 0x00, 0x20},
+        {SENSOR_LONG, 0x0d, 0x01, 0x00},
+        {SENSOR_LONG, 0x1b, S5K83A_DEFAULT_BRIGHTNESS >> 3,
+                            S5K83A_DEFAULT_BRIGHTNESS >> 1},
+
+        /* set default whiteness */
+        {SENSOR, S5K83A_WHITENESS, S5K83A_DEFAULT_WHITENESS, 0x00},
+
+        /* set default gain */
+        {SENSOR_LONG, 0x18, 0x00, S5K83A_DEFAULT_GAIN},
+
+        /* set default flip */
+        {SENSOR, S5K83A_PAGE_MAP, 0x05, 0x00},
+        {SENSOR, S5K83A_FLIP, 0x00 | S5K83A_FLIP_MASK, 0x00},
+        {SENSOR, S5K83A_HFLIP_TUNE, 0x0b, 0x00},
+        {SENSOR, S5K83A_VFLIP_TUNE, 0x0a, 0x00}
+
+};
+
+#endif
diff --git a/drivers/media/video/gspca/m5602/m5602_sensor.h b/drivers/media/video/gspca/m5602/m5602_sensor.h
new file mode 100644
index 000000000000..930fcaab4416
--- /dev/null
+++ b/drivers/media/video/gspca/m5602/m5602_sensor.h
@@ -0,0 +1,76 @@
+/*
+ * USB Driver for ALi m5602 based webcams
+ *
+ * Copyright (C) 2008 Erik Andren
+ * Copyright (C) 2007 Ilyes Gouta. Based on the m5603x Linux Driver Project.
+ * Copyright (C) 2005 m5603x Linux Driver Project <m5602@x3ng.com.br>
+ *
+ * Portions of code to USB interface and ALi driver software,
+ * Copyright (c) 2006 Willem Duinker
+ * v4l2 interface modeled after the V4L2 driver
+ * for SN9C10x PC Camera Controllers
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ *
+ */
+
+#ifndef M5602_SENSOR_H_
+#define M5602_SENSOR_H_
+
+#include "m5602_bridge.h"
+
+#define M5602_DEFAULT_FRAME_WIDTH  640
+#define M5602_DEFAULT_FRAME_HEIGHT 480
+
+#define M5602_MAX_CTRLS         (V4L2_CID_LASTP1 - V4L2_CID_BASE + 10)
+
+/* Enumerates all supported sensors */
+enum sensors {
+        OV9650_SENSOR   = 1,
+        S5K83A_SENSOR   = 2,
+        S5K4AA_SENSOR   = 3,
+        MT9M111_SENSOR  = 4,
+        PO1030_SENSOR   = 5
+};
+
+/* Enumerates all possible instruction types */
+enum instruction {
+        BRIDGE,
+        SENSOR,
+        SENSOR_LONG
+};
+
+struct m5602_sensor {
+        /* Defines the name of a sensor */
+        char name[32];
+
+        /* What i2c address the sensor is connected to */
+        u8 i2c_slave_id;
+
+        /* Probes if the sensor is connected */
+        int (*probe)(struct sd *sd);
+
+        /* Performs a initialization sequence */
+        int (*init)(struct sd *sd);
+
+        /* Performs a power down sequence */
+        int (*power_down)(struct sd *sd);
+
+        /* Reads a sensor register */
+        int (*read_sensor)(struct sd *sd, const u8 address,
+              u8 *i2c_data, const u8 len);
+
+        /* Writes to a sensor register */
+        int (*write_sensor)(struct sd *sd, const u8 address,
+              u8 *i2c_data, const u8 len);
+
+        int nctrls;
+        struct ctrl ctrls[M5602_MAX_CTRLS];
+
+        char nmodes;
+        struct v4l2_pix_format modes[];
+};
+
+#endif
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index 4d5db47ba8cb..277ca34a8817 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -134,7 +134,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         int err_code;
         __u8 *data;
@@ -143,9 +143,10 @@ static void sd_start(struct gspca_dev *gspca_dev)
         int intpipe;
 
         PDEBUG(D_STREAM, "camera start, iface %d, alt 8", gspca_dev->iface);
-        if (usb_set_interface(gspca_dev->dev, gspca_dev->iface, 8) < 0) {
+        err_code = usb_set_interface(gspca_dev->dev, gspca_dev->iface, 8);
+        if (err_code < 0) {
                 PDEBUG(D_ERR|D_STREAM, "Set packet size: set interface error");
-                return;
+                return err_code;
         }
 
         data = gspca_dev->usb_buf;
@@ -154,7 +155,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
         err_code = reg_w(gspca_dev, data[0], 2);
         if (err_code < 0)
-                return;
+                return err_code;
 
         /*
            Initialize the MR97113 chip register
@@ -180,14 +181,14 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
         err_code = reg_w(gspca_dev, data[0], 11);
         if (err_code < 0)
-                return;
+                return err_code;
 
         data[0] = 0x23;         /* address */
         data[1] = 0x09;         /* reg 35, append frame header */
 
         err_code = reg_w(gspca_dev, data[0], 2);
         if (err_code < 0)
-                return;
+                return err_code;
 
         data[0] = 0x3c;         /* address */
 /*      if (gspca_dev->width == 1280) */
@@ -198,7 +199,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                                  *      (unit: 4KB) 200KB */
         err_code = reg_w(gspca_dev, data[0], 2);
         if (err_code < 0)
-                return;
+                return err_code;
 
         if (0) {                        /* fixed dark-gain */
                 data[1] = 0;            /* reg 94, Y Gain (1.75) */
@@ -240,13 +241,13 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
         err_code = reg_w(gspca_dev, data[0], 6);
         if (err_code < 0)
-                return;
+                return err_code;
 
         data[0] = 0x67;
         data[1] = 0x13;         /* reg 103, first pixel B, disable sharpness */
         err_code = reg_w(gspca_dev, data[0], 2);
         if (err_code < 0)
-                return;
+                return err_code;
 
         /*
          * initialize the value of MI sensor...
@@ -326,6 +327,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         data[0] = 0x00;
         data[1] = 0x4d;         /* ISOC transfering enable... */
         reg_w(gspca_dev, data[0], 2);
+        return err_code;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index 4df4eec9f7e7..ca671194679e 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -1854,7 +1854,7 @@ static int set_ov_sensor_window(struct sd *sd)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int ret;
@@ -1871,9 +1871,10 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 goto out;
         PDEBUG(D_STREAM, "camera started alt: 0x%02x", gspca_dev->alt);
         ov51x_led_control(sd, 1);
-        return;
+        return 0;
 out:
         PDEBUG(D_ERR, "camera start error:%d", ret);
+        return ret;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index 83b5f740c947..0b0c573d06da 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -281,7 +281,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         __u8 mode;
@@ -323,6 +323,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         sd->sof_read = 0;
         sd->autogain_ignore_frames = 0;
         atomic_set(&sd->avg_lum, -1);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -534,6 +535,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
         {USB_DEVICE(0x093a, 0x2470)},
         {USB_DEVICE(0x093a, 0x2471)},
         {USB_DEVICE(0x093a, 0x2472)},
+        {USB_DEVICE(0x093a, 0x2476)},
         {USB_DEVICE(0x2001, 0xf115)},
         {}
 };
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index ba865b7f1ed8..e5ff9a6199ef 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -675,7 +675,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -724,6 +724,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 reg_w(gspca_dev, 0x78, 0x01);
         else
                 reg_w(gspca_dev, 0x78, 0x05);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 12b81ae526b7..6c69bc7778fc 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -490,7 +490,7 @@ static const __u8 tas5130_sensor_init[][8] = {
         {0x30, 0x11, 0x02, 0x20, 0x70, 0x00, 0x00, 0x10},
 };
 
-struct sensor_data sensor_data[] = {
+static struct sensor_data sensor_data[] = {
 SENS(initHv7131, NULL, hv7131_sensor_init, NULL, NULL, 0, NO_EXPO|NO_FREQ, 0),
 SENS(initOv6650, NULL, ov6650_sensor_init, NULL, NULL, F_GAIN|F_SIF, 0, 0x60),
 SENS(initOv7630, initOv7630_3, ov7630_sensor_init, NULL, ov7630_sensor_init_3,
@@ -892,7 +892,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam = &gspca_dev->cam;
@@ -976,6 +976,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         sd->frames_to_drop = 0;
         sd->autogain_ignore_frames = 0;
         atomic_set(&sd->avg_lum, -1);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 572b0f363b64..53cb82d9e7c6 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -39,6 +39,7 @@ struct sd {
         unsigned char contrast;
         unsigned char colors;
         unsigned char autogain;
+        __u8 vflip;                     /* ov7630 only */
 
         signed char ag_cnt;
 #define AG_CNT_START 13
@@ -70,6 +71,8 @@ static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
 static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val);
 
 static struct ctrl sd_ctrls[] = {
         {
@@ -131,6 +134,22 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_setautogain,
             .get = sd_getautogain,
         },
+/* ov7630 only */
+#define VFLIP_IDX 4
+        {
+            {
+                .id      = V4L2_CID_VFLIP,
+                .type    = V4L2_CTRL_TYPE_BOOLEAN,
+                .name    = "Vflip",
+                .minimum = 0,
+                .maximum = 1,
+                .step    = 1,
+#define VFLIP_DEF 1
+                .default_value = VFLIP_DEF,
+            },
+            .set = sd_setvflip,
+            .get = sd_getvflip,
+        },
 };
 
 static struct v4l2_pix_format vga_mode[] = {
@@ -248,10 +267,12 @@ static const __u8 gamma_def[] = {
         0xa6, 0xb2, 0xbf, 0xca, 0xd5, 0xe0, 0xeb, 0xf5, 0xff
 };
 
+/* color matrix and offsets */
 static const __u8 reg84[] = {
-        0x14, 0x00, 0x27, 0x00, 0x07, 0x00, 0xe5, 0x0f,
-        0xe4, 0x0f, 0x38, 0x00, 0x3e, 0x00, 0xc3, 0x0f,
-        0xf7, 0x0f, 0x00, 0x00, 0x00
+        0x14, 0x00, 0x27, 0x00, 0x07, 0x00,     /* YR YG YB gains */
+        0xe8, 0x0f, 0xda, 0x0f, 0x40, 0x00,     /* UR UG UB */
+        0x3e, 0x00, 0xcd, 0x0f, 0xf7, 0x0f,     /* VR VG VB */
+        0x00, 0x00, 0x00                        /* YUV offsets */
 };
 static const __u8 hv7131r_sensor_init[][8] = {
         {0xC1, 0x11, 0x01, 0x08, 0x01, 0x00, 0x00, 0x10},
@@ -434,7 +455,8 @@ static const __u8 ov7630_sensor_init[][8] = {
         {0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},
         {0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},
 /*fixme: + 0x12, 0x04*/
-        {0xa1, 0x21, 0x75, 0x82, 0x00, 0x00, 0x00, 0x10},
+/*      {0xa1, 0x21, 0x75, 0x82, 0x00, 0x00, 0x00, 0x10},  * COMN
+                                                         * set by setvflip */
         {0xa1, 0x21, 0x10, 0x32, 0x00, 0x00, 0x00, 0x10},
         {0xa1, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10},
         {0xb1, 0x21, 0x01, 0x80, 0x80, 0x00, 0x00, 0x10},
@@ -949,6 +971,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 gspca_dev->ctrl_dis = (1 << AUTOGAIN_IDX);
                 break;
         }
+        if (sd->sensor != SENSOR_OV7630)
+                gspca_dev->ctrl_dis |= (1 << VFLIP_IDX);
 
         return 0;
 }
@@ -1080,20 +1104,17 @@ static unsigned int setexposure(struct gspca_dev *gspca_dev,
 static void setbrightcont(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        unsigned val;
+        int val;
         __u8 reg84_full[0x15];
 
-        memset(reg84_full, 0, sizeof reg84_full);
-        val = sd->contrast * 0x20 / CONTRAST_MAX + 0x10;        /* 10..30 */
-        reg84_full[2] = val;
-        reg84_full[0] = (val + 1) / 2;
-        reg84_full[4] = (val + 1) / 5;
-        if (val > BRIGHTNESS_DEF)
-                val = (sd->brightness - BRIGHTNESS_DEF) * 0x20
+        memcpy(reg84_full, reg84, sizeof reg84_full);
+        val = sd->contrast * 0x30 / CONTRAST_MAX + 0x10;        /* 10..40 */
+        reg84_full[0] = (val + 1) / 2;          /* red */
+        reg84_full[2] = val;                    /* green */
+        reg84_full[4] = (val + 1) / 5;          /* blue */
+        val = (sd->brightness - BRIGHTNESS_DEF) * 0x10
                         / BRIGHTNESS_MAX;
-        else
-                val = 0;
-        reg84_full[0x12] = val;                 /* 00..1f */
+        reg84_full[0x12] = val & 0x1f;          /* 5:0 signed value */
         reg_w(gspca_dev, 0x84, reg84_full, sizeof reg84_full);
 }
 
@@ -1172,8 +1193,16 @@ static void setautogain(struct gspca_dev *gspca_dev)
                 sd->ag_cnt = -1;
 }
 
+static void setvflip(struct sd *sd)
+{
+        if (sd->sensor != SENSOR_OV7630)
+                return;
+        i2c_w1(&sd->gspca_dev, 0x75,                    /* COMN */
+                sd->vflip ? 0x82 : 0x02);
+}
+
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int i;
@@ -1263,6 +1292,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 break;
         case SENSOR_OV7630:
                 ov7630_InitSensor(gspca_dev);
+                setvflip(sd);
                 reg17 = 0xe2;
                 reg1 = 0x44;
                 break;
@@ -1320,12 +1350,16 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 setbrightness(gspca_dev);
                 setcontrast(gspca_dev);
                 break;
+        case SENSOR_OV7630:
+                setvflip(sd);
+                /* fall thru */
         default:                        /* OV76xx */
                 setbrightcont(gspca_dev);
                 break;
         }
         setautogain(gspca_dev);
         reg_w1(gspca_dev, 0x01, reg1);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -1546,6 +1580,24 @@ static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
         return 0;
 }
 
+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        sd->vflip = val;
+        if (gspca_dev->streaming)
+                setvflip(sd);
+        return 0;
+}
+
+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        *val = sd->vflip;
+        return 0;
+}
+
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
@@ -1567,6 +1619,7 @@ static const struct sd_desc sd_desc = {
 static const __devinitdata struct usb_device_id device_table[] = {
 #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
         {USB_DEVICE(0x0458, 0x7025), BSI(SN9C120, MI0360, 0x5d)},
+        {USB_DEVICE(0x0458, 0x702e), BSI(SN9C120, OV7660, 0x21)},
         {USB_DEVICE(0x045e, 0x00f5), BSI(SN9C105, OV7660, 0x21)},
         {USB_DEVICE(0x045e, 0x00f7), BSI(SN9C105, OV7660, 0x21)},
         {USB_DEVICE(0x0471, 0x0327), BSI(SN9C105, MI0360, 0x5d)},
@@ -1588,7 +1641,9 @@ static const __devinitdata struct usb_device_id device_table[] = {
 /*      {USB_DEVICE(0x0c45, 0x60fa), BSI(SN9C105, OV7648, 0x??)}, */
         {USB_DEVICE(0x0c45, 0x60fb), BSI(SN9C105, OV7660, 0x21)},
         {USB_DEVICE(0x0c45, 0x60fc), BSI(SN9C105, HV7131R, 0x11)},
-/*      {USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x??)}, */
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
+        {USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x21)},
+#endif
 /*      {USB_DEVICE(0x0c45, 0x6108), BSI(SN9C120, OM6801, 0x??)}, */
 /*      {USB_DEVICE(0x0c45, 0x6122), BSI(SN9C110, ICM105C, 0x??)}, */
 /*      {USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index 6e733901fcca..bca106c153fa 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -660,7 +660,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int err;
@@ -867,6 +867,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 write_vector(gspca_dev, Clicksmart510_defaults);
                 break;
         }
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index e9eb59bae4fb..b742f260c7ca 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -1980,7 +1980,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
         int mode;
@@ -2012,6 +2012,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         setbrightness(gspca_dev);
         setcontrast(gspca_dev);
         setcolors(gspca_dev);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index f601daf19ebe..b345749213cf 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -688,7 +688,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
         int ret;
@@ -733,6 +733,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
 /*      reg_write(dev, 0x5, 0x0, 0x0); */
 /*      reg_write(dev, 0x5, 0x0, 0x1); */
 /*      reg_write(dev, 0x5, 0x11, 0x2); */
+        return ret;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c
index 195dce96ef06..645ee9d44d02 100644
--- a/drivers/media/video/gspca/spca506.c
+++ b/drivers/media/video/gspca/spca506.c
@@ -422,7 +422,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
         __u16 norme;
@@ -549,6 +549,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         PDEBUG(D_STREAM, "webcam started");
         spca506_GetNormeInput(gspca_dev, &norme, &channel);
         spca506_SetNormeInput(gspca_dev, norme, channel);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index 281ce02103a3..63ec902c895d 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -1528,7 +1528,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         int mode;
 
@@ -1546,6 +1546,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 break;
         }
         reg_write(gspca_dev->dev, 0x8112, 0x10 | 0x20);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 95fcfcb9e31b..020a03c466c1 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -152,7 +152,7 @@ static void reg_w_val(struct usb_device *dev, __u16 index, __u8 value)
 
         ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                               0,                /* request */
-                              USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                               value, index, NULL, 0, 500);
         PDEBUG(D_USBO, "reg write: 0x%02x:0x%02x", index, value);
         if (ret < 0)
@@ -699,7 +699,7 @@ static void setautogain(struct gspca_dev *gspca_dev)
                 sd->ag_cnt = -1;
 }
 
-static void sd_start_12a(struct gspca_dev *gspca_dev)
+static int sd_start_12a(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
         int Clck = 0x8a; /* lower 0x8X values lead to fps > 30 */
@@ -725,8 +725,9 @@ static void sd_start_12a(struct gspca_dev *gspca_dev)
         setwhite(gspca_dev);
         setautogain(gspca_dev);
         setexposure(gspca_dev);
+        return 0;
 }
-static void sd_start_72a(struct gspca_dev *gspca_dev)
+static int sd_start_72a(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
         int Clck;
@@ -750,6 +751,7 @@ static void sd_start_72a(struct gspca_dev *gspca_dev)
         reg_w_val(dev, 0x8700, Clck);   /* 0x27 clock */
         reg_w_val(dev, 0x8112, 0x10 | 0x20);
         setautogain(gspca_dev);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -1064,7 +1066,7 @@ static struct ctrl sd_ctrls_12a[] = {
             {
                 .id = V4L2_CID_DO_WHITE_BALANCE,
                 .type = V4L2_CTRL_TYPE_INTEGER,
-                .name = "While Balance",
+                .name = "White Balance",
                 .minimum = WHITE_MIN,
                 .maximum = WHITE_MAX,
                 .step = 1,
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 2f2de429e273..d9d64911f22a 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -324,7 +324,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         int ret, value;
 
@@ -374,9 +374,10 @@ static void sd_start(struct gspca_dev *gspca_dev)
         set_par(gspca_dev, 0x01000000);
         set_par(gspca_dev, 0x01000000);
         PDEBUG(D_STREAM, "camera started alt: 0x%02x", gspca_dev->alt);
-        return;
+        return 0;
 out:
         PDEBUG(D_ERR|D_STREAM, "camera start err %d", ret);
+        return ret;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index 1cfcc6c49558..bd9288665a80 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -961,7 +961,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct usb_device *dev = gspca_dev->dev;
@@ -1042,6 +1042,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 break;
         }
         sp5xx_initContBrigHueRegisters(gspca_dev);
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index f034c748fc7e..b561f7c4f066 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -28,8 +28,6 @@
 
 #include "gspca.h"
 
-#define MAX_GAMMA 0x10          /* 0 to 15 */
-
 #define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0)
 
 MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>");
@@ -49,6 +47,10 @@ struct sd {
         unsigned char whitebalance;
         unsigned char mirror;
         unsigned char effect;
+
+        __u8 sensor;
+#define SENSOR_TAS5130A 0
+#define SENSOR_OTHER 1
 };
 
 /* V4L2 controls supported by the driver */
@@ -83,9 +85,9 @@ static struct ctrl sd_ctrls[] = {
           .type = V4L2_CTRL_TYPE_INTEGER,
           .name = "Brightness",
           .minimum = 0,
-          .maximum = 0x0f,
+          .maximum = 14,
           .step = 1,
-          .default_value = 0x09,
+          .default_value = 8,
           },
          .set = sd_setbrightness,
          .get = sd_getbrightness,
@@ -118,16 +120,17 @@ static struct ctrl sd_ctrls[] = {
          .set = sd_setcolors,
          .get = sd_getcolors,
          },
-#define SD_GAMMA 3
+#define GAMMA_MAX 16
+#define GAMMA_DEF 10
         {
          {
           .id = V4L2_CID_GAMMA, /* (gamma on win) */
           .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Gamma (Untested)",
+          .name = "Gamma",
           .minimum = 0,
-          .maximum = MAX_GAMMA,
+          .maximum = GAMMA_MAX - 1,
           .step = 1,
-          .default_value = 0x09,
+          .default_value = GAMMA_DEF,
           },
          .set = sd_setgamma,
          .get = sd_getgamma,
@@ -197,7 +200,7 @@ static struct ctrl sd_ctrls[] = {
           .type = V4L2_CTRL_TYPE_INTEGER,
           .name = "Sharpness",
           .minimum = 0,
-          .maximum = MAX_GAMMA, /* 0 to 16 */
+          .maximum = 15,
           .step = 1,
           .default_value = 0x06,
           },
@@ -258,7 +261,6 @@ static struct v4l2_pix_format vga_mode_t16[] = {
                 .priv = 0},
 };
 
-#define T16_OFFSET_DATA 631
 #define MAX_EFFECTS 7
 /* easily done by soft, this table could be removed,
  * i keep it here just in case */
@@ -272,87 +274,87 @@ static const __u8 effects_table[MAX_EFFECTS][6] = {
         {0xa8, 0xc8, 0xc6, 0xd2, 0xc0, 0x40},   /* Negative */
 };
 
-static const __u8 gamma_table[MAX_GAMMA][34] = {
-        {0x90, 0x00, 0x91, 0x3e, 0x92, 0x69, 0x93, 0x85,
+static const __u8 gamma_table[GAMMA_MAX][34] = {
+        {0x90, 0x00, 0x91, 0x3e, 0x92, 0x69, 0x93, 0x85,        /* 0 */
          0x94, 0x95, 0x95, 0xa1, 0x96, 0xae, 0x97, 0xb9,
          0x98, 0xc2, 0x99, 0xcb, 0x9a, 0xd4, 0x9b, 0xdb,
          0x9c, 0xe3, 0x9d, 0xea, 0x9e, 0xf1, 0x9f, 0xf8,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x33, 0x92, 0x5A, 0x93, 0x75,
-         0x94, 0x85, 0x95, 0x93, 0x96, 0xA1, 0x97, 0xAD,
-         0x98, 0xB7, 0x99, 0xC2, 0x9A, 0xCB, 0x9B, 0xD4,
-         0x9C, 0xDE, 0x9D, 0xE7, 0x9E, 0xF0, 0x9F, 0xF7,
+        {0x90, 0x00, 0x91, 0x33, 0x92, 0x5a, 0x93, 0x75,        /* 1 */
+         0x94, 0x85, 0x95, 0x93, 0x96, 0xa1, 0x97, 0xad,
+         0x98, 0xb7, 0x99, 0xc2, 0x9a, 0xcb, 0x9b, 0xd4,
+         0x9c, 0xde, 0x9D, 0xe7, 0x9e, 0xf0, 0x9f, 0xf7,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x2F, 0x92, 0x51, 0x93, 0x6B,
-         0x94, 0x7C, 0x95, 0x8A, 0x96, 0x99, 0x97, 0xA6,
-         0x98, 0xB1, 0x99, 0xBC, 0x9A, 0xC6, 0x9B, 0xD0,
-         0x9C, 0xDB, 0x9D, 0xE4, 0x9E, 0xED, 0x9F, 0xF6,
+        {0x90, 0x00, 0x91, 0x2f, 0x92, 0x51, 0x93, 0x6b,        /* 2 */
+         0x94, 0x7c, 0x95, 0x8a, 0x96, 0x99, 0x97, 0xa6,
+         0x98, 0xb1, 0x99, 0xbc, 0x9a, 0xc6, 0x9b, 0xd0,
+         0x9c, 0xdb, 0x9d, 0xe4, 0x9e, 0xed, 0x9f, 0xf6,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x29, 0x92, 0x48, 0x93, 0x60,
-         0x94, 0x72, 0x95, 0x81, 0x96, 0x90, 0x97, 0x9E,
-         0x98, 0xAA, 0x99, 0xB5, 0x9A, 0xBF, 0x9B, 0xCB,
-         0x9C, 0xD6, 0x9D, 0xE1, 0x9E, 0xEB, 0x9F, 0xF5,
+        {0x90, 0x00, 0x91, 0x29, 0x92, 0x48, 0x93, 0x60,        /* 3 */
+         0x94, 0x72, 0x95, 0x81, 0x96, 0x90, 0x97, 0x9e,
+         0x98, 0xaa, 0x99, 0xb5, 0x9a, 0xbf, 0x9b, 0xcb,
+         0x9c, 0xd6, 0x9d, 0xe1, 0x9e, 0xeb, 0x9f, 0xf5,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x23, 0x92, 0x3F, 0x93, 0x55,
+        {0x90, 0x00, 0x91, 0x23, 0x92, 0x3f, 0x93, 0x55,        /* 4 */
          0x94, 0x68, 0x95, 0x77, 0x96, 0x86, 0x97, 0x95,
-         0x98, 0xA2, 0x99, 0xAD, 0x9A, 0xB9, 0x9B, 0xC6,
-         0x9C, 0xD2, 0x9D, 0xDE, 0x9E, 0xE9, 0x9F, 0xF4,
+         0x98, 0xa2, 0x99, 0xad, 0x9a, 0xb9, 0x9b, 0xc6,
+         0x9c, 0xd2, 0x9d, 0xde, 0x9e, 0xe9, 0x9f, 0xf4,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x1B, 0x92, 0x33, 0x93, 0x48,
+        {0x90, 0x00, 0x91, 0x1b, 0x92, 0x33, 0x93, 0x48,        /* 5 */
          0x94, 0x59, 0x95, 0x69, 0x96, 0x79, 0x97, 0x87,
-         0x98, 0x96, 0x99, 0xA3, 0x9A, 0xB1, 0x9B, 0xBE,
-         0x9C, 0xCC, 0x9D, 0xDA, 0x9E, 0xE7, 0x9F, 0xF3,
+         0x98, 0x96, 0x99, 0xa3, 0x9a, 0xb1, 0x9b, 0xbe,
+         0x9c, 0xcc, 0x9d, 0xda, 0x9e, 0xe7, 0x9f, 0xf3,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x02, 0x92, 0x10, 0x93, 0x20,
+        {0x90, 0x00, 0x91, 0x02, 0x92, 0x10, 0x93, 0x20,        /* 6 */
          0x94, 0x32, 0x95, 0x40, 0x96, 0x57, 0x97, 0x67,
          0x98, 0x77, 0x99, 0x88, 0x9a, 0x99, 0x9b, 0xaa,
          0x9c, 0xbb, 0x9d, 0xcc, 0x9e, 0xdd, 0x9f, 0xee,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x02, 0x92, 0x14, 0x93, 0x26,
-         0x94, 0x38, 0x95, 0x4A, 0x96, 0x60, 0x97, 0x70,
-         0x98, 0x80, 0x99, 0x90, 0x9A, 0xA0, 0x9B, 0xB0,
-         0x9C, 0xC0, 0x9D, 0xD0, 0x9E, 0xE0, 0x9F, 0xF0,
+        {0x90, 0x00, 0x91, 0x02, 0x92, 0x14, 0x93, 0x26,        /* 7 */
+         0x94, 0x38, 0x95, 0x4a, 0x96, 0x60, 0x97, 0x70,
+         0x98, 0x80, 0x99, 0x90, 0x9a, 0xa0, 0x9b, 0xb0,
+         0x9c, 0xc0, 0x9D, 0xd0, 0x9e, 0xe0, 0x9f, 0xf0,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x10, 0x92, 0x22, 0x93, 0x35,
-         0x94, 0x47, 0x95, 0x5A, 0x96, 0x69, 0x97, 0x79,
-         0x98, 0x88, 0x99, 0x97, 0x9A, 0xA7, 0x9B, 0xB6,
-         0x9C, 0xC4, 0x9D, 0xD3, 0x9E, 0xE0, 0x9F, 0xF0,
+        {0x90, 0x00, 0x91, 0x10, 0x92, 0x22, 0x93, 0x35,        /* 8 */
+         0x94, 0x47, 0x95, 0x5a, 0x96, 0x69, 0x97, 0x79,
+         0x98, 0x88, 0x99, 0x97, 0x9a, 0xa7, 0x9b, 0xb6,
+         0x9c, 0xc4, 0x9d, 0xd3, 0x9e, 0xe0, 0x9f, 0xf0,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x10, 0x92, 0x26, 0x93, 0x40,
+        {0x90, 0x00, 0x91, 0x10, 0x92, 0x26, 0x93, 0x40,        /* 9 */
          0x94, 0x54, 0x95, 0x65, 0x96, 0x75, 0x97, 0x84,
          0x98, 0x93, 0x99, 0xa1, 0x9a, 0xb0, 0x9b, 0xbd,
          0x9c, 0xca, 0x9d, 0xd6, 0x9e, 0xe0, 0x9f, 0xf0,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x18, 0x92, 0x2B, 0x93, 0x44,
-         0x94, 0x60, 0x95, 0x70, 0x96, 0x80, 0x97, 0x8E,
-         0x98, 0x9C, 0x99, 0xAA, 0x9A, 0xB7, 0x9B, 0xC4,
-         0x9C, 0xD0, 0x9D, 0xD8, 0x9E, 0xE2, 0x9F, 0xF0,
+        {0x90, 0x00, 0x91, 0x18, 0x92, 0x2b, 0x93, 0x44,        /* 10 */
+         0x94, 0x60, 0x95, 0x70, 0x96, 0x80, 0x97, 0x8e,
+         0x98, 0x9c, 0x99, 0xaa, 0x9a, 0xb7, 0x9b, 0xc4,
+         0x9c, 0xd0, 0x9d, 0xd8, 0x9e, 0xe2, 0x9f, 0xf0,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x1A, 0x92, 0x34, 0x93, 0x52,
-         0x94, 0x66, 0x95, 0x7E, 0x96, 0x8D, 0x97, 0x9B,
-         0x98, 0xA8, 0x99, 0xB4, 0x9A, 0xC0, 0x9B, 0xCB,
-         0x9C, 0xD6, 0x9D, 0xE1, 0x9E, 0xEB, 0x9F, 0xF5,
+        {0x90, 0x00, 0x91, 0x1a, 0x92, 0x34, 0x93, 0x52,        /* 11 */
+         0x94, 0x66, 0x95, 0x7e, 0x96, 0x8D, 0x97, 0x9B,
+         0x98, 0xa8, 0x99, 0xb4, 0x9a, 0xc0, 0x9b, 0xcb,
+         0x9c, 0xd6, 0x9d, 0xe1, 0x9e, 0xeb, 0x9f, 0xf5,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x3F, 0x92, 0x5A, 0x93, 0x6E,
-         0x94, 0x7F, 0x95, 0x8E, 0x96, 0x9C, 0x97, 0xA8,
-         0x98, 0xB4, 0x99, 0xBF, 0x9A, 0xC9, 0x9B, 0xD3,
-         0x9C, 0xDC, 0x9D, 0xE5, 0x9E, 0xEE, 0x9F, 0xF6,
-         0xA0, 0xFF},
-        {0x90, 0x00, 0x91, 0x54, 0x92, 0x6F, 0x93, 0x83,
-         0x94, 0x93, 0x95, 0xA0, 0x96, 0xAD, 0x97, 0xB7,
-         0x98, 0xC2, 0x99, 0xCB, 0x9A, 0xD4, 0x9B, 0xDC,
-         0x9C, 0xE4, 0x9D, 0xEB, 0x9E, 0xF2, 0x9F, 0xF9,
+        {0x90, 0x00, 0x91, 0x3f, 0x92, 0x5a, 0x93, 0x6e,        /* 12 */
+         0x94, 0x7f, 0x95, 0x8e, 0x96, 0x9c, 0x97, 0xa8,
+         0x98, 0xb4, 0x99, 0xbf, 0x9a, 0xc9, 0x9b, 0xd3,
+         0x9c, 0xdc, 0x9d, 0xe5, 0x9e, 0xee, 0x9f, 0xf6,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x6E, 0x92, 0x88, 0x93, 0x9A,
-         0x94, 0xA8, 0x95, 0xB3, 0x96, 0xBD, 0x97, 0xC6,
-         0x98, 0xCF, 0x99, 0xD6, 0x9A, 0xDD, 0x9B, 0xE3,
-         0x9C, 0xE9, 0x9D, 0xEF, 0x9E, 0xF4, 0x9F, 0xFA,
+        {0x90, 0x00, 0x91, 0x54, 0x92, 0x6f, 0x93, 0x83,        /* 13 */
+         0x94, 0x93, 0x95, 0xa0, 0x96, 0xad, 0x97, 0xb7,
+         0x98, 0xc2, 0x99, 0xcb, 0x9a, 0xd4, 0x9b, 0xdc,
+         0x9c, 0xe4, 0x9d, 0xeb, 0x9e, 0xf2, 0x9f, 0xf9,
          0xa0, 0xff},
-        {0x90, 0x00, 0x91, 0x93, 0x92, 0xA8, 0x93, 0xB7,
-         0x94, 0xC1, 0x95, 0xCA, 0x96, 0xD2, 0x97, 0xD8,
-         0x98, 0xDE, 0x99, 0xE3, 0x9A, 0xE8, 0x9B, 0xED,
-         0x9C, 0xF1, 0x9D, 0xF5, 0x9E, 0xF8, 0x9F, 0xFC,
-         0xA0, 0xFF}
+        {0x90, 0x00, 0x91, 0x6e, 0x92, 0x88, 0x93, 0x9a,        /* 14 */
+         0x94, 0xa8, 0x95, 0xb3, 0x96, 0xbd, 0x97, 0xc6,
+         0x98, 0xcf, 0x99, 0xd6, 0x9a, 0xdd, 0x9b, 0xe3,
+         0x9c, 0xe9, 0x9d, 0xef, 0x9e, 0xf4, 0x9f, 0xfa,
+         0xa0, 0xff},
+        {0x90, 0x00, 0x91, 0x93, 0x92, 0xa8, 0x93, 0xb7,        /* 15 */
+         0x94, 0xc1, 0x95, 0xca, 0x96, 0xd2, 0x97, 0xd8,
+         0x98, 0xde, 0x99, 0xe3, 0x9a, 0xe8, 0x9b, 0xed,
+         0x9c, 0xf1, 0x9d, 0xf5, 0x9e, 0xf8, 0x9f, 0xfc,
+         0xa0, 0xff}
 };
 
 static const __u8 tas5130a_sensor_init[][8] = {
@@ -364,7 +366,7 @@ static const __u8 tas5130a_sensor_init[][8] = {
 };
 
 /* read 1 byte */
-static int reg_r_1(struct gspca_dev *gspca_dev,
+static int reg_r(struct gspca_dev *gspca_dev,
                    __u16 index)
 {
         usb_control_msg(gspca_dev->dev,
@@ -378,26 +380,26 @@ static int reg_r_1(struct gspca_dev *gspca_dev,
 }
 
 static void reg_w(struct gspca_dev *gspca_dev,
-                        __u16 value,
-                        __u16 index,
-                        const __u8 *buffer, __u16 len)
+                  __u16 index)
+{
+        usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
+                        0,
+                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
+                        0, index,
+                        NULL, 0, 500);
+}
+
+static void i2c_w(struct gspca_dev *gspca_dev,
+                  const __u8 *buffer, __u16 len)
 {
-        if (buffer == NULL) {
-                usb_control_msg(gspca_dev->dev,
-                                usb_sndctrlpipe(gspca_dev->dev, 0),
-                                0,
-                           USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
-                                value, index,
-                                NULL, 0, 500);
-                return;
-        }
         if (len <= USB_BUF_SZ) {
                 memcpy(gspca_dev->usb_buf, buffer, len);
                 usb_control_msg(gspca_dev->dev,
                                 usb_sndctrlpipe(gspca_dev->dev, 0),
                                 0,
                            USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
-                                value, index,
+                                0x01, 0,
                                 gspca_dev->usb_buf, len, 500);
         } else {
                 __u8 *tmpbuf;
@@ -408,12 +410,56 @@ static void reg_w(struct gspca_dev *gspca_dev,
                                 usb_sndctrlpipe(gspca_dev->dev, 0),
                                 0,
                            USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
-                                value, index,
+                                0x01, 0,
                                 tmpbuf, len, 500);
                 kfree(tmpbuf);
         }
 }
 
+static void other_sensor_init(struct gspca_dev *gspca_dev)
+{
+        int i;
+        const __u8 *p;
+        __u8 byte;
+        __u8 val[6] = {0x62, 0, 0x64, 0, 0x60, 0x05};
+        static const __u8 sensor_init[] = {
+                0xdf, 0x6d,
+                0xdd, 0x18,
+                0x5a, 0xe0,
+                0x5c, 0x07,
+                0x5d, 0xb0,
+                0x5e, 0x1e,
+                0x60, 0x71,
+                0xef, 0x00,
+                0xe9, 0x00,
+                0xea, 0x00,
+                0x90, 0x24,
+                0x91, 0xb2,
+                0x82, 0x32,
+                0xfd, 0x00,
+                0xfd, 0x01,
+                0xfd, 0x41,
+                0x00                    /* table end */
+        };
+
+        p = sensor_init;
+        while (*p != 0) {
+                val[1] = *p++;
+                val[3] = *p++;
+                if (*p == 0)
+                        reg_w(gspca_dev, 0x3c80);
+                i2c_w(gspca_dev, val, sizeof val);
+                i = 4;
+                while (--i >= 0) {
+                        msleep(15);
+                        byte = reg_r(gspca_dev, 0x60);
+                        if (!(byte & 0x01))
+                                break;
+                }
+        }
+                        reg_w(gspca_dev, 0x3c80);
+}
+
 /* this function is called at probe time */
 static int sd_config(struct gspca_dev *gspca_dev,
                      const struct usb_device_id *id)
@@ -430,7 +476,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
         sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
         sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;
-        sd->gamma = sd_ctrls[SD_GAMMA].qctrl.default_value;
+        sd->gamma = GAMMA_DEF;
         sd->mirror = sd_ctrls[SD_MIRROR].qctrl.default_value;
         sd->freq = sd_ctrls[SD_LIGHTFREQ].qctrl.default_value;
         sd->whitebalance = sd_ctrls[SD_WHITE_BALANCE].qctrl.default_value;
@@ -439,27 +485,37 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-static int init_default_parameters(struct gspca_dev *gspca_dev)
+static void setgamma(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        PDEBUG(D_CONF, "Gamma: %d", sd->gamma);
+        i2c_w(gspca_dev, gamma_table[sd->gamma], sizeof gamma_table[0]);
+}
+
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         /* some of this registers are not really neded, because
          * they are overriden by setbrigthness, setcontrast, etc,
          * but wont hurt anyway, and can help someone with similar webcam
          * to see the initial parameters.*/
-        int i = 0;
-        __u8 test_byte;
+        struct sd *sd = (struct sd *) gspca_dev;
+        int i;
+        __u8 byte, test_byte;
 
         static const __u8 read_indexs[] =
                 { 0x06, 0x07, 0x0a, 0x0b, 0x66, 0x80, 0x81, 0x8e, 0x8f, 0xa5,
                   0xa6, 0xa8, 0xbb, 0xbc, 0xc6, 0x00, 0x00 };
-        static const __u8 n1[6] =
+        static const __u8 n1[] =
                         {0x08, 0x03, 0x09, 0x03, 0x12, 0x04};
-        static const __u8 n2[2] =
+        static const __u8 n2[] =
                         {0x08, 0x00};
-        static const __u8 nset[6] =
-                { 0x61, 0x68, 0x62, 0xff, 0x60, 0x07 };
-        static const __u8 n3[6] =
+        static const __u8 nset[] =
+                        { 0x61, 0x68, 0x62, 0xff, 0x60, 0x07 };
+        static const __u8 n3[] =
                         {0x61, 0x68, 0x65, 0x0a, 0x60, 0x04};
-        static const __u8 n4[0x46] =
+        static const __u8 n4[] =
                 {0x09, 0x01, 0x12, 0x04, 0x66, 0x8a, 0x80, 0x3c,
                  0x81, 0x22, 0x84, 0x50, 0x8a, 0x78, 0x8b, 0x68,
                  0x8c, 0x88, 0x8e, 0x33, 0x8f, 0x24, 0xaa, 0xb1,
@@ -469,33 +525,26 @@ static int init_default_parameters(struct gspca_dev *gspca_dev)
                  0x65, 0x0a, 0xbb, 0x86, 0xaf, 0x58, 0xb0, 0x68,
                  0x87, 0x40, 0x89, 0x2b, 0x8d, 0xff, 0x83, 0x40,
                  0xac, 0x84, 0xad, 0x86, 0xaf, 0x46};
-        static const __u8 nset4[18] = {
+        static const __u8 nset4[] = {
                 0xe0, 0x60, 0xe1, 0xa8, 0xe2, 0xe0, 0xe3, 0x60, 0xe4, 0xa8,
                 0xe5, 0xe0, 0xe6, 0x60, 0xe7, 0xa8,
                 0xe8, 0xe0
         };
         /* ojo puede ser 0xe6 en vez de 0xe9 */
-        static const __u8 nset2[20] = {
+        static const __u8 nset2[] = {
                 0xd0, 0xbb, 0xd1, 0x28, 0xd2, 0x10, 0xd3, 0x10, 0xd4, 0xbb,
                 0xd5, 0x28, 0xd6, 0x1e, 0xd7, 0x27,
                 0xd8, 0xc8, 0xd9, 0xfc
         };
-        static const __u8 missing[8] =
+        static const __u8 missing[] =
                 { 0x87, 0x20, 0x88, 0x20, 0x89, 0x20, 0x80, 0x38 };
-        static const __u8 nset3[18] = {
+        static const __u8 nset3[] = {
                 0xc7, 0x60, 0xc8, 0xa8, 0xc9, 0xe0, 0xca, 0x60, 0xcb, 0xa8,
                 0xcc, 0xe0, 0xcd, 0x60, 0xce, 0xa8,
                 0xcf, 0xe0
         };
-        static const __u8 nset5[4] =
-                { 0x8f, 0x24, 0xc3, 0x00 };     /* bright */
-        static const __u8 nset6[34] = {
-                0x90, 0x00, 0x91, 0x1c, 0x92, 0x30, 0x93, 0x43, 0x94, 0x54,
-                0x95, 0x65, 0x96, 0x75, 0x97, 0x84,
-                0x98, 0x93, 0x99, 0xa1, 0x9a, 0xb0, 0x9b, 0xbd, 0x9c, 0xca,
-                0x9d, 0xd8, 0x9e, 0xe5, 0x9f, 0xf2,
-                0xa0, 0xff
-        };                      /* Gamma */
+        static const __u8 nset5[] =
+                        { 0x8f, 0x24, 0xc3, 0x00 };     /* bright */
         static const __u8 nset7[4] =
                         { 0x66, 0xca, 0xa8, 0xf8 };     /* 50/60 Hz */
         static const __u8 nset9[4] =
@@ -505,95 +554,111 @@ static int init_default_parameters(struct gspca_dev *gspca_dev)
         static const __u8 nset10[6] =
                         { 0x0c, 0x03, 0xab, 0x10, 0x81, 0x20 };
 
-        reg_w(gspca_dev, 0x01, 0x0000, n1, 0x06);
-        reg_w(gspca_dev, 0x01, 0x0000, nset, 0x06);
-        reg_r_1(gspca_dev, 0x0063);
-        reg_w(gspca_dev, 0x01, 0x0000, n2, 0x02);
+        byte = reg_r(gspca_dev, 0x06);
+        test_byte = reg_r(gspca_dev, 0x07);
+        if (byte == 0x08 && test_byte == 0x07) {
+                PDEBUG(D_CONF, "other sensor");
+                sd->sensor = SENSOR_OTHER;
+        } else {
+                PDEBUG(D_CONF, "sensor %02x %02x", byte, test_byte);
+                sd->sensor = SENSOR_TAS5130A;
+        }
+
+        i2c_w(gspca_dev, n1, sizeof n1);
+        test_byte = 0;
+        i = 5;
+        while (--i >= 0) {
+                i2c_w(gspca_dev, nset, sizeof nset);
+                msleep(5);
+                test_byte = reg_r(gspca_dev, 0x0063);
+                msleep(100);
+                if (test_byte == 0x17)
+                        break;          /* OK */
+        }
+        if (i < 0) {
+                err("Bad sensor reset %02x", test_byte);
+/*              return -EIO; */
+/*fixme: test - continue */
+        }
+        i2c_w(gspca_dev, n2, sizeof n2);
 
+        i = 0;
         while (read_indexs[i] != 0x00) {
-                test_byte = reg_r_1(gspca_dev, read_indexs[i]);
-                PDEBUG(D_CONF, "Reg 0x%02x => 0x%02x", read_indexs[i],
+                test_byte = reg_r(gspca_dev, read_indexs[i]);
+                PDEBUG(D_STREAM, "Reg 0x%02x = 0x%02x", read_indexs[i],
                        test_byte);
                 i++;
         }
 
-        reg_w(gspca_dev, 0x01, 0x0000, n3, 0x06);
-        reg_w(gspca_dev, 0x01, 0x0000, n4, 0x46);
-        reg_r_1(gspca_dev, 0x0080);
-        reg_w(gspca_dev, 0x00, 0x2c80, NULL, 0);
-        reg_w(gspca_dev, 0x01, 0x0000, nset2, 0x14);
-        reg_w(gspca_dev, 0x01, 0x0000, nset3, 0x12);
-        reg_w(gspca_dev, 0x01, 0x0000, nset4, 0x12);
-        reg_w(gspca_dev, 0x00, 0x3880, NULL, 0);
-        reg_w(gspca_dev, 0x00, 0x3880, NULL, 0);
-        reg_w(gspca_dev, 0x00, 0x338e, NULL, 0);
-        reg_w(gspca_dev, 0x01, 0x0000, nset5, 0x04);
-        reg_w(gspca_dev, 0x00, 0x00a9, NULL, 0);
-        reg_w(gspca_dev, 0x01, 0x0000, nset6, 0x22);
-        reg_w(gspca_dev, 0x00, 0x86bb, NULL, 0);
-        reg_w(gspca_dev, 0x00, 0x4aa6, NULL, 0);
-
-        reg_w(gspca_dev, 0x01, 0x0000, missing, 0x08);
-
-        reg_w(gspca_dev, 0x00, 0x2087, NULL, 0);
-        reg_w(gspca_dev, 0x00, 0x2088, NULL, 0);
-        reg_w(gspca_dev, 0x00, 0x2089, NULL, 0);
-
-        reg_w(gspca_dev, 0x01, 0x0000, nset7, 0x04);
-        reg_w(gspca_dev, 0x01, 0x0000, nset10, 0x06);
-        reg_w(gspca_dev, 0x01, 0x0000, nset8, 0x06);
-        reg_w(gspca_dev, 0x01, 0x0000, nset9, 0x04);
-
-        reg_w(gspca_dev, 0x00, 0x2880, NULL, 0);
-        reg_w(gspca_dev, 0x01, 0x0000, nset2, 0x14);
-        reg_w(gspca_dev, 0x01, 0x0000, nset3, 0x12);
-        reg_w(gspca_dev, 0x01, 0x0000, nset4, 0x12);
+        i2c_w(gspca_dev, n3, sizeof n3);
+        i2c_w(gspca_dev, n4, sizeof n4);
+        reg_r(gspca_dev, 0x0080);
+        reg_w(gspca_dev, 0x2c80);
+        i2c_w(gspca_dev, nset2, sizeof nset2);
+        i2c_w(gspca_dev, nset3, sizeof nset3);
+        i2c_w(gspca_dev, nset4, sizeof nset4);
+        reg_w(gspca_dev, 0x3880);
+        reg_w(gspca_dev, 0x3880);
+        reg_w(gspca_dev, 0x338e);
+        i2c_w(gspca_dev, nset5, sizeof nset5);
+        reg_w(gspca_dev, 0x00a9);
+        setgamma(gspca_dev);
+        reg_w(gspca_dev, 0x86bb);
+        reg_w(gspca_dev, 0x4aa6);
+
+        i2c_w(gspca_dev, missing, sizeof missing);
+
+        reg_w(gspca_dev, 0x2087);
+        reg_w(gspca_dev, 0x2088);
+        reg_w(gspca_dev, 0x2089);
+
+        i2c_w(gspca_dev, nset7, sizeof nset7);
+        i2c_w(gspca_dev, nset10, sizeof nset10);
+        i2c_w(gspca_dev, nset8, sizeof nset8);
+        i2c_w(gspca_dev, nset9, sizeof nset9);
+
+        reg_w(gspca_dev, 0x2880);
+        i2c_w(gspca_dev, nset2, sizeof nset2);
+        i2c_w(gspca_dev, nset3, sizeof nset3);
+        i2c_w(gspca_dev, nset4, sizeof nset4);
 
         return 0;
 }
 
-/* this function is called at probe and resume time */
-static int sd_init(struct gspca_dev *gspca_dev)
-{
-        init_default_parameters(gspca_dev);
-        return 0;
-}
-
 static void setbrightness(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         unsigned int brightness;
-        __u8 set6[4] = { 0x8f, 0x26, 0xc3, 0x80 };
-        brightness = sd->brightness;
+        __u8 set6[4] = { 0x8f, 0x26, 0xc3, 0x00 };
 
+        brightness = sd->brightness;
         if (brightness < 7) {
-                set6[3] = 0x70 - (brightness * 0xa);
+                set6[3] = 0x70 - brightness * 0x10;
         } else {
                 set6[1] = 0x24;
-                set6[3] = 0x00 + ((brightness - 7) * 0xa);
+                set6[3] = 0x00 + ((brightness - 7) * 0x10);
         }
 
-        reg_w(gspca_dev, 0x01, 0x0000, set6, 4);
+        i2c_w(gspca_dev, set6, sizeof set6);
 }
 
 static void setflip(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-
         __u8 flipcmd[8] =
-            { 0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09 };
+                {0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09};
 
-        if (sd->mirror == 1)
+        if (sd->mirror)
                 flipcmd[3] = 0x01;
 
-        reg_w(gspca_dev, 0x01, 0x0000, flipcmd, 8);
+        i2c_w(gspca_dev, flipcmd, sizeof flipcmd);
 }
 
 static void seteffect(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        reg_w(gspca_dev, 0x01, 0x0000, effects_table[sd->effect], 0x06);
+        i2c_w(gspca_dev, effects_table[sd->effect], sizeof effects_table[0]);
         if (sd->effect == 1 || sd->effect == 5) {
                 PDEBUG(D_CONF,
                        "This effect have been disabled for webcam \"safety\"");
@@ -601,9 +666,9 @@ static void seteffect(struct gspca_dev *gspca_dev)
         }
 
         if (sd->effect == 1 || sd->effect == 4)
-                reg_w(gspca_dev, 0x00, 0x4aa6, NULL, 0);
+                reg_w(gspca_dev, 0x4aa6);
         else
-                reg_w(gspca_dev, 0x00, 0xfaa6, NULL, 0);
+                reg_w(gspca_dev, 0xfaa6);
 }
 
 static void setwhitebalance(struct gspca_dev *gspca_dev)
@@ -616,7 +681,7 @@ static void setwhitebalance(struct gspca_dev *gspca_dev)
         if (sd->whitebalance == 1)
                 white_balance[7] = 0x3c;
 
-        reg_w(gspca_dev, 0x01, 0x0000, white_balance, 8);
+        i2c_w(gspca_dev, white_balance, sizeof white_balance);
 }
 
 static void setlightfreq(struct gspca_dev *gspca_dev)
@@ -627,21 +692,21 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
         if (sd->freq == 2)      /* 60hz */
                 freq[1] = 0x00;
 
-        reg_w(gspca_dev, 0x1, 0x0000, freq, 0x4);
+        i2c_w(gspca_dev, freq, sizeof freq);
 }
 
 static void setcontrast(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         unsigned int contrast = sd->contrast;
-        __u16 reg_to_write = 0x00;
+        __u16 reg_to_write;
 
         if (contrast < 7)
                 reg_to_write = 0x8ea9 - (0x200 * contrast);
         else
                 reg_to_write = (0x00a9 + ((contrast - 7) * 0x200));
 
-        reg_w(gspca_dev, 0x00, reg_to_write, NULL, 0);
+        reg_w(gspca_dev, reg_to_write);
 }
 
 static void setcolors(struct gspca_dev *gspca_dev)
@@ -650,11 +715,7 @@ static void setcolors(struct gspca_dev *gspca_dev)
         __u16 reg_to_write;
 
         reg_to_write = 0xc0bb + sd->colors * 0x100;
-        reg_w(gspca_dev, 0x00, reg_to_write, NULL, 0);
-}
-
-static void setgamma(struct gspca_dev *gspca_dev)
-{
+        reg_w(gspca_dev, reg_to_write);
 }
 
 static void setsharpness(struct gspca_dev *gspca_dev)
@@ -664,7 +725,99 @@ static void setsharpness(struct gspca_dev *gspca_dev)
 
         reg_to_write = 0x0aa6 + 0x1000 * sd->sharpness;
 
-        reg_w(gspca_dev, 0x00, reg_to_write, NULL, 0);
+        reg_w(gspca_dev, reg_to_write);
+}
+
+static int sd_start(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        int i, mode;
+        static const __u8 t1[] = { 0x66, 0x00, 0xa8, 0xe8 };
+        __u8 t2[] = { 0x07, 0x00, 0x0d, 0x60, 0x0e, 0x80 };
+        static const __u8 t3[] =
+                { 0xb3, 0x07, 0xb4, 0x00, 0xb5, 0x88, 0xb6, 0x02, 0xb7, 0x06,
+                  0xb8, 0x00, 0xb9, 0xe7, 0xba, 0x01 };
+        static const __u8 t4[] = { 0x0b, 0x04, 0x0a, 0x40 };
+
+        mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode]. priv;
+        switch (mode) {
+        case 1:         /* 352x288 */
+                t2[1] = 0x40;
+                break;
+        case 2:         /* 320x240 */
+                t2[1] = 0x10;
+                break;
+        case 3:         /* 176x144 */
+                t2[1] = 0x50;
+                break;
+        case 4:         /* 160x120 */
+                t2[1] = 0x20;
+                break;
+        default:        /* 640x480 (0x00) */
+                break;
+        }
+
+        if (sd->sensor == SENSOR_TAS5130A) {
+                i = 0;
+                while (tas5130a_sensor_init[i][0] != 0) {
+                        i2c_w(gspca_dev, tas5130a_sensor_init[i],
+                                         sizeof tas5130a_sensor_init[0]);
+                        i++;
+                }
+                reg_w(gspca_dev, 0x3c80);
+                /* just in case and to keep sync with logs (for mine) */
+                i2c_w(gspca_dev, tas5130a_sensor_init[3],
+                                 sizeof tas5130a_sensor_init[0]);
+                reg_w(gspca_dev, 0x3c80);
+        } else {
+                other_sensor_init(gspca_dev);
+        }
+        /* just in case and to keep sync with logs  (for mine) */
+        i2c_w(gspca_dev, t1, sizeof t1);
+        i2c_w(gspca_dev, t2, sizeof t2);
+        reg_r(gspca_dev, 0x0012);
+        i2c_w(gspca_dev, t3, sizeof t3);
+        reg_w(gspca_dev, 0x0013);
+        i2c_w(gspca_dev, t4, sizeof t4);
+        /* restart on each start, just in case, sometimes regs goes wrong
+         * when using controls from app */
+        setbrightness(gspca_dev);
+        setcontrast(gspca_dev);
+        setcolors(gspca_dev);
+        return 0;
+}
+
+static void sd_pkt_scan(struct gspca_dev *gspca_dev,
+                        struct gspca_frame *frame,      /* target */
+                        __u8 *data,                     /* isoc packet */
+                        int len)                        /* iso packet length */
+{
+        static __u8 ffd9[] = { 0xff, 0xd9 };
+
+        if (data[0] == 0x5a) {
+                /* Control Packet, after this came the header again,
+                 * but extra bytes came in the packet before this,
+                 * sometimes an EOF arrives, sometimes not... */
+                return;
+        }
+        data += 2;
+        len -= 2;
+        if (data[0] == 0xff && data[1] == 0xd8) {
+                /* extra bytes....., could be processed too but would be
+                 * a waste of time, right now leave the application and
+                 * libjpeg do it for ourserlves.. */
+                frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
+                                        ffd9, 2);
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);
+                return;
+        }
+
+        if (data[len - 2] == 0xff && data[len - 1] == 0xd9) {
+                /* Just in case, i have seen packets with the marker,
+                 * other's do not include it... */
+                len -= 2;
+        }
+        gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
 }
 
 static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
@@ -788,6 +941,7 @@ static int sd_setgamma(struct gspca_dev *gspca_dev, __s32 val)
 static int sd_getgamma(struct gspca_dev *gspca_dev, __s32 *val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
+
         *val = sd->gamma;
         return 0;
 }
@@ -835,9 +989,9 @@ static int sd_setlowlight(struct gspca_dev *gspca_dev, __s32 val)
 
         sd->autogain = val;
         if (val != 0)
-                reg_w(gspca_dev, 0x00, 0xf48e, NULL, 0);
+                reg_w(gspca_dev, 0xf48e);
         else
-                reg_w(gspca_dev, 0x00, 0xb48e, NULL, 0);
+                reg_w(gspca_dev, 0xb48e);
         return 0;
 }
 
@@ -849,99 +1003,6 @@ static int sd_getlowlight(struct gspca_dev *gspca_dev, __s32 *val)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
-{
-        int mode;
-
-        static const __u8 t1[] = { 0x66, 0x00, 0xa8, 0xe8 };
-        __u8 t2[] = { 0x07, 0x00, 0x0d, 0x60, 0x0e, 0x80 };
-        static const __u8 t3[] =
-                { 0xb3, 0x07, 0xb4, 0x00, 0xb5, 0x88, 0xb6, 0x02, 0xb7, 0x06,
-                  0xb8, 0x00, 0xb9, 0xe7, 0xba, 0x01 };
-        static const __u8 t4[] = { 0x0b, 0x04, 0x0a, 0x40 };
-
-        mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode]. priv;
-        switch (mode) {
-        case 1:         /* 352x288 */
-                t2[1] = 0x40;
-                break;
-        case 2:         /* 320x240 */
-                t2[1] = 0x10;
-                break;
-        case 3:         /* 176x144 */
-                t2[1] = 0x50;
-                break;
-        case 4:         /* 160x120 */
-                t2[1] = 0x20;
-                break;
-        default:        /* 640x480 (0x00) */
-                break;
-        }
-
-        reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[0], 0x8);
-        reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[1], 0x8);
-        reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[2], 0x8);
-        reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[3], 0x8);
-        reg_w(gspca_dev, 0x00, 0x3c80, NULL, 0);
-                /* just in case and to keep sync with logs  (for mine) */
-        reg_w(gspca_dev, 0x01, 0x0000, tas5130a_sensor_init[3], 0x8);
-        reg_w(gspca_dev, 0x00, 0x3c80, NULL, 0);
-                /* just in case and to keep sync with logs  (for mine) */
-        reg_w(gspca_dev, 0x01, 0x0000, t1, 4);
-        reg_w(gspca_dev, 0x01, 0x0000, t2, 6);
-        reg_r_1(gspca_dev, 0x0012);
-        reg_w(gspca_dev, 0x01, 0x0000, t3, 0x10);
-        reg_w(gspca_dev, 0x00, 0x0013, NULL, 0);
-        reg_w(gspca_dev, 0x01, 0x0000, t4, 0x4);
-        /* restart on each start, just in case, sometimes regs goes wrong
-         * when using controls from app */
-        setbrightness(gspca_dev);
-        setcontrast(gspca_dev);
-        setcolors(gspca_dev);
-}
-
-static void sd_pkt_scan(struct gspca_dev *gspca_dev,
-                        struct gspca_frame *frame,      /* target */
-                        __u8 *data,                     /* isoc packet */
-                        int len)                        /* iso packet length */
-{
-        int sof = 0;
-        static __u8 ffd9[] = { 0xff, 0xd9 };
-
-        if (data[0] == 0x5a) {
-                /* Control Packet, after this came the header again,
-                 * but extra bytes came in the packet before this,
-                 * sometimes an EOF arrives, sometimes not... */
-                return;
-        }
-
-        if (data[len - 1] == 0xff && data[len] == 0xd9) {
-                /* Just in case, i have seen packets with the marker,
-                 * other's do not include it... */
-                data += 2;
-                len -= 4;
-        } else if (data[2] == 0xff && data[3] == 0xd8) {
-                sof = 1;
-                data += 2;
-                len -= 2;
-        } else {
-                data += 2;
-                len -= 2;
-        }
-
-        if (sof) {
-                /* extra bytes....., could be processed too but would be
-                 * a waste of time, right now leave the application and
-                 * libjpeg do it for ourserlves.. */
-                frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
-                                        ffd9, 2);
-                gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);
-                return;
-        }
-
-        gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
-}
-
 static int sd_querymenu(struct gspca_dev *gspca_dev,
                         struct v4l2_querymenu *menu)
 {
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index 084af05302a0..968a5911704f 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -390,7 +390,7 @@ static void setbrightness(struct gspca_dev *gspca_dev)
 }
 
 /* -- start the camera -- */
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         reg_w_1(gspca_dev, TV8532_AD_SLOPE, 0x32);
         reg_w_1(gspca_dev, TV8532_AD_BITCTRL, 0x00);
@@ -443,6 +443,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
         /************************************************/
         tv_8532_PollReg(gspca_dev);
         reg_w_1(gspca_dev, TV8532_UDP_UPDATE, 0x00);    /* 0x31 */
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index bd4c226c9a07..be46d9232540 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -80,7 +80,6 @@ static struct ctrl sd_ctrls[] = {
                 .step    = 1,
 #define FREQ_DEF 1
                 .default_value = FREQ_DEF,
-                .default_value = 1,
             },
             .set = sd_setfreq,
             .get = sd_getfreq,
@@ -1502,7 +1501,7 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
         usb_exchange(gspca_dev, ov7660_freq_tb[sd->lightfreq]);
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         const __u8 *GammaT = NULL;
@@ -1586,7 +1585,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 break;
         default:
                 PDEBUG(D_PROBE, "Damned !! no sensor found Bye");
-                return;
+                return -EMEDIUMTYPE;
         }
         if (GammaT && MatrixT) {
                 put_tab_to_reg(gspca_dev, GammaT, 17, 0xb84a);
@@ -1622,6 +1621,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 setautogain(gspca_dev);
                 setlightfreq(gspca_dev);
         }
+        return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index d61ef727e0c2..d0a4451dc46f 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -7178,7 +7178,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return 0;
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct usb_device *dev = gspca_dev->dev;
@@ -7331,6 +7331,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
                 reg_w(dev, 0x02, 0x0008);
                 break;
         }
+        return 0;
 }
 
 static void sd_stop0(struct gspca_dev *gspca_dev)
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index a30254bed311..efe849981ab7 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -12,6 +12,10 @@
  *      Markus Rechberger <mrechberger@gmail.com>
  * modified for DViCO Fusion HDTV 5 RT GOLD by
  *      Chaogui Zhang <czhang1974@gmail.com>
+ * modified for MSI TV@nywhere Plus by
+ *      Henry Wong <henry@stuffedcow.net>
+ *      Mark Schultz <n9xmj@yahoo.com>
+ *      Brian Rogers <brian_rogers@comcast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -65,7 +69,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
                                int size, int offset)
 {
         unsigned char buf[6];
-        int start, range, toggle, dev, code;
+        int start, range, toggle, dev, code, ircode;
 
         /* poll IR chip */
         if (size != i2c_master_recv(&ir->c,buf,size))
@@ -85,6 +89,24 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
         if (!start)
                 /* no key pressed */
                 return 0;
+        /*
+         * Hauppauge remotes (black/silver) always use
+         * specific device ids. If we do not filter the
+         * device ids then messages destined for devices
+         * such as TVs (id=0) will get through causing
+         * mis-fired events.
+         *
+         * We also filter out invalid key presses which
+         * produce annoying debug log entries.
+         */
+        ircode= (start << 12) | (toggle << 11) | (dev << 6) | code;
+        if ((ircode & 0x1fff)==0x1fff)
+                /* invalid key press */
+                return 0;
+
+        if (dev!=0x1e && dev!=0x1f)
+                /* not a hauppauge remote */
+                return 0;
 
         if (!range)
                 code += 64;
@@ -94,7 +116,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
 
         /* return key */
         *ir_key = code;
-        *ir_raw = (start << 12) | (toggle << 11) | (dev << 6) | code;
+        *ir_raw = ircode;
         return 1;
 }
 
@@ -224,9 +246,15 @@ static void ir_timer(unsigned long data)
 static void ir_work(struct work_struct *work)
 {
         struct IR_i2c *ir = container_of(work, struct IR_i2c, work);
+        int polling_interval = 100;
+
+        /* MSI TV@nywhere Plus requires more frequent polling
+           otherwise it will miss some keypresses */
+        if (ir->c.adapter->id == I2C_HW_SAA7134 && ir->c.addr == 0x30)
+                polling_interval = 50;
 
         ir_key_poll(ir);
-        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(100));
+        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(polling_interval));
 }
 
 /* ----------------------------------------------------------------------- */
@@ -465,9 +493,37 @@ static int ir_probe(struct i2c_adapter *adap)
                         (1 == rc) ? "yes" : "no");
                 if (1 == rc) {
                         ir_attach(adap, probe[i], 0, 0);
-                        break;
+                        return 0;
                 }
         }
+
+        /* Special case for MSI TV@nywhere Plus remote */
+        if (adap->id == I2C_HW_SAA7134) {
+                u8 temp;
+
+                /* MSI TV@nywhere Plus controller doesn't seem to
+                   respond to probes unless we read something from
+                   an existing device. Weird... */
+
+                msg.addr = 0x50;
+                rc = i2c_transfer(adap, &msg, 1);
+                        dprintk(1, "probe 0x%02x @ %s: %s\n",
+                        msg.addr, adap->name,
+                        (1 == rc) ? "yes" : "no");
+
+                /* Now do the probe. The controller does not respond
+                   to 0-byte reads, so we use a 1-byte read instead. */
+                msg.addr = 0x30;
+                msg.len = 1;
+                msg.buf = &temp;
+                rc = i2c_transfer(adap, &msg, 1);
+                dprintk(1, "probe 0x%02x @ %s: %s\n",
+                        msg.addr, adap->name,
+                        (1 == rc) ? "yes" : "no");
+                if (1 == rc)
+                        ir_attach(adap, msg.addr, 0, 0);
+        }
+
         return 0;
 }
 
diff --git a/drivers/media/video/ivtv/ivtv-cards.h b/drivers/media/video/ivtv/ivtv-cards.h
index 381af1bceef8..0b8fe85fb697 100644
--- a/drivers/media/video/ivtv/ivtv-cards.h
+++ b/drivers/media/video/ivtv/ivtv-cards.h
@@ -154,7 +154,7 @@
 #define IVTV_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \
                           V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | V4L2_CAP_VBI_CAPTURE | \
                           V4L2_CAP_SLICED_VBI_CAPTURE)
-#define IVTV_CAP_DECODER (V4L2_CAP_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT | \
+#define IVTV_CAP_DECODER (V4L2_CAP_VIDEO_OUTPUT | \
                           V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)
 
 struct ivtv_card_video_input {
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 4afc7ea07e86..aeaa13f6cb36 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -61,14 +61,14 @@
 #include "tuner-xc2028.h"
 
 /* var to keep track of the number of array elements in use */
-int ivtv_cards_active = 0;
+int ivtv_cards_active;
 
 /* If you have already X v4l cards, then set this to X. This way
    the device numbers stay matched. Example: you have a WinTV card
    without radio and a PVR-350 with. Normally this would give a
    video1 device together with a radio0 device for the PVR. By
    setting this to 1 you ensure that radio0 is now also radio1. */
-int ivtv_first_minor = 0;
+int ivtv_first_minor;
 
 /* Master variable for all ivtv info */
 struct ivtv *ivtv_cards[IVTV_MAX_CARDS];
@@ -251,7 +251,7 @@ MODULE_PARM_DESC(newi2c,
                  "\t\t\t-1 is autodetect, 0 is off, 1 is on\n"
                  "\t\t\tDefault is autodetect");
 
-MODULE_PARM_DESC(ivtv_first_minor, "Set minor assigned to first card");
+MODULE_PARM_DESC(ivtv_first_minor, "Set kernel number assigned to first card");
 
 MODULE_AUTHOR("Kevin Thayer, Chris Kennedy, Hans Verkuil");
 MODULE_DESCRIPTION("CX23415/CX23416 driver");
@@ -655,9 +655,9 @@ done:
 
         if (itv->card == NULL) {
                 itv->card = ivtv_get_card(IVTV_CARD_PVR_150);
-                IVTV_ERR("Unknown card: vendor/device: %04x/%04x\n",
+                IVTV_ERR("Unknown card: vendor/device: [%04x:%04x]\n",
                      itv->dev->vendor, itv->dev->device);
-                IVTV_ERR("              subsystem vendor/device: %04x/%04x\n",
+                IVTV_ERR("              subsystem vendor/device: [%04x:%04x]\n",
                      itv->dev->subsystem_vendor, itv->dev->subsystem_device);
                 IVTV_ERR("              %s based\n", chipname);
                 IVTV_ERR("Defaulting to %s card\n", itv->card->name);
@@ -720,7 +720,7 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)
         itv->speed = 1000;
 
         /* VBI */
-        itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
+        itv->vbi.in.type = V4L2_BUF_TYPE_VBI_CAPTURE;
         itv->vbi.sliced_in = &itv->vbi.in.fmt.sliced;
 
         /* Init the sg table for osd/yuv output */
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 2ceb5227637c..bc29436e8a3c 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -49,7 +49,6 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/list.h>
 #include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
 #include <linux/pagemap.h>
 #include <linux/scatterlist.h>
 #include <linux/workqueue.h>
@@ -507,6 +506,8 @@ struct yuv_playback_info
         struct v4l2_rect main_rect;
         u32 v4l2_src_w;
         u32 v4l2_src_h;
+
+        u8 running; /* Have any frames been displayed */
 };
 
 #define IVTV_VBI_FRAMES 32
@@ -751,6 +752,12 @@ void ivtv_read_eeprom(struct ivtv *itv, struct tveeprom *tv);
 /* First-open initialization: load firmware, init cx25840, etc. */
 int ivtv_init_on_first_open(struct ivtv *itv);
 
+/* Test if the current VBI mode is raw (1) or sliced (0) */
+static inline int ivtv_raw_vbi(const struct ivtv *itv)
+{
+        return itv->vbi.in.type == V4L2_BUF_TYPE_VBI_CAPTURE;
+}
+
 /* This is a PCI post thing, where if the pci register is not read, then
    the write doesn't always take effect right away. By reading back the
    register any pending PCI writes will be performed (in order), and so
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 7ec5c99f9ad1..b7457fc60ba5 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -39,7 +39,7 @@
    associated VBI streams are also automatically claimed.
    Possible error returns: -EBUSY if someone else has claimed
    the stream or 0 on success. */
-int ivtv_claim_stream(struct ivtv_open_id *id, int type)
+static int ivtv_claim_stream(struct ivtv_open_id *id, int type)
 {
         struct ivtv *itv = id->itv;
         struct ivtv_stream *s = &itv->streams[type];
@@ -78,7 +78,7 @@ int ivtv_claim_stream(struct ivtv_open_id *id, int type)
         if (type == IVTV_DEC_STREAM_TYPE_MPG) {
                 vbi_type = IVTV_DEC_STREAM_TYPE_VBI;
         } else if (type == IVTV_ENC_STREAM_TYPE_MPG &&
-                   itv->vbi.insert_mpeg && itv->vbi.sliced_in->service_set) {
+                   itv->vbi.insert_mpeg && !ivtv_raw_vbi(itv)) {
                 vbi_type = IVTV_ENC_STREAM_TYPE_VBI;
         } else {
                 return 0;
@@ -305,7 +305,7 @@ static size_t ivtv_copy_buf_to_user(struct ivtv_stream *s, struct ivtv_buffer *b
 
         if (len > ucount) len = ucount;
         if (itv->vbi.insert_mpeg && s->type == IVTV_ENC_STREAM_TYPE_MPG &&
-            itv->vbi.sliced_in->service_set && buf != &itv->vbi.sliced_mpeg_buf) {
+            !ivtv_raw_vbi(itv) && buf != &itv->vbi.sliced_mpeg_buf) {
                 const char *start = buf->buf + buf->readpos;
                 const char *p = start + 1;
                 const u8 *q;
@@ -372,7 +372,7 @@ static ssize_t ivtv_read(struct ivtv_stream *s, char __user *ubuf, size_t tot_co
         /* Each VBI buffer is one frame, the v4l2 API says that for VBI the frames should
            arrive one-by-one, so make sure we never output more than one VBI frame at a time */
         if (s->type == IVTV_DEC_STREAM_TYPE_VBI ||
-                        (s->type == IVTV_ENC_STREAM_TYPE_VBI && itv->vbi.sliced_in->service_set))
+            (s->type == IVTV_ENC_STREAM_TYPE_VBI && !ivtv_raw_vbi(itv)))
                 single_frame = 1;
 
         for (;;) {
diff --git a/drivers/media/video/ivtv/ivtv-fileops.h b/drivers/media/video/ivtv/ivtv-fileops.h
index 2c8d5186c9c3..df81e790147f 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.h
+++ b/drivers/media/video/ivtv/ivtv-fileops.h
@@ -38,11 +38,6 @@ void ivtv_unmute(struct ivtv *itv);
 
 /* Utilities */
 
-/* Try to claim a stream for the filehandle. Return 0 on success,
-   -EBUSY if stream already claimed. Once a stream is claimed, it
-   remains claimed until the associated filehandle is closed. */
-int ivtv_claim_stream(struct ivtv_open_id *id, int type);
-
 /* Release a previously claimed stream. */
 void ivtv_release_stream(struct ivtv_stream *s);
 
diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c
index bc22905ea20f..74a44844ccaf 100644
--- a/drivers/media/video/ivtv/ivtv-gpio.c
+++ b/drivers/media/video/ivtv/ivtv-gpio.c
@@ -124,7 +124,7 @@ void ivtv_reset_ir_gpio(struct ivtv *itv)
 }
 
 /* Xceive tuner reset function */
-int ivtv_reset_tuner_gpio(void *dev, int cmd, int value)
+int ivtv_reset_tuner_gpio(void *dev, int component, int cmd, int value)
 {
         struct i2c_algo_bit_data *algo = dev;
         struct ivtv *itv = algo->data;
diff --git a/drivers/media/video/ivtv/ivtv-gpio.h b/drivers/media/video/ivtv/ivtv-gpio.h
index 964a265d91a9..48b6291613a2 100644
--- a/drivers/media/video/ivtv/ivtv-gpio.h
+++ b/drivers/media/video/ivtv/ivtv-gpio.h
@@ -24,7 +24,7 @@
 /* GPIO stuff */
 void ivtv_gpio_init(struct ivtv *itv);
 void ivtv_reset_ir_gpio(struct ivtv *itv);
-int ivtv_reset_tuner_gpio(void *dev, int cmd, int value);
+int ivtv_reset_tuner_gpio(void *dev, int component, int cmd, int value);
 int ivtv_gpio(struct ivtv *itv, unsigned int command, void *arg);
 
 #endif
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index af154238fb9a..24700c211d52 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -64,8 +64,6 @@
 #include "ivtv-gpio.h"
 #include "ivtv-i2c.h"
 
-#include <media/ir-kbd-i2c.h>
-
 /* i2c implementation for cx23415/6 chip, ivtv project.
  * Author: Kevin Thayer (nufan_wfk at yahoo.com)
  */
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 61030309d0ad..8696527ab134 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -101,18 +101,15 @@ void ivtv_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
         }
 }
 
-static int check_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
+static void check_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
 {
         int f, l;
-        u16 set = 0;
 
         for (f = 0; f < 2; f++) {
                 for (l = 0; l < 24; l++) {
                         fmt->service_lines[f][l] = select_service_from_set(f, l, fmt->service_lines[f][l], is_pal);
-                        set |= fmt->service_lines[f][l];
                 }
         }
-        return set != 0;
 }
 
 u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt)
@@ -474,7 +471,7 @@ static int ivtv_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format
         int h = fmt->fmt.pix.height;
 
         w = min(w, 720);
-        w = max(w, 1);
+        w = max(w, 2);
         h = min(h, itv->is_50hz ? 576 : 480);
         h = max(h, 2);
         ivtv_g_fmt_vid_cap(file, fh, fmt);
@@ -512,27 +509,20 @@ static int ivtv_try_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_
 static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *fmt)
 {
         struct ivtv_open_id *id = fh;
-        s32 w, h;
-        int field;
-        int ret;
+        struct ivtv *itv = id->itv;
+        s32 w = fmt->fmt.pix.width;
+        s32 h = fmt->fmt.pix.height;
+        int field = fmt->fmt.pix.field;
+        int ret = ivtv_g_fmt_vid_out(file, fh, fmt);
 
-        w = fmt->fmt.pix.width;
-        h = fmt->fmt.pix.height;
-        field = fmt->fmt.pix.field;
-        ret = ivtv_g_fmt_vid_out(file, fh, fmt);
+        w = min(w, 720);
+        w = max(w, 2);
+        h = min(h, itv->is_out_50hz ? 576 : 480);
+        h = max(h, 2);
+        if (id->type == IVTV_DEC_STREAM_TYPE_YUV)
+                fmt->fmt.pix.field = field;
         fmt->fmt.pix.width = w;
         fmt->fmt.pix.height = h;
-        if (!ret && id->type == IVTV_DEC_STREAM_TYPE_YUV) {
-                fmt->fmt.pix.field = field;
-                if (fmt->fmt.pix.width < 2)
-                        fmt->fmt.pix.width = 2;
-                if (fmt->fmt.pix.width > 720)
-                        fmt->fmt.pix.width = 720;
-                if (fmt->fmt.pix.height < 2)
-                        fmt->fmt.pix.height = 2;
-                if (fmt->fmt.pix.height > 576)
-                        fmt->fmt.pix.height = 576;
-        }
         return ret;
 }
 
@@ -560,9 +550,9 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
         struct ivtv_open_id *id = fh;
         struct ivtv *itv = id->itv;
         struct cx2341x_mpeg_params *p = &itv->params;
+        int ret = ivtv_try_fmt_vid_cap(file, fh, fmt);
         int w = fmt->fmt.pix.width;
         int h = fmt->fmt.pix.height;
-        int ret = ivtv_try_fmt_vid_cap(file, fh, fmt);
 
         if (ret)
                 return ret;
@@ -585,8 +575,11 @@ static int ivtv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f
 {
         struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv;
 
+        if (!ivtv_raw_vbi(itv) && atomic_read(&itv->capturing) > 0)
+                return -EBUSY;
         itv->vbi.sliced_in->service_set = 0;
-        itv->video_dec_func(itv, VIDIOC_S_FMT, &itv->vbi.in);
+        itv->vbi.in.type = V4L2_BUF_TYPE_VBI_CAPTURE;
+        itv->video_dec_func(itv, VIDIOC_S_FMT, fmt);
         return ivtv_g_fmt_vbi_cap(file, fh, fmt);
 }
 
@@ -600,10 +593,10 @@ static int ivtv_s_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo
         if (ret || id->type == IVTV_DEC_STREAM_TYPE_VBI)
                 return ret;
 
-        if (check_service_set(vbifmt, itv->is_50hz) == 0)
-                return -EINVAL;
-        if (atomic_read(&itv->capturing) > 0)
+        check_service_set(vbifmt, itv->is_50hz);
+        if (ivtv_raw_vbi(itv) && atomic_read(&itv->capturing) > 0)
                 return -EBUSY;
+        itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
         itv->video_dec_func(itv, VIDIOC_S_FMT, fmt);
         memcpy(itv->vbi.sliced_in, vbifmt, sizeof(*itv->vbi.sliced_in));
         return 0;
@@ -651,8 +644,6 @@ static int ivtv_s_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f
                 itv->dma_data_req_size =
                         1080 * ((yi->v4l2_src_h + 31) & ~31);
 
-        /* Force update of yuv registers */
-        yi->yuv_forced_update = 1;
         return 0;
 }
 
@@ -761,7 +752,7 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc
 
         strlcpy(vcap->driver, IVTV_DRIVER_NAME, sizeof(vcap->driver));
         strlcpy(vcap->card, itv->card_name, sizeof(vcap->card));
-        strlcpy(vcap->bus_info, pci_name(itv->dev), sizeof(vcap->bus_info));
+        snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(itv->dev));
         vcap->version = IVTV_DRIVER_VERSION;        /* version */
         vcap->capabilities = itv->v4l2_cap;         /* capabilities */
         return 0;
@@ -1370,6 +1361,9 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
         if (itv->osd_global_alpha_state)
                 fb->flags |= V4L2_FBUF_FLAG_GLOBAL_ALPHA;
 
+        if (yi->track_osd)
+                fb->flags |= V4L2_FBUF_FLAG_OVERLAY;
+
         pixfmt &= 7;
 
         /* no local alpha for RGB565 or unknown formats */
@@ -1389,8 +1383,6 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
                 else
                         fb->flags |= V4L2_FBUF_FLAG_LOCAL_ALPHA;
         }
-        if (yi->track_osd)
-                fb->flags |= V4L2_FBUF_FLAG_OVERLAY;
 
         return 0;
 }
diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c
index 34f3ab827858..f5d00ec5da73 100644
--- a/drivers/media/video/ivtv/ivtv-irq.c
+++ b/drivers/media/video/ivtv/ivtv-irq.c
@@ -753,7 +753,7 @@ static void ivtv_irq_vsync(struct ivtv *itv)
          */
         unsigned int frame = read_reg(0x28c0) & 1;
         struct yuv_playback_info *yi = &itv->yuv_info;
-        int last_dma_frame = atomic_read(&itv->yuv_info.next_dma_frame);
+        int last_dma_frame = atomic_read(&yi->next_dma_frame);
         struct yuv_frame_info *f = &yi->new_frame_info[last_dma_frame];
 
         if (0) IVTV_DEBUG_IRQ("DEC VSYNC\n");
@@ -772,6 +772,7 @@ static void ivtv_irq_vsync(struct ivtv *itv)
                                 next_dma_frame = (next_dma_frame + 1) % IVTV_YUV_BUFFERS;
                                 atomic_set(&yi->next_dma_frame, next_dma_frame);
                                 yi->fields_lapsed = -1;
+                                yi->running = 1;
                         }
                 }
         }
@@ -804,9 +805,11 @@ static void ivtv_irq_vsync(struct ivtv *itv)
                 }
 
                 /* Check if we need to update the yuv registers */
-                if ((yi->yuv_forced_update || f->update) && last_dma_frame != -1) {
+                if (yi->running && (yi->yuv_forced_update || f->update)) {
                         if (!f->update) {
-                                last_dma_frame = (u8)(last_dma_frame - 1) % IVTV_YUV_BUFFERS;
+                                last_dma_frame =
+                                        (u8)(atomic_read(&yi->next_dma_frame) -
+                                                 1) % IVTV_YUV_BUFFERS;
                                 f = &yi->new_frame_info[last_dma_frame];
                         }
 
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 730e85d86fc8..5bbf31e39304 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -75,7 +75,7 @@ static const struct file_operations ivtv_v4l2_dec_fops = {
 static struct {
         const char *name;
         int vfl_type;
-        int minor_offset;
+        int num_offset;
         int dma, pio;
         enum v4l2_buf_type buf_type;
         const struct file_operations *fops;
@@ -171,8 +171,8 @@ static void ivtv_stream_init(struct ivtv *itv, int type)
 static int ivtv_prep_dev(struct ivtv *itv, int type)
 {
         struct ivtv_stream *s = &itv->streams[type];
-        int minor_offset = ivtv_stream_info[type].minor_offset;
-        int minor;
+        int num_offset = ivtv_stream_info[type].num_offset;
+        int num = itv->num + ivtv_first_minor + num_offset;
 
         /* These four fields are always initialized. If v4l2dev == NULL, then
            this stream is not in use. In that case no other fields but these
@@ -188,9 +188,6 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
         if (type >= IVTV_DEC_STREAM_TYPE_MPG && !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
                 return 0;
 
-        /* card number + user defined offset + device offset */
-        minor = itv->num + ivtv_first_minor + minor_offset;
-
         /* User explicitly selected 0 buffers for these streams, so don't
            create them. */
         if (ivtv_stream_info[type].dma != PCI_DMA_NONE &&
@@ -211,7 +208,7 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
         snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d %s",
                         itv->num, s->name);
 
-        s->v4l2dev->minor = minor;
+        s->v4l2dev->num = num;
         s->v4l2dev->parent = &itv->dev->dev;
         s->v4l2dev->fops = ivtv_stream_info[type].fops;
         s->v4l2dev->release = video_device_release;
@@ -250,39 +247,46 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)
 {
         struct ivtv_stream *s = &itv->streams[type];
         int vfl_type = ivtv_stream_info[type].vfl_type;
-        int minor;
+        int num;
 
         if (s->v4l2dev == NULL)
                 return 0;
 
-        minor = s->v4l2dev->minor;
+        num = s->v4l2dev->num;
+        /* card number + user defined offset + device offset */
+        if (type != IVTV_ENC_STREAM_TYPE_MPG) {
+                struct ivtv_stream *s_mpg = &itv->streams[IVTV_ENC_STREAM_TYPE_MPG];
+
+                if (s_mpg->v4l2dev)
+                        num = s_mpg->v4l2dev->num + ivtv_stream_info[type].num_offset;
+        }
+
         /* Register device. First try the desired minor, then any free one. */
-        if (video_register_device(s->v4l2dev, vfl_type, minor) &&
-                        video_register_device(s->v4l2dev, vfl_type, -1)) {
-                IVTV_ERR("Couldn't register v4l2 device for %s minor %d\n",
-                                s->name, minor);
+        if (video_register_device(s->v4l2dev, vfl_type, num)) {
+                IVTV_ERR("Couldn't register v4l2 device for %s kernel number %d\n",
+                                s->name, num);
                 video_device_release(s->v4l2dev);
                 s->v4l2dev = NULL;
                 return -ENOMEM;
         }
+        num = s->v4l2dev->num;
 
         switch (vfl_type) {
         case VFL_TYPE_GRABBER:
                 IVTV_INFO("Registered device video%d for %s (%d kB)\n",
-                        s->v4l2dev->minor, s->name, itv->options.kilobytes[type]);
+                        num, s->name, itv->options.kilobytes[type]);
                 break;
         case VFL_TYPE_RADIO:
                 IVTV_INFO("Registered device radio%d for %s\n",
-                        s->v4l2dev->minor - MINOR_VFL_TYPE_RADIO_MIN, s->name);
+                        num, s->name);
                 break;
         case VFL_TYPE_VBI:
                 if (itv->options.kilobytes[type])
                         IVTV_INFO("Registered device vbi%d for %s (%d kB)\n",
-                                s->v4l2dev->minor - MINOR_VFL_TYPE_VBI_MIN,
-                                s->name, itv->options.kilobytes[type]);
+                                num, s->name, itv->options.kilobytes[type]);
                 else
                         IVTV_INFO("Registered device vbi%d for %s\n",
-                                s->v4l2dev->minor - MINOR_VFL_TYPE_VBI_MIN, s->name);
+                                num, s->name);
                 break;
         }
         return 0;
@@ -330,7 +334,7 @@ void ivtv_streams_cleanup(struct ivtv *itv, int unregister)
 
 static void ivtv_vbi_setup(struct ivtv *itv)
 {
-        int raw = itv->vbi.sliced_in->service_set == 0;
+        int raw = ivtv_raw_vbi(itv);
         u32 data[CX2341X_MBOX_MAX_DATA];
         int lines;
         int i;
diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c
index 1ce9deb1104f..4a37a7d2e69d 100644
--- a/drivers/media/video/ivtv/ivtv-vbi.c
+++ b/drivers/media/video/ivtv/ivtv-vbi.c
@@ -334,7 +334,7 @@ void ivtv_process_vbi_data(struct ivtv *itv, struct ivtv_buffer *buf,
         int y;
 
         /* Raw VBI data */
-        if (streamtype == IVTV_ENC_STREAM_TYPE_VBI && itv->vbi.sliced_in->service_set == 0) {
+        if (streamtype == IVTV_ENC_STREAM_TYPE_VBI && ivtv_raw_vbi(itv)) {
                 u8 type;
 
                 ivtv_buf_swap(buf);
diff --git a/drivers/media/video/ivtv/ivtv-yuv.c b/drivers/media/video/ivtv/ivtv-yuv.c
index 3092ff1d00a0..ee91107376c7 100644
--- a/drivers/media/video/ivtv/ivtv-yuv.c
+++ b/drivers/media/video/ivtv/ivtv-yuv.c
@@ -1147,6 +1147,7 @@ void ivtv_yuv_close(struct ivtv *itv)
         IVTV_DEBUG_YUV("ivtv_yuv_close\n");
         ivtv_waitq(&itv->vsync_waitq);
 
+        yi->running = 0;
         atomic_set(&yi->next_dma_frame, -1);
         atomic_set(&yi->next_fill_frame, 0);
 
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index bdfda48e56bf..8a4a150b12fb 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -275,7 +275,6 @@ static int ivtvfb_prep_dec_dma_to_device(struct ivtv *itv,
                                   int size_in_bytes)
 {
         DEFINE_WAIT(wait);
-        int ret = 0;
         int got_sig = 0;
 
         mutex_lock(&itv->udma.lock);
@@ -316,7 +315,7 @@ static int ivtvfb_prep_dec_dma_to_device(struct ivtv *itv,
                 return -EINTR;
         }
 
-        return ret;
+        return 0;
 }
 
 static int ivtvfb_prep_frame(struct ivtv *itv, int cmd, void __user *source,
@@ -368,11 +367,12 @@ static int ivtvfb_prep_frame(struct ivtv *itv, int cmd, void __user *source,
 }
 
 static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,
-                     size_t count, loff_t *ppos)
+                                                size_t count, loff_t *ppos)
 {
         unsigned long p = *ppos;
         void *dst;
         int err = 0;
+        int dma_err;
         unsigned long total_size;
         struct ivtv *itv = (struct ivtv *) info->par;
         unsigned long dma_offset =
@@ -399,7 +399,6 @@ static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,
         if (count + p > total_size) {
                 if (!err)
                         err = -ENOSPC;
-
                 count = total_size - p;
         }
 
@@ -408,39 +407,34 @@ static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,
         if (info->fbops->fb_sync)
                 info->fbops->fb_sync(info);
 
-        if (!access_ok(VERIFY_READ, buf, count)) {
-                IVTVFB_WARN("Invalid userspace pointer 0x%08lx\n",
-                        (unsigned long)buf);
-                err = -EFAULT;
-        }
-
-        if (!err) {
-                /* If transfer size > threshold and both src/dst
-                addresses are aligned, use DMA */
-                if (count >= 4096 &&
-                    ((unsigned long)buf & 3) == ((unsigned long)dst & 3)) {
-                        /* Odd address = can't DMA. Align */
-                        if ((unsigned long)dst & 3) {
-                                lead = 4 - ((unsigned long)dst & 3);
-                                memcpy(dst, buf, lead);
-                                buf += lead;
-                                dst += lead;
-                        }
-                        /* DMA resolution is 32 bits */
-                        if ((count - lead) & 3)
-                                tail = (count - lead) & 3;
-                        /* DMA the data */
-                        dma_size = count - lead - tail;
-                        err = ivtvfb_prep_dec_dma_to_device(itv,
-                               p + lead + dma_offset, (void *)buf, dma_size);
-                        dst += dma_size;
-                        buf += dma_size;
-                        /* Copy any leftover data */
-                        if (tail)
-                                memcpy(dst, buf, tail);
-                } else {
-                        memcpy(dst, buf, count);
+        /* If transfer size > threshold and both src/dst
+        addresses are aligned, use DMA */
+        if (count >= 4096 &&
+            ((unsigned long)buf & 3) == ((unsigned long)dst & 3)) {
+                /* Odd address = can't DMA. Align */
+                if ((unsigned long)dst & 3) {
+                        lead = 4 - ((unsigned long)dst & 3);
+                        if (copy_from_user(dst, buf, lead))
+                                return -EFAULT;
+                        buf += lead;
+                        dst += lead;
                 }
+                /* DMA resolution is 32 bits */
+                if ((count - lead) & 3)
+                        tail = (count - lead) & 3;
+                /* DMA the data */
+                dma_size = count - lead - tail;
+                dma_err = ivtvfb_prep_dec_dma_to_device(itv,
+                       p + lead + dma_offset, (void __user *)buf, dma_size);
+                if (dma_err)
+                        return dma_err;
+                dst += dma_size;
+                buf += dma_size;
+                /* Copy any leftover data */
+                if (tail && copy_from_user(dst, buf, tail))
+                        return -EFAULT;
+        } else if (copy_from_user(dst, buf, count)) {
+                return -EFAULT;
         }
 
         if  (!err)
@@ -463,9 +457,12 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar
                         vblank.flags = FB_VBLANK_HAVE_COUNT |FB_VBLANK_HAVE_VCOUNT |
                                         FB_VBLANK_HAVE_VSYNC;
                         trace = read_reg(0x028c0) >> 16;
-                        if (itv->is_50hz && trace > 312) trace -= 312;
-                        else if (itv->is_60hz && trace > 262) trace -= 262;
-                        if (trace == 1) vblank.flags |= FB_VBLANK_VSYNCING;
+                        if (itv->is_50hz && trace > 312)
+                                trace -= 312;
+                        else if (itv->is_60hz && trace > 262)
+                                trace -= 262;
+                        if (trace == 1)
+                                vblank.flags |= FB_VBLANK_VSYNCING;
                         vblank.count = itv->last_vsync_field;
                         vblank.vcount = trace;
                         vblank.hcount = 0;
@@ -476,7 +473,8 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar
 
                 case FBIO_WAITFORVSYNC:
                         prepare_to_wait(&itv->vsync_waitq, &wait, TASK_INTERRUPTIBLE);
-                        if (!schedule_timeout(msecs_to_jiffies(50))) rc = -ETIMEDOUT;
+                        if (!schedule_timeout(msecs_to_jiffies(50)))
+                                rc = -ETIMEDOUT;
                         finish_wait(&itv->vsync_waitq, &wait);
                         return rc;
 
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index a9ef7802eb5f..6418f4a78f2a 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -843,17 +843,16 @@ again:
 
 static int meye_open(struct inode *inode, struct file *file)
 {
-        int i, err;
+        int i;
 
-        err = video_exclusive_open(inode, file);
-        if (err < 0)
-                return err;
+        if (test_and_set_bit(0, &meye.in_use))
+                return -EBUSY;
 
         mchip_hic_stop();
 
         if (mchip_dma_alloc()) {
                 printk(KERN_ERR "meye: mchip framebuffer allocation failed\n");
-                video_exclusive_release(inode, file);
+                clear_bit(0, &meye.in_use);
                 return -ENOBUFS;
         }
 
@@ -868,7 +867,7 @@ static int meye_release(struct inode *inode, struct file *file)
 {
         mchip_hic_stop();
         mchip_dma_free();
-        video_exclusive_release(inode, file);
+        clear_bit(0, &meye.in_use);
         return 0;
 }
 
@@ -1774,6 +1773,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
                 goto outnotdev;
         }
 
+        ret = -ENOMEM;
         meye.mchip_dev = pcidev;
         meye.video_dev = video_device_alloc();
         if (!meye.video_dev) {
@@ -1781,7 +1781,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
                 goto outnotdev;
         }
 
-        ret = -ENOMEM;
         meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE);
         if (!meye.grab_temp) {
                 printk(KERN_ERR "meye: grab buffer allocation failed\n");
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h
index d535748df445..5f70a106ba2b 100644
--- a/drivers/media/video/meye.h
+++ b/drivers/media/video/meye.h
@@ -311,6 +311,7 @@ struct meye {
         struct video_device *video_dev; /* video device parameters */
         struct video_picture picture;   /* video picture parameters */
         struct meye_params params;      /* additional parameters */
+        unsigned long in_use;           /* set to 1 if the device is in use */
 #ifdef CONFIG_PM
         u8 pm_mchip_mode;               /* old mchip mode */
 #endif
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 554d2295484e..0c524376b67e 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -117,24 +117,51 @@ static int reg_clear(struct soc_camera_device *icd, const u8 reg,
 
 static int mt9m001_init(struct soc_camera_device *icd)
 {
+        struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+        struct soc_camera_link *icl = mt9m001->client->dev.platform_data;
         int ret;
 
-        /* Disable chip, synchronous option update */
         dev_dbg(icd->vdev->parent, "%s\n", __func__);
 
-        ret = reg_write(icd, MT9M001_RESET, 1);
-        if (ret >= 0)
-                ret = reg_write(icd, MT9M001_RESET, 0);
-        if (ret >= 0)
+        if (icl->power) {
+                ret = icl->power(&mt9m001->client->dev, 1);
+                if (ret < 0) {
+                        dev_err(icd->vdev->parent,
+                                "Platform failed to power-on the camera.\n");
+                        return ret;
+                }
+        }
+
+        /* The camera could have been already on, we reset it additionally */
+        if (icl->reset)
+                ret = icl->reset(&mt9m001->client->dev);
+        else
+                ret = -ENODEV;
+
+        if (ret < 0) {
+                /* Either no platform reset, or platform reset failed */
+                ret = reg_write(icd, MT9M001_RESET, 1);
+                if (!ret)
+                        ret = reg_write(icd, MT9M001_RESET, 0);
+        }
+        /* Disable chip, synchronous option update */
+        if (!ret)
                 ret = reg_write(icd, MT9M001_OUTPUT_CONTROL, 0);
 
-        return ret >= 0 ? 0 : -EIO;
+        return ret;
 }
 
 static int mt9m001_release(struct soc_camera_device *icd)
 {
+        struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+        struct soc_camera_link *icl = mt9m001->client->dev.platform_data;
+
         /* Disable the chip */
         reg_write(icd, MT9M001_OUTPUT_CONTROL, 0);
+
+        if (icl->power)
+                icl->power(&mt9m001->client->dev, 0);
+
         return 0;
 }
 
@@ -267,24 +294,24 @@ static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,
 
         /* Blanking and start values - default... */
         ret = reg_write(icd, MT9M001_HORIZONTAL_BLANKING, hblank);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9M001_VERTICAL_BLANKING, vblank);
 
         /* The caller provides a supported format, as verified per
          * call to icd->try_fmt_cap() */
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9M001_COLUMN_START, rect->left);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9M001_ROW_START, rect->top);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9M001_WINDOW_WIDTH, rect->width - 1);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9M001_WINDOW_HEIGHT,
                                 rect->height + icd->y_skip_top - 1);
-        if (ret >= 0 && mt9m001->autoexposure) {
+        if (!ret && mt9m001->autoexposure) {
                 ret = reg_write(icd, MT9M001_SHUTTER_WIDTH,
                                 rect->height + icd->y_skip_top + vblank);
-                if (ret >= 0) {
+                if (!ret) {
                         const struct v4l2_queryctrl *qctrl =
                                 soc_camera_find_qctrl(icd->ops,
                                                       V4L2_CID_EXPOSURE);
@@ -295,7 +322,7 @@ static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,
                 }
         }
 
-        return ret < 0 ? ret : 0;
+        return ret;
 }
 
 static int mt9m001_try_fmt_cap(struct soc_camera_device *icd,
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
new file mode 100644
index 000000000000..da0b2d553fd0
--- /dev/null
+++ b/drivers/media/video/mt9m111.c
@@ -0,0 +1,973 @@
+/*
+ * Driver for MT9M111 CMOS Image Sensor from Micron
+ *
+ * Copyright (C) 2008, Robert Jarzmik <robert.jarzmik@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/videodev2.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/log2.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+
+#include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/soc_camera.h>
+
+/*
+ * mt9m111 i2c address is 0x5d or 0x48 (depending on SAddr pin)
+ * The platform has to define i2c_board_info and call i2c_register_board_info()
+ */
+
+/* mt9m111: Sensor register addresses */
+#define MT9M111_CHIP_VERSION            0x000
+#define MT9M111_ROW_START               0x001
+#define MT9M111_COLUMN_START            0x002
+#define MT9M111_WINDOW_HEIGHT           0x003
+#define MT9M111_WINDOW_WIDTH            0x004
+#define MT9M111_HORIZONTAL_BLANKING_B   0x005
+#define MT9M111_VERTICAL_BLANKING_B     0x006
+#define MT9M111_HORIZONTAL_BLANKING_A   0x007
+#define MT9M111_VERTICAL_BLANKING_A     0x008
+#define MT9M111_SHUTTER_WIDTH           0x009
+#define MT9M111_ROW_SPEED               0x00a
+#define MT9M111_EXTRA_DELAY             0x00b
+#define MT9M111_SHUTTER_DELAY           0x00c
+#define MT9M111_RESET                   0x00d
+#define MT9M111_READ_MODE_B             0x020
+#define MT9M111_READ_MODE_A             0x021
+#define MT9M111_FLASH_CONTROL           0x023
+#define MT9M111_GREEN1_GAIN             0x02b
+#define MT9M111_BLUE_GAIN               0x02c
+#define MT9M111_RED_GAIN                0x02d
+#define MT9M111_GREEN2_GAIN             0x02e
+#define MT9M111_GLOBAL_GAIN             0x02f
+#define MT9M111_CONTEXT_CONTROL         0x0c8
+#define MT9M111_PAGE_MAP                0x0f0
+#define MT9M111_BYTE_WISE_ADDR          0x0f1
+
+#define MT9M111_RESET_SYNC_CHANGES      (1 << 15)
+#define MT9M111_RESET_RESTART_BAD_FRAME (1 << 9)
+#define MT9M111_RESET_SHOW_BAD_FRAMES   (1 << 8)
+#define MT9M111_RESET_RESET_SOC         (1 << 5)
+#define MT9M111_RESET_OUTPUT_DISABLE    (1 << 4)
+#define MT9M111_RESET_CHIP_ENABLE       (1 << 3)
+#define MT9M111_RESET_ANALOG_STANDBY    (1 << 2)
+#define MT9M111_RESET_RESTART_FRAME     (1 << 1)
+#define MT9M111_RESET_RESET_MODE        (1 << 0)
+
+#define MT9M111_RMB_MIRROR_COLS         (1 << 1)
+#define MT9M111_RMB_MIRROR_ROWS         (1 << 0)
+#define MT9M111_CTXT_CTRL_RESTART       (1 << 15)
+#define MT9M111_CTXT_CTRL_DEFECTCOR_B   (1 << 12)
+#define MT9M111_CTXT_CTRL_RESIZE_B      (1 << 10)
+#define MT9M111_CTXT_CTRL_CTRL2_B       (1 << 9)
+#define MT9M111_CTXT_CTRL_GAMMA_B       (1 << 8)
+#define MT9M111_CTXT_CTRL_XENON_EN      (1 << 7)
+#define MT9M111_CTXT_CTRL_READ_MODE_B   (1 << 3)
+#define MT9M111_CTXT_CTRL_LED_FLASH_EN  (1 << 2)
+#define MT9M111_CTXT_CTRL_VBLANK_SEL_B  (1 << 1)
+#define MT9M111_CTXT_CTRL_HBLANK_SEL_B  (1 << 0)
+/*
+ * mt9m111: Colorpipe register addresses (0x100..0x1ff)
+ */
+#define MT9M111_OPER_MODE_CTRL          0x106
+#define MT9M111_OUTPUT_FORMAT_CTRL      0x108
+#define MT9M111_REDUCER_XZOOM_B         0x1a0
+#define MT9M111_REDUCER_XSIZE_B         0x1a1
+#define MT9M111_REDUCER_YZOOM_B         0x1a3
+#define MT9M111_REDUCER_YSIZE_B         0x1a4
+#define MT9M111_REDUCER_XZOOM_A         0x1a6
+#define MT9M111_REDUCER_XSIZE_A         0x1a7
+#define MT9M111_REDUCER_YZOOM_A         0x1a9
+#define MT9M111_REDUCER_YSIZE_A         0x1aa
+
+#define MT9M111_OUTPUT_FORMAT_CTRL2_A   0x13a
+#define MT9M111_OUTPUT_FORMAT_CTRL2_B   0x19b
+
+#define MT9M111_OPMODE_AUTOEXPO_EN      (1 << 14)
+
+
+#define MT9M111_OUTFMT_PROCESSED_BAYER  (1 << 14)
+#define MT9M111_OUTFMT_BYPASS_IFP       (1 << 10)
+#define MT9M111_OUTFMT_INV_PIX_CLOCK    (1 << 9)
+#define MT9M111_OUTFMT_RGB              (1 << 8)
+#define MT9M111_OUTFMT_RGB565           (0x0 << 6)
+#define MT9M111_OUTFMT_RGB555           (0x1 << 6)
+#define MT9M111_OUTFMT_RGB444x          (0x2 << 6)
+#define MT9M111_OUTFMT_RGBx444          (0x3 << 6)
+#define MT9M111_OUTFMT_TST_RAMP_OFF     (0x0 << 4)
+#define MT9M111_OUTFMT_TST_RAMP_COL     (0x1 << 4)
+#define MT9M111_OUTFMT_TST_RAMP_ROW     (0x2 << 4)
+#define MT9M111_OUTFMT_TST_RAMP_FRAME   (0x3 << 4)
+#define MT9M111_OUTFMT_SHIFT_3_UP       (1 << 3)
+#define MT9M111_OUTFMT_AVG_CHROMA       (1 << 2)
+#define MT9M111_OUTFMT_SWAP_YCbCr_C_Y   (1 << 1)
+#define MT9M111_OUTFMT_SWAP_RGB_EVEN    (1 << 1)
+#define MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr (1 << 0)
+/*
+ * mt9m111: Camera control register addresses (0x200..0x2ff not implemented)
+ */
+
+#define reg_read(reg) mt9m111_reg_read(icd, MT9M111_##reg)
+#define reg_write(reg, val) mt9m111_reg_write(icd, MT9M111_##reg, (val))
+#define reg_set(reg, val) mt9m111_reg_set(icd, MT9M111_##reg, (val))
+#define reg_clear(reg, val) mt9m111_reg_clear(icd, MT9M111_##reg, (val))
+
+#define MT9M111_MIN_DARK_ROWS   8
+#define MT9M111_MIN_DARK_COLS   24
+#define MT9M111_MAX_HEIGHT      1024
+#define MT9M111_MAX_WIDTH       1280
+
+#define COL_FMT(_name, _depth, _fourcc, _colorspace) \
+        { .name = _name, .depth = _depth, .fourcc = _fourcc, \
+        .colorspace = _colorspace }
+#define RGB_FMT(_name, _depth, _fourcc) \
+        COL_FMT(_name, _depth, _fourcc, V4L2_COLORSPACE_SRGB)
+
+static const struct soc_camera_data_format mt9m111_colour_formats[] = {
+        COL_FMT("YCrYCb 8 bit", 8, V4L2_PIX_FMT_YUYV, V4L2_COLORSPACE_JPEG),
+        RGB_FMT("RGB 565", 16, V4L2_PIX_FMT_RGB565),
+        RGB_FMT("RGB 555", 16, V4L2_PIX_FMT_RGB555),
+        RGB_FMT("Bayer (sRGB) 10 bit", 10, V4L2_PIX_FMT_SBGGR16),
+        RGB_FMT("Bayer (sRGB) 8 bit", 8, V4L2_PIX_FMT_SBGGR8),
+};
+
+enum mt9m111_context {
+        HIGHPOWER = 0,
+        LOWPOWER,
+};
+
+struct mt9m111 {
+        struct i2c_client *client;
+        struct soc_camera_device icd;
+        int model;      /* V4L2_IDENT_MT9M111* codes from v4l2-chip-ident.h */
+        enum mt9m111_context context;
+        unsigned int left, top, width, height;
+        u32 pixfmt;
+        unsigned char autoexposure;
+        unsigned char datawidth;
+        unsigned int powered:1;
+        unsigned int hflip:1;
+        unsigned int vflip:1;
+        unsigned int swap_rgb_even_odd:1;
+        unsigned int swap_rgb_red_blue:1;
+        unsigned int swap_yuv_y_chromas:1;
+        unsigned int swap_yuv_cb_cr:1;
+};
+
+static int reg_page_map_set(struct i2c_client *client, const u16 reg)
+{
+        int ret;
+        u16 page;
+        static int lastpage = -1;       /* PageMap cache value */
+
+        page = (reg >> 8);
+        if (page == lastpage)
+                return 0;
+        if (page > 2)
+                return -EINVAL;
+
+        ret = i2c_smbus_write_word_data(client, MT9M111_PAGE_MAP, swab16(page));
+        if (!ret)
+                lastpage = page;
+        return ret;
+}
+
+static int mt9m111_reg_read(struct soc_camera_device *icd, const u16 reg)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        struct i2c_client *client = mt9m111->client;
+        int ret;
+
+        ret = reg_page_map_set(client, reg);
+        if (!ret)
+                ret = swab16(i2c_smbus_read_word_data(client, (reg & 0xff)));
+
+        dev_dbg(&icd->dev, "read  reg.%03x -> %04x\n", reg, ret);
+        return ret;
+}
+
+static int mt9m111_reg_write(struct soc_camera_device *icd, const u16 reg,
+                             const u16 data)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        struct i2c_client *client = mt9m111->client;
+        int ret;
+
+        ret = reg_page_map_set(client, reg);
+        if (!ret)
+                ret = i2c_smbus_write_word_data(mt9m111->client, (reg & 0xff),
+                                                swab16(data));
+        dev_dbg(&icd->dev, "write reg.%03x = %04x -> %d\n", reg, data, ret);
+        return ret;
+}
+
+static int mt9m111_reg_set(struct soc_camera_device *icd, const u16 reg,
+                           const u16 data)
+{
+        int ret;
+
+        ret = mt9m111_reg_read(icd, reg);
+        if (ret >= 0)
+                ret = mt9m111_reg_write(icd, reg, ret | data);
+        return ret;
+}
+
+static int mt9m111_reg_clear(struct soc_camera_device *icd, const u16 reg,
+                             const u16 data)
+{
+        int ret;
+
+        ret = mt9m111_reg_read(icd, reg);
+        return mt9m111_reg_write(icd, reg, ret & ~data);
+}
+
+static int mt9m111_set_context(struct soc_camera_device *icd,
+                               enum mt9m111_context ctxt)
+{
+        int valB = MT9M111_CTXT_CTRL_RESTART | MT9M111_CTXT_CTRL_DEFECTCOR_B
+                | MT9M111_CTXT_CTRL_RESIZE_B | MT9M111_CTXT_CTRL_CTRL2_B
+                | MT9M111_CTXT_CTRL_GAMMA_B | MT9M111_CTXT_CTRL_READ_MODE_B
+                | MT9M111_CTXT_CTRL_VBLANK_SEL_B
+                | MT9M111_CTXT_CTRL_HBLANK_SEL_B;
+        int valA = MT9M111_CTXT_CTRL_RESTART;
+
+        if (ctxt == HIGHPOWER)
+                return reg_write(CONTEXT_CONTROL, valB);
+        else
+                return reg_write(CONTEXT_CONTROL, valA);
+}
+
+static int mt9m111_setup_rect(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret, is_raw_format;
+        int width = mt9m111->width;
+        int height = mt9m111->height;
+
+        if ((mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR8)
+            || (mt9m111->pixfmt == V4L2_PIX_FMT_SBGGR16))
+                is_raw_format = 1;
+        else
+                is_raw_format = 0;
+
+        ret = reg_write(COLUMN_START, mt9m111->left);
+        if (!ret)
+                ret = reg_write(ROW_START, mt9m111->top);
+
+        if (is_raw_format) {
+                if (!ret)
+                        ret = reg_write(WINDOW_WIDTH, width);
+                if (!ret)
+                        ret = reg_write(WINDOW_HEIGHT, height);
+        } else {
+                if (!ret)
+                        ret = reg_write(REDUCER_XZOOM_B, MT9M111_MAX_WIDTH);
+                if (!ret)
+                        ret = reg_write(REDUCER_YZOOM_B, MT9M111_MAX_HEIGHT);
+                if (!ret)
+                        ret = reg_write(REDUCER_XSIZE_B, width);
+                if (!ret)
+                        ret = reg_write(REDUCER_YSIZE_B, height);
+                if (!ret)
+                        ret = reg_write(REDUCER_XZOOM_A, MT9M111_MAX_WIDTH);
+                if (!ret)
+                        ret = reg_write(REDUCER_YZOOM_A, MT9M111_MAX_HEIGHT);
+                if (!ret)
+                        ret = reg_write(REDUCER_XSIZE_A, width);
+                if (!ret)
+                        ret = reg_write(REDUCER_YSIZE_A, height);
+        }
+
+        return ret;
+}
+
+static int mt9m111_setup_pixfmt(struct soc_camera_device *icd, u16 outfmt)
+{
+        int ret;
+
+        ret = reg_write(OUTPUT_FORMAT_CTRL2_A, outfmt);
+        if (!ret)
+                ret = reg_write(OUTPUT_FORMAT_CTRL2_B, outfmt);
+        return ret;
+}
+
+static int mt9m111_setfmt_bayer8(struct soc_camera_device *icd)
+{
+        return mt9m111_setup_pixfmt(icd, MT9M111_OUTFMT_PROCESSED_BAYER);
+}
+
+static int mt9m111_setfmt_bayer10(struct soc_camera_device *icd)
+{
+        return mt9m111_setup_pixfmt(icd, MT9M111_OUTFMT_BYPASS_IFP);
+}
+
+static int mt9m111_setfmt_rgb565(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int val = 0;
+
+        if (mt9m111->swap_rgb_red_blue)
+                val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr;
+        if (mt9m111->swap_rgb_even_odd)
+                val |= MT9M111_OUTFMT_SWAP_RGB_EVEN;
+        val |= MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565;
+
+        return mt9m111_setup_pixfmt(icd, val);
+}
+
+static int mt9m111_setfmt_rgb555(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int val = 0;
+
+        if (mt9m111->swap_rgb_red_blue)
+                val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr;
+        if (mt9m111->swap_rgb_even_odd)
+                val |= MT9M111_OUTFMT_SWAP_RGB_EVEN;
+        val |= MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB555;
+
+        return mt9m111_setup_pixfmt(icd, val);
+}
+
+static int mt9m111_setfmt_yuv(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int val = 0;
+
+        if (mt9m111->swap_yuv_cb_cr)
+                val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr;
+        if (mt9m111->swap_yuv_y_chromas)
+                val |= MT9M111_OUTFMT_SWAP_YCbCr_C_Y;
+
+        return mt9m111_setup_pixfmt(icd, val);
+}
+
+static int mt9m111_enable(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        struct soc_camera_link *icl = mt9m111->client->dev.platform_data;
+        int ret;
+
+        if (icl->power) {
+                ret = icl->power(&mt9m111->client->dev, 1);
+                if (ret < 0) {
+                        dev_err(icd->vdev->parent,
+                                "Platform failed to power-on the camera.\n");
+                        return ret;
+                }
+        }
+
+        ret = reg_set(RESET, MT9M111_RESET_CHIP_ENABLE);
+        if (!ret)
+                mt9m111->powered = 1;
+        return ret;
+}
+
+static int mt9m111_disable(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        struct soc_camera_link *icl = mt9m111->client->dev.platform_data;
+        int ret;
+
+        ret = reg_clear(RESET, MT9M111_RESET_CHIP_ENABLE);
+        if (!ret)
+                mt9m111->powered = 0;
+
+        if (icl->power)
+                icl->power(&mt9m111->client->dev, 0);
+
+        return ret;
+}
+
+static int mt9m111_reset(struct soc_camera_device *icd)
+{
+        int ret;
+
+        ret = reg_set(RESET, MT9M111_RESET_RESET_MODE);
+        if (!ret)
+                ret = reg_set(RESET, MT9M111_RESET_RESET_SOC);
+        if (!ret)
+                ret = reg_clear(RESET, MT9M111_RESET_RESET_MODE
+                                | MT9M111_RESET_RESET_SOC);
+        return ret;
+}
+
+static int mt9m111_start_capture(struct soc_camera_device *icd)
+{
+        return 0;
+}
+
+static int mt9m111_stop_capture(struct soc_camera_device *icd)
+{
+        return 0;
+}
+
+static unsigned long mt9m111_query_bus_param(struct soc_camera_device *icd)
+{
+        return SOCAM_MASTER | SOCAM_PCLK_SAMPLE_RISING |
+                SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
+                SOCAM_DATAWIDTH_8;
+}
+
+static int mt9m111_set_bus_param(struct soc_camera_device *icd, unsigned long f)
+{
+        return 0;
+}
+
+static int mt9m111_set_pixfmt(struct soc_camera_device *icd, u32 pixfmt)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret;
+
+        switch (pixfmt) {
+        case V4L2_PIX_FMT_SBGGR8:
+                ret = mt9m111_setfmt_bayer8(icd);
+                break;
+        case V4L2_PIX_FMT_SBGGR16:
+                ret = mt9m111_setfmt_bayer10(icd);
+                break;
+        case V4L2_PIX_FMT_RGB555:
+                ret = mt9m111_setfmt_rgb555(icd);
+                break;
+        case V4L2_PIX_FMT_RGB565:
+                ret = mt9m111_setfmt_rgb565(icd);
+                break;
+        case V4L2_PIX_FMT_YUYV:
+                ret = mt9m111_setfmt_yuv(icd);
+                break;
+        default:
+                dev_err(&icd->dev, "Pixel format not handled : %x\n", pixfmt);
+                ret = -EINVAL;
+        }
+
+        if (!ret)
+                mt9m111->pixfmt = pixfmt;
+
+        return ret;
+}
+
+static int mt9m111_set_fmt_cap(struct soc_camera_device *icd,
+                               __u32 pixfmt, struct v4l2_rect *rect)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret;
+
+        mt9m111->left = rect->left;
+        mt9m111->top = rect->top;
+        mt9m111->width = rect->width;
+        mt9m111->height = rect->height;
+
+        dev_dbg(&icd->dev, "%s fmt=%x left=%d, top=%d, width=%d, height=%d\n",
+                __func__, pixfmt, mt9m111->left, mt9m111->top, mt9m111->width,
+                mt9m111->height);
+
+        ret = mt9m111_setup_rect(icd);
+        if (!ret)
+                ret = mt9m111_set_pixfmt(icd, pixfmt);
+        return ret;
+}
+
+static int mt9m111_try_fmt_cap(struct soc_camera_device *icd,
+                               struct v4l2_format *f)
+{
+        if (f->fmt.pix.height > MT9M111_MAX_HEIGHT)
+                f->fmt.pix.height = MT9M111_MAX_HEIGHT;
+        if (f->fmt.pix.width > MT9M111_MAX_WIDTH)
+                f->fmt.pix.width = MT9M111_MAX_WIDTH;
+
+        return 0;
+}
+
+static int mt9m111_get_chip_id(struct soc_camera_device *icd,
+                               struct v4l2_chip_ident *id)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+
+        if (id->match_type != V4L2_CHIP_MATCH_I2C_ADDR)
+                return -EINVAL;
+
+        if (id->match_chip != mt9m111->client->addr)
+                return -ENODEV;
+
+        id->ident       = mt9m111->model;
+        id->revision    = 0;
+
+        return 0;
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int mt9m111_get_register(struct soc_camera_device *icd,
+                                struct v4l2_register *reg)
+{
+        int val;
+
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+
+        if (reg->match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff)
+                return -EINVAL;
+        if (reg->match_chip != mt9m111->client->addr)
+                return -ENODEV;
+
+        val = mt9m111_reg_read(icd, reg->reg);
+        reg->val = (u64)val;
+
+        if (reg->val > 0xffff)
+                return -EIO;
+
+        return 0;
+}
+
+static int mt9m111_set_register(struct soc_camera_device *icd,
+                                struct v4l2_register *reg)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+
+        if (reg->match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff)
+                return -EINVAL;
+
+        if (reg->match_chip != mt9m111->client->addr)
+                return -ENODEV;
+
+        if (mt9m111_reg_write(icd, reg->reg, reg->val) < 0)
+                return -EIO;
+
+        return 0;
+}
+#endif
+
+static const struct v4l2_queryctrl mt9m111_controls[] = {
+        {
+                .id             = V4L2_CID_VFLIP,
+                .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                .name           = "Flip Verticaly",
+                .minimum        = 0,
+                .maximum        = 1,
+                .step           = 1,
+                .default_value  = 0,
+        }, {
+                .id             = V4L2_CID_HFLIP,
+                .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                .name           = "Flip Horizontaly",
+                .minimum        = 0,
+                .maximum        = 1,
+                .step           = 1,
+                .default_value  = 0,
+        }, {    /* gain = 1/32*val (=>gain=1 if val==32) */
+                .id             = V4L2_CID_GAIN,
+                .type           = V4L2_CTRL_TYPE_INTEGER,
+                .name           = "Gain",
+                .minimum        = 0,
+                .maximum        = 63 * 2 * 2,
+                .step           = 1,
+                .default_value  = 32,
+                .flags          = V4L2_CTRL_FLAG_SLIDER,
+        }, {
+                .id             = V4L2_CID_EXPOSURE_AUTO,
+                .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                .name           = "Auto Exposure",
+                .minimum        = 0,
+                .maximum        = 1,
+                .step           = 1,
+                .default_value  = 1,
+        }
+};
+
+static int mt9m111_video_probe(struct soc_camera_device *);
+static void mt9m111_video_remove(struct soc_camera_device *);
+static int mt9m111_get_control(struct soc_camera_device *,
+                               struct v4l2_control *);
+static int mt9m111_set_control(struct soc_camera_device *,
+                               struct v4l2_control *);
+static int mt9m111_resume(struct soc_camera_device *icd);
+static int mt9m111_init(struct soc_camera_device *icd);
+static int mt9m111_release(struct soc_camera_device *icd);
+
+static struct soc_camera_ops mt9m111_ops = {
+        .owner                  = THIS_MODULE,
+        .probe                  = mt9m111_video_probe,
+        .remove                 = mt9m111_video_remove,
+        .init                   = mt9m111_init,
+        .resume                 = mt9m111_resume,
+        .release                = mt9m111_release,
+        .start_capture          = mt9m111_start_capture,
+        .stop_capture           = mt9m111_stop_capture,
+        .set_fmt_cap            = mt9m111_set_fmt_cap,
+        .try_fmt_cap            = mt9m111_try_fmt_cap,
+        .query_bus_param        = mt9m111_query_bus_param,
+        .set_bus_param          = mt9m111_set_bus_param,
+        .controls               = mt9m111_controls,
+        .num_controls           = ARRAY_SIZE(mt9m111_controls),
+        .get_control            = mt9m111_get_control,
+        .set_control            = mt9m111_set_control,
+        .get_chip_id            = mt9m111_get_chip_id,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        .get_register           = mt9m111_get_register,
+        .set_register           = mt9m111_set_register,
+#endif
+};
+
+static int mt9m111_set_flip(struct soc_camera_device *icd, int flip, int mask)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret;
+
+        if (mt9m111->context == HIGHPOWER) {
+                if (flip)
+                        ret = reg_set(READ_MODE_B, mask);
+                else
+                        ret = reg_clear(READ_MODE_B, mask);
+        } else {
+                if (flip)
+                        ret = reg_set(READ_MODE_A, mask);
+                else
+                        ret = reg_clear(READ_MODE_A, mask);
+        }
+
+        return ret;
+}
+
+static int mt9m111_get_global_gain(struct soc_camera_device *icd)
+{
+        unsigned int data, gain;
+
+        data = reg_read(GLOBAL_GAIN);
+        if (data >= 0)
+                gain = ((data & (1 << 10)) * 2)
+                        | ((data & (1 << 9)) * 2)
+                        | (data & 0x2f);
+        else
+                gain = data;
+
+        return gain;
+}
+static int mt9m111_set_global_gain(struct soc_camera_device *icd, int gain)
+{
+        u16 val;
+
+        if (gain > 63 * 2 * 2)
+                return -EINVAL;
+
+        icd->gain = gain;
+        if ((gain >= 64 * 2) && (gain < 63 * 2 * 2))
+                val = (1 << 10) | (1 << 9) | (gain / 4);
+        else if ((gain >= 64) && (gain < 64 * 2))
+                val = (1 << 9) | (gain / 2);
+        else
+                val = gain;
+
+        return reg_write(GLOBAL_GAIN, val);
+}
+
+static int mt9m111_set_autoexposure(struct soc_camera_device *icd, int on)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret;
+
+        if (on)
+                ret = reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
+        else
+                ret = reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN);
+
+        if (!ret)
+                mt9m111->autoexposure = on;
+
+        return ret;
+}
+static int mt9m111_get_control(struct soc_camera_device *icd,
+                               struct v4l2_control *ctrl)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int data;
+
+        switch (ctrl->id) {
+        case V4L2_CID_VFLIP:
+                if (mt9m111->context == HIGHPOWER)
+                        data = reg_read(READ_MODE_B);
+                else
+                        data = reg_read(READ_MODE_A);
+
+                if (data < 0)
+                        return -EIO;
+                ctrl->value = !!(data & MT9M111_RMB_MIRROR_ROWS);
+                break;
+        case V4L2_CID_HFLIP:
+                if (mt9m111->context == HIGHPOWER)
+                        data = reg_read(READ_MODE_B);
+                else
+                        data = reg_read(READ_MODE_A);
+
+                if (data < 0)
+                        return -EIO;
+                ctrl->value = !!(data & MT9M111_RMB_MIRROR_COLS);
+                break;
+        case V4L2_CID_GAIN:
+                data = mt9m111_get_global_gain(icd);
+                if (data < 0)
+                        return data;
+                ctrl->value = data;
+                break;
+        case V4L2_CID_EXPOSURE_AUTO:
+                ctrl->value = mt9m111->autoexposure;
+                break;
+        }
+        return 0;
+}
+
+static int mt9m111_set_control(struct soc_camera_device *icd,
+                               struct v4l2_control *ctrl)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        const struct v4l2_queryctrl *qctrl;
+        int ret;
+
+        qctrl = soc_camera_find_qctrl(&mt9m111_ops, ctrl->id);
+
+        if (!qctrl)
+                return -EINVAL;
+
+        switch (ctrl->id) {
+        case V4L2_CID_VFLIP:
+                mt9m111->vflip = ctrl->value;
+                ret = mt9m111_set_flip(icd, ctrl->value,
+                                        MT9M111_RMB_MIRROR_ROWS);
+                break;
+        case V4L2_CID_HFLIP:
+                mt9m111->hflip = ctrl->value;
+                ret = mt9m111_set_flip(icd, ctrl->value,
+                                        MT9M111_RMB_MIRROR_COLS);
+                break;
+        case V4L2_CID_GAIN:
+                ret = mt9m111_set_global_gain(icd, ctrl->value);
+                break;
+        case V4L2_CID_EXPOSURE_AUTO:
+                ret =  mt9m111_set_autoexposure(icd, ctrl->value);
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
+static int mt9m111_restore_state(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+
+        mt9m111_set_context(icd, mt9m111->context);
+        mt9m111_set_pixfmt(icd, mt9m111->pixfmt);
+        mt9m111_setup_rect(icd);
+        mt9m111_set_flip(icd, mt9m111->hflip, MT9M111_RMB_MIRROR_COLS);
+        mt9m111_set_flip(icd, mt9m111->vflip, MT9M111_RMB_MIRROR_ROWS);
+        mt9m111_set_global_gain(icd, icd->gain);
+        mt9m111_set_autoexposure(icd, mt9m111->autoexposure);
+        return 0;
+}
+
+static int mt9m111_resume(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret = 0;
+
+        if (mt9m111->powered) {
+                ret = mt9m111_enable(icd);
+                if (!ret)
+                        ret = mt9m111_reset(icd);
+                if (!ret)
+                        ret = mt9m111_restore_state(icd);
+        }
+        return ret;
+}
+
+static int mt9m111_init(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        int ret;
+
+        mt9m111->context = HIGHPOWER;
+        ret = mt9m111_enable(icd);
+        if (!ret)
+                ret = mt9m111_reset(icd);
+        if (!ret)
+                ret = mt9m111_set_context(icd, mt9m111->context);
+        if (!ret)
+                ret = mt9m111_set_autoexposure(icd, mt9m111->autoexposure);
+        if (ret)
+                dev_err(&icd->dev, "mt9m111 init failed: %d\n", ret);
+        return ret;
+}
+
+static int mt9m111_release(struct soc_camera_device *icd)
+{
+        int ret;
+
+        ret = mt9m111_disable(icd);
+        if (ret < 0)
+                dev_err(&icd->dev, "mt9m111 release failed: %d\n", ret);
+
+        return ret;
+}
+
+/*
+ * Interface active, can use i2c. If it fails, it can indeed mean, that
+ * this wasn't our capture interface, so, we wait for the right one
+ */
+static int mt9m111_video_probe(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+        s32 data;
+        int ret;
+
+        /*
+         * We must have a parent by now. And it cannot be a wrong one.
+         * So this entire test is completely redundant.
+         */
+        if (!icd->dev.parent ||
+            to_soc_camera_host(icd->dev.parent)->nr != icd->iface)
+                return -ENODEV;
+
+        ret = mt9m111_enable(icd);
+        if (ret)
+                goto ei2c;
+        ret = mt9m111_reset(icd);
+        if (ret)
+                goto ei2c;
+
+        data = reg_read(CHIP_VERSION);
+
+        switch (data) {
+        case 0x143a:
+                mt9m111->model = V4L2_IDENT_MT9M111;
+                icd->formats = mt9m111_colour_formats;
+                icd->num_formats = ARRAY_SIZE(mt9m111_colour_formats);
+                break;
+        default:
+                ret = -ENODEV;
+                dev_err(&icd->dev,
+                        "No MT9M111 chip detected, register read %x\n", data);
+                goto ei2c;
+        }
+
+        dev_info(&icd->dev, "Detected a MT9M111 chip ID 0x143a\n");
+
+        ret = soc_camera_video_start(icd);
+        if (ret)
+                goto eisis;
+
+        mt9m111->autoexposure = 1;
+
+        mt9m111->swap_rgb_even_odd = 1;
+        mt9m111->swap_rgb_red_blue = 1;
+
+        return 0;
+eisis:
+ei2c:
+        return ret;
+}
+
+static void mt9m111_video_remove(struct soc_camera_device *icd)
+{
+        struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
+
+        dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9m111->client->addr,
+                mt9m111->icd.dev.parent, mt9m111->icd.vdev);
+        soc_camera_video_stop(&mt9m111->icd);
+}
+
+static int mt9m111_probe(struct i2c_client *client,
+                         const struct i2c_device_id *did)
+{
+        struct mt9m111 *mt9m111;
+        struct soc_camera_device *icd;
+        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
+        struct soc_camera_link *icl = client->dev.platform_data;
+        int ret;
+
+        if (!icl) {
+                dev_err(&client->dev, "MT9M111 driver needs platform data\n");
+                return -EINVAL;
+        }
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) {
+                dev_warn(&adapter->dev,
+                         "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n");
+                return -EIO;
+        }
+
+        mt9m111 = kzalloc(sizeof(struct mt9m111), GFP_KERNEL);
+        if (!mt9m111)
+                return -ENOMEM;
+
+        mt9m111->client = client;
+        i2c_set_clientdata(client, mt9m111);
+
+        /* Second stage probe - when a capture adapter is there */
+        icd             = &mt9m111->icd;
+        icd->ops        = &mt9m111_ops;
+        icd->control    = &client->dev;
+        icd->x_min      = MT9M111_MIN_DARK_COLS;
+        icd->y_min      = MT9M111_MIN_DARK_ROWS;
+        icd->x_current  = icd->x_min;
+        icd->y_current  = icd->y_min;
+        icd->width_min  = MT9M111_MIN_DARK_ROWS;
+        icd->width_max  = MT9M111_MAX_WIDTH;
+        icd->height_min = MT9M111_MIN_DARK_COLS;
+        icd->height_max = MT9M111_MAX_HEIGHT;
+        icd->y_skip_top = 0;
+        icd->iface      = icl->bus_id;
+
+        ret = soc_camera_device_register(icd);
+        if (ret)
+                goto eisdr;
+        return 0;
+
+eisdr:
+        kfree(mt9m111);
+        return ret;
+}
+
+static int mt9m111_remove(struct i2c_client *client)
+{
+        struct mt9m111 *mt9m111 = i2c_get_clientdata(client);
+        soc_camera_device_unregister(&mt9m111->icd);
+        kfree(mt9m111);
+
+        return 0;
+}
+
+static const struct i2c_device_id mt9m111_id[] = {
+        { "mt9m111", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, mt9m111_id);
+
+static struct i2c_driver mt9m111_i2c_driver = {
+        .driver = {
+                .name = "mt9m111",
+        },
+        .probe          = mt9m111_probe,
+        .remove         = mt9m111_remove,
+        .id_table       = mt9m111_id,
+};
+
+static int __init mt9m111_mod_init(void)
+{
+        return i2c_add_driver(&mt9m111_i2c_driver);
+}
+
+static void __exit mt9m111_mod_exit(void)
+{
+        i2c_del_driver(&mt9m111_i2c_driver);
+}
+
+module_init(mt9m111_mod_init);
+module_exit(mt9m111_mod_exit);
+
+MODULE_DESCRIPTION("Micron MT9M111 Camera driver");
+MODULE_AUTHOR("Robert Jarzmik");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index 56808cd2f8a9..2584201059d8 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -134,34 +134,56 @@ static int reg_clear(struct soc_camera_device *icd, const u8 reg,
 static int mt9v022_init(struct soc_camera_device *icd)
 {
         struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
+        struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
         int ret;
 
+        if (icl->power) {
+                ret = icl->power(&mt9v022->client->dev, 1);
+                if (ret < 0) {
+                        dev_err(icd->vdev->parent,
+                                "Platform failed to power-on the camera.\n");
+                        return ret;
+                }
+        }
+
+        /*
+         * The camera could have been already on, we hard-reset it additionally,
+         * if available. Soft reset is done in video_probe().
+         */
+        if (icl->reset)
+                icl->reset(&mt9v022->client->dev);
+
         /* Almost the default mode: master, parallel, simultaneous, and an
          * undocumented bit 0x200, which is present in table 7, but not in 8,
          * plus snapshot mode to disable scan for now */
         mt9v022->chip_control |= 0x10;
         ret = reg_write(icd, MT9V022_CHIP_CONTROL, mt9v022->chip_control);
-        if (ret >= 0)
-                reg_write(icd, MT9V022_READ_MODE, 0x300);
+        if (!ret)
+                ret = reg_write(icd, MT9V022_READ_MODE, 0x300);
 
         /* All defaults */
-        if (ret >= 0)
+        if (!ret)
                 /* AEC, AGC on */
                 ret = reg_set(icd, MT9V022_AEC_AGC_ENABLE, 0x3);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_MAX_TOTAL_SHUTTER_WIDTH, 480);
-        if (ret >= 0)
+        if (!ret)
                 /* default - auto */
                 ret = reg_clear(icd, MT9V022_BLACK_LEVEL_CALIB_CTRL, 1);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_DIGITAL_TEST_PATTERN, 0);
 
-        return ret >= 0 ? 0 : -EIO;
+        return ret;
 }
 
 static int mt9v022_release(struct soc_camera_device *icd)
 {
-        /* Nothing? */
+        struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
+        struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
+
+        if (icl->power)
+                icl->power(&mt9v022->client->dev, 0);
+
         return 0;
 }
 
@@ -352,21 +374,21 @@ static int mt9v022_set_fmt_cap(struct soc_camera_device *icd,
                                         rect->height + icd->y_skip_top + 43);
         }
         /* Setup frame format: defaults apart from width and height */
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_COLUMN_START, rect->left);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_ROW_START, rect->top);
-        if (ret >= 0)
+        if (!ret)
                 /* Default 94, Phytec driver says:
                  * "width + horizontal blank >= 660" */
                 ret = reg_write(icd, MT9V022_HORIZONTAL_BLANKING,
                                 rect->width > 660 - 43 ? 43 :
                                 660 - rect->width);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_VERTICAL_BLANKING, 45);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_WINDOW_WIDTH, rect->width);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_WINDOW_HEIGHT,
                                 rect->height + icd->y_skip_top);
 
@@ -717,7 +739,7 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)
                         icd->num_formats = 1;
         }
 
-        if (ret >= 0)
+        if (!ret)
                 ret = soc_camera_video_start(icd);
         if (ret < 0)
                 goto eisis;
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index 8ef578caba3b..7f130284b5c7 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -27,6 +27,7 @@
 #include <media/tuner.h>
 #include <linux/video_decoder.h>
 #include <media/v4l2-common.h>
+#include <media/saa7115.h>
 
 #include "mxb.h"
 #include "tea6415c.h"
@@ -122,6 +123,8 @@ static struct saa7146_extension_ioctls ioctls[] = {
         { VIDIOC_S_FREQUENCY,   SAA7146_EXCLUSIVE },
         { VIDIOC_G_AUDIO,       SAA7146_EXCLUSIVE },
         { VIDIOC_S_AUDIO,       SAA7146_EXCLUSIVE },
+        { VIDIOC_DBG_G_REGISTER,        SAA7146_EXCLUSIVE },
+        { VIDIOC_DBG_S_REGISTER,        SAA7146_EXCLUSIVE },
         { MXB_S_AUDIO_CD,       SAA7146_EXCLUSIVE },    /* custom control */
         { MXB_S_AUDIO_LINE,     SAA7146_EXCLUSIVE },    /* custom control */
         { 0,                    0 }
@@ -134,12 +137,12 @@ struct mxb
 
         struct i2c_adapter      i2c_adapter;
 
-        struct i2c_client*      saa7111a;
-        struct i2c_client*      tda9840;
-        struct i2c_client*      tea6415c;
-        struct i2c_client*      tuner;
-        struct i2c_client*      tea6420_1;
-        struct i2c_client*      tea6420_2;
+        struct i2c_client       *saa7111a;
+        struct i2c_client       *tda9840;
+        struct i2c_client       *tea6415c;
+        struct i2c_client       *tuner;
+        struct i2c_client       *tea6420_1;
+        struct i2c_client       *tea6420_2;
 
         int     cur_mode;       /* current audio mode (mono, stereo, ...) */
         int     cur_input;      /* current input */
@@ -151,23 +154,23 @@ static struct saa7146_extension extension;
 
 static int mxb_check_clients(struct device *dev, void *data)
 {
-        struct mxb* mxb = data;
+        struct mxb *mxb = data;
         struct i2c_client *client = i2c_verify_client(dev);
 
-        if( !client )
+        if (!client)
                 return 0;
 
-        if( I2C_ADDR_TEA6420_1 == client->addr )
+        if (I2C_ADDR_TEA6420_1 == client->addr)
                 mxb->tea6420_1 = client;
-        if( I2C_ADDR_TEA6420_2 == client->addr )
+        if (I2C_ADDR_TEA6420_2 == client->addr)
                 mxb->tea6420_2 = client;
-        if( I2C_TEA6415C_2 == client->addr )
+        if (I2C_TEA6415C_2 == client->addr)
                 mxb->tea6415c = client;
-        if( I2C_ADDR_TDA9840 == client->addr )
+        if (I2C_ADDR_TDA9840 == client->addr)
                 mxb->tda9840 = client;
-        if( I2C_SAA7111 == client->addr )
+        if (I2C_SAA7111 == client->addr)
                 mxb->saa7111a = client;
-        if( 0x60 == client->addr )
+        if (0x60 == client->addr)
                 mxb->tuner = client;
 
         return 0;
@@ -178,23 +181,28 @@ static int mxb_probe(struct saa7146_dev* dev)
         struct mxb* mxb = NULL;
         int result;
 
-        if ((result = request_module("saa7111")) < 0) {
+        result = request_module("saa7115");
+        if (result < 0) {
                 printk("mxb: saa7111 i2c module not available.\n");
                 return -ENODEV;
         }
-        if ((result = request_module("tea6420")) < 0) {
+        result = request_module("tea6420");
+        if (result < 0) {
                 printk("mxb: tea6420 i2c module not available.\n");
                 return -ENODEV;
         }
-        if ((result = request_module("tea6415c")) < 0) {
+        result = request_module("tea6415c");
+        if (result < 0) {
                 printk("mxb: tea6415c i2c module not available.\n");
                 return -ENODEV;
         }
-        if ((result = request_module("tda9840")) < 0) {
+        result = request_module("tda9840");
+        if (result < 0) {
                 printk("mxb: tda9840 i2c module not available.\n");
                 return -ENODEV;
         }
-        if ((result = request_module("tuner")) < 0) {
+        result = request_module("tuner");
+        if (result < 0) {
                 printk("mxb: tuner i2c module not available.\n");
                 return -ENODEV;
         }
@@ -207,9 +215,10 @@ static int mxb_probe(struct saa7146_dev* dev)
 
         mxb->i2c_adapter = (struct i2c_adapter) {
                 .class = I2C_CLASS_TV_ANALOG,
-                .name = "mxb",
         };
 
+        snprintf(mxb->i2c_adapter.name, sizeof(mxb->i2c_adapter.name), "mxb%d", mxb_num);
+
         saa7146_i2c_adapter_prepare(dev, &mxb->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
         if(i2c_add_adapter(&mxb->i2c_adapter) < 0) {
                 DEB_S(("cannot register i2c-device. skipping.\n"));
@@ -290,38 +299,7 @@ static struct {
         { 9, { 0x1d, 0xed, 0xd0, 0x68, 0x29, 0xb4, 0xe1, 0x00, 0xb8 } },
         { 9, { 0x3d, 0xed, 0xd0, 0x68, 0x29, 0xb4, 0xe1, 0x00, 0xb8 } },
         { 3, { 0x80, 0xb3, 0x0a } },
-        {-1, { 0} }
-};
-
-static const unsigned char mxb_saa7111_init[] = {
-        0x00, 0x00,       /* 00 - ID byte */
-        0x01, 0x00,       /* 01 - reserved */
-
-        /*front end */
-        0x02, 0xd8,       /* 02 - FUSE=x, GUDL=x, MODE=x */
-        0x03, 0x23,       /* 03 - HLNRS=0, VBSL=1, WPOFF=0, HOLDG=0, GAFIX=0, GAI1=256, GAI2=256 */
-        0x04, 0x00,       /* 04 - GAI1=256 */
-        0x05, 0x00,       /* 05 - GAI2=256 */
-
-        /* decoder */
-        0x06, 0xf0,       /* 06 - HSB at  xx(50Hz) /  xx(60Hz) pixels after end of last line */
-        0x07, 0x30,       /* 07 - HSS at  xx(50Hz) /  xx(60Hz) pixels after end of last line */
-        0x08, 0xa8,       /* 08 - AUFD=x, FSEL=x, EXFIL=x, VTRC=x, HPLL=x, VNOI=x */
-        0x09, 0x02,       /* 09 - BYPS=x, PREF=x, BPSS=x, VBLB=x, UPTCV=x, APER=x */
-        0x0a, 0x80,       /* 0a - BRIG=128 */
-        0x0b, 0x47,       /* 0b - CONT=1.109 */
-        0x0c, 0x40,       /* 0c - SATN=1.0 */
-        0x0d, 0x00,       /* 0d - HUE=0 */
-        0x0e, 0x01,       /* 0e - CDTO=0, CSTD=0, DCCF=0, FCTC=0, CHBW=1 */
-        0x0f, 0x00,       /* 0f - reserved */
-        0x10, 0xd0,       /* 10 - OFTS=x, HDEL=x, VRLN=x, YDEL=x */
-        0x11, 0x8c,       /* 11 - GPSW=x, CM99=x, FECO=x, COMPO=x, OEYC=1, OEHV=1, VIPB=0, COLO=0 */
-        0x12, 0x80,       /* 12 - xx output control 2 */
-        0x13, 0x30,       /* 13 - xx output control 3 */
-        0x14, 0x00,       /* 14 - reserved */
-        0x15, 0x15,       /* 15 - VBI */
-        0x16, 0x04,       /* 16 - VBI */
-        0x17, 0x00,       /* 17 - VBI */
+        {-1, { 0 } }
 };
 
 /* bring hardware to a sane state. this has to be done, just in case someone
@@ -331,37 +309,28 @@ static const unsigned char mxb_saa7111_init[] = {
 static int mxb_init_done(struct saa7146_dev* dev)
 {
         struct mxb* mxb = (struct mxb*)dev->ext_priv;
-        struct video_decoder_init init;
         struct i2c_msg msg;
         struct tuner_setup tun_setup;
         v4l2_std_id std = V4L2_STD_PAL_BG;
+        struct v4l2_routing route;
 
         int i = 0, err = 0;
-        struct  tea6415c_multiplex vm;
+        struct tea6415c_multiplex vm;
 
         /* select video mode in saa7111a */
-        i = VIDEO_MODE_PAL;
-        /* fixme: currently pointless: gets overwritten by configuration below */
-        mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_NORM, &i);
-
-        /* write configuration to saa7111a */
-        init.data = mxb_saa7111_init;
-        init.len = sizeof(mxb_saa7111_init);
-        mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_INIT, &init);
+        mxb->saa7111a->driver->command(mxb->saa7111a, VIDIOC_S_STD, &std);
 
         /* select tuner-output on saa7111a */
         i = 0;
-        mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_INPUT, &i);
-
-        /* enable vbi bypass */
-        i = 1;
-        mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_VBI_BYPASS, &i);
+        route.input = SAA7115_COMPOSITE0;
+        route.output = SAA7111_FMT_CCIR | SAA7111_VBI_BYPASS;
+        mxb->saa7111a->driver->command(mxb->saa7111a, VIDIOC_INT_S_VIDEO_ROUTING, &route);
 
         /* select a tuner type */
         tun_setup.mode_mask = T_ANALOG_TV;
         tun_setup.addr = ADDR_UNSET;
         tun_setup.type = TUNER_PHILIPS_PAL;
-        mxb->tuner->driver->command(mxb->tuner,TUNER_SET_TYPE_ADDR, &tun_setup);
+        mxb->tuner->driver->command(mxb->tuner, TUNER_SET_TYPE_ADDR, &tun_setup);
         /* tune in some frequency on tuner */
         mxb->cur_freq.tuner = 0;
         mxb->cur_freq.type = V4L2_TUNER_ANALOG_TV;
@@ -373,27 +342,26 @@ static int mxb_init_done(struct saa7146_dev* dev)
         mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std);
 
         /* mute audio on tea6420s */
-        mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[6][0]);
-        mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_line[6][1]);
-        mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_cd[6][0]);
-        mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_cd[6][1]);
+        mxb->tea6420_1->driver->command(mxb->tea6420_1, TEA6420_SWITCH, &TEA6420_line[6][0]);
+        mxb->tea6420_2->driver->command(mxb->tea6420_2, TEA6420_SWITCH, &TEA6420_line[6][1]);
+        mxb->tea6420_1->driver->command(mxb->tea6420_1, TEA6420_SWITCH, &TEA6420_cd[6][0]);
+        mxb->tea6420_2->driver->command(mxb->tea6420_2, TEA6420_SWITCH, &TEA6420_cd[6][1]);
 
         /* switch to tuner-channel on tea6415c*/
         vm.out = 17;
         vm.in  = 3;
-        mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm);
+        mxb->tea6415c->driver->command(mxb->tea6415c, TEA6415C_SWITCH, &vm);
 
         /* select tuner-output on multicable on tea6415c*/
         vm.in  = 3;
         vm.out = 13;
-        mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm);
+        mxb->tea6415c->driver->command(mxb->tea6415c, TEA6415C_SWITCH, &vm);
 
         /* the rest for mxb */
         mxb->cur_input = 0;
         mxb->cur_mute = 1;
 
         mxb->cur_mode = V4L2_TUNER_MODE_STEREO;
-        mxb->tda9840->driver->command(mxb->tda9840, TDA9840_SWITCH, &mxb->cur_mode);
 
         /* check if the saa7740 (aka 'sound arena module') is present
            on the mxb. if so, we must initialize it. due to lack of
@@ -404,21 +372,22 @@ static int mxb_init_done(struct saa7146_dev* dev)
         msg.len = mxb_saa7740_init[0].length;
         msg.buf = &mxb_saa7740_init[0].data[0];
 
-        if( 1 == (err = i2c_transfer(&mxb->i2c_adapter, &msg, 1))) {
+        err = i2c_transfer(&mxb->i2c_adapter, &msg, 1);
+        if (err == 1) {
                 /* the sound arena module is a pos, that's probably the reason
                    philips refuses to hand out a datasheet for the saa7740...
                    it seems to screw up the i2c bus, so we disable fast irq
                    based i2c transactions here and rely on the slow and safe
                    polling method ... */
                 extension.flags &= ~SAA7146_USE_I2C_IRQ;
-                for(i = 1;;i++) {
-                        if( -1 == mxb_saa7740_init[i].length ) {
+                for (i = 1; ; i++) {
+                        if (-1 == mxb_saa7740_init[i].length)
                                 break;
-                        }
 
                         msg.len = mxb_saa7740_init[i].length;
                         msg.buf = &mxb_saa7740_init[i].data[0];
-                        if( 1 != (err = i2c_transfer(&mxb->i2c_adapter, &msg, 1))) {
+                        err = i2c_transfer(&mxb->i2c_adapter, &msg, 1);
+                        if (err != 1) {
                                 DEB_D(("failed to initialize 'sound arena module'.\n"));
                                 goto err;
                         }
@@ -432,7 +401,8 @@ err:
         /* ext->saa has been filled by the core driver */
 
         /* some stuff is done via variables */
-        saa7146_set_hps_source_and_sync(dev, input_port_selection[mxb->cur_input].hps_source, input_port_selection[mxb->cur_input].hps_sync);
+        saa7146_set_hps_source_and_sync(dev, input_port_selection[mxb->cur_input].hps_source,
+                        input_port_selection[mxb->cur_input].hps_sync);
 
         /* some stuff is done via direct write to the registers */
 
@@ -457,24 +427,24 @@ void mxb_irq_bh(struct saa7146_dev* dev, u32* irq_mask)
 static struct saa7146_ext_vv vv_data;
 
 /* this function only gets called when the probing was successful */
-static int mxb_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
+static int mxb_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info)
 {
-        struct mxb* mxb = (struct mxb*)dev->ext_priv;
+        struct mxb *mxb = (struct mxb *)dev->ext_priv;
 
-        DEB_EE(("dev:%p\n",dev));
+        DEB_EE(("dev:%p\n", dev));
 
         /* checking for i2c-devices can be omitted here, because we
            already did this in "mxb_vl42_probe" */
 
-        saa7146_vv_init(dev,&vv_data);
-        if( 0 != saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
+        saa7146_vv_init(dev, &vv_data);
+        if (saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
                 ERR(("cannot register capture v4l2 device. skipping.\n"));
                 return -1;
         }
 
         /* initialization stuff (vbi) (only for revision > 0 and for extensions which want it)*/
-        if( 0 != MXB_BOARD_CAN_DO_VBI(dev)) {
-                if( 0 != saa7146_register_device(&mxb->vbi_dev, dev, "mxb", VFL_TYPE_VBI)) {
+        if (MXB_BOARD_CAN_DO_VBI(dev)) {
+                if (saa7146_register_device(&mxb->vbi_dev, dev, "mxb", VFL_TYPE_VBI)) {
                         ERR(("cannot register vbi v4l2 device. skipping.\n"));
                 }
         }
@@ -486,18 +456,18 @@ static int mxb_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data
         i2c_use_client(mxb->saa7111a);
         i2c_use_client(mxb->tuner);
 
-        printk("mxb: found 'Multimedia eXtension Board'-%d.\n",mxb_num);
+        printk("mxb: found Multimedia eXtension Board #%d.\n", mxb_num);
 
         mxb_num++;
         mxb_init_done(dev);
         return 0;
 }
 
-static int mxb_detach(struct saa7146_dev* dev)
+static int mxb_detach(struct saa7146_dev *dev)
 {
-        struct mxb* mxb = (struct mxb*)dev->ext_priv;
+        struct mxb *mxb = (struct mxb *)dev->ext_priv;
 
-        DEB_EE(("dev:%p\n",dev));
+        DEB_EE(("dev:%p\n", dev));
 
         i2c_release_client(mxb->tea6420_1);
         i2c_release_client(mxb->tea6420_2);
@@ -507,9 +477,8 @@ static int mxb_detach(struct saa7146_dev* dev)
         i2c_release_client(mxb->tuner);
 
         saa7146_unregister_device(&mxb->video_dev,dev);
-        if( 0 != MXB_BOARD_CAN_DO_VBI(dev)) {
-                saa7146_unregister_device(&mxb->vbi_dev,dev);
-        }
+        if (MXB_BOARD_CAN_DO_VBI(dev))
+                saa7146_unregister_device(&mxb->vbi_dev, dev);
         saa7146_vv_release(dev);
 
         mxb_num--;
@@ -523,7 +492,7 @@ static int mxb_detach(struct saa7146_dev* dev)
 static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
 {
         struct saa7146_dev *dev = fh->dev;
-        struct mxb* mxb = (struct mxb*)dev->ext_priv;
+        struct mxb *mxb = (struct mxb *)dev->ext_priv;
         struct saa7146_vv *vv = dev->vv_data;
 
         switch(cmd) {
@@ -532,11 +501,9 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                 struct v4l2_input *i = arg;
 
                 DEB_EE(("VIDIOC_ENUMINPUT %d.\n",i->index));
-                if( i->index < 0 || i->index >= MXB_INPUTS) {
+                if (i->index < 0 || i->index >= MXB_INPUTS)
                         return -EINVAL;
-                }
                 memcpy(i, &mxb_inputs[i->index], sizeof(struct v4l2_input));
-
                 return 0;
         }
         /* the saa7146 provides some controls (brightness, contrast, saturation)
@@ -550,7 +517,7 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                 for (i = MAXCONTROLS - 1; i >= 0; i--) {
                         if (mxb_controls[i].id == qc->id) {
                                 *qc = mxb_controls[i];
-                                DEB_D(("VIDIOC_QUERYCTRL %d.\n",qc->id));
+                                DEB_D(("VIDIOC_QUERYCTRL %d.\n", qc->id));
                                 return 0;
                         }
                 }
@@ -562,56 +529,51 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                 int i;
 
                 for (i = MAXCONTROLS - 1; i >= 0; i--) {
-                        if (mxb_controls[i].id == vc->id) {
+                        if (mxb_controls[i].id == vc->id)
                                 break;
-                        }
                 }
 
-                if( i < 0 ) {
+                if (i < 0)
                         return -EAGAIN;
-                }
 
-                switch (vc->id ) {
-                        case V4L2_CID_AUDIO_MUTE: {
-                                vc->value = mxb->cur_mute;
-                                DEB_D(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n",vc->value));
-                                return 0;
-                        }
+                if (vc->id == V4L2_CID_AUDIO_MUTE) {
+                        vc->value = mxb->cur_mute;
+                        DEB_D(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n", vc->value));
+                        return 0;
                 }
 
-                DEB_EE(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n",vc->value));
+                DEB_EE(("VIDIOC_G_CTRL V4L2_CID_AUDIO_MUTE:%d.\n", vc->value));
                 return 0;
         }
 
         case VIDIOC_S_CTRL:
         {
-                struct  v4l2_control    *vc = arg;
+                struct v4l2_control *vc = arg;
                 int i = 0;
 
                 for (i = MAXCONTROLS - 1; i >= 0; i--) {
-                        if (mxb_controls[i].id == vc->id) {
+                        if (mxb_controls[i].id == vc->id)
                                 break;
-                        }
                 }
 
-                if( i < 0 ) {
+                if (i < 0)
                         return -EAGAIN;
-                }
 
-                switch (vc->id ) {
-                        case V4L2_CID_AUDIO_MUTE: {
-                                mxb->cur_mute = vc->value;
-                                if( 0 == vc->value ) {
-                                        /* switch the audio-source */
-                                        mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[video_audio_connect[mxb->cur_input]][0]);
-                                        mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_line[video_audio_connect[mxb->cur_input]][1]);
-                                } else {
-                                        mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[6][0]);
-                                        mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_line[6][1]);
-                                }
-                                DEB_EE(("VIDIOC_S_CTRL, V4L2_CID_AUDIO_MUTE: %d.\n",vc->value));
-                                break;
+                if (vc->id == V4L2_CID_AUDIO_MUTE) {
+                        mxb->cur_mute = vc->value;
+                        if (!vc->value) {
+                                /* switch the audio-source */
+                                mxb->tea6420_1->driver->command(mxb->tea6420_1, TEA6420_SWITCH,
+                                                &TEA6420_line[video_audio_connect[mxb->cur_input]][0]);
+                                mxb->tea6420_2->driver->command(mxb->tea6420_2, TEA6420_SWITCH,
+                                                &TEA6420_line[video_audio_connect[mxb->cur_input]][1]);
+                        } else {
+                                mxb->tea6420_1->driver->command(mxb->tea6420_1, TEA6420_SWITCH,
+                                                &TEA6420_line[6][0]);
+                                mxb->tea6420_2->driver->command(mxb->tea6420_2, TEA6420_SWITCH,
+                                                &TEA6420_line[6][1]);
                         }
+                        DEB_EE(("VIDIOC_S_CTRL, V4L2_CID_AUDIO_MUTE: %d.\n", vc->value));
                 }
                 return 0;
         }
@@ -620,106 +582,84 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                 int *input = (int *)arg;
                 *input = mxb->cur_input;
 
-                DEB_EE(("VIDIOC_G_INPUT %d.\n",*input));
+                DEB_EE(("VIDIOC_G_INPUT %d.\n", *input));
                 return 0;
         }
         case VIDIOC_S_INPUT:
         {
                 int input = *(int *)arg;
-                struct  tea6415c_multiplex vm;
+                struct tea6415c_multiplex vm;
+                struct v4l2_routing route;
                 int i = 0;
 
-                DEB_EE(("VIDIOC_S_INPUT %d.\n",input));
+                DEB_EE(("VIDIOC_S_INPUT %d.\n", input));
 
-                if (input < 0 || input >= MXB_INPUTS) {
+                if (input < 0 || input >= MXB_INPUTS)
                         return -EINVAL;
-                }
-
-                /* fixme: locke das setzen des inputs mit hilfe des mutexes
-                mutex_lock(&dev->lock);
-                video_mux(dev,*i);
-                mutex_unlock(&dev->lock);
-                */
-
-                /* fixme: check if streaming capture
-                if ( 0 != dev->streaming ) {
-                        DEB_D(("VIDIOC_S_INPUT illegal while streaming.\n"));
-                        return -EPERM;
-                }
-                */
 
                 mxb->cur_input = input;
 
-                saa7146_set_hps_source_and_sync(dev, input_port_selection[input].hps_source, input_port_selection[input].hps_sync);
+                saa7146_set_hps_source_and_sync(dev, input_port_selection[input].hps_source,
+                                input_port_selection[input].hps_sync);
 
                 /* prepare switching of tea6415c and saa7111a;
                    have a look at the 'background'-file for further informations  */
-                switch( input ) {
-
-                        case TUNER:
-                        {
-                                i = 0;
-                                vm.in  = 3;
-                                vm.out = 17;
-
-                        if ( 0 != mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm)) {
-                                        printk("VIDIOC_S_INPUT: could not address tea6415c #1\n");
-                                        return -EFAULT;
-                                }
-                                /* connect tuner-output always to multicable */
-                                vm.in  = 3;
-                                vm.out = 13;
-                                break;
-                        }
-                        case AUX3_YC:
-                        {
-                                /* nothing to be done here. aux3_yc is
-                                   directly connected to the saa711a */
-                                i = 5;
-                                break;
-                        }
-                        case AUX3:
-                        {
-                                /* nothing to be done here. aux3 is
-                                   directly connected to the saa711a */
-                                i = 1;
-                                break;
-                        }
-                        case AUX1:
-                        {
-                                i = 0;
-                                vm.in  = 1;
-                                vm.out = 17;
-                                break;
+                switch (input) {
+                case TUNER:
+                        i = SAA7115_COMPOSITE0;
+                        vm.in  = 3;
+                        vm.out = 17;
+
+                        if (mxb->tea6415c->driver->command(mxb->tea6415c, TEA6415C_SWITCH, &vm)) {
+                                printk(KERN_ERR "VIDIOC_S_INPUT: could not address tea6415c #1\n");
+                                return -EFAULT;
                         }
+                        /* connect tuner-output always to multicable */
+                        vm.in  = 3;
+                        vm.out = 13;
+                        break;
+                case AUX3_YC:
+                        /* nothing to be done here. aux3_yc is
+                           directly connected to the saa711a */
+                        i = SAA7115_SVIDEO1;
+                        break;
+                case AUX3:
+                        /* nothing to be done here. aux3 is
+                           directly connected to the saa711a */
+                        i = SAA7115_COMPOSITE1;
+                        break;
+                case AUX1:
+                        i = SAA7115_COMPOSITE0;
+                        vm.in  = 1;
+                        vm.out = 17;
+                        break;
                 }
 
                 /* switch video in tea6415c only if necessary */
-                switch( input ) {
-                        case TUNER:
-                        case AUX1:
-                        {
-                                if ( 0 != mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm)) {
-                                        printk("VIDIOC_S_INPUT: could not address tea6415c #3\n");
-                                        return -EFAULT;
-                                }
-                                break;
-                        }
-                        default:
-                        {
-                                break;
+                switch (input) {
+                case TUNER:
+                case AUX1:
+                        if (mxb->tea6415c->driver->command(mxb->tea6415c, TEA6415C_SWITCH, &vm)) {
+                                printk(KERN_ERR "VIDIOC_S_INPUT: could not address tea6415c #3\n");
+                                return -EFAULT;
                         }
+                        break;
+                default:
+                        break;
                 }
 
                 /* switch video in saa7111a */
-                if ( 0 != mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_INPUT, &i)) {
+                route.input = i;
+                route.output = 0;
+                if (mxb->saa7111a->driver->command(mxb->saa7111a, VIDIOC_INT_S_VIDEO_ROUTING, &route))
                         printk("VIDIOC_S_INPUT: could not address saa7111a #1.\n");
-                }
 
                 /* switch the audio-source only if necessary */
                 if( 0 == mxb->cur_mute ) {
-                        mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[video_audio_connect[input]][0]);
-                        mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_line[video_audio_connect[input]][1]);
+                        mxb->tea6420_1->driver->command(mxb->tea6420_1, TEA6420_SWITCH,
+                                        &TEA6420_line[video_audio_connect[input]][0]);
+                        mxb->tea6420_2->driver->command(mxb->tea6420_2, TEA6420_SWITCH,
+                                       &TEA6420_line[video_audio_connect[input]][1]);
                 }
 
                 return 0;
@@ -727,114 +667,44 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         case VIDIOC_G_TUNER:
         {
                 struct v4l2_tuner *t = arg;
-                int byte = 0;
 
-                if( 0 != t->index ) {
+                if (t->index) {
                         DEB_D(("VIDIOC_G_TUNER: channel %d does not have a tuner attached.\n", t->index));
                         return -EINVAL;
                 }
 
                 DEB_EE(("VIDIOC_G_TUNER: %d\n", t->index));
 
-                memset(t,0,sizeof(*t));
-                strcpy(t->name, "Television");
+                memset(t, 0, sizeof(*t));
+                i2c_clients_command(&mxb->i2c_adapter, cmd, arg);
 
+                strlcpy(t->name, "TV Tuner", sizeof(t->name));
                 t->type = V4L2_TUNER_ANALOG_TV;
-                t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;
-                t->rangelow = 772;      /* 48.25 MHZ / 62.5 kHz = 772, see fi1216mk2-specs, page 2 */
-                t->rangehigh = 13684;   /* 855.25 MHz / 62.5 kHz = 13684 */
-                /* FIXME: add the real signal strength here */
-                t->signal = 0xffff;
-                t->afc = 0;
-
-                mxb->tda9840->driver->command(mxb->tda9840,TDA9840_DETECT, &byte);
+                t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | \
+                        V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;
                 t->audmode = mxb->cur_mode;
-
-                if( byte < 0 ) {
-                        t->rxsubchans  = V4L2_TUNER_SUB_MONO;
-                } else {
-                        switch(byte) {
-                                case TDA9840_MONO_DETECT: {
-                                        t->rxsubchans   = V4L2_TUNER_SUB_MONO;
-                                        DEB_D(("VIDIOC_G_TUNER: V4L2_TUNER_MODE_MONO.\n"));
-                                        break;
-                                }
-                                case TDA9840_DUAL_DETECT: {
-                                        t->rxsubchans   = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
-                                        DEB_D(("VIDIOC_G_TUNER: V4L2_TUNER_MODE_LANG1.\n"));
-                                        break;
-                                }
-                                case TDA9840_STEREO_DETECT: {
-                                        t->rxsubchans   = V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;
-                                        DEB_D(("VIDIOC_G_TUNER: V4L2_TUNER_MODE_STEREO.\n"));
-                                        break;
-                                }
-                                default: { /* TDA9840_INCORRECT_DETECT */
-                                        t->rxsubchans   = V4L2_TUNER_MODE_MONO;
-                                        DEB_D(("VIDIOC_G_TUNER: TDA9840_INCORRECT_DETECT => V4L2_TUNER_MODE_MONO\n"));
-                                        break;
-                                }
-                        }
-                }
-
                 return 0;
         }
         case VIDIOC_S_TUNER:
         {
                 struct v4l2_tuner *t = arg;
-                int result = 0;
-                int byte = 0;
 
-                if( 0 != t->index ) {
+                if (t->index) {
                         DEB_D(("VIDIOC_S_TUNER: channel %d does not have a tuner attached.\n",t->index));
                         return -EINVAL;
                 }
 
-                switch(t->audmode) {
-                        case V4L2_TUNER_MODE_STEREO: {
-                                mxb->cur_mode = V4L2_TUNER_MODE_STEREO;
-                                byte = TDA9840_SET_STEREO;
-                                DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_STEREO\n"));
-                                break;
-                        }
-                        case V4L2_TUNER_MODE_LANG1_LANG2: {
-                                mxb->cur_mode = V4L2_TUNER_MODE_LANG1_LANG2;
-                                byte = TDA9840_SET_BOTH;
-                                DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1_LANG2\n"));
-                                break;
-                        }
-                        case V4L2_TUNER_MODE_LANG1: {
-                                mxb->cur_mode = V4L2_TUNER_MODE_LANG1;
-                                byte = TDA9840_SET_LANG1;
-                                DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1\n"));
-                                break;
-                        }
-                        case V4L2_TUNER_MODE_LANG2: {
-                                mxb->cur_mode = V4L2_TUNER_MODE_LANG2;
-                                byte = TDA9840_SET_LANG2;
-                                DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG2\n"));
-                                break;
-                        }
-                        default: { /* case V4L2_TUNER_MODE_MONO: {*/
-                                mxb->cur_mode = V4L2_TUNER_MODE_MONO;
-                                byte = TDA9840_SET_MONO;
-                                DEB_D(("VIDIOC_S_TUNER: TDA9840_SET_MONO\n"));
-                                break;
-                        }
-                }
-
-                if( 0 != (result = mxb->tda9840->driver->command(mxb->tda9840, TDA9840_SWITCH, &byte))) {
-                        printk("VIDIOC_S_TUNER error. result:%d, byte:%d\n",result,byte);
-                }
-
+                mxb->cur_mode = t->audmode;
+                i2c_clients_command(&mxb->i2c_adapter, cmd, arg);
                 return 0;
         }
         case VIDIOC_G_FREQUENCY:
         {
                 struct v4l2_frequency *f = arg;
 
-                if(0 != mxb->cur_input) {
-                        DEB_D(("VIDIOC_G_FREQ: channel %d does not have a tuner!\n",mxb->cur_input));
+                if (mxb->cur_input) {
+                        DEB_D(("VIDIOC_G_FREQ: channel %d does not have a tuner!\n",
+                                                mxb->cur_input));
                         return -EINVAL;
                 }
 
@@ -847,14 +717,14 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         {
                 struct v4l2_frequency *f = arg;
 
-                if (0 != f->tuner)
+                if (f->tuner)
                         return -EINVAL;
 
                 if (V4L2_TUNER_ANALOG_TV != f->type)
                         return -EINVAL;
 
-                if(0 != mxb->cur_input) {
-                        DEB_D(("VIDIOC_S_FREQ: channel %d does not have a tuner!\n",mxb->cur_input));
+                if (mxb->cur_input) {
+                        DEB_D(("VIDIOC_S_FREQ: channel %d does not have a tuner!\n", mxb->cur_input));
                         return -EINVAL;
                 }
 
@@ -875,7 +745,7 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         {
                 int i = *(int*)arg;
 
-                if( i < 0 || i >= MXB_AUDIOS ) {
+                if (i < 0 || i >= MXB_AUDIOS) {
                         DEB_D(("illegal argument to MXB_S_AUDIO_CD: i:%d.\n",i));
                         return -EINVAL;
                 }
@@ -891,7 +761,7 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         {
                 int i = *(int*)arg;
 
-                if( i < 0 || i >= MXB_AUDIOS ) {
+                if (i < 0 || i >= MXB_AUDIOS) {
                         DEB_D(("illegal argument to MXB_S_AUDIO_LINE: i:%d.\n",i));
                         return -EINVAL;
                 }
@@ -906,12 +776,12 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         {
                 struct v4l2_audio *a = arg;
 
-                if( a->index < 0 || a->index > MXB_INPUTS ) {
-                        DEB_D(("VIDIOC_G_AUDIO %d out of range.\n",a->index));
+                if (a->index < 0 || a->index > MXB_INPUTS) {
+                        DEB_D(("VIDIOC_G_AUDIO %d out of range.\n", a->index));
                         return -EINVAL;
                 }
 
-                DEB_EE(("VIDIOC_G_AUDIO %d.\n",a->index));
+                DEB_EE(("VIDIOC_G_AUDIO %d.\n", a->index));
                 memcpy(a, &mxb_audios[video_audio_connect[mxb->cur_input]], sizeof(struct v4l2_audio));
 
                 return 0;
@@ -919,9 +789,16 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         case VIDIOC_S_AUDIO:
         {
                 struct v4l2_audio *a = arg;
-                DEB_D(("VIDIOC_S_AUDIO %d.\n",a->index));
+
+                DEB_D(("VIDIOC_S_AUDIO %d.\n", a->index));
                 return 0;
         }
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        case VIDIOC_DBG_S_REGISTER:
+        case VIDIOC_DBG_G_REGISTER:
+                i2c_clients_command(&mxb->i2c_adapter, cmd, arg);
+                return 0;
+#endif
         default:
 /*
                 DEB2(printk("does not handle this ioctl.\n"));
@@ -944,7 +821,7 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa
                 /* set the 7146 gpio register -- I don't know what this does exactly */
                 saa7146_write(dev, GPIO_CTRL, 0x00404050);
                 /* unset the 7111 gpio register -- I don't know what this does exactly */
-                mxb->saa7111a->driver->command(mxb->saa7111a, DECODER_SET_GPIO, &zero);
+                mxb->saa7111a->driver->command(mxb->saa7111a, VIDIOC_INT_S_GPIO, &zero);
                 mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std);
         } else {
                 v4l2_std_id std = V4L2_STD_PAL_BG;
@@ -953,7 +830,7 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa
                 /* set the 7146 gpio register -- I don't know what this does exactly */
                 saa7146_write(dev, GPIO_CTRL, 0x00404050);
                 /* set the 7111 gpio register -- I don't know what this does exactly */
-                mxb->saa7111a->driver->command(mxb->saa7111a, DECODER_SET_GPIO, &one);
+                mxb->saa7111a->driver->command(mxb->saa7111a, VIDIOC_INT_S_GPIO, &one);
                 mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std);
         }
         return 0;
@@ -1029,7 +906,7 @@ static struct saa7146_extension extension = {
 
 static int __init mxb_init_module(void)
 {
-        if( 0 != saa7146_register_extension(&extension)) {
+        if (saa7146_register_extension(&extension)) {
                 DEB_S(("failed to register extension.\n"));
                 return -ENODEV;
         }
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index c6852402c5e9..935d73de57bd 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -974,14 +974,14 @@ dump_i2c_range(struct usb_ov511 *ov, int reg1, int regn)
 
         for (i = reg1; i <= regn; i++) {
                 rc = i2c_r(ov, i);
-                info("Sensor[0x%02X] = 0x%02X", i, rc);
+                dev_info(&ov->dev->dev, "Sensor[0x%02X] = 0x%02X\n", i, rc);
         }
 }
 
 static void
 dump_i2c_regs(struct usb_ov511 *ov)
 {
-        info("I2C REGS");
+        dev_info(&ov->dev->dev, "I2C REGS\n");
         dump_i2c_range(ov, 0x00, 0x7C);
 }
 
@@ -992,28 +992,28 @@ dump_reg_range(struct usb_ov511 *ov, int reg1, int regn)
 
         for (i = reg1; i <= regn; i++) {
                 rc = reg_r(ov, i);
-                info("OV511[0x%02X] = 0x%02X", i, rc);
+                dev_info(&ov->dev->dev, "OV511[0x%02X] = 0x%02X\n", i, rc);
         }
 }
 
 static void
 ov511_dump_regs(struct usb_ov511 *ov)
 {
-        info("CAMERA INTERFACE REGS");
+        dev_info(&ov->dev->dev, "CAMERA INTERFACE REGS\n");
         dump_reg_range(ov, 0x10, 0x1f);
-        info("DRAM INTERFACE REGS");
+        dev_info(&ov->dev->dev, "DRAM INTERFACE REGS\n");
         dump_reg_range(ov, 0x20, 0x23);
-        info("ISO FIFO REGS");
+        dev_info(&ov->dev->dev, "ISO FIFO REGS\n");
         dump_reg_range(ov, 0x30, 0x31);
-        info("PIO REGS");
+        dev_info(&ov->dev->dev, "PIO REGS\n");
         dump_reg_range(ov, 0x38, 0x39);
         dump_reg_range(ov, 0x3e, 0x3e);
-        info("I2C REGS");
+        dev_info(&ov->dev->dev, "I2C REGS\n");
         dump_reg_range(ov, 0x40, 0x49);
-        info("SYSTEM CONTROL REGS");
+        dev_info(&ov->dev->dev, "SYSTEM CONTROL REGS\n");
         dump_reg_range(ov, 0x50, 0x55);
         dump_reg_range(ov, 0x5e, 0x5f);
-        info("OmniCE REGS");
+        dev_info(&ov->dev->dev, "OmniCE REGS\n");
         dump_reg_range(ov, 0x70, 0x79);
         /* NOTE: Quantization tables are not readable. You will get the value
          * in reg. 0x79 for every table register */
@@ -1025,25 +1025,25 @@ ov511_dump_regs(struct usb_ov511 *ov)
 static void
 ov518_dump_regs(struct usb_ov511 *ov)
 {
-        info("VIDEO MODE REGS");
+        dev_info(&ov->dev->dev, "VIDEO MODE REGS\n");
         dump_reg_range(ov, 0x20, 0x2f);
-        info("DATA PUMP AND SNAPSHOT REGS");
+        dev_info(&ov->dev->dev, "DATA PUMP AND SNAPSHOT REGS\n");
         dump_reg_range(ov, 0x30, 0x3f);
-        info("I2C REGS");
+        dev_info(&ov->dev->dev, "I2C REGS\n");
         dump_reg_range(ov, 0x40, 0x4f);
-        info("SYSTEM CONTROL AND VENDOR REGS");
+        dev_info(&ov->dev->dev, "SYSTEM CONTROL AND VENDOR REGS\n");
         dump_reg_range(ov, 0x50, 0x5f);
-        info("60 - 6F");
+        dev_info(&ov->dev->dev, "60 - 6F\n");
         dump_reg_range(ov, 0x60, 0x6f);
-        info("70 - 7F");
+        dev_info(&ov->dev->dev, "70 - 7F\n");
         dump_reg_range(ov, 0x70, 0x7f);
-        info("Y QUANTIZATION TABLE");
+        dev_info(&ov->dev->dev, "Y QUANTIZATION TABLE\n");
         dump_reg_range(ov, 0x80, 0x8f);
-        info("UV QUANTIZATION TABLE");
+        dev_info(&ov->dev->dev, "UV QUANTIZATION TABLE\n");
         dump_reg_range(ov, 0x90, 0x9f);
-        info("A0 - BF");
+        dev_info(&ov->dev->dev, "A0 - BF\n");
         dump_reg_range(ov, 0xa0, 0xbf);
-        info("CBR");
+        dev_info(&ov->dev->dev, "CBR\n");
         dump_reg_range(ov, 0xc0, 0xcf);
 }
 #endif
@@ -3205,9 +3205,10 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
          */
 
         if (printph) {
-                info("ph(%3d): %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x",
-                     pnum, in[0], in[1], in[2], in[3], in[4], in[5], in[6],
-                     in[7], in[8], in[9], in[10], in[11]);
+                dev_info(&ov->dev->dev,
+                         "ph(%3d): %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x\n",
+                         pnum, in[0], in[1], in[2], in[3], in[4], in[5], in[6],
+                         in[7], in[8], in[9], in[10], in[11]);
         }
 
         /* Check for SOF/EOF packet */
@@ -3366,8 +3367,10 @@ ov518_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
          * the definitive SOF/EOF format */
         if ((!(in[0] | in[1] | in[2] | in[3] | in[5])) && in[6]) {
                 if (printph) {
-                        info("ph: %2x %2x %2x %2x %2x %2x %2x %2x", in[0],
-                             in[1], in[2], in[3], in[4], in[5], in[6], in[7]);
+                        dev_info(&ov->dev->dev,
+                                 "ph: %2x %2x %2x %2x %2x %2x %2x %2x\n",
+                                 in[0], in[1], in[2], in[3], in[4], in[5],
+                                 in[6], in[7]);
                 }
 
                 if (frame->scanstate == STATE_LINES) {
@@ -3646,14 +3649,16 @@ ov51x_init_isoc(struct usb_ov511 *ov)
                 if (packetsize == -1) {
                         ov518_set_packet_size(ov, 640);
                 } else {
-                        info("Forcing packet size to %d", packetsize);
+                        dev_info(&ov->dev->dev, "Forcing packet size to %d\n",
+                                 packetsize);
                         ov518_set_packet_size(ov, packetsize);
                 }
         } else {
                 if (packetsize == -1) {
                         ov511_set_packet_size(ov, size);
                 } else {
-                        info("Forcing packet size to %d", packetsize);
+                        dev_info(&ov->dev->dev, "Forcing packet size to %d\n",
+                                 packetsize);
                         ov511_set_packet_size(ov, packetsize);
                 }
         }
@@ -4121,7 +4126,7 @@ ov51x_v4l1_ioctl_internal(struct inode *inode, struct file *file,
                         return -EIO;
 
                 if (force_palette && p->palette != force_palette) {
-                        info("Palette rejected (%s)",
+                        dev_info(&ov->dev->dev, "Palette rejected (%s)\n",
                              symbolic(v4l1_plist, p->palette));
                         return -EINVAL;
                 }
@@ -4849,26 +4854,27 @@ ov7xx0_configure(struct usb_ov511 *ov)
                 err("Error detecting sensor type");
                 return -1;
         } else if ((rc & 3) == 3) {
-                info("Sensor is an OV7610");
+                dev_info(&ov->dev->dev, "Sensor is an OV7610\n");
                 ov->sensor = SEN_OV7610;
         } else if ((rc & 3) == 1) {
                 /* I don't know what's different about the 76BE yet. */
                 if (i2c_r(ov, 0x15) & 1)
-                        info("Sensor is an OV7620AE");
+                        dev_info(&ov->dev->dev, "Sensor is an OV7620AE\n");
                 else
-                        info("Sensor is an OV76BE");
+                        dev_info(&ov->dev->dev, "Sensor is an OV76BE\n");
 
                 /* OV511+ will return all zero isoc data unless we
                  * configure the sensor as a 7620. Someone needs to
                  * find the exact reg. setting that causes this. */
                 if (ov->bridge == BRG_OV511PLUS) {
-                        info("Enabling 511+/7620AE workaround");
+                        dev_info(&ov->dev->dev,
+                                 "Enabling 511+/7620AE workaround\n");
                         ov->sensor = SEN_OV7620;
                 } else {
                         ov->sensor = SEN_OV76BE;
                 }
         } else if ((rc & 3) == 0) {
-                info("Sensor is an OV7620");
+                dev_info(&ov->dev->dev, "Sensor is an OV7620\n");
                 ov->sensor = SEN_OV7620;
         } else {
                 err("Unknown image sensor version: %d", rc & 3);
@@ -5024,16 +5030,16 @@ ov6xx0_configure(struct usb_ov511 *ov)
 
         if ((rc & 3) == 0) {
                 ov->sensor = SEN_OV6630;
-                info("Sensor is an OV6630");
+                dev_info(&ov->dev->dev, "Sensor is an OV6630\n");
         } else if ((rc & 3) == 1) {
                 ov->sensor = SEN_OV6620;
-                info("Sensor is an OV6620");
+                dev_info(&ov->dev->dev, "Sensor is an OV6620\n");
         } else if ((rc & 3) == 2) {
                 ov->sensor = SEN_OV6630;
-                info("Sensor is an OV6630AE");
+                dev_info(&ov->dev->dev, "Sensor is an OV6630AE\n");
         } else if ((rc & 3) == 3) {
                 ov->sensor = SEN_OV6630;
-                info("Sensor is an OV6630AF");
+                dev_info(&ov->dev->dev, "Sensor is an OV6630AF\n");
         }
 
         /* Set sensor-specific vars */
@@ -5088,10 +5094,10 @@ ks0127_configure(struct usb_ov511 *ov)
                         err("Error detecting sensor type");
                         return -1;
                 } else if ((rc & 0x0f) == 0) {
-                        info("Sensor is a KS0127");
+                        dev_info(&ov->dev->dev, "Sensor is a KS0127\n");
                         ov->sensor = SEN_KS0127;
                 } else if ((rc & 0x0f) == 9) {
-                        info("Sensor is a KS0127B Rev. A");
+                        dev_info(&ov->dev->dev, "Sensor is a KS0127B Rev. A\n");
                         ov->sensor = SEN_KS0127B;
                 }
         } else {
@@ -5200,7 +5206,8 @@ saa7111a_configure(struct usb_ov511 *ov)
                 err("Error detecting sensor version");
                 return -1;
         } else {
-                info("Sensor is an SAA7111A (version 0x%x)", rc);
+                dev_info(&ov->dev->dev,
+                         "Sensor is an SAA7111A (version 0x%x)\n", rc);
                 ov->sensor = SEN_SAA7111A;
         }
 
@@ -5262,7 +5269,7 @@ ov511_configure(struct usb_ov511 *ov)
 
         PDEBUG (1, "CustomID = %d", ov->customid);
         ov->desc = symbolic(camlist, ov->customid);
-        info("model: %s", ov->desc);
+        dev_info(&ov->dev->dev, "model: %s\n", ov->desc);
 
         if (0 == strcmp(ov->desc, NOT_DEFINED_STR)) {
                 err("Camera type (%d) not recognized", ov->customid);
@@ -5426,7 +5433,8 @@ ov518_configure(struct usb_ov511 *ov)
         PDEBUG(4, "");
 
         /* First 5 bits of custom ID reg are a revision ID on OV518 */
-        info("Device revision %d", 0x1F & reg_r(ov, R511_SYS_CUST_ID));
+        dev_info(&ov->dev->dev, "Device revision %d\n",
+                 0x1F & reg_r(ov, R511_SYS_CUST_ID));
 
         /* Give it the default description */
         ov->desc = symbolic(camlist, 0);
@@ -5773,7 +5781,8 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 goto error;
         }
 
-        info("USB %s video device found", symbolic(brglist, ov->bridge));
+        dev_info(&intf->dev, "USB %s video device found\n",
+                 symbolic(brglist, ov->bridge));
 
         init_waitqueue_head(&ov->wq);
 
@@ -5854,8 +5863,8 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 goto error;
         }
 
-        info("Device at %s registered to minor %d", ov->usb_path,
-             ov->vdev->minor);
+        dev_info(&intf->dev, "Device at %s registered to minor %d\n",
+                 ov->usb_path, ov->vdev->minor);
 
         usb_set_intfdata(intf, ov);
         if (ov_create_sysfs(ov->vdev)) {
@@ -5958,7 +5967,8 @@ usb_ov511_init(void)
         if (retval)
                 goto out;
 
-        info(DRIVER_VERSION " : " DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
 out:
         return retval;
@@ -5968,8 +5978,7 @@ static void __exit
 usb_ov511_exit(void)
 {
         usb_deregister(&ov511_driver);
-        info("driver deregistered");
-
+        printk(KERN_INFO KBUILD_MODNAME ": driver deregistered\n");
 }
 
 module_init(usb_ov511_init);
diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h
index baded1262ca9..70d99e52329d 100644
--- a/drivers/media/video/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -12,7 +12,8 @@
 
 #ifdef OV511_DEBUG
         #define PDEBUG(level, fmt, args...) \
-                if (debug >= (level)) info("[%s:%d] " fmt, \
+                if (debug >= (level))   \
+                        printk(KERN_INFO KBUILD_MODNAME "[%s:%d] \n" fmt, \
                 __func__, __LINE__ , ## args)
 #else
         #define PDEBUG(level, fmt, args...) do {} while(0)
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 065c2454113e..2c4acbf5a4fe 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -49,12 +49,6 @@ MODULE_LICENSE("GPL");
 #define GENERIC_REG_ID_LOW        0x1D  /* manufacturer ID LSB */
 #define GENERIC_REG_COM_I         0x29  /* misc ID bits */
 
-extern struct ovcamchip_ops ov6x20_ops;
-extern struct ovcamchip_ops ov6x30_ops;
-extern struct ovcamchip_ops ov7x10_ops;
-extern struct ovcamchip_ops ov7x20_ops;
-extern struct ovcamchip_ops ov76be_ops;
-
 static char *chip_names[NUM_CC_TYPES] = {
         [CC_UNKNOWN]    = "Unknown chip",
         [CC_OV76BE]     = "OV76BE",
diff --git a/drivers/media/video/ovcamchip/ovcamchip_priv.h b/drivers/media/video/ovcamchip/ovcamchip_priv.h
index 9afa4fe47726..a05650faedda 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_priv.h
+++ b/drivers/media/video/ovcamchip/ovcamchip_priv.h
@@ -53,6 +53,12 @@ struct ovcamchip {
         int initialized;           /* OVCAMCHIP_CMD_INITIALIZE was successful */
 };
 
+extern struct ovcamchip_ops ov6x20_ops;
+extern struct ovcamchip_ops ov6x30_ops;
+extern struct ovcamchip_ops ov7x10_ops;
+extern struct ovcamchip_ops ov7x20_ops;
+extern struct ovcamchip_ops ov76be_ops;
+
 /* --------------------------------- */
 /*              I2C I/O              */
 /* --------------------------------- */
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 7c84f795db54..994807818aa2 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -47,6 +47,7 @@ struct pms_device
         struct video_picture picture;
         int height;
         int width;
+        unsigned long in_use;
         struct mutex lock;
 };
 
@@ -881,10 +882,27 @@ static ssize_t pms_read(struct file *file, char __user *buf,
         return len;
 }
 
+static int pms_exclusive_open(struct inode *inode, struct file *file)
+{
+        struct video_device *v = video_devdata(file);
+        struct pms_device *pd = (struct pms_device *)v;
+
+        return test_and_set_bit(0, &pd->in_use) ? -EBUSY : 0;
+}
+
+static int pms_exclusive_release(struct inode *inode, struct file *file)
+{
+        struct video_device *v = video_devdata(file);
+        struct pms_device *pd = (struct pms_device *)v;
+
+        clear_bit(0, &pd->in_use);
+        return 0;
+}
+
 static const struct file_operations pms_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = pms_exclusive_open,
+        .release        = pms_exclusive_release,
         .ioctl          = pms_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -897,6 +915,7 @@ static struct video_device pms_template=
 {
         .name           = "Mediavision PMS",
         .fops           = &pms_fops,
+        .release        = video_device_release_empty,
 };
 
 static struct pms_device pms_device;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 0764fbfffb73..203f54cd18a1 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -134,13 +134,17 @@ int pvr2_ctrl_get_min(struct pvr2_ctrl *cptr)
 
 
 /* Retrieve control's default value (any type) */
-int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr)
+int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr, int *valptr)
 {
         int ret = 0;
         if (!cptr) return 0;
         LOCK_TAKE(cptr->hdw->big_lock); do {
                 if (cptr->info->type == pvr2_ctl_int) {
-                        ret = cptr->info->default_value;
+                        if (cptr->info->get_def_value) {
+                                ret = cptr->info->get_def_value(cptr, valptr);
+                        } else {
+                                *valptr = cptr->info->default_value;
+                        }
                 }
         } while(0); LOCK_GIVE(cptr->hdw->big_lock);
         return ret;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.h b/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
index 0371ae6e6e4e..794ff90121c7 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.h
@@ -49,7 +49,7 @@ int pvr2_ctrl_get_max(struct pvr2_ctrl *);
 int pvr2_ctrl_get_min(struct pvr2_ctrl *);
 
 /* Retrieve control's default value (any type) */
-int pvr2_ctrl_get_def(struct pvr2_ctrl *);
+int pvr2_ctrl_get_def(struct pvr2_ctrl *, int *valptr);
 
 /* Retrieve control's enumeration count (enum only) */
 int pvr2_ctrl_get_cnt(struct pvr2_ctrl *);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 657f861593b3..de7ee7264be6 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -82,6 +82,7 @@ struct pvr2_ctl_info {
 
         /* Control's implementation */
         pvr2_ctlf_get_value get_value;      /* Get its value */
+        pvr2_ctlf_get_value get_def_value;  /* Get its default value */
         pvr2_ctlf_get_value get_min_value;  /* Get minimum allowed value */
         pvr2_ctlf_get_value get_max_value;  /* Get maximum allowed value */
         pvr2_ctlf_set_value set_value;      /* Set its value */
@@ -307,6 +308,10 @@ struct pvr2_hdw {
         struct v4l2_tuner tuner_signal_info;
         int tuner_signal_stale;
 
+        /* Cropping capability info */
+        struct v4l2_cropcap cropcap_info;
+        int cropcap_stale;
+
         /* Video standard handling */
         v4l2_std_id std_mask_eeprom; // Hardware supported selections
         v4l2_std_id std_mask_avail;  // Which standards we may select from
@@ -367,6 +372,10 @@ struct pvr2_hdw {
         VCREATE_DATA(bass);
         VCREATE_DATA(treble);
         VCREATE_DATA(mute);
+        VCREATE_DATA(cropl);
+        VCREATE_DATA(cropt);
+        VCREATE_DATA(cropw);
+        VCREATE_DATA(croph);
         VCREATE_DATA(input);
         VCREATE_DATA(audiomode);
         VCREATE_DATA(res_hor);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index f051c6aa7f1f..94265bd3d926 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -298,6 +298,7 @@ static int pvr2_send_request_ex(struct pvr2_hdw *hdw,
                                 unsigned int timeout,int probe_fl,
                                 void *write_data,unsigned int write_len,
                                 void *read_data,unsigned int read_len);
+static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw);
 
 
 static void trace_stbit(const char *name,int val)
@@ -402,6 +403,194 @@ static int ctrl_freq_set(struct pvr2_ctrl *cptr,int m,int v)
         return 0;
 }
 
+static int ctrl_cropl_min_get(struct pvr2_ctrl *cptr, int *left)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *left = cap->bounds.left;
+        return 0;
+}
+
+static int ctrl_cropl_max_get(struct pvr2_ctrl *cptr, int *left)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *left = cap->bounds.left;
+        if (cap->bounds.width > cptr->hdw->cropw_val) {
+                *left += cap->bounds.width - cptr->hdw->cropw_val;
+        }
+        return 0;
+}
+
+static int ctrl_cropt_min_get(struct pvr2_ctrl *cptr, int *top)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *top = cap->bounds.top;
+        return 0;
+}
+
+static int ctrl_cropt_max_get(struct pvr2_ctrl *cptr, int *top)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *top = cap->bounds.top;
+        if (cap->bounds.height > cptr->hdw->croph_val) {
+                *top += cap->bounds.height - cptr->hdw->croph_val;
+        }
+        return 0;
+}
+
+static int ctrl_cropw_max_get(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = 0;
+        if (cap->bounds.width > cptr->hdw->cropl_val) {
+                *val = cap->bounds.width - cptr->hdw->cropl_val;
+        }
+        return 0;
+}
+
+static int ctrl_croph_max_get(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = 0;
+        if (cap->bounds.height > cptr->hdw->cropt_val) {
+                *val = cap->bounds.height - cptr->hdw->cropt_val;
+        }
+        return 0;
+}
+
+static int ctrl_get_cropcapbl(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->bounds.left;
+        return 0;
+}
+
+static int ctrl_get_cropcapbt(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->bounds.top;
+        return 0;
+}
+
+static int ctrl_get_cropcapbw(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->bounds.width;
+        return 0;
+}
+
+static int ctrl_get_cropcapbh(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->bounds.height;
+        return 0;
+}
+
+static int ctrl_get_cropcapdl(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->defrect.left;
+        return 0;
+}
+
+static int ctrl_get_cropcapdt(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->defrect.top;
+        return 0;
+}
+
+static int ctrl_get_cropcapdw(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->defrect.width;
+        return 0;
+}
+
+static int ctrl_get_cropcapdh(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->defrect.height;
+        return 0;
+}
+
+static int ctrl_get_cropcappan(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->pixelaspect.numerator;
+        return 0;
+}
+
+static int ctrl_get_cropcappad(struct pvr2_ctrl *cptr, int *val)
+{
+        struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info;
+        int stat = pvr2_hdw_check_cropcap(cptr->hdw);
+        if (stat != 0) {
+                return stat;
+        }
+        *val = cap->pixelaspect.denominator;
+        return 0;
+}
+
 static int ctrl_vres_max_get(struct pvr2_ctrl *cptr,int *vp)
 {
         /* Actual maximum depends on the video standard in effect. */
@@ -779,6 +968,10 @@ VCREATE_FUNCS(balance)
 VCREATE_FUNCS(bass)
 VCREATE_FUNCS(treble)
 VCREATE_FUNCS(mute)
+VCREATE_FUNCS(cropl)
+VCREATE_FUNCS(cropt)
+VCREATE_FUNCS(cropw)
+VCREATE_FUNCS(croph)
 VCREATE_FUNCS(audiomode)
 VCREATE_FUNCS(res_hor)
 VCREATE_FUNCS(res_ver)
@@ -849,6 +1042,72 @@ static const struct pvr2_ctl_info control_defs[] = {
                 .default_value = 0,
                 DEFREF(mute),
                 DEFBOOL,
+        }, {
+                .desc = "Capture crop left margin",
+                .name = "crop_left",
+                .internal_id = PVR2_CID_CROPL,
+                .default_value = 0,
+                DEFREF(cropl),
+                DEFINT(-129, 340),
+                .get_min_value = ctrl_cropl_min_get,
+                .get_max_value = ctrl_cropl_max_get,
+                .get_def_value = ctrl_get_cropcapdl,
+        }, {
+                .desc = "Capture crop top margin",
+                .name = "crop_top",
+                .internal_id = PVR2_CID_CROPT,
+                .default_value = 0,
+                DEFREF(cropt),
+                DEFINT(-35, 544),
+                .get_min_value = ctrl_cropt_min_get,
+                .get_max_value = ctrl_cropt_max_get,
+                .get_def_value = ctrl_get_cropcapdt,
+        }, {
+                .desc = "Capture crop width",
+                .name = "crop_width",
+                .internal_id = PVR2_CID_CROPW,
+                .default_value = 720,
+                DEFREF(cropw),
+                .get_max_value = ctrl_cropw_max_get,
+                .get_def_value = ctrl_get_cropcapdw,
+        }, {
+                .desc = "Capture crop height",
+                .name = "crop_height",
+                .internal_id = PVR2_CID_CROPH,
+                .default_value = 480,
+                DEFREF(croph),
+                .get_max_value = ctrl_croph_max_get,
+                .get_def_value = ctrl_get_cropcapdh,
+        }, {
+                .desc = "Capture capability pixel aspect numerator",
+                .name = "cropcap_pixel_numerator",
+                .internal_id = PVR2_CID_CROPCAPPAN,
+                .get_value = ctrl_get_cropcappan,
+        }, {
+                .desc = "Capture capability pixel aspect denominator",
+                .name = "cropcap_pixel_denominator",
+                .internal_id = PVR2_CID_CROPCAPPAD,
+                .get_value = ctrl_get_cropcappad,
+        }, {
+                .desc = "Capture capability bounds top",
+                .name = "cropcap_bounds_top",
+                .internal_id = PVR2_CID_CROPCAPBT,
+                .get_value = ctrl_get_cropcapbt,
+        }, {
+                .desc = "Capture capability bounds left",
+                .name = "cropcap_bounds_left",
+                .internal_id = PVR2_CID_CROPCAPBL,
+                .get_value = ctrl_get_cropcapbl,
+        }, {
+                .desc = "Capture capability bounds width",
+                .name = "cropcap_bounds_width",
+                .internal_id = PVR2_CID_CROPCAPBW,
+                .get_value = ctrl_get_cropcapbw,
+        }, {
+                .desc = "Capture capability bounds height",
+                .name = "cropcap_bounds_height",
+                .internal_id = PVR2_CID_CROPCAPBH,
+                .get_value = ctrl_get_cropcapbh,
         },{
                 .desc = "Video Source",
                 .name = "input",
@@ -1313,9 +1572,19 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw)
                 if (bcnt > FIRMWARE_CHUNK_SIZE) bcnt = FIRMWARE_CHUNK_SIZE;
                 memcpy(fw_ptr, fw_entry->data + fw_done, bcnt);
                 /* Usbsnoop log shows that we must swap bytes... */
+                /* Some background info: The data being swapped here is a
+                   firmware image destined for the mpeg encoder chip that
+                   lives at the other end of a USB endpoint.  The encoder
+                   chip always talks in 32 bit chunks and its storage is
+                   organized into 32 bit words.  However from the file
+                   system to the encoder chip everything is purely a byte
+                   stream.  The firmware file's contents are always 32 bit
+                   swapped from what the encoder expects.  Thus the need
+                   always exists to swap the bytes regardless of the endian
+                   type of the host processor and therefore swab32() makes
+                   the most sense. */
                 for (icnt = 0; icnt < bcnt/4 ; icnt++)
-                        ((u32 *)fw_ptr)[icnt] =
-                                ___swab32(((u32 *)fw_ptr)[icnt]);
+                        ((u32 *)fw_ptr)[icnt] = swab32(((u32 *)fw_ptr)[icnt]);
 
                 ret |= usb_bulk_msg(hdw->usb_dev, pipe, fw_ptr,bcnt,
                                     &actual_length, HZ);
@@ -1905,7 +2174,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
                                  const struct usb_device_id *devid)
 {
         unsigned int idx,cnt1,cnt2,m;
-        struct pvr2_hdw *hdw;
+        struct pvr2_hdw *hdw = NULL;
         int valid_std_mask;
         struct pvr2_ctrl *cptr;
         const struct pvr2_device_desc *hdw_desc;
@@ -1915,6 +2184,16 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
 
         hdw_desc = (const struct pvr2_device_desc *)(devid->driver_info);
 
+        if (hdw_desc == NULL) {
+                pvr2_trace(PVR2_TRACE_INIT, "pvr2_hdw_create:"
+                           " No device description pointer,"
+                           " unable to continue.");
+                pvr2_trace(PVR2_TRACE_INIT, "If you have a new device type,"
+                           " please contact Mike Isely <isely@pobox.com>"
+                           " to get it included in the driver\n");
+                goto fail;
+        }
+
         hdw = kzalloc(sizeof(*hdw),GFP_KERNEL);
         pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_create: hdw=%p, type \"%s\"",
                    hdw,hdw_desc->description);
@@ -2072,6 +2351,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
                         valid_std_mask;
         }
 
+        hdw->cropcap_stale = !0;
         hdw->eeprom_addr = -1;
         hdw->unit_number = -1;
         hdw->v4l_minor_number_video = -1;
@@ -2508,6 +2788,28 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
                 /* Can't commit anything until pathway is ok. */
                 return 0;
         }
+        /* The broadcast decoder can only scale down, so if
+         * res_*_dirty && crop window < output format ==> enlarge crop.
+         *
+         * The mpeg encoder receives fields of res_hor_val dots and
+         * res_ver_val halflines.  Limits: hor<=720, ver<=576.
+         */
+        if (hdw->res_hor_dirty && hdw->cropw_val < hdw->res_hor_val) {
+                hdw->cropw_val = hdw->res_hor_val;
+                hdw->cropw_dirty = !0;
+        } else if (hdw->cropw_dirty) {
+                hdw->res_hor_dirty = !0;           /* must rescale */
+                hdw->res_hor_val = min(720, hdw->cropw_val);
+        }
+        if (hdw->res_ver_dirty && hdw->croph_val < hdw->res_ver_val) {
+                hdw->croph_val = hdw->res_ver_val;
+                hdw->croph_dirty = !0;
+        } else if (hdw->croph_dirty) {
+                int nvres = hdw->std_mask_cur & V4L2_STD_525_60 ? 480 : 576;
+                hdw->res_ver_dirty = !0;
+                hdw->res_ver_val = min(nvres, hdw->croph_val);
+        }
+
         /* If any of the below has changed, then we can't do the update
            while the pipeline is running.  Pipeline must be paused first
            and decoder -> encoder connection be made quiescent before we
@@ -2518,6 +2820,8 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
                  hdw->srate_dirty ||
                  hdw->res_ver_dirty ||
                  hdw->res_hor_dirty ||
+                 hdw->cropw_dirty ||
+                 hdw->croph_dirty ||
                  hdw->input_dirty ||
                  (hdw->active_stream_type != hdw->desired_stream_type));
         if (disruptive_change && !hdw->state_pipeline_idle) {
@@ -2587,6 +2891,9 @@ static int pvr2_hdw_commit_execute(struct pvr2_hdw *hdw)
         }
 
         hdw->state_pipeline_config = !0;
+        /* Hardware state may have changed in a way to cause the cropping
+           capabilities to have changed.  So mark it stale, which will
+           cause a later re-fetch. */
         trace_stbit("state_pipeline_config",hdw->state_pipeline_config);
         return !0;
 }
@@ -2677,6 +2984,33 @@ void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *hdw)
 }
 
 
+static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw)
+{
+        if (!hdw->cropcap_stale) {
+                return 0;
+        }
+        pvr2_i2c_core_status_poll(hdw);
+        if (hdw->cropcap_stale) {
+                return -EIO;
+        }
+        return 0;
+}
+
+
+/* Return information about cropping capabilities */
+int pvr2_hdw_get_cropcap(struct pvr2_hdw *hdw, struct v4l2_cropcap *pp)
+{
+        int stat = 0;
+        LOCK_TAKE(hdw->big_lock);
+        stat = pvr2_hdw_check_cropcap(hdw);
+        if (!stat) {
+                memcpy(pp, &hdw->cropcap_info, sizeof(hdw->cropcap_info));
+        }
+        LOCK_GIVE(hdw->big_lock);
+        return stat;
+}
+
+
 /* Return information about the tuner */
 int pvr2_hdw_get_tuner_status(struct pvr2_hdw *hdw,struct v4l2_tuner *vtp)
 {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index c04956d304a7..49482d1f2b28 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -36,6 +36,16 @@
 #define PVR2_CID_FREQUENCY 6
 #define PVR2_CID_HRES 7
 #define PVR2_CID_VRES 8
+#define PVR2_CID_CROPL 9
+#define PVR2_CID_CROPT 10
+#define PVR2_CID_CROPW 11
+#define PVR2_CID_CROPH 12
+#define PVR2_CID_CROPCAPPAN 13
+#define PVR2_CID_CROPCAPPAD 14
+#define PVR2_CID_CROPCAPBL 15
+#define PVR2_CID_CROPCAPBT 16
+#define PVR2_CID_CROPCAPBW 17
+#define PVR2_CID_CROPCAPBH 18
 
 /* Legal values for the INPUT state variable */
 #define PVR2_CVAL_INPUT_TV 0
@@ -170,6 +180,9 @@ void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *);
 /* Return information about the tuner */
 int pvr2_hdw_get_tuner_status(struct pvr2_hdw *,struct v4l2_tuner *);
 
+/* Return information about cropping capabilities */
+int pvr2_hdw_get_cropcap(struct pvr2_hdw *, struct v4l2_cropcap *);
+
 /* Query device and see if it thinks it is on a high-speed USB link */
 int pvr2_hdw_is_hsm(struct pvr2_hdw *);
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index ccdb429fc7af..94a47718e88e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -37,8 +37,9 @@
 #define OP_VOLUME 3
 #define OP_FREQ 4
 #define OP_AUDIORATE 5
-#define OP_SIZE 6
-#define OP_LOG 7
+#define OP_CROP 6
+#define OP_SIZE 7
+#define OP_LOG 8
 
 static const struct pvr2_i2c_op * const ops[] = {
         [OP_STANDARD] = &pvr2_i2c_op_v4l2_standard,
@@ -46,6 +47,7 @@ static const struct pvr2_i2c_op * const ops[] = {
         [OP_BCSH] = &pvr2_i2c_op_v4l2_bcsh,
         [OP_VOLUME] = &pvr2_i2c_op_v4l2_volume,
         [OP_FREQ] = &pvr2_i2c_op_v4l2_frequency,
+        [OP_CROP] = &pvr2_i2c_op_v4l2_crop,
         [OP_SIZE] = &pvr2_i2c_op_v4l2_size,
         [OP_LOG] = &pvr2_i2c_op_v4l2_log,
 };
@@ -59,6 +61,7 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
                         (1 << OP_BCSH) |
                         (1 << OP_VOLUME) |
                         (1 << OP_FREQ) |
+                        (1 << OP_CROP) |
                         (1 << OP_SIZE) |
                         (1 << OP_LOG));
         cp->status_poll = pvr2_v4l2_cmd_status_poll;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index 55f04a0b2047..16bb11902a52 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -37,6 +37,7 @@ static void set_standard(struct pvr2_hdw *hdw)
                 pvr2_i2c_core_cmd(hdw,VIDIOC_S_STD,&vs);
         }
         hdw->tuner_signal_stale = !0;
+        hdw->cropcap_stale = !0;
 }
 
 
@@ -233,6 +234,37 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size = {
 };
 
 
+static void set_crop(struct pvr2_hdw *hdw)
+{
+        struct v4l2_crop crop;
+
+        memset(&crop, 0, sizeof crop);
+        crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        crop.c.left = hdw->cropl_val;
+        crop.c.top = hdw->cropt_val;
+        crop.c.height = hdw->croph_val;
+        crop.c.width = hdw->cropw_val;
+
+        pvr2_trace(PVR2_TRACE_CHIPS,
+                   "i2c v4l2 set_crop crop=%d:%d:%d:%d",
+                   crop.c.width, crop.c.height, crop.c.left, crop.c.top);
+
+        pvr2_i2c_core_cmd(hdw, VIDIOC_S_CROP, &crop);
+}
+
+static int check_crop(struct pvr2_hdw *hdw)
+{
+        return (hdw->cropl_dirty || hdw->cropt_dirty ||
+                hdw->cropw_dirty || hdw->croph_dirty);
+}
+
+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_crop = {
+        .check = check_crop,
+        .update = set_crop,
+        .name = "v4l2_crop",
+};
+
+
 static void do_log(struct pvr2_hdw *hdw)
 {
         pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 do_log()");
@@ -263,7 +295,19 @@ void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *cp,int fl)
 
 void pvr2_v4l2_cmd_status_poll(struct pvr2_i2c_client *cp)
 {
-        pvr2_i2c_client_cmd(cp,VIDIOC_G_TUNER,&cp->hdw->tuner_signal_info);
+        int stat;
+        struct pvr2_hdw *hdw = cp->hdw;
+        if (hdw->cropcap_stale) {
+                hdw->cropcap_info.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                stat = pvr2_i2c_client_cmd(cp, VIDIOC_CROPCAP,
+                                           &hdw->cropcap_info);
+                if (stat == 0) {
+                        /* Check was successful, so the data is no
+                           longer considered stale. */
+                        hdw->cropcap_stale = 0;
+                }
+        }
+        pvr2_i2c_client_cmd(cp, VIDIOC_G_TUNER, &hdw->tuner_signal_info);
 }
 
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
index 7fa38683b3b1..eb744a20610d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
@@ -29,6 +29,7 @@ extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_volume;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_frequency;
+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_crop;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_audiomode;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_log;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index e600576a6c4b..d6a35401fefb 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -827,7 +827,7 @@ static unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp,
         if ((detail & PVR2_I2C_DETAIL_CTLMASK) && cp->ctl_mask) {
                 unsigned int idx;
                 unsigned long msk,sm;
-                int spcfl;
+
                 bcnt = scnprintf(buf,maxlen," [");
                 ccnt += bcnt; buf += bcnt; maxlen -= bcnt;
                 sm = 0;
@@ -891,6 +891,7 @@ static int pvr2_i2c_attach_inform(struct i2c_client *client)
         INIT_LIST_HEAD(&cp->list);
         cp->client = client;
         mutex_lock(&hdw->i2c_list_lock); do {
+                hdw->cropcap_stale = !0;
                 list_add_tail(&cp->list,&hdw->i2c_clients);
                 hdw->i2c_pend_types |= PVR2_I2C_PEND_DETECT;
         } while (0); mutex_unlock(&hdw->i2c_list_lock);
@@ -905,6 +906,7 @@ static int pvr2_i2c_detach_inform(struct i2c_client *client)
         unsigned long amask = 0;
         int foundfl = 0;
         mutex_lock(&hdw->i2c_list_lock); do {
+                hdw->cropcap_stale = !0;
                 list_for_each_entry_safe(cp, ncp, &hdw->i2c_clients, list) {
                         if (cp->client == client) {
                                 trace_i2c("pvr2_i2c_detach"
@@ -946,22 +948,32 @@ static struct i2c_adapter pvr2_i2c_adap_template = {
         .client_unregister = pvr2_i2c_detach_inform,
 };
 
-static void do_i2c_scan(struct pvr2_hdw *hdw)
+
+/* Return true if device exists at given address */
+static int do_i2c_probe(struct pvr2_hdw *hdw, int addr)
 {
         struct i2c_msg msg[1];
-        int i,rc;
+        int rc;
         msg[0].addr = 0;
         msg[0].flags = I2C_M_RD;
         msg[0].len = 0;
         msg[0].buf = NULL;
-        printk("%s: i2c scan beginning\n",hdw->name);
+        msg[0].addr = addr;
+        rc = i2c_transfer(&hdw->i2c_adap, msg, ARRAY_SIZE(msg));
+        return rc == 1;
+}
+
+static void do_i2c_scan(struct pvr2_hdw *hdw)
+{
+        int i;
+        printk(KERN_INFO "%s: i2c scan beginning\n", hdw->name);
         for (i = 0; i < 128; i++) {
-                msg[0].addr = i;
-                rc = i2c_transfer(&hdw->i2c_adap,msg, ARRAY_SIZE(msg));
-                if (rc != 1) continue;
-                printk("%s: i2c scan: found device @ 0x%x\n",hdw->name,i);
+                if (do_i2c_probe(hdw, i)) {
+                        printk(KERN_INFO "%s: i2c scan: found device @ 0x%x\n",
+                               hdw->name, i);
+                }
         }
-        printk("%s: i2c scan done.\n",hdw->name);
+        printk(KERN_INFO "%s: i2c scan done.\n", hdw->name);
 }
 
 void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
@@ -980,8 +992,6 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
                 hdw->i2c_func[0x18] = i2c_black_hole;
         } else if (ir_mode[hdw->unit_number] == 1) {
                 if (hdw->hdw_desc->ir_scheme == PVR2_IR_SCHEME_24XXX) {
-                        /* This comment is present PURELY to get
-                           checkpatch.pl to STFU.  Lovely, eh? */
                         hdw->i2c_func[0x18] = i2c_24xxx_ir;
                 }
         }
@@ -1006,6 +1016,16 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
         mutex_init(&hdw->i2c_list_lock);
         hdw->i2c_linked = !0;
         i2c_add_adapter(&hdw->i2c_adap);
+        if (hdw->i2c_func[0x18] == i2c_24xxx_ir) {
+                /* Probe for a different type of IR receiver on this
+                   device.  If present, disable the emulated IR receiver. */
+                if (do_i2c_probe(hdw, 0x71)) {
+                        pvr2_trace(PVR2_TRACE_INFO,
+                                   "Device has newer IR hardware;"
+                                   " disabling unneeded virtual IR device");
+                        hdw->i2c_func[0x18] = NULL;
+                }
+        }
         if (i2c_scan) do_i2c_scan(hdw);
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c
index ad0d98c2ebb4..9b3c874d96d6 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -137,9 +137,11 @@ static int __init pvr_init(void)
         ret = usb_register(&pvr_driver);
 
         if (ret == 0)
-                info(DRIVER_DESC " : " DRIVER_VERSION);
-        if (pvrusb2_debug) info("Debug mask is %d (0x%x)",
-                                pvrusb2_debug,pvrusb2_debug);
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                       DRIVER_DESC "\n");
+        if (pvrusb2_debug)
+                printk(KERN_INFO KBUILD_MODNAME ": Debug mask is %d (0x%x)\n",
+                       pvrusb2_debug,pvrusb2_debug);
 
         pvr2_trace(PVR2_TRACE_INIT,"pvr_init complete");
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index 46a8c39ba030..733680f21317 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -65,6 +65,7 @@ struct pvr2_sysfs_ctl_item {
         struct device_attribute attr_type;
         struct device_attribute attr_min;
         struct device_attribute attr_max;
+        struct device_attribute attr_def;
         struct device_attribute attr_enum;
         struct device_attribute attr_bits;
         struct device_attribute attr_val;
@@ -145,6 +146,23 @@ static ssize_t show_max(struct device *class_dev,
         return scnprintf(buf, PAGE_SIZE, "%ld\n", val);
 }
 
+static ssize_t show_def(struct device *class_dev,
+                        struct device_attribute *attr,
+                        char *buf)
+{
+        struct pvr2_sysfs_ctl_item *cip;
+        int val;
+        int ret;
+        cip = container_of(attr, struct pvr2_sysfs_ctl_item, attr_def);
+        ret = pvr2_ctrl_get_def(cip->cptr, &val);
+        pvr2_sysfs_trace("pvr2_sysfs(%p) show_def(cid=%d) is %d, stat=%d",
+                         cip->chptr, cip->ctl_id, val, ret);
+        if (ret < 0) {
+                return ret;
+        }
+        return scnprintf(buf, PAGE_SIZE, "%d\n", val);
+}
+
 static ssize_t show_val_norm(struct device *class_dev,
                              struct device_attribute *attr,
                              char *buf)
@@ -320,6 +338,10 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
         cip->attr_max.attr.mode = S_IRUGO;
         cip->attr_max.show = show_max;
 
+        cip->attr_def.attr.name = "def_val";
+        cip->attr_def.attr.mode = S_IRUGO;
+        cip->attr_def.show = show_def;
+
         cip->attr_val.attr.name = "cur_val";
         cip->attr_val.attr.mode = S_IRUGO;
 
@@ -343,6 +365,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
         cip->attr_gen[acnt++] = &cip->attr_name.attr;
         cip->attr_gen[acnt++] = &cip->attr_type.attr;
         cip->attr_gen[acnt++] = &cip->attr_val.attr;
+        cip->attr_gen[acnt++] = &cip->attr_def.attr;
         cip->attr_val.show = show_val_norm;
         cip->attr_val.store = store_val_norm;
         if (pvr2_ctrl_has_custom_symbols(cptr)) {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 00306faeac01..f048d80b77e5 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -533,7 +533,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 
                         lmin = pvr2_ctrl_get_min(hcp);
                         lmax = pvr2_ctrl_get_max(hcp);
-                        ldef = pvr2_ctrl_get_def(hcp);
+                        pvr2_ctrl_get_def(hcp, &ldef);
                         if (w == -1) {
                                 w = ldef;
                         } else if (w < lmin) {
@@ -543,7 +543,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                         }
                         lmin = pvr2_ctrl_get_min(vcp);
                         lmax = pvr2_ctrl_get_max(vcp);
-                        ldef = pvr2_ctrl_get_def(vcp);
+                        pvr2_ctrl_get_def(vcp, &ldef);
                         if (h == -1) {
                                 h = ldef;
                         } else if (h < lmin) {
@@ -604,6 +604,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOC_QUERYCTRL:
         {
                 struct pvr2_ctrl *cptr;
+                int val;
                 struct v4l2_queryctrl *vc = (struct v4l2_queryctrl *)arg;
                 ret = 0;
                 if (vc->id & V4L2_CTRL_FLAG_NEXT_CTRL) {
@@ -627,7 +628,8 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                            pvr2_ctrl_get_desc(cptr));
                 strlcpy(vc->name,pvr2_ctrl_get_desc(cptr),sizeof(vc->name));
                 vc->flags = pvr2_ctrl_get_v4lflags(cptr);
-                vc->default_value = pvr2_ctrl_get_def(cptr);
+                pvr2_ctrl_get_def(cptr, &val);
+                vc->default_value = val;
                 switch (pvr2_ctrl_get_type(cptr)) {
                 case pvr2_ctl_enum:
                         vc->type = V4L2_CTRL_TYPE_MENU;
@@ -753,6 +755,92 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 break;
         }
 
+        case VIDIOC_CROPCAP:
+        {
+                struct v4l2_cropcap *cap = (struct v4l2_cropcap *)arg;
+                if (cap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_hdw_get_cropcap(hdw, cap);
+                cap->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; /* paranoia */
+                break;
+        }
+        case VIDIOC_G_CROP:
+        {
+                struct v4l2_crop *crop = (struct v4l2_crop *)arg;
+                int val = 0;
+                if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.left = val;
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPT), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.top = val;
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPW), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.width = val;
+                ret = pvr2_ctrl_get_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPH), &val);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                crop->c.height = val;
+        }
+        case VIDIOC_S_CROP:
+        {
+                struct v4l2_crop *crop = (struct v4l2_crop *)arg;
+                struct v4l2_cropcap cap;
+                if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                        ret = -EINVAL;
+                        break;
+                }
+                cap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPL),
+                        crop->c.left);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPT),
+                        crop->c.top);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPW),
+                        crop->c.width);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+                ret = pvr2_ctrl_set_value(
+                        pvr2_hdw_get_ctrl_by_id(hdw, PVR2_CID_CROPH),
+                        crop->c.height);
+                if (ret != 0) {
+                        ret = -EINVAL;
+                        break;
+                }
+        }
         case VIDIOC_LOG_STATUS:
         {
                 pvr2_hdw_trigger_module_log(hdw);
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c
index dbc560742553..c66530210192 100644
--- a/drivers/media/video/pwc/pwc-ctrl.c
+++ b/drivers/media/video/pwc/pwc-ctrl.c
@@ -41,7 +41,6 @@
 #include <asm/uaccess.h>
 #endif
 #include <asm/errno.h>
-#include <linux/version.h>
 
 #include "pwc.h"
 #include "pwc-uncompress.h"
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 9aee7cb6f79a..ab28389b4cda 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1112,7 +1112,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
 
         PWC_DEBUG_OPEN(">> video_open called(vdev = 0x%p).\n", vdev);
 
-        pdev = (struct pwc_device *)vdev->priv;
+        pdev = video_get_drvdata(vdev);
         BUG_ON(!pdev);
         if (pdev->vopen) {
                 PWC_DEBUG_OPEN("I'm busy, someone is using the device.\n");
@@ -1233,7 +1233,7 @@ static int pwc_video_close(struct inode *inode, struct file *file)
         PWC_DEBUG_OPEN(">> video_close called(vdev = 0x%p).\n", vdev);
 
         lock_kernel();
-        pdev = (struct pwc_device *)vdev->priv;
+        pdev = video_get_drvdata(vdev);
         if (pdev->vopen == 0)
                 PWC_DEBUG_MODULE("video_close() called on closed device?\n");
 
@@ -1304,7 +1304,7 @@ static ssize_t pwc_video_read(struct file *file, char __user *buf,
                         vdev, buf, count);
         if (vdev == NULL)
                 return -EFAULT;
-        pdev = vdev->priv;
+        pdev = video_get_drvdata(vdev);
         if (pdev == NULL)
                 return -EFAULT;
 
@@ -1386,7 +1386,7 @@ static unsigned int pwc_video_poll(struct file *file, poll_table *wait)
 
         if (vdev == NULL)
                 return -EFAULT;
-        pdev = vdev->priv;
+        pdev = video_get_drvdata(vdev);
         if (pdev == NULL)
                 return -EFAULT;
 
@@ -1408,7 +1408,7 @@ static int pwc_video_ioctl(struct inode *inode, struct file *file,
 
         if (!vdev)
                 goto out;
-        pdev = vdev->priv;
+        pdev = video_get_drvdata(vdev);
 
         mutex_lock(&pdev->modlock);
         if (!pdev->unplugged)
@@ -1428,7 +1428,7 @@ static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)
         int index;
 
         PWC_DEBUG_MEMORY(">> %s\n", __func__);
-        pdev = vdev->priv;
+        pdev = video_get_drvdata(vdev);
         size = vma->vm_end - vma->vm_start;
         start = vma->vm_start;
 
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 1742889874df..76a1376c9751 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -346,7 +346,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
 
         if (vdev == NULL)
                 return -EFAULT;
-        pdev = vdev->priv;
+        pdev = video_get_drvdata(vdev);
         if (pdev == NULL)
                 return -EFAULT;
 
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index cf96b2cc4f1c..eb6be5802928 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -629,17 +629,6 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
                 pdata->init(pcdev->dev);
         }
 
-        if (pdata && pdata->power) {
-                dev_dbg(pcdev->dev, "%s: Power on camera\n", __func__);
-                pdata->power(pcdev->dev, 1);
-        }
-
-        if (pdata && pdata->reset) {
-                dev_dbg(pcdev->dev, "%s: Releasing camera reset\n",
-                        __func__);
-                pdata->reset(pcdev->dev, 1);
-        }
-
         CICR0 = 0x3FF;   /* disable all interrupts */
 
         if (pcdev->platform_flags & PXA_CAMERA_PCLK_EN)
@@ -660,20 +649,7 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
 
 static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)
 {
-        struct pxacamera_platform_data *board = pcdev->pdata;
-
         clk_disable(pcdev->clk);
-
-        if (board && board->reset) {
-                dev_dbg(pcdev->dev, "%s: Asserting camera reset\n",
-                        __func__);
-                board->reset(pcdev->dev, 0);
-        }
-
-        if (board && board->power) {
-                dev_dbg(pcdev->dev, "%s: Power off camera\n", __func__);
-                board->power(pcdev->dev, 0);
-        }
 }
 
 static irqreturn_t pxa_camera_irq(int irq, void *data)
@@ -1144,31 +1120,31 @@ static int pxa_camera_probe(struct platform_device *pdev)
         pcdev->dev = &pdev->dev;
 
         /* request dma */
-        pcdev->dma_chans[0] = pxa_request_dma("CI_Y", DMA_PRIO_HIGH,
-                                              pxa_camera_dma_irq_y, pcdev);
-        if (pcdev->dma_chans[0] < 0) {
+        err = pxa_request_dma("CI_Y", DMA_PRIO_HIGH,
+                              pxa_camera_dma_irq_y, pcdev);
+        if (err < 0) {
                 dev_err(pcdev->dev, "Can't request DMA for Y\n");
-                err = -ENOMEM;
                 goto exit_iounmap;
         }
+        pcdev->dma_chans[0] = err;
         dev_dbg(pcdev->dev, "got DMA channel %d\n", pcdev->dma_chans[0]);
 
-        pcdev->dma_chans[1] = pxa_request_dma("CI_U", DMA_PRIO_HIGH,
-                                              pxa_camera_dma_irq_u, pcdev);
-        if (pcdev->dma_chans[1] < 0) {
+        err = pxa_request_dma("CI_U", DMA_PRIO_HIGH,
+                              pxa_camera_dma_irq_u, pcdev);
+        if (err < 0) {
                 dev_err(pcdev->dev, "Can't request DMA for U\n");
-                err = -ENOMEM;
                 goto exit_free_dma_y;
         }
+        pcdev->dma_chans[1] = err;
         dev_dbg(pcdev->dev, "got DMA channel (U) %d\n", pcdev->dma_chans[1]);
 
-        pcdev->dma_chans[2] = pxa_request_dma("CI_V", DMA_PRIO_HIGH,
-                                              pxa_camera_dma_irq_v, pcdev);
-        if (pcdev->dma_chans[0] < 0) {
+        err = pxa_request_dma("CI_V", DMA_PRIO_HIGH,
+                              pxa_camera_dma_irq_v, pcdev);
+        if (err < 0) {
                 dev_err(pcdev->dev, "Can't request DMA for V\n");
-                err = -ENOMEM;
                 goto exit_free_dma_u;
         }
+        pcdev->dma_chans[2] = err;
         dev_dbg(pcdev->dev, "got DMA channel (V) %d\n", pcdev->dma_chans[2]);
 
         DRCMR(68) = pcdev->dma_chans[0] | DRCMR_MAPVLD;
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 92b83feae366..5272926db73e 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -58,6 +58,8 @@
 
 
 
+/* default JPEG quality */
+#define S2255_DEF_JPEG_QUAL     50
 /* vendor request in */
 #define S2255_VR_IN             0
 /* vendor request out */
@@ -67,20 +69,21 @@
 /* USB endpoint number for configuring the device */
 #define S2255_CONFIG_EP         2
 /* maximum time for DSP to start responding after last FW word loaded(ms) */
-#define S2255_DSP_BOOTTIME      400
+#define S2255_DSP_BOOTTIME      800
 /* maximum time to wait for firmware to load (ms) */
 #define S2255_LOAD_TIMEOUT      (5000 + S2255_DSP_BOOTTIME)
 #define S2255_DEF_BUFS          16
+#define S2255_SETMODE_TIMEOUT   500
 #define MAX_CHANNELS            4
-#define FRAME_MARKER            0x2255DA4AL
-#define MAX_PIPE_USBBLOCK       (40 * 1024)
-#define DEFAULT_PIPE_USBBLOCK   (16 * 1024)
+#define S2255_MARKER_FRAME      0x2255DA4AL
+#define S2255_MARKER_RESPONSE   0x2255ACACL
+#define S2255_USB_XFER_SIZE     (16 * 1024)
 #define MAX_CHANNELS            4
 #define MAX_PIPE_BUFFERS        1
 #define SYS_FRAMES              4
 /* maximum size is PAL full size plus room for the marker header(s) */
-#define SYS_FRAMES_MAXSIZE      (720 * 288 * 2 * 2 + 4096)
-#define DEF_USB_BLOCK           (4096)
+#define SYS_FRAMES_MAXSIZE      (720*288*2*2 + 4096)
+#define DEF_USB_BLOCK           S2255_USB_XFER_SIZE
 #define LINE_SZ_4CIFS_NTSC      640
 #define LINE_SZ_2CIFS_NTSC      640
 #define LINE_SZ_1CIFS_NTSC      320
@@ -108,6 +111,9 @@
 #define COLOR_YUVPL     1       /* YUV planar */
 #define COLOR_YUVPK     2       /* YUV packed */
 #define COLOR_Y8        4       /* monochrome */
+#define COLOR_JPG       5       /* JPEG */
+#define MASK_COLOR      0xff
+#define MASK_JPG_QUALITY 0xff00
 
 /* frame decimation. Not implemented by V4L yet(experimental in V4L) */
 #define FDEC_1          1       /* capture every frame. default */
@@ -148,16 +154,14 @@ struct s2255_mode {
         u32 restart;    /* if DSP requires restart */
 };
 
-/* frame structure */
-#define FRAME_STATE_UNUSED      0
-#define FRAME_STATE_FILLING     1
-#define FRAME_STATE_FULL        2
 
+#define S2255_READ_IDLE         0
+#define S2255_READ_FRAME        1
 
+/* frame structure */
 struct s2255_framei {
         unsigned long size;
-
-        unsigned long ulState;  /* ulState ==0 unused, 1 being filled, 2 full */
+        unsigned long ulState;  /* ulState:S2255_READ_IDLE, S2255_READ_FRAME*/
         void *lpvbits;          /* image data */
         unsigned long cur_size; /* current data copied to it */
 };
@@ -188,6 +192,10 @@ struct s2255_dmaqueue {
 #define S2255_FW_FAILED         3
 #define S2255_FW_DISCONNECTING  4
 
+#define S2255_FW_MARKER         0x22552f2f
+/* 2255 read states */
+#define S2255_READ_IDLE         0
+#define S2255_READ_FRAME        1
 struct s2255_fw {
         int                   fw_loaded;
         int                   fw_size;
@@ -195,7 +203,6 @@ struct s2255_fw {
         atomic_t              fw_state;
         void                  *pfw_data;
         wait_queue_head_t     wait_fw;
-        struct timer_list     dsp_wait;
         const struct firmware *fw;
 };
 
@@ -237,15 +244,27 @@ struct s2255_dev {
         struct s2255_pipeinfo   pipes[MAX_PIPE_BUFFERS];
         struct s2255_bufferi            buffer[MAX_CHANNELS];
         struct s2255_mode       mode[MAX_CHANNELS];
+        /* jpeg compression */
+        struct v4l2_jpegcompression jc[MAX_CHANNELS];
         const struct s2255_fmt  *cur_fmt[MAX_CHANNELS];
         int                     cur_frame[MAX_CHANNELS];
         int                     last_frame[MAX_CHANNELS];
         u32                     cc;     /* current channel */
         int                     b_acquire[MAX_CHANNELS];
+        /* allocated image size */
         unsigned long           req_image_size[MAX_CHANNELS];
+        /* received packet size */
+        unsigned long           pkt_size[MAX_CHANNELS];
         int                     bad_payload[MAX_CHANNELS];
         unsigned long           frame_count[MAX_CHANNELS];
         int                     frame_ready;
+        /* if JPEG image */
+        int                     jpg_size[MAX_CHANNELS];
+        /* if channel configured to default state */
+        int                     chn_configured[MAX_CHANNELS];
+        wait_queue_head_t       wait_setmode[MAX_CHANNELS];
+        int                     setmode_ready[MAX_CHANNELS];
+        int                     chn_ready;
         struct kref             kref;
         spinlock_t              slock;
 };
@@ -306,12 +325,16 @@ static void s2255_stop_readpipe(struct s2255_dev *dev);
 static int s2255_start_acquire(struct s2255_dev *dev, unsigned long chn);
 static int s2255_stop_acquire(struct s2255_dev *dev, unsigned long chn);
 static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,
-                           int chn);
+                           int chn, int jpgsize);
 static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,
                           struct s2255_mode *mode);
 static int s2255_board_shutdown(struct s2255_dev *dev);
 static void s2255_exit_v4l(struct s2255_dev *dev);
-static void s2255_fwload_start(struct s2255_dev *dev);
+static void s2255_fwload_start(struct s2255_dev *dev, int reset);
+static void s2255_destroy(struct kref *kref);
+static long s2255_vendor_req(struct s2255_dev *dev, unsigned char req,
+                             u16 index, u16 value, void *buf,
+                             s32 buf_len, int bOut);
 
 #define dprintk(level, fmt, arg...)                                     \
         do {                                                            \
@@ -407,6 +430,10 @@ static const struct s2255_fmt formats[] = {
                 .fourcc = V4L2_PIX_FMT_UYVY,
                 .depth = 16
         }, {
+                .name = "JPG",
+                .fourcc = V4L2_PIX_FMT_JPEG,
+                .depth = 24
+        }, {
                 .name = "8bpp GREY",
                 .fourcc = V4L2_PIX_FMT_GREY,
                 .depth = 8
@@ -464,6 +491,13 @@ static void planar422p_to_yuv_packed(const unsigned char *in,
         return;
 }
 
+static void s2255_reset_dsppower(struct s2255_dev *dev)
+{
+        s2255_vendor_req(dev, 0x40, 0x0b0b, 0x0b0b, NULL, 0, 1);
+        msleep(10);
+        s2255_vendor_req(dev, 0x50, 0x0000, 0x0000, NULL, 0, 1);
+        return;
+}
 
 /* kickstarts the firmware loading. from probe
  */
@@ -480,18 +514,6 @@ static void s2255_timer(unsigned long user_data)
         }
 }
 
-/* called when DSP is up and running.  DSP is guaranteed to
-   be running after S2255_DSP_BOOTTIME */
-static void s2255_dsp_running(unsigned long user_data)
-{
-        struct s2255_fw *data = (struct s2255_fw *)user_data;
-        dprintk(1, "dsp running\n");
-        atomic_set(&data->fw_state, S2255_FW_SUCCESS);
-        wake_up(&data->wait_fw);
-        printk(KERN_INFO "s2255: firmware loaded successfully\n");
-        return;
-}
-
 
 /* this loads the firmware asynchronously.
    Originally this was done synchroously in probe.
@@ -549,19 +571,14 @@ static void s2255_fwchunk_complete(struct urb *urb)
                 }
                 data->fw_loaded += len;
         } else {
-                init_timer(&data->dsp_wait);
-                data->dsp_wait.function = s2255_dsp_running;
-                data->dsp_wait.data = (unsigned long)data;
                 atomic_set(&data->fw_state, S2255_FW_LOADED_DSPWAIT);
-                mod_timer(&data->dsp_wait, msecs_to_jiffies(S2255_DSP_BOOTTIME)
-                          + jiffies);
         }
         dprintk(100, "2255 complete done\n");
         return;
 
 }
 
-static int s2255_got_frame(struct s2255_dev *dev, int chn)
+static int s2255_got_frame(struct s2255_dev *dev, int chn, int jpgsize)
 {
         struct s2255_dmaqueue *dma_q = &dev->vidq[chn];
         struct s2255_buffer *buf;
@@ -586,8 +603,7 @@ static int s2255_got_frame(struct s2255_dev *dev, int chn)
         list_del(&buf->vb.queue);
         do_gettimeofday(&buf->vb.ts);
         dprintk(100, "[%p/%d] wakeup\n", buf, buf->vb.i);
-
-        s2255_fillbuff(dev, buf, dma_q->channel);
+        s2255_fillbuff(dev, buf, dma_q->channel, jpgsize);
         wake_up(&buf->vb.done);
         dprintk(2, "wakeup [buf/i] [%p/%d]\n", buf, buf->vb.i);
 unlock:
@@ -621,7 +637,7 @@ static const struct s2255_fmt *format_by_fourcc(int fourcc)
  *
  */
 static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,
-                           int chn)
+                           int chn, int jpgsize)
 {
         int pos = 0;
         struct timeval ts;
@@ -649,6 +665,10 @@ static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,
                 case V4L2_PIX_FMT_GREY:
                         memcpy(vbuf, tmpbuf, buf->vb.width * buf->vb.height);
                         break;
+                case V4L2_PIX_FMT_JPEG:
+                        buf->vb.size = jpgsize;
+                        memcpy(vbuf, tmpbuf, buf->vb.size);
+                        break;
                 case V4L2_PIX_FMT_YUV422P:
                         memcpy(vbuf, tmpbuf,
                                buf->vb.width * buf->vb.height * 2);
@@ -657,9 +677,6 @@ static void s2255_fillbuff(struct s2255_dev *dev, struct s2255_buffer *buf,
                         printk(KERN_DEBUG "s2255: unknown format?\n");
                 }
                 dev->last_frame[chn] = -1;
-                /* done with the frame, free it */
-                frm->ulState = 0;
-                dprintk(4, "freeing buffer\n");
         } else {
                 printk(KERN_ERR "s2255: =======no frame\n");
                 return;
@@ -1021,6 +1038,10 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         case V4L2_PIX_FMT_GREY:
                 fh->mode.color = COLOR_Y8;
                 break;
+        case V4L2_PIX_FMT_JPEG:
+                fh->mode.color = COLOR_JPG |
+                        (fh->dev->jc[fh->channel].quality << 8);
+                break;
         case V4L2_PIX_FMT_YUV422P:
                 fh->mode.color = COLOR_YUVPL;
                 break;
@@ -1139,7 +1160,7 @@ static u32 get_transfer_size(struct s2255_mode *mode)
                 }
         }
         outImageSize = linesPerFrame * pixelsPerLine;
-        if (mode->color != COLOR_Y8) {
+        if ((mode->color & MASK_COLOR) != COLOR_Y8) {
                 /* 2 bytes/pixel if not monochrome */
                 outImageSize *= 2;
         }
@@ -1185,12 +1206,17 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,
         u32 *buffer;
         unsigned long chn_rev;
 
+        mutex_lock(&dev->lock);
         chn_rev = G_chnmap[chn];
         dprintk(3, "mode scale [%ld] %p %d\n", chn, mode, mode->scale);
         dprintk(3, "mode scale [%ld] %p %d\n", chn, &dev->mode[chn],
                 dev->mode[chn].scale);
         dprintk(2, "mode contrast %x\n", mode->contrast);
 
+        /* if JPEG, set the quality */
+        if ((mode->color & MASK_COLOR) == COLOR_JPG)
+                mode->color = (dev->jc[chn].quality << 8) | COLOR_JPG;
+
         /* save the mode */
         dev->mode[chn] = *mode;
         dev->req_image_size[chn] = get_transfer_size(mode);
@@ -1199,6 +1225,7 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,
         buffer = kzalloc(512, GFP_KERNEL);
         if (buffer == NULL) {
                 dev_err(&dev->udev->dev, "out of mem\n");
+                mutex_unlock(&dev->lock);
                 return -ENOMEM;
         }
 
@@ -1214,12 +1241,20 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn,
         dprintk(1, "set mode done chn %lu, %d\n", chn, res);
 
         /* wait at least 3 frames before continuing */
-        if (mode->restart)
-                msleep(125);
+        if (mode->restart) {
+                dev->setmode_ready[chn] = 0;
+                wait_event_timeout(dev->wait_setmode[chn],
+                                   (dev->setmode_ready[chn] != 0),
+                                   msecs_to_jiffies(S2255_SETMODE_TIMEOUT));
+                if (dev->setmode_ready[chn] != 1) {
+                        printk(KERN_DEBUG "s2255: no set mode response\n");
+                        res = -EFAULT;
+                }
+        }
 
         /* clear the restart flag */
         dev->mode[chn].restart = 0;
-
+        mutex_unlock(&dev->lock);
         return res;
 }
 
@@ -1270,7 +1305,7 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
         dev->cur_frame[chn] = 0;
         dev->frame_count[chn] = 0;
         for (j = 0; j < SYS_FRAMES; j++) {
-                dev->buffer[chn].frame[j].ulState = 0;
+                dev->buffer[chn].frame[j].ulState = S2255_READ_IDLE;
                 dev->buffer[chn].frame[j].cur_size = 0;
         }
         res = videobuf_streamon(&fh->vb_vidq);
@@ -1446,6 +1481,27 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
         return -EINVAL;
 }
 
+static int vidioc_g_jpegcomp(struct file *file, void *priv,
+                         struct v4l2_jpegcompression *jc)
+{
+        struct s2255_fh *fh = priv;
+        struct s2255_dev *dev = fh->dev;
+        *jc = dev->jc[fh->channel];
+        dprintk(2, "getting jpegcompression, quality %d\n", jc->quality);
+        return 0;
+}
+
+static int vidioc_s_jpegcomp(struct file *file, void *priv,
+                         struct v4l2_jpegcompression *jc)
+{
+        struct s2255_fh *fh = priv;
+        struct s2255_dev *dev = fh->dev;
+        if (jc->quality < 0 || jc->quality > 100)
+                return -EINVAL;
+        dev->jc[fh->channel].quality = jc->quality;
+        dprintk(2, "setting jpeg quality %d\n", jc->quality);
+        return 0;
+}
 static int s2255_open(struct inode *inode, struct file *file)
 {
         int minor = iminor(inode);
@@ -1455,8 +1511,10 @@ static int s2255_open(struct inode *inode, struct file *file)
         enum v4l2_buf_type type = 0;
         int i = 0;
         int cur_channel = -1;
+        int state;
         dprintk(1, "s2255: open called (minor=%d)\n", minor);
 
+        lock_kernel();
         list_for_each(list, &s2255_devlist) {
                 h = list_entry(list, struct s2255_dev, s2255_devlist);
                 for (i = 0; i < MAX_CHANNELS; i++) {
@@ -1469,45 +1527,78 @@ static int s2255_open(struct inode *inode, struct file *file)
         }
 
         if ((NULL == dev) || (cur_channel == -1)) {
-                dprintk(1, "s2255: openv4l no dev\n");
+                unlock_kernel();
+                printk(KERN_INFO "s2255: openv4l no dev\n");
                 return -ENODEV;
         }
 
+        if (atomic_read(&dev->fw_data->fw_state) == S2255_FW_DISCONNECTING) {
+                unlock_kernel();
+                printk(KERN_INFO "disconnecting\n");
+                return -ENODEV;
+        }
+        kref_get(&dev->kref);
         mutex_lock(&dev->open_lock);
 
         dev->users[cur_channel]++;
         dprintk(4, "s2255: open_handles %d\n", dev->users[cur_channel]);
 
-        if (atomic_read(&dev->fw_data->fw_state) == S2255_FW_FAILED) {
+        switch (atomic_read(&dev->fw_data->fw_state)) {
+        case S2255_FW_FAILED:
                 err("2255 firmware load failed. retrying.\n");
-                s2255_fwload_start(dev);
+                s2255_fwload_start(dev, 1);
                 wait_event_timeout(dev->fw_data->wait_fw,
-                                   (atomic_read(&dev->fw_data->fw_state)
-                                    != S2255_FW_NOTLOADED),
+                                   ((atomic_read(&dev->fw_data->fw_state)
+                                     == S2255_FW_SUCCESS) ||
+                                    (atomic_read(&dev->fw_data->fw_state)
+                                     == S2255_FW_DISCONNECTING)),
                                    msecs_to_jiffies(S2255_LOAD_TIMEOUT));
-                if (atomic_read(&dev->fw_data->fw_state)
-                    != S2255_FW_SUCCESS) {
-                        printk(KERN_INFO "2255 FW load failed.\n");
-                        dev->users[cur_channel]--;
-                        mutex_unlock(&dev->open_lock);
-                        return -EFAULT;
-                }
-        } else if (atomic_read(&dev->fw_data->fw_state) == S2255_FW_NOTLOADED) {
+                break;
+        case S2255_FW_NOTLOADED:
+        case S2255_FW_LOADED_DSPWAIT:
                 /* give S2255_LOAD_TIMEOUT time for firmware to load in case
                    driver loaded and then device immediately opened */
                 printk(KERN_INFO "%s waiting for firmware load\n", __func__);
                 wait_event_timeout(dev->fw_data->wait_fw,
-                                   (atomic_read(&dev->fw_data->fw_state)
-                                   != S2255_FW_NOTLOADED),
-                                   msecs_to_jiffies(S2255_LOAD_TIMEOUT));
-                if (atomic_read(&dev->fw_data->fw_state)
-                    != S2255_FW_SUCCESS) {
-                        printk(KERN_INFO "2255 firmware not loaded"
-                               "try again\n");
-                        dev->users[cur_channel]--;
-                        mutex_unlock(&dev->open_lock);
-                        return -EBUSY;
+                                   ((atomic_read(&dev->fw_data->fw_state)
+                                     == S2255_FW_SUCCESS) ||
+                                    (atomic_read(&dev->fw_data->fw_state)
+                                     == S2255_FW_DISCONNECTING)),
+                        msecs_to_jiffies(S2255_LOAD_TIMEOUT));
+                break;
+        case S2255_FW_SUCCESS:
+        default:
+                break;
+        }
+        state = atomic_read(&dev->fw_data->fw_state);
+        if (state != S2255_FW_SUCCESS) {
+                int rc;
+                switch (state) {
+                case S2255_FW_FAILED:
+                        printk(KERN_INFO "2255 FW load failed. %d\n", state);
+                        rc = -ENODEV;
+                        break;
+                case S2255_FW_DISCONNECTING:
+                        printk(KERN_INFO "%s: disconnecting\n", __func__);
+                        rc = -ENODEV;
+                        break;
+                case S2255_FW_LOADED_DSPWAIT:
+                case S2255_FW_NOTLOADED:
+                        printk(KERN_INFO "%s: firmware not loaded yet"
+                               "please try again later\n",
+                               __func__);
+                        rc = -EAGAIN;
+                        break;
+                default:
+                        printk(KERN_INFO "%s: unknown state\n", __func__);
+                        rc = -EFAULT;
+                        break;
                 }
+                dev->users[cur_channel]--;
+                mutex_unlock(&dev->open_lock);
+                kref_put(&dev->kref, s2255_destroy);
+                unlock_kernel();
+                return rc;
         }
 
         /* allocate + initialize per filehandle data */
@@ -1515,6 +1606,8 @@ static int s2255_open(struct inode *inode, struct file *file)
         if (NULL == fh) {
                 dev->users[cur_channel]--;
                 mutex_unlock(&dev->open_lock);
+                kref_put(&dev->kref, s2255_destroy);
+                unlock_kernel();
                 return -ENOMEM;
         }
 
@@ -1528,6 +1621,13 @@ static int s2255_open(struct inode *inode, struct file *file)
         fh->height = NUM_LINES_4CIFS_NTSC * 2;
         fh->channel = cur_channel;
 
+        /* configure channel to default state */
+        if (!dev->chn_configured[cur_channel]) {
+                s2255_set_mode(dev, cur_channel, &fh->mode);
+                dev->chn_configured[cur_channel] = 1;
+        }
+
+
         /* Put all controls at a sane state */
         for (i = 0; i < ARRAY_SIZE(s2255_qctrl); i++)
                 qctl_regs[i] = s2255_qctrl[i].default_value;
@@ -1546,8 +1646,8 @@ static int s2255_open(struct inode *inode, struct file *file)
                                     V4L2_FIELD_INTERLACED,
                                     sizeof(struct s2255_buffer), fh);
 
-        kref_get(&dev->kref);
         mutex_unlock(&dev->open_lock);
+        unlock_kernel();
         return 0;
 }
 
@@ -1569,30 +1669,24 @@ static unsigned int s2255_poll(struct file *file,
 static void s2255_destroy(struct kref *kref)
 {
         struct s2255_dev *dev = to_s2255_dev(kref);
+        struct list_head *list;
+        int i;
         if (!dev) {
                 printk(KERN_ERR "s2255drv: kref problem\n");
                 return;
         }
-
-        /*
-         * Wake up any firmware load waiting (only done in .open,
-         * which holds the open_lock mutex)
-         */
         atomic_set(&dev->fw_data->fw_state, S2255_FW_DISCONNECTING);
         wake_up(&dev->fw_data->wait_fw);
-
-        /* prevent s2255_disconnect from racing s2255_open */
+        for (i = 0; i < MAX_CHANNELS; i++) {
+                dev->setmode_ready[i] = 1;
+                wake_up(&dev->wait_setmode[i]);
+        }
         mutex_lock(&dev->open_lock);
+        /* reset the DSP so firmware can be reload next time */
+        s2255_reset_dsppower(dev);
         s2255_exit_v4l(dev);
-        /*
-         * device unregistered so no longer possible to open. open_mutex
-         *  can be unlocked and timers deleted afterwards.
-         */
-        mutex_unlock(&dev->open_lock);
-
         /* board shutdown stops the read pipe if it is running */
         s2255_board_shutdown(dev);
-
         /* make sure firmware still not trying to load */
         del_timer(&dev->timer);  /* only started in .probe and .open */
 
@@ -1602,23 +1696,19 @@ static void s2255_destroy(struct kref *kref)
                 usb_free_urb(dev->fw_data->fw_urb);
                 dev->fw_data->fw_urb = NULL;
         }
-
-        /*
-         * delete the dsp_wait timer, which sets the firmware
-         * state on completion.  This is done before fw_data
-         * is freed below.
-         */
-
-        del_timer(&dev->fw_data->dsp_wait); /* only started in .open */
-
         if (dev->fw_data->fw)
                 release_firmware(dev->fw_data->fw);
         kfree(dev->fw_data->pfw_data);
         kfree(dev->fw_data);
-
         usb_put_dev(dev->udev);
         dprintk(1, "%s", __func__);
         kfree(dev);
+
+        while (!list_empty(&s2255_devlist)) {
+                list = s2255_devlist.next;
+                list_del(list);
+        }
+        mutex_unlock(&dev->open_lock);
 }
 
 static int s2255_close(struct inode *inode, struct file *file)
@@ -1702,6 +1792,8 @@ static const struct v4l2_ioctl_ops s2255_ioctl_ops = {
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
         .vidiocgmbuf = vidioc_cgmbuf,
 #endif
+        .vidioc_s_jpegcomp = vidioc_s_jpegcomp,
+        .vidioc_g_jpegcomp = vidioc_g_jpegcomp,
 };
 
 static struct video_device template = {
@@ -1740,7 +1832,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
                         ret = video_register_device(dev->vdev[i],
                                                     VFL_TYPE_GRABBER,
                                                     cur_nr + i);
-                dev->vdev[i]->priv = dev;
+                video_set_drvdata(dev->vdev[i], dev);
 
                 if (ret != 0) {
                         dev_err(&dev->udev->dev,
@@ -1754,18 +1846,16 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
 
 static void s2255_exit_v4l(struct s2255_dev *dev)
 {
-        struct list_head *list;
+
         int i;
-        /* unregister the video devices */
-        while (!list_empty(&s2255_devlist)) {
-                list = s2255_devlist.next;
-                list_del(list);
-        }
         for (i = 0; i < MAX_CHANNELS; i++) {
-                if (-1 != dev->vdev[i]->minor)
+                if (-1 != dev->vdev[i]->minor) {
                         video_unregister_device(dev->vdev[i]);
-                else
+                        printk(KERN_INFO "s2255 unregistered\n");
+                } else {
                         video_device_release(dev->vdev[i]);
+                        printk(KERN_INFO "s2255 released\n");
+                }
         }
 }
 
@@ -1775,134 +1865,123 @@ static void s2255_exit_v4l(struct s2255_dev *dev)
  * function again).
  *
  * Received frame structure:
- * bytes 0-3:  marker : 0x2255DA4AL (FRAME_MARKER)
+ * bytes 0-3:  marker : 0x2255DA4AL (S2255_MARKER_FRAME)
  * bytes 4-7:  channel: 0-3
  * bytes 8-11: payload size:  size of the frame
  * bytes 12-payloadsize+12:  frame data
  */
 static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
 {
-        static int dbgsync; /* = 0; */
         char *pdest;
         u32 offset = 0;
-        int bsync = 0;
-        int btrunc = 0;
+        int bframe = 0;
         char *psrc;
         unsigned long copy_size;
         unsigned long size;
         s32 idx = -1;
         struct s2255_framei *frm;
         unsigned char *pdata;
-        unsigned long cur_size;
-        int bsearch = 0;
-        struct s2255_bufferi *buf;
+
         dprintk(100, "buffer to user\n");
 
         idx = dev->cur_frame[dev->cc];
-        buf = &dev->buffer[dev->cc];
-        frm = &buf->frame[idx];
-
-        if (frm->ulState == 0) {
-                frm->ulState = 1;
-                frm->cur_size = 0;
-                bsearch = 1;
-        } else if (frm->ulState == 2) {
-                /* system frame was not freed */
-                dprintk(2, "sys frame not free.  overrun ringbuf\n");
-                bsearch = 1;
-                frm->ulState = 1;
-                frm->cur_size = 0;
-        }
-
-        if (bsearch) {
-                if (*(s32 *) pipe_info->transfer_buffer != FRAME_MARKER) {
-                        u32 jj;
-                        if (dbgsync == 0) {
-                                dprintk(3, "not synched, discarding all packets"
-                                        "until marker\n");
+        frm = &dev->buffer[dev->cc].frame[idx];
 
-                                dbgsync++;
-                        }
-                        pdata = (unsigned char *)pipe_info->transfer_buffer;
-                        for (jj = 0; jj < (pipe_info->cur_transfer_size - 12);
-                             jj++) {
-                                if (*(s32 *) pdata == FRAME_MARKER) {
-                                        int cc;
-                                        dprintk(3,
-                                                "found frame marker at offset:"
-                                                " %d [%x %x]\n", jj, pdata[0],
-                                                pdata[1]);
-                                        offset = jj;
-                                        bsync = 1;
-                                        cc = *(u32 *) (pdata + sizeof(u32));
-                                        if (cc >= MAX_CHANNELS) {
-                                                printk(KERN_ERR
-                                                       "bad channel\n");
-                                                return -EINVAL;
-                                        }
-                                        /* reverse it */
-                                        dev->cc = G_chnmap[cc];
+        if (frm->ulState == S2255_READ_IDLE) {
+                int jj;
+                unsigned int cc;
+                s32 *pdword;
+                int payload;
+                /* search for marker codes */
+                pdata = (unsigned char *)pipe_info->transfer_buffer;
+                for (jj = 0; jj < (pipe_info->cur_transfer_size - 12); jj++) {
+                        switch (*(s32 *) pdata) {
+                        case S2255_MARKER_FRAME:
+                                pdword = (s32 *)pdata;
+                                dprintk(4, "found frame marker at offset:"
+                                        " %d [%x %x]\n", jj, pdata[0],
+                                        pdata[1]);
+                                offset = jj + PREFIX_SIZE;
+                                bframe = 1;
+                                cc = pdword[1];
+                                if (cc >= MAX_CHANNELS) {
+                                        printk(KERN_ERR
+                                               "bad channel\n");
+                                        return -EINVAL;
+                                }
+                                /* reverse it */
+                                dev->cc = G_chnmap[cc];
+                                payload =  pdword[3];
+                                if (payload > dev->req_image_size[dev->cc]) {
+                                        dev->bad_payload[dev->cc]++;
+                                        /* discard the bad frame */
+                                        return -EINVAL;
+                                }
+                                dev->pkt_size[dev->cc] = payload;
+                                dev->jpg_size[dev->cc] = pdword[4];
+                                break;
+                        case S2255_MARKER_RESPONSE:
+                                pdword = (s32 *)pdata;
+                                pdata += DEF_USB_BLOCK;
+                                jj += DEF_USB_BLOCK;
+                                if (pdword[1] >= MAX_CHANNELS)
+                                        break;
+                                cc = G_chnmap[pdword[1]];
+                                if (!(cc >= 0 && cc < MAX_CHANNELS))
+                                        break;
+                                switch (pdword[2]) {
+                                case 0x01:
+                                        /* check if channel valid */
+                                        /* set mode ready */
+                                        dev->setmode_ready[cc] = 1;
+                                        wake_up(&dev->wait_setmode[cc]);
+                                        dprintk(5, "setmode ready %d\n", cc);
                                         break;
+                                case 0x10:
+
+                                        dev->chn_ready |= (1 << cc);
+                                        if ((dev->chn_ready & 0x0f) != 0x0f)
+                                                break;
+                                        /* all channels ready */
+                                        printk(KERN_INFO "s2255: fw loaded\n");
+                                        atomic_set(&dev->fw_data->fw_state,
+                                                   S2255_FW_SUCCESS);
+                                        wake_up(&dev->fw_data->wait_fw);
+                                        break;
+                                default:
+                                        printk(KERN_INFO "s2255 unknwn resp\n");
                                 }
+                        default:
                                 pdata++;
+                                break;
                         }
-                        if (bsync == 0)
-                                return -EINVAL;
-                } else {
-                        u32 *pword;
-                        u32 payload;
-                        int cc;
-                        dbgsync = 0;
-                        bsync = 1;
-                        pword = (u32 *) pipe_info->transfer_buffer;
-                        cc = pword[1];
-
-                        if (cc >= MAX_CHANNELS) {
-                                printk("invalid channel found. "
-                                        "throwing out data!\n");
-                                return -EINVAL;
-                        }
-                        dev->cc = G_chnmap[cc];
-                        payload = pword[2];
-                        if (payload != dev->req_image_size[dev->cc]) {
-                                dprintk(1, "[%d][%d]unexpected payload: %d"
-                                        "required: %lu \n", cc, dev->cc,
-                                        payload, dev->req_image_size[dev->cc]);
-                                dev->bad_payload[dev->cc]++;
-                                /* discard the bad frame */
-                                return -EINVAL;
-                        }
-
-                }
-        }
-        /* search done.  now find out if should be acquiring
-           on this channel */
-        if (!dev->b_acquire[dev->cc]) {
-                frm->ulState = 0;
-                return -EINVAL;
+                        if (bframe)
+                                break;
+                } /* for */
+                if (!bframe)
+                        return -EINVAL;
         }
 
+
         idx = dev->cur_frame[dev->cc];
         frm = &dev->buffer[dev->cc].frame[idx];
 
-        if (frm->ulState == 0) {
-                frm->ulState = 1;
-                frm->cur_size = 0;
-        } else if (frm->ulState == 2) {
-                /* system frame ring buffer overrun */
-                dprintk(2, "sys frame overrun.  overwriting frame %d %d\n",
-                        dev->cc, idx);
-                frm->ulState = 1;
-                frm->cur_size = 0;
+        /* search done.  now find out if should be acquiring on this channel */
+        if (!dev->b_acquire[dev->cc]) {
+                /* we found a frame, but this channel is turned off */
+                frm->ulState = S2255_READ_IDLE;
+                return -EINVAL;
         }
 
-        if (bsync) {
-                /* skip the marker 512 bytes (and offset if out of sync) */
-                psrc = (u8 *)pipe_info->transfer_buffer + offset + PREFIX_SIZE;
-        } else {
-                psrc = (u8 *)pipe_info->transfer_buffer;
+        if (frm->ulState == S2255_READ_IDLE) {
+                frm->ulState = S2255_READ_FRAME;
+                frm->cur_size = 0;
         }
 
+        /* skip the marker 512 bytes (and offset if out of sync) */
+        psrc = (u8 *)pipe_info->transfer_buffer + offset;
+
+
         if (frm->lpvbits == NULL) {
                 dprintk(1, "s2255 frame buffer == NULL.%p %p %d %d",
                         frm, dev, dev->cc, idx);
@@ -1911,33 +1990,20 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
 
         pdest = frm->lpvbits + frm->cur_size;
 
-        if (bsync) {
-                copy_size =
-                    (pipe_info->cur_transfer_size - offset) - PREFIX_SIZE;
-                if (copy_size > pipe_info->cur_transfer_size) {
-                        printk("invalid copy size, overflow!\n");
-                        return -ENOMEM;
-                }
-        } else {
-                copy_size = pipe_info->cur_transfer_size;
-        }
+        copy_size = (pipe_info->cur_transfer_size - offset);
 
-        cur_size = frm->cur_size;
-        size = dev->req_image_size[dev->cc];
+        size = dev->pkt_size[dev->cc] - PREFIX_SIZE;
 
-        if ((copy_size + cur_size) > size) {
-                copy_size = size - cur_size;
-                btrunc = 1;
-        }
+        /* sanity check on pdest */
+        if ((copy_size + frm->cur_size) < dev->req_image_size[dev->cc])
+                memcpy(pdest, psrc, copy_size);
 
-        memcpy(pdest, psrc, copy_size);
-        cur_size += copy_size;
         frm->cur_size += copy_size;
-        dprintk(50, "cur_size size %lu size %lu \n", cur_size, size);
+        dprintk(4, "cur_size size %lu size %lu \n", frm->cur_size, size);
+
+        if (frm->cur_size >= size) {
 
-        if (cur_size >= (size - PREFIX_SIZE)) {
                 u32 cc = dev->cc;
-                frm->ulState = 2;
                 dprintk(2, "****************[%d]Buffer[%d]full*************\n",
                         cc, idx);
                 dev->last_frame[cc] = dev->cur_frame[cc];
@@ -1946,16 +2012,13 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
                 if ((dev->cur_frame[cc] == SYS_FRAMES) ||
                     (dev->cur_frame[cc] == dev->buffer[cc].dwFrames))
                         dev->cur_frame[cc] = 0;
-
-                /* signal the semaphore for this channel */
+                /* frame ready */
                 if (dev->b_acquire[cc])
-                        s2255_got_frame(dev, cc);
+                        s2255_got_frame(dev, cc, dev->jpg_size[cc]);
                 dev->frame_count[cc]++;
-        }
-        /* frame was truncated */
-        if (btrunc) {
-                /* return more data to process */
-                return EAGAIN;
+                frm->ulState = S2255_READ_IDLE;
+                frm->cur_size = 0;
+
         }
         /* done successfully */
         return 0;
@@ -1974,8 +2037,8 @@ static void s2255_read_video_callback(struct s2255_dev *dev,
         }
         /* otherwise copy to the system buffers */
         res = save_frame(dev, pipe_info);
-        if (res == EAGAIN)
-                save_frame(dev, pipe_info);
+        if (res != 0)
+                dprintk(4, "s2255: read callback failed\n");
 
         dprintk(50, "callback read video done\n");
         return;
@@ -2095,11 +2158,9 @@ static int s2255_board_init(struct s2255_dev *dev)
 
                 memset(pipe, 0, sizeof(*pipe));
                 pipe->dev = dev;
-                pipe->cur_transfer_size = DEFAULT_PIPE_USBBLOCK;
-                pipe->max_transfer_size = MAX_PIPE_USBBLOCK;
+                pipe->cur_transfer_size = S2255_USB_XFER_SIZE;
+                pipe->max_transfer_size = S2255_USB_XFER_SIZE;
 
-                if (pipe->cur_transfer_size > pipe->max_transfer_size)
-                        pipe->cur_transfer_size = pipe->max_transfer_size;
                 pipe->transfer_buffer = kzalloc(pipe->max_transfer_size,
                                                 GFP_KERNEL);
                 if (pipe->transfer_buffer == NULL) {
@@ -2119,6 +2180,7 @@ static int s2255_board_init(struct s2255_dev *dev)
         for (j = 0; j < MAX_CHANNELS; j++) {
                 dev->b_acquire[j] = 0;
                 dev->mode[j] = mode_def;
+                dev->jc[j].quality = S2255_DEF_JPEG_QUAL;
                 dev->cur_fmt[j] = &formats[0];
                 dev->mode[j].restart = 1;
                 dev->req_image_size[j] = get_transfer_size(&mode_def);
@@ -2323,7 +2385,7 @@ static int s2255_stop_acquire(struct s2255_dev *dev, unsigned long chn)
         kfree(buffer);
         dev->b_acquire[chn] = 0;
 
-        return 0;
+        return res;
 }
 
 static void s2255_stop_readpipe(struct s2255_dev *dev)
@@ -2359,8 +2421,10 @@ static void s2255_stop_readpipe(struct s2255_dev *dev)
         return;
 }
 
-static void s2255_fwload_start(struct s2255_dev *dev)
+static void s2255_fwload_start(struct s2255_dev *dev, int reset)
 {
+        if (reset)
+                s2255_reset_dsppower(dev);
         dev->fw_data->fw_size = dev->fw_data->fw->size;
         atomic_set(&dev->fw_data->fw_state, S2255_FW_NOTLOADED);
         memcpy(dev->fw_data->pfw_data,
@@ -2383,6 +2447,8 @@ static int s2255_probe(struct usb_interface *interface,
         struct usb_endpoint_descriptor *endpoint;
         int i;
         int retval = -ENOMEM;
+        __le32 *pdata;
+        int fw_size;
 
         dprintk(2, "s2255: probe\n");
 
@@ -2437,6 +2503,8 @@ static int s2255_probe(struct usb_interface *interface,
         dev->timer.data = (unsigned long)dev->fw_data;
 
         init_waitqueue_head(&dev->fw_data->wait_fw);
+        for (i = 0; i < MAX_CHANNELS; i++)
+                init_waitqueue_head(&dev->wait_setmode[i]);
 
 
         dev->fw_data->fw_urb = usb_alloc_urb(0, GFP_KERNEL);
@@ -2456,16 +2524,30 @@ static int s2255_probe(struct usb_interface *interface,
                 printk(KERN_ERR "sensoray 2255 failed to get firmware\n");
                 goto error;
         }
+        /* check the firmware is valid */
+        fw_size = dev->fw_data->fw->size;
+        pdata = (__le32 *) &dev->fw_data->fw->data[fw_size - 8];
 
+        if (*pdata != S2255_FW_MARKER) {
+                printk(KERN_INFO "Firmware invalid.\n");
+                retval = -ENODEV;
+                goto error;
+        } else {
+                /* make sure firmware is the latest */
+                __le32 *pRel;
+                pRel = (__le32 *) &dev->fw_data->fw->data[fw_size - 4];
+                printk(KERN_INFO "s2255 dsp fw version %x\n", *pRel);
+        }
         /* loads v4l specific */
         s2255_probe_v4l(dev);
+        usb_reset_device(dev->udev);
         /* load 2255 board specific */
         s2255_board_init(dev);
 
         dprintk(4, "before probe done %p\n", dev);
         spin_lock_init(&dev->slock);
 
-        s2255_fwload_start(dev);
+        s2255_fwload_start(dev, 0);
         dev_info(&interface->dev, "Sensoray 2255 detected\n");
         return 0;
 error:
@@ -2476,14 +2558,30 @@ error:
 static void s2255_disconnect(struct usb_interface *interface)
 {
         struct s2255_dev *dev = NULL;
+        int i;
         dprintk(1, "s2255: disconnect interface %p\n", interface);
         dev = usb_get_intfdata(interface);
+
+        /*
+         * wake up any of the timers to allow open_lock to be
+         * acquired sooner
+         */
+        atomic_set(&dev->fw_data->fw_state, S2255_FW_DISCONNECTING);
+        wake_up(&dev->fw_data->wait_fw);
+        for (i = 0; i < MAX_CHANNELS; i++) {
+                dev->setmode_ready[i] = 1;
+                wake_up(&dev->wait_setmode[i]);
+        }
+
+        mutex_lock(&dev->open_lock);
+        usb_set_intfdata(interface, NULL);
+        mutex_unlock(&dev->open_lock);
+
         if (dev) {
                 kref_put(&dev->kref, s2255_destroy);
                 dprintk(1, "s2255drv: disconnect\n");
                 dev_info(&interface->dev, "s2255usb now disconnected\n");
         }
-        usb_set_intfdata(interface, NULL);
 }
 
 static struct usb_driver s2255_driver = {
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 6ee63e69b36c..4a21b8a6a709 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -43,135 +43,363 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
+#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/videotext.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
-#include <linux/mutex.h>
-
-#include "saa5246a.h"
+#include <media/v4l2-i2c-drv-legacy.h>
 
 MODULE_AUTHOR("Michael Geng <linux@MichaelGeng.de>");
 MODULE_DESCRIPTION("Philips SAA5246A, SAA5281 Teletext decoder driver");
 MODULE_LICENSE("GPL");
 
-struct saa5246a_device
-{
-        u8     pgbuf[NUM_DAUS][VTX_VIRTUALSIZE];
-        int    is_searching[NUM_DAUS];
-        struct i2c_client *client;
-        struct mutex lock;
-};
+#define MAJOR_VERSION 1         /* driver major version number */
+#define MINOR_VERSION 8         /* driver minor version number */
+
+/* Number of DAUs = number of pages that can be searched at the same time. */
+#define NUM_DAUS 4
+
+#define NUM_ROWS_PER_PAGE 40
+
+/* first column is 0 (not 1) */
+#define POS_TIME_START 32
+#define POS_TIME_END 39
+
+#define POS_HEADER_START 7
+#define POS_HEADER_END 31
+
+/* Returns 'true' if the part of the videotext page described with req contains
+   (at least parts of) the time field */
+#define REQ_CONTAINS_TIME(p_req) \
+        ((p_req)->start <= POS_TIME_END && \
+         (p_req)->end   >= POS_TIME_START)
+
+/* Returns 'true' if the part of the videotext page described with req contains
+   (at least parts of) the page header */
+#define REQ_CONTAINS_HEADER(p_req) \
+        ((p_req)->start <= POS_HEADER_END && \
+         (p_req)->end   >= POS_HEADER_START)
+
+/*****************************************************************************/
+/* Mode register numbers of the SAA5246A                                     */
+/*****************************************************************************/
+#define SAA5246A_REGISTER_R0    0
+#define SAA5246A_REGISTER_R1    1
+#define SAA5246A_REGISTER_R2    2
+#define SAA5246A_REGISTER_R3    3
+#define SAA5246A_REGISTER_R4    4
+#define SAA5246A_REGISTER_R5    5
+#define SAA5246A_REGISTER_R6    6
+#define SAA5246A_REGISTER_R7    7
+#define SAA5246A_REGISTER_R8    8
+#define SAA5246A_REGISTER_R9    9
+#define SAA5246A_REGISTER_R10  10
+#define SAA5246A_REGISTER_R11  11
+#define SAA5246A_REGISTER_R11B 11
+
+/* SAA5246A mode registers often autoincrement to the next register.
+   Therefore we use variable argument lists. The following macro indicates
+   the end of a command list. */
+#define COMMAND_END (-1)
+
+/*****************************************************************************/
+/* Contents of the mode registers of the SAA5246A                            */
+/*****************************************************************************/
+/* Register R0 (Advanced Control) */
+#define R0_SELECT_R11                                      0x00
+#define R0_SELECT_R11B                                     0x01
+
+#define R0_PLL_TIME_CONSTANT_LONG                          0x00
+#define R0_PLL_TIME_CONSTANT_SHORT                         0x02
+
+#define R0_ENABLE_nODD_EVEN_OUTPUT                         0x00
+#define R0_DISABLE_nODD_EVEN_OUTPUT                        0x04
+
+#define R0_ENABLE_HDR_POLL                                 0x00
+#define R0_DISABLE_HDR_POLL                                0x10
+
+#define R0_DO_NOT_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED 0x00
+#define R0_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED        0x20
+
+#define R0_NO_FREE_RUN_PLL                                 0x00
+#define R0_FREE_RUN_PLL                                    0x40
+
+#define R0_NO_AUTOMATIC_FASTEXT_PROMPT                     0x00
+#define R0_AUTOMATIC_FASTEXT_PROMPT                        0x80
+
+/* Register R1 (Mode) */
+#define R1_INTERLACED_312_AND_HALF_312_AND_HALF_LINES      0x00
+#define R1_NON_INTERLACED_312_313_LINES                    0x01
+#define R1_NON_INTERLACED_312_312_LINES                    0x02
+#define R1_FFB_LEADING_EDGE_IN_FIRST_BROAD_PULSE           0x03
+#define R1_FFB_LEADING_EDGE_IN_SECOND_BROAD_PULSE          0x07
+
+#define R1_DEW                                             0x00
+#define R1_FULL_FIELD                                      0x08
+
+#define R1_EXTENDED_PACKET_DISABLE                         0x00
+#define R1_EXTENDED_PACKET_ENABLE                          0x10
+
+#define R1_DAUS_ALL_ON                                     0x00
+#define R1_DAUS_ALL_OFF                                    0x20
+
+#define R1_7_BITS_PLUS_PARITY                              0x00
+#define R1_8_BITS_NO_PARITY                                0x40
+
+#define R1_VCS_TO_SCS                                      0x00
+#define R1_NO_VCS_TO_SCS                                   0x80
+
+/* Register R2 (Page request address) */
+#define R2_IN_R3_SELECT_PAGE_HUNDREDS                      0x00
+#define R2_IN_R3_SELECT_PAGE_TENS                          0x01
+#define R2_IN_R3_SELECT_PAGE_UNITS                         0x02
+#define R2_IN_R3_SELECT_HOURS_TENS                         0x03
+#define R2_IN_R3_SELECT_HOURS_UNITS                        0x04
+#define R2_IN_R3_SELECT_MINUTES_TENS                       0x05
+#define R2_IN_R3_SELECT_MINUTES_UNITS                      0x06
+
+#define R2_DAU_0                                           0x00
+#define R2_DAU_1                                           0x10
+#define R2_DAU_2                                           0x20
+#define R2_DAU_3                                           0x30
+
+#define R2_BANK_0                                          0x00
+#define R2_BANK 1                                          0x40
+
+#define R2_HAMMING_CHECK_ON                                0x80
+#define R2_HAMMING_CHECK_OFF                               0x00
+
+/* Register R3 (Page request data) */
+#define R3_PAGE_HUNDREDS_0                                 0x00
+#define R3_PAGE_HUNDREDS_1                                 0x01
+#define R3_PAGE_HUNDREDS_2                                 0x02
+#define R3_PAGE_HUNDREDS_3                                 0x03
+#define R3_PAGE_HUNDREDS_4                                 0x04
+#define R3_PAGE_HUNDREDS_5                                 0x05
+#define R3_PAGE_HUNDREDS_6                                 0x06
+#define R3_PAGE_HUNDREDS_7                                 0x07
 
-static struct video_device saa_template;        /* Declared near bottom */
+#define R3_HOLD_PAGE                                       0x00
+#define R3_UPDATE_PAGE                                     0x08
 
-/* Addresses to scan */
-static unsigned short normal_i2c[]       = { I2C_ADDRESS, I2C_CLIENT_END };
+#define R3_PAGE_HUNDREDS_DO_NOT_CARE                       0x00
+#define R3_PAGE_HUNDREDS_DO_CARE                           0x10
 
-I2C_CLIENT_INSMOD;
+#define R3_PAGE_TENS_DO_NOT_CARE                           0x00
+#define R3_PAGE_TENS_DO_CARE                               0x10
 
-static struct i2c_client client_template;
+#define R3_PAGE_UNITS_DO_NOT_CARE                          0x00
+#define R3_PAGE_UNITS_DO_CARE                              0x10
 
-static int saa5246a_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-        int pgbuf;
-        int err;
-        struct i2c_client *client;
-        struct video_device *vd;
-        struct saa5246a_device *t;
+#define R3_HOURS_TENS_DO_NOT_CARE                          0x00
+#define R3_HOURS_TENS_DO_CARE                              0x10
 
-        printk(KERN_INFO "saa5246a: teletext chip found.\n");
-        client=kmalloc(sizeof(*client), GFP_KERNEL);
-        if(client==NULL)
-                return -ENOMEM;
-        client_template.adapter = adap;
-        client_template.addr = addr;
-        memcpy(client, &client_template, sizeof(*client));
-        t = kzalloc(sizeof(*t), GFP_KERNEL);
-        if(t==NULL)
-        {
-                kfree(client);
-                return -ENOMEM;
-        }
-        strlcpy(client->name, IF_NAME, I2C_NAME_SIZE);
-        mutex_init(&t->lock);
+#define R3_HOURS_UNITS_DO_NOT_CARE                         0x00
+#define R3_HOURS_UNITS_DO_CARE                             0x10
 
-        /*
-         *      Now create a video4linux device
-         */
+#define R3_MINUTES_TENS_DO_NOT_CARE                        0x00
+#define R3_MINUTES_TENS_DO_CARE                            0x10
 
-        vd = video_device_alloc();
-        if(vd==NULL)
-        {
-                kfree(t);
-                kfree(client);
-                return -ENOMEM;
-        }
-        i2c_set_clientdata(client, vd);
-        memcpy(vd, &saa_template, sizeof(*vd));
+#define R3_MINUTES_UNITS_DO_NOT_CARE                       0x00
+#define R3_MINUTES_UNITS_DO_CARE                           0x10
 
-        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
-        {
-                memset(t->pgbuf[pgbuf], ' ', sizeof(t->pgbuf[0]));
-                t->is_searching[pgbuf] = false;
-        }
-        vd->priv=t;
+/* Register R4 (Display chapter) */
+#define R4_DISPLAY_PAGE_0                                  0x00
+#define R4_DISPLAY_PAGE_1                                  0x01
+#define R4_DISPLAY_PAGE_2                                  0x02
+#define R4_DISPLAY_PAGE_3                                  0x03
+#define R4_DISPLAY_PAGE_4                                  0x04
+#define R4_DISPLAY_PAGE_5                                  0x05
+#define R4_DISPLAY_PAGE_6                                  0x06
+#define R4_DISPLAY_PAGE_7                                  0x07
 
+/* Register R5 (Normal display control) */
+#define R5_PICTURE_INSIDE_BOXING_OFF                       0x00
+#define R5_PICTURE_INSIDE_BOXING_ON                        0x01
 
-        /*
-         *      Register it
-         */
+#define R5_PICTURE_OUTSIDE_BOXING_OFF                      0x00
+#define R5_PICTURE_OUTSIDE_BOXING_ON                       0x02
 
-        if((err=video_register_device(vd, VFL_TYPE_VTX,-1))<0)
-        {
-                kfree(t);
-                kfree(client);
-                video_device_release(vd);
-                return err;
-        }
-        t->client = client;
-        i2c_attach_client(client);
-        return 0;
-}
+#define R5_TEXT_INSIDE_BOXING_OFF                          0x00
+#define R5_TEXT_INSIDE_BOXING_ON                           0x04
 
-/*
- *      We do most of the hard work when we become a device on the i2c.
- */
-static int saa5246a_probe(struct i2c_adapter *adap)
-{
-        if (adap->class & I2C_CLASS_TV_ANALOG)
-                return i2c_probe(adap, &addr_data, saa5246a_attach);
-        return 0;
-}
+#define R5_TEXT_OUTSIDE_BOXING_OFF                         0x00
+#define R5_TEXT_OUTSIDE_BOXING_ON                          0x08
 
-static int saa5246a_detach(struct i2c_client *client)
-{
-        struct video_device *vd = i2c_get_clientdata(client);
-        i2c_detach_client(client);
-        video_unregister_device(vd);
-        kfree(vd->priv);
-        kfree(client);
-        return 0;
-}
+#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_OFF            0x00
+#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_ON             0x10
 
-/*
- *      I2C interfaces
- */
+#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF           0x00
+#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON            0x20
+
+#define R5_BACKGROUND_COLOR_INSIDE_BOXING_OFF              0x00
+#define R5_BACKGROUND_COLOR_INSIDE_BOXING_ON               0x40
+
+#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF             0x00
+#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_ON              0x80
+
+/* Register R6 (Newsflash display) */
+#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_OFF             0x00
+#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_ON              0x01
+
+#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_OFF            0x00
+#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_ON             0x02
+
+#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_OFF                0x00
+#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_ON                 0x04
+
+#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_OFF               0x00
+#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_ON                0x08
+
+#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_OFF  0x00
+#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_ON   0x10
+
+#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF 0x00
+#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON  0x20
+
+#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_OFF    0x00
+#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_ON     0x40
+
+#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF   0x00
+#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_ON    0x80
+
+/* Register R7 (Display mode) */
+#define R7_BOX_OFF_ROW_0                                   0x00
+#define R7_BOX_ON_ROW_0                                    0x01
+
+#define R7_BOX_OFF_ROW_1_TO_23                             0x00
+#define R7_BOX_ON_ROW_1_TO_23                              0x02
+
+#define R7_BOX_OFF_ROW_24                                  0x00
+#define R7_BOX_ON_ROW_24                                   0x04
+
+#define R7_SINGLE_HEIGHT                                   0x00
+#define R7_DOUBLE_HEIGHT                                   0x08
+
+#define R7_TOP_HALF                                        0x00
+#define R7_BOTTOM_HALF                                     0x10
+
+#define R7_REVEAL_OFF                                      0x00
+#define R7_REVEAL_ON                                       0x20
+
+#define R7_CURSER_OFF                                      0x00
+#define R7_CURSER_ON                                       0x40
+
+#define R7_STATUS_BOTTOM                                   0x00
+#define R7_STATUS_TOP                                      0x80
+
+/* Register R8 (Active chapter) */
+#define R8_ACTIVE_CHAPTER_0                                0x00
+#define R8_ACTIVE_CHAPTER_1                                0x01
+#define R8_ACTIVE_CHAPTER_2                                0x02
+#define R8_ACTIVE_CHAPTER_3                                0x03
+#define R8_ACTIVE_CHAPTER_4                                0x04
+#define R8_ACTIVE_CHAPTER_5                                0x05
+#define R8_ACTIVE_CHAPTER_6                                0x06
+#define R8_ACTIVE_CHAPTER_7                                0x07
+
+#define R8_CLEAR_MEMORY                                    0x08
+#define R8_DO_NOT_CLEAR_MEMORY                             0x00
+
+/* Register R9 (Curser row) */
+#define R9_CURSER_ROW_0                                    0x00
+#define R9_CURSER_ROW_1                                    0x01
+#define R9_CURSER_ROW_2                                    0x02
+#define R9_CURSER_ROW_25                                   0x19
+
+/* Register R10 (Curser column) */
+#define R10_CURSER_COLUMN_0                                0x00
+#define R10_CURSER_COLUMN_6                                0x06
+#define R10_CURSER_COLUMN_8                                0x08
+
+/*****************************************************************************/
+/* Row 25 control data in column 0 to 9                                      */
+/*****************************************************************************/
+#define ROW25_COLUMN0_PAGE_UNITS                           0x0F
+
+#define ROW25_COLUMN1_PAGE_TENS                            0x0F
+
+#define ROW25_COLUMN2_MINUTES_UNITS                        0x0F
 
-static struct i2c_driver i2c_driver_videotext =
+#define ROW25_COLUMN3_MINUTES_TENS                         0x07
+#define ROW25_COLUMN3_DELETE_PAGE                          0x08
+
+#define ROW25_COLUMN4_HOUR_UNITS                           0x0F
+
+#define ROW25_COLUMN5_HOUR_TENS                            0x03
+#define ROW25_COLUMN5_INSERT_HEADLINE                      0x04
+#define ROW25_COLUMN5_INSERT_SUBTITLE                      0x08
+
+#define ROW25_COLUMN6_SUPPRESS_HEADER                      0x01
+#define ROW25_COLUMN6_UPDATE_PAGE                          0x02
+#define ROW25_COLUMN6_INTERRUPTED_SEQUENCE                 0x04
+#define ROW25_COLUMN6_SUPPRESS_DISPLAY                     0x08
+
+#define ROW25_COLUMN7_SERIAL_MODE                          0x01
+#define ROW25_COLUMN7_CHARACTER_SET                        0x0E
+
+#define ROW25_COLUMN8_PAGE_HUNDREDS                        0x07
+#define ROW25_COLUMN8_PAGE_NOT_FOUND                       0x10
+
+#define ROW25_COLUMN9_PAGE_BEING_LOOKED_FOR                0x20
+
+#define ROW25_COLUMN0_TO_7_HAMMING_ERROR                   0x10
+
+/*****************************************************************************/
+/* Helper macros for extracting page, hour and minute digits                 */
+/*****************************************************************************/
+/* BYTE_POS  0 is at row 0, column 0,
+   BYTE_POS  1 is at row 0, column 1,
+   BYTE_POS 40 is at row 1, column 0, (with NUM_ROWS_PER_PAGE = 40)
+   BYTE_POS 41 is at row 1, column 1, (with NUM_ROWS_PER_PAGE = 40),
+   ... */
+#define ROW(BYTE_POS)    (BYTE_POS / NUM_ROWS_PER_PAGE)
+#define COLUMN(BYTE_POS) (BYTE_POS % NUM_ROWS_PER_PAGE)
+
+/*****************************************************************************/
+/* Helper macros for extracting page, hour and minute digits                 */
+/*****************************************************************************/
+/* Macros for extracting hundreds, tens and units of a page number which
+   must be in the range 0 ... 0x799.
+   Note that page is coded in hexadecimal, i.e. 0x123 means page 123.
+   page 0x.. means page 8.. */
+#define HUNDREDS_OF_PAGE(page) (((page) / 0x100) & 0x7)
+#define TENS_OF_PAGE(page)     (((page) / 0x10)  & 0xF)
+#define UNITS_OF_PAGE(page)     ((page) & 0xF)
+
+/* Macros for extracting tens and units of a hour information which
+   must be in the range 0 ... 0x24.
+   Note that hour is coded in hexadecimal, i.e. 0x12 means 12 hours */
+#define TENS_OF_HOUR(hour)  ((hour) / 0x10)
+#define UNITS_OF_HOUR(hour) ((hour) & 0xF)
+
+/* Macros for extracting tens and units of a minute information which
+   must be in the range 0 ... 0x59.
+   Note that minute is coded in hexadecimal, i.e. 0x12 means 12 minutes */
+#define TENS_OF_MINUTE(minute)  ((minute) / 0x10)
+#define UNITS_OF_MINUTE(minute) ((minute) & 0xF)
+
+#define HOUR_MAX   0x23
+#define MINUTE_MAX 0x59
+#define PAGE_MAX   0x8FF
+
+
+struct saa5246a_device
 {
-        .driver = {
-                .name   = IF_NAME,              /* name */
-        },
-        .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .attach_adapter = saa5246a_probe,
-        .detach_client  = saa5246a_detach,
+        u8     pgbuf[NUM_DAUS][VTX_VIRTUALSIZE];
+        int    is_searching[NUM_DAUS];
+        struct i2c_client *client;
+        unsigned long in_use;
+        struct mutex lock;
 };
 
-static struct i2c_client client_template = {
-        .driver         = &i2c_driver_videotext,
-        .name           = "(unset)",
-};
+static struct video_device saa_template;        /* Declared near bottom */
+
+/*
+ *      I2C interfaces
+ */
 
 static int i2c_sendbuf(struct saa5246a_device *t, int reg, int count, u8 *data)
 {
@@ -579,8 +807,8 @@ static inline int saa5246a_stop_dau(struct saa5246a_device *t,
 static int do_saa5246a_ioctl(struct inode *inode, struct file *file,
                             unsigned int cmd, void *arg)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5246a_device *t=vd->priv;
+        struct saa5246a_device *t = video_drvdata(file);
+
         switch(cmd)
         {
                 case VTXIOCGETINFO:
@@ -720,8 +948,7 @@ static inline unsigned int vtx_fix_command(unsigned int cmd)
 static int saa5246a_ioctl(struct inode *inode, struct file *file,
                          unsigned int cmd, unsigned long arg)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5246a_device *t = vd->priv;
+        struct saa5246a_device *t = video_drvdata(file);
         int err;
 
         cmd = vtx_fix_command(cmd);
@@ -733,21 +960,15 @@ static int saa5246a_ioctl(struct inode *inode, struct file *file,
 
 static int saa5246a_open(struct inode *inode, struct file *file)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5246a_device *t = vd->priv;
-        int err;
+        struct saa5246a_device *t = video_drvdata(file);
 
-        err = video_exclusive_open(inode,file);
-        if (err < 0)
-                return err;
+        if (t->client == NULL)
+                return -ENODEV;
 
-        if (t->client==NULL) {
-                err = -ENODEV;
-                goto fail;
-        }
+        if (test_and_set_bit(0, &t->in_use))
+                return -EBUSY;
 
         if (i2c_senddata(t, SAA5246A_REGISTER_R0,
-
                 R0_SELECT_R11 |
                 R0_PLL_TIME_CONSTANT_LONG |
                 R0_ENABLE_nODD_EVEN_OUTPUT |
@@ -773,21 +994,15 @@ static int saa5246a_open(struct inode *inode, struct file *file)
 
                 COMMAND_END))
         {
-                err = -EIO;
-                goto fail;
+                clear_bit(0, &t->in_use);
+                return -EIO;
         }
-
         return 0;
-
-fail:
-        video_exclusive_release(inode,file);
-        return err;
 }
 
 static int saa5246a_release(struct inode *inode, struct file *file)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5246a_device *t = vd->priv;
+        struct saa5246a_device *t = video_drvdata(file);
 
         /* Stop all acquisition circuits. */
         i2c_senddata(t, SAA5246A_REGISTER_R1,
@@ -800,26 +1015,10 @@ static int saa5246a_release(struct inode *inode, struct file *file)
                 R1_VCS_TO_SCS,
 
                 COMMAND_END);
-        video_exclusive_release(inode,file);
+        clear_bit(0, &t->in_use);
         return 0;
 }
 
-static int __init init_saa_5246a (void)
-{
-        printk(KERN_INFO
-                "SAA5246A (or compatible) Teletext decoder driver version %d.%d\n",
-                MAJOR_VERSION, MINOR_VERSION);
-        return i2c_add_driver(&i2c_driver_videotext);
-}
-
-static void __exit cleanup_saa_5246a (void)
-{
-        i2c_del_driver(&i2c_driver_videotext);
-}
-
-module_init(init_saa_5246a);
-module_exit(cleanup_saa_5246a);
-
 static const struct file_operations saa_fops = {
         .owner   = THIS_MODULE,
         .open    = saa5246a_open,
@@ -830,8 +1029,79 @@ static const struct file_operations saa_fops = {
 
 static struct video_device saa_template =
 {
-        .name     = IF_NAME,
+        .name     = "saa5246a",
         .fops     = &saa_fops,
         .release  = video_device_release,
         .minor    = -1,
 };
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD;
+
+static int saa5246a_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        int pgbuf;
+        int err;
+        struct video_device *vd;
+        struct saa5246a_device *t;
+
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
+        v4l_info(client, "VideoText version %d.%d\n",
+                        MAJOR_VERSION, MINOR_VERSION);
+        t = kzalloc(sizeof(*t), GFP_KERNEL);
+        if (t == NULL)
+                return -ENOMEM;
+        mutex_init(&t->lock);
+
+        /* Now create a video4linux device */
+        vd = video_device_alloc();
+        if (vd == NULL) {
+                kfree(t);
+                return -ENOMEM;
+        }
+        i2c_set_clientdata(client, vd);
+        memcpy(vd, &saa_template, sizeof(*vd));
+
+        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++) {
+                memset(t->pgbuf[pgbuf], ' ', sizeof(t->pgbuf[0]));
+                t->is_searching[pgbuf] = false;
+        }
+        video_set_drvdata(vd, t);
+
+        /* Register it */
+        err = video_register_device(vd, VFL_TYPE_VTX, -1);
+        if (err < 0) {
+                kfree(t);
+                video_device_release(vd);
+                return err;
+        }
+        t->client = client;
+        return 0;
+}
+
+static int saa5246a_remove(struct i2c_client *client)
+{
+        struct video_device *vd = i2c_get_clientdata(client);
+
+        video_unregister_device(vd);
+        kfree(video_get_drvdata(vd));
+        return 0;
+}
+
+static const struct i2c_device_id saa5246a_id[] = {
+        { "saa5246a", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa5246a_id);
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+        .name = "saa5246a",
+        .driverid = I2C_DRIVERID_SAA5249,
+        .probe = saa5246a_probe,
+        .remove = saa5246a_remove,
+        .id_table = saa5246a_id,
+};
diff --git a/drivers/media/video/saa5246a.h b/drivers/media/video/saa5246a.h
deleted file mode 100644
index 64394c036c60..000000000000
--- a/drivers/media/video/saa5246a.h
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
-   Driver for the SAA5246A or SAA5281 Teletext (=Videotext) decoder chips from
-   Philips.
-
-   Copyright (C) 2004 Michael Geng (linux@MichaelGeng.de)
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- */
-#ifndef __SAA5246A_H__
-#define __SAA5246A_H__
-
-#define MAJOR_VERSION 1         /* driver major version number */
-#define MINOR_VERSION 8         /* driver minor version number */
-
-#define IF_NAME "SAA5246A"
-
-#define I2C_ADDRESS 17
-
-/* Number of DAUs = number of pages that can be searched at the same time. */
-#define NUM_DAUS 4
-
-#define NUM_ROWS_PER_PAGE 40
-
-/* first column is 0 (not 1) */
-#define POS_TIME_START 32
-#define POS_TIME_END 39
-
-#define POS_HEADER_START 7
-#define POS_HEADER_END 31
-
-/* Returns 'true' if the part of the videotext page described with req contains
-   (at least parts of) the time field */
-#define REQ_CONTAINS_TIME(p_req) \
-        ((p_req)->start <= POS_TIME_END && \
-         (p_req)->end   >= POS_TIME_START)
-
-/* Returns 'true' if the part of the videotext page described with req contains
-   (at least parts of) the page header */
-#define REQ_CONTAINS_HEADER(p_req) \
-        ((p_req)->start <= POS_HEADER_END && \
-         (p_req)->end   >= POS_HEADER_START)
-
-/*****************************************************************************/
-/* Mode register numbers of the SAA5246A                                     */
-/*****************************************************************************/
-#define SAA5246A_REGISTER_R0    0
-#define SAA5246A_REGISTER_R1    1
-#define SAA5246A_REGISTER_R2    2
-#define SAA5246A_REGISTER_R3    3
-#define SAA5246A_REGISTER_R4    4
-#define SAA5246A_REGISTER_R5    5
-#define SAA5246A_REGISTER_R6    6
-#define SAA5246A_REGISTER_R7    7
-#define SAA5246A_REGISTER_R8    8
-#define SAA5246A_REGISTER_R9    9
-#define SAA5246A_REGISTER_R10  10
-#define SAA5246A_REGISTER_R11  11
-#define SAA5246A_REGISTER_R11B 11
-
-/* SAA5246A mode registers often autoincrement to the next register.
-   Therefore we use variable argument lists. The following macro indicates
-   the end of a command list. */
-#define COMMAND_END (- 1)
-
-/*****************************************************************************/
-/* Contents of the mode registers of the SAA5246A                            */
-/*****************************************************************************/
-/* Register R0 (Advanced Control) */
-#define R0_SELECT_R11                                      0x00
-#define R0_SELECT_R11B                                     0x01
-
-#define R0_PLL_TIME_CONSTANT_LONG                          0x00
-#define R0_PLL_TIME_CONSTANT_SHORT                         0x02
-
-#define R0_ENABLE_nODD_EVEN_OUTPUT                         0x00
-#define R0_DISABLE_nODD_EVEN_OUTPUT                        0x04
-
-#define R0_ENABLE_HDR_POLL                                 0x00
-#define R0_DISABLE_HDR_POLL                                0x10
-
-#define R0_DO_NOT_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED 0x00
-#define R0_FORCE_nODD_EVEN_LOW_IF_PICTURE_DISPLAYED        0x20
-
-#define R0_NO_FREE_RUN_PLL                                 0x00
-#define R0_FREE_RUN_PLL                                    0x40
-
-#define R0_NO_AUTOMATIC_FASTEXT_PROMPT                     0x00
-#define R0_AUTOMATIC_FASTEXT_PROMPT                        0x80
-
-/* Register R1 (Mode) */
-#define R1_INTERLACED_312_AND_HALF_312_AND_HALF_LINES      0x00
-#define R1_NON_INTERLACED_312_313_LINES                    0x01
-#define R1_NON_INTERLACED_312_312_LINES                    0x02
-#define R1_FFB_LEADING_EDGE_IN_FIRST_BROAD_PULSE           0x03
-#define R1_FFB_LEADING_EDGE_IN_SECOND_BROAD_PULSE          0x07
-
-#define R1_DEW                                             0x00
-#define R1_FULL_FIELD                                      0x08
-
-#define R1_EXTENDED_PACKET_DISABLE                         0x00
-#define R1_EXTENDED_PACKET_ENABLE                          0x10
-
-#define R1_DAUS_ALL_ON                                     0x00
-#define R1_DAUS_ALL_OFF                                    0x20
-
-#define R1_7_BITS_PLUS_PARITY                              0x00
-#define R1_8_BITS_NO_PARITY                                0x40
-
-#define R1_VCS_TO_SCS                                      0x00
-#define R1_NO_VCS_TO_SCS                                   0x80
-
-/* Register R2 (Page request address) */
-#define R2_IN_R3_SELECT_PAGE_HUNDREDS                      0x00
-#define R2_IN_R3_SELECT_PAGE_TENS                          0x01
-#define R2_IN_R3_SELECT_PAGE_UNITS                         0x02
-#define R2_IN_R3_SELECT_HOURS_TENS                         0x03
-#define R2_IN_R3_SELECT_HOURS_UNITS                        0x04
-#define R2_IN_R3_SELECT_MINUTES_TENS                       0x05
-#define R2_IN_R3_SELECT_MINUTES_UNITS                      0x06
-
-#define R2_DAU_0                                           0x00
-#define R2_DAU_1                                           0x10
-#define R2_DAU_2                                           0x20
-#define R2_DAU_3                                           0x30
-
-#define R2_BANK_0                                          0x00
-#define R2_BANK 1                                          0x40
-
-#define R2_HAMMING_CHECK_ON                                0x80
-#define R2_HAMMING_CHECK_OFF                               0x00
-
-/* Register R3 (Page request data) */
-#define R3_PAGE_HUNDREDS_0                                 0x00
-#define R3_PAGE_HUNDREDS_1                                 0x01
-#define R3_PAGE_HUNDREDS_2                                 0x02
-#define R3_PAGE_HUNDREDS_3                                 0x03
-#define R3_PAGE_HUNDREDS_4                                 0x04
-#define R3_PAGE_HUNDREDS_5                                 0x05
-#define R3_PAGE_HUNDREDS_6                                 0x06
-#define R3_PAGE_HUNDREDS_7                                 0x07
-
-#define R3_HOLD_PAGE                                       0x00
-#define R3_UPDATE_PAGE                                     0x08
-
-#define R3_PAGE_HUNDREDS_DO_NOT_CARE                       0x00
-#define R3_PAGE_HUNDREDS_DO_CARE                           0x10
-
-#define R3_PAGE_TENS_DO_NOT_CARE                           0x00
-#define R3_PAGE_TENS_DO_CARE                               0x10
-
-#define R3_PAGE_UNITS_DO_NOT_CARE                          0x00
-#define R3_PAGE_UNITS_DO_CARE                              0x10
-
-#define R3_HOURS_TENS_DO_NOT_CARE                          0x00
-#define R3_HOURS_TENS_DO_CARE                              0x10
-
-#define R3_HOURS_UNITS_DO_NOT_CARE                         0x00
-#define R3_HOURS_UNITS_DO_CARE                             0x10
-
-#define R3_MINUTES_TENS_DO_NOT_CARE                        0x00
-#define R3_MINUTES_TENS_DO_CARE                            0x10
-
-#define R3_MINUTES_UNITS_DO_NOT_CARE                       0x00
-#define R3_MINUTES_UNITS_DO_CARE                           0x10
-
-/* Register R4 (Display chapter) */
-#define R4_DISPLAY_PAGE_0                                  0x00
-#define R4_DISPLAY_PAGE_1                                  0x01
-#define R4_DISPLAY_PAGE_2                                  0x02
-#define R4_DISPLAY_PAGE_3                                  0x03
-#define R4_DISPLAY_PAGE_4                                  0x04
-#define R4_DISPLAY_PAGE_5                                  0x05
-#define R4_DISPLAY_PAGE_6                                  0x06
-#define R4_DISPLAY_PAGE_7                                  0x07
-
-/* Register R5 (Normal display control) */
-#define R5_PICTURE_INSIDE_BOXING_OFF                       0x00
-#define R5_PICTURE_INSIDE_BOXING_ON                        0x01
-
-#define R5_PICTURE_OUTSIDE_BOXING_OFF                      0x00
-#define R5_PICTURE_OUTSIDE_BOXING_ON                       0x02
-
-#define R5_TEXT_INSIDE_BOXING_OFF                          0x00
-#define R5_TEXT_INSIDE_BOXING_ON                           0x04
-
-#define R5_TEXT_OUTSIDE_BOXING_OFF                         0x00
-#define R5_TEXT_OUTSIDE_BOXING_ON                          0x08
-
-#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_OFF            0x00
-#define R5_CONTRAST_REDUCTION_INSIDE_BOXING_ON             0x10
-
-#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF           0x00
-#define R5_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON            0x20
-
-#define R5_BACKGROUND_COLOR_INSIDE_BOXING_OFF              0x00
-#define R5_BACKGROUND_COLOR_INSIDE_BOXING_ON               0x40
-
-#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF             0x00
-#define R5_BACKGROUND_COLOR_OUTSIDE_BOXING_ON              0x80
-
-/* Register R6 (Newsflash display) */
-#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_OFF             0x00
-#define R6_NEWSFLASH_PICTURE_INSIDE_BOXING_ON              0x01
-
-#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_OFF            0x00
-#define R6_NEWSFLASH_PICTURE_OUTSIDE_BOXING_ON             0x02
-
-#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_OFF                0x00
-#define R6_NEWSFLASH_TEXT_INSIDE_BOXING_ON                 0x04
-
-#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_OFF               0x00
-#define R6_NEWSFLASH_TEXT_OUTSIDE_BOXING_ON                0x08
-
-#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_OFF  0x00
-#define R6_NEWSFLASH_CONTRAST_REDUCTION_INSIDE_BOXING_ON   0x10
-
-#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_OFF 0x00
-#define R6_NEWSFLASH_CONTRAST_REDUCTION_OUTSIDE_BOXING_ON  0x20
-
-#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_OFF    0x00
-#define R6_NEWSFLASH_BACKGROUND_COLOR_INSIDE_BOXING_ON     0x40
-
-#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_OFF   0x00
-#define R6_NEWSFLASH_BACKGROUND_COLOR_OUTSIDE_BOXING_ON    0x80
-
-/* Register R7 (Display mode) */
-#define R7_BOX_OFF_ROW_0                                   0x00
-#define R7_BOX_ON_ROW_0                                    0x01
-
-#define R7_BOX_OFF_ROW_1_TO_23                             0x00
-#define R7_BOX_ON_ROW_1_TO_23                              0x02
-
-#define R7_BOX_OFF_ROW_24                                  0x00
-#define R7_BOX_ON_ROW_24                                   0x04
-
-#define R7_SINGLE_HEIGHT                                   0x00
-#define R7_DOUBLE_HEIGHT                                   0x08
-
-#define R7_TOP_HALF                                        0x00
-#define R7_BOTTOM_HALF                                     0x10
-
-#define R7_REVEAL_OFF                                      0x00
-#define R7_REVEAL_ON                                       0x20
-
-#define R7_CURSER_OFF                                      0x00
-#define R7_CURSER_ON                                       0x40
-
-#define R7_STATUS_BOTTOM                                   0x00
-#define R7_STATUS_TOP                                      0x80
-
-/* Register R8 (Active chapter) */
-#define R8_ACTIVE_CHAPTER_0                                0x00
-#define R8_ACTIVE_CHAPTER_1                                0x01
-#define R8_ACTIVE_CHAPTER_2                                0x02
-#define R8_ACTIVE_CHAPTER_3                                0x03
-#define R8_ACTIVE_CHAPTER_4                                0x04
-#define R8_ACTIVE_CHAPTER_5                                0x05
-#define R8_ACTIVE_CHAPTER_6                                0x06
-#define R8_ACTIVE_CHAPTER_7                                0x07
-
-#define R8_CLEAR_MEMORY                                    0x08
-#define R8_DO_NOT_CLEAR_MEMORY                             0x00
-
-/* Register R9 (Curser row) */
-#define R9_CURSER_ROW_0                                    0x00
-#define R9_CURSER_ROW_1                                    0x01
-#define R9_CURSER_ROW_2                                    0x02
-#define R9_CURSER_ROW_25                                   0x19
-
-/* Register R10 (Curser column) */
-#define R10_CURSER_COLUMN_0                                0x00
-#define R10_CURSER_COLUMN_6                                0x06
-#define R10_CURSER_COLUMN_8                                0x08
-
-/*****************************************************************************/
-/* Row 25 control data in column 0 to 9                                      */
-/*****************************************************************************/
-#define ROW25_COLUMN0_PAGE_UNITS                           0x0F
-
-#define ROW25_COLUMN1_PAGE_TENS                            0x0F
-
-#define ROW25_COLUMN2_MINUTES_UNITS                        0x0F
-
-#define ROW25_COLUMN3_MINUTES_TENS                         0x07
-#define ROW25_COLUMN3_DELETE_PAGE                          0x08
-
-#define ROW25_COLUMN4_HOUR_UNITS                           0x0F
-
-#define ROW25_COLUMN5_HOUR_TENS                            0x03
-#define ROW25_COLUMN5_INSERT_HEADLINE                      0x04
-#define ROW25_COLUMN5_INSERT_SUBTITLE                      0x08
-
-#define ROW25_COLUMN6_SUPPRESS_HEADER                      0x01
-#define ROW25_COLUMN6_UPDATE_PAGE                          0x02
-#define ROW25_COLUMN6_INTERRUPTED_SEQUENCE                 0x04
-#define ROW25_COLUMN6_SUPPRESS_DISPLAY                     0x08
-
-#define ROW25_COLUMN7_SERIAL_MODE                          0x01
-#define ROW25_COLUMN7_CHARACTER_SET                        0x0E
-
-#define ROW25_COLUMN8_PAGE_HUNDREDS                        0x07
-#define ROW25_COLUMN8_PAGE_NOT_FOUND                       0x10
-
-#define ROW25_COLUMN9_PAGE_BEING_LOOKED_FOR                0x20
-
-#define ROW25_COLUMN0_TO_7_HAMMING_ERROR                   0x10
-
-/*****************************************************************************/
-/* Helper macros for extracting page, hour and minute digits                 */
-/*****************************************************************************/
-/* BYTE_POS  0 is at row 0, column 0,
-   BYTE_POS  1 is at row 0, column 1,
-   BYTE_POS 40 is at row 1, column 0, (with NUM_ROWS_PER_PAGE = 40)
-   BYTE_POS 41 is at row 1, column 1, (with NUM_ROWS_PER_PAGE = 40),
-   ... */
-#define ROW(BYTE_POS)    (BYTE_POS / NUM_ROWS_PER_PAGE)
-#define COLUMN(BYTE_POS) (BYTE_POS % NUM_ROWS_PER_PAGE)
-
-/*****************************************************************************/
-/* Helper macros for extracting page, hour and minute digits                 */
-/*****************************************************************************/
-/* Macros for extracting hundreds, tens and units of a page number which
-   must be in the range 0 ... 0x799.
-   Note that page is coded in hexadecimal, i.e. 0x123 means page 123.
-   page 0x.. means page 8.. */
-#define HUNDREDS_OF_PAGE(page) (((page) / 0x100) & 0x7)
-#define TENS_OF_PAGE(page)     (((page) / 0x10)  & 0xF)
-#define UNITS_OF_PAGE(page)     ((page) & 0xF)
-
-/* Macros for extracting tens and units of a hour information which
-   must be in the range 0 ... 0x24.
-   Note that hour is coded in hexadecimal, i.e. 0x12 means 12 hours */
-#define TENS_OF_HOUR(hour)  ((hour) / 0x10)
-#define UNITS_OF_HOUR(hour) ((hour) & 0xF)
-
-/* Macros for extracting tens and units of a minute information which
-   must be in the range 0 ... 0x59.
-   Note that minute is coded in hexadecimal, i.e. 0x12 means 12 minutes */
-#define TENS_OF_MINUTE(minute)  ((minute) / 0x10)
-#define UNITS_OF_MINUTE(minute) ((minute) & 0xF)
-
-#define HOUR_MAX   0x23
-#define MINUTE_MAX 0x59
-#define PAGE_MAX   0x8FF
-
-#endif  /* __SAA5246A_H__ */
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 0d639738d4e6..3bb959c25d9d 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -15,8 +15,6 @@
  *
  *      Copyright (c) 1998 Richard Guenther <richard.guenther@student.uni-tuebingen.de>
  *
- * $Id: saa5249.c,v 1.1 1998/03/30 22:23:23 alan Exp $
- *
  *      Derived From
  *
  * vtx.c:
@@ -45,33 +43,28 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/init.h>
-#include <stdarg.h>
 #include <linux/i2c.h>
+#include <linux/smp_lock.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
 #include <linux/videotext.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
-#include <linux/mutex.h>
-
+#include <media/v4l2-i2c-drv-legacy.h>
 
-#include <asm/io.h>
-#include <asm/uaccess.h>
+MODULE_AUTHOR("Michael Geng <linux@MichaelGeng.de>");
+MODULE_DESCRIPTION("Philips SAA5249 Teletext decoder driver");
+MODULE_LICENSE("GPL");
 
 #define VTX_VER_MAJ 1
 #define VTX_VER_MIN 8
 
 
-
 #define NUM_DAUS 4
 #define NUM_BUFS 8
-#define IF_NAME "SAA5249"
 
 static const int disp_modes[8][3] =
 {
@@ -109,6 +102,7 @@ struct saa5249_device
         int disp_mode;
         int virtual_mode;
         struct i2c_client *client;
+        unsigned long in_use;
         struct mutex lock;
 };
 
@@ -123,125 +117,8 @@ struct saa5249_device
 
 #define VTX_DEV_MINOR 0
 
-/* General defines and debugging support */
-
-#define RESCHED do { cond_resched(); } while(0)
-
 static struct video_device saa_template;        /* Declared near bottom */
 
-/* Addresses to scan */
-static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END};
-
-I2C_CLIENT_INSMOD;
-
-static struct i2c_client client_template;
-
-static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-        int pgbuf;
-        int err;
-        struct i2c_client *client;
-        struct video_device *vd;
-        struct saa5249_device *t;
-
-        printk(KERN_INFO "saa5249: teletext chip found.\n");
-        client=kmalloc(sizeof(*client), GFP_KERNEL);
-        if(client==NULL)
-                return -ENOMEM;
-        client_template.adapter = adap;
-        client_template.addr = addr;
-        memcpy(client, &client_template, sizeof(*client));
-        t = kzalloc(sizeof(*t), GFP_KERNEL);
-        if(t==NULL)
-        {
-                kfree(client);
-                return -ENOMEM;
-        }
-        strlcpy(client->name, IF_NAME, I2C_NAME_SIZE);
-        mutex_init(&t->lock);
-
-        /*
-         *      Now create a video4linux device
-         */
-
-        vd = kmalloc(sizeof(struct video_device), GFP_KERNEL);
-        if(vd==NULL)
-        {
-                kfree(t);
-                kfree(client);
-                return -ENOMEM;
-        }
-        i2c_set_clientdata(client, vd);
-        memcpy(vd, &saa_template, sizeof(*vd));
-
-        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
-        {
-                memset(t->vdau[pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
-                memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
-                memset(t->vdau[pgbuf].laststat, 0, sizeof(t->vdau[0].laststat));
-                t->vdau[pgbuf].expire = 0;
-                t->vdau[pgbuf].clrfound = true;
-                t->vdau[pgbuf].stopped = true;
-                t->is_searching[pgbuf] = false;
-        }
-        vd->priv=t;
-
-
-        /*
-         *      Register it
-         */
-
-        if((err=video_register_device(vd, VFL_TYPE_VTX,-1))<0)
-        {
-                kfree(t);
-                kfree(vd);
-                kfree(client);
-                return err;
-        }
-        t->client = client;
-        i2c_attach_client(client);
-        return 0;
-}
-
-/*
- *      We do most of the hard work when we become a device on the i2c.
- */
-
-static int saa5249_probe(struct i2c_adapter *adap)
-{
-        if (adap->class & I2C_CLASS_TV_ANALOG)
-                return i2c_probe(adap, &addr_data, saa5249_attach);
-        return 0;
-}
-
-static int saa5249_detach(struct i2c_client *client)
-{
-        struct video_device *vd = i2c_get_clientdata(client);
-        i2c_detach_client(client);
-        video_unregister_device(vd);
-        kfree(vd->priv);
-        kfree(vd);
-        kfree(client);
-        return 0;
-}
-
-/* new I2C driver support */
-
-static struct i2c_driver i2c_driver_videotext =
-{
-        .driver = {
-                .name   = IF_NAME,              /* name */
-        },
-        .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .attach_adapter = saa5249_probe,
-        .detach_client  = saa5249_detach,
-};
-
-static struct i2c_client client_template = {
-        .driver         = &i2c_driver_videotext,
-        .name           = "(unset)",
-};
-
 /*
  *      Wait the given number of jiffies (10ms). This calls the scheduler, so the actual
  *      delay may be longer.
@@ -275,7 +152,7 @@ static int i2c_sendbuf(struct saa5249_device *t, int reg, int count, u8 *data)
         buf[0] = reg;
         memcpy(buf+1, data, count);
 
-        if(i2c_master_send(t->client, buf, count+1)==count+1)
+        if (i2c_master_send(t->client, buf, count + 1) == count + 1)
                 return 0;
         return -1;
 }
@@ -317,246 +194,236 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
                             unsigned int cmd, void *arg)
 {
         static int virtual_mode = false;
-        struct video_device *vd = video_devdata(file);
-        struct saa5249_device *t=vd->priv;
+        struct saa5249_device *t = video_drvdata(file);
 
-        switch(cmd)
+        switch (cmd) {
+        case VTXIOCGETINFO:
         {
-                case VTXIOCGETINFO:
-                {
-                        vtx_info_t *info = arg;
-                        info->version_major = VTX_VER_MAJ;
-                        info->version_minor = VTX_VER_MIN;
-                        info->numpages = NUM_DAUS;
-                        /*info->cct_type = CCT_TYPE;*/
-                        return 0;
-                }
+                vtx_info_t *info = arg;
+                info->version_major = VTX_VER_MAJ;
+                info->version_minor = VTX_VER_MIN;
+                info->numpages = NUM_DAUS;
+                /*info->cct_type = CCT_TYPE;*/
+                return 0;
+        }
 
-                case VTXIOCCLRPAGE:
-                {
-                        vtx_pagereq_t *req = arg;
+        case VTXIOCCLRPAGE:
+        {
+                vtx_pagereq_t *req = arg;
 
-                        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
-                                return -EINVAL;
-                        memset(t->vdau[req->pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
-                        t->vdau[req->pgbuf].clrfound = true;
-                        return 0;
-                }
+                if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
+                        return -EINVAL;
+                memset(t->vdau[req->pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
+                t->vdau[req->pgbuf].clrfound = true;
+                return 0;
+        }
 
-                case VTXIOCCLRFOUND:
-                {
-                        vtx_pagereq_t *req = arg;
+        case VTXIOCCLRFOUND:
+        {
+                vtx_pagereq_t *req = arg;
 
-                        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
-                                return -EINVAL;
-                        t->vdau[req->pgbuf].clrfound = true;
-                        return 0;
-                }
+                if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
+                        return -EINVAL;
+                t->vdau[req->pgbuf].clrfound = true;
+                return 0;
+        }
 
-                case VTXIOCPAGEREQ:
-                {
-                        vtx_pagereq_t *req = arg;
-                        if (!(req->pagemask & PGMASK_PAGE))
-                                req->page = 0;
-                        if (!(req->pagemask & PGMASK_HOUR))
-                                req->hour = 0;
-                        if (!(req->pagemask & PGMASK_MINUTE))
-                                req->minute = 0;
-                        if (req->page < 0 || req->page > 0x8ff) /* 7FF ?? */
-                                return -EINVAL;
-                        req->page &= 0x7ff;
-                        if (req->hour < 0 || req->hour > 0x3f || req->minute < 0 || req->minute > 0x7f ||
-                                req->pagemask < 0 || req->pagemask >= PGMASK_MAX || req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
-                                return -EINVAL;
-                        t->vdau[req->pgbuf].sregs[0] = (req->pagemask & PG_HUND ? 0x10 : 0) | (req->page / 0x100);
-                        t->vdau[req->pgbuf].sregs[1] = (req->pagemask & PG_TEN ? 0x10 : 0) | ((req->page / 0x10) & 0xf);
-                        t->vdau[req->pgbuf].sregs[2] = (req->pagemask & PG_UNIT ? 0x10 : 0) | (req->page & 0xf);
-                        t->vdau[req->pgbuf].sregs[3] = (req->pagemask & HR_TEN ? 0x10 : 0) | (req->hour / 0x10);
-                        t->vdau[req->pgbuf].sregs[4] = (req->pagemask & HR_UNIT ? 0x10 : 0) | (req->hour & 0xf);
-                        t->vdau[req->pgbuf].sregs[5] = (req->pagemask & MIN_TEN ? 0x10 : 0) | (req->minute / 0x10);
-                        t->vdau[req->pgbuf].sregs[6] = (req->pagemask & MIN_UNIT ? 0x10 : 0) | (req->minute & 0xf);
-                        t->vdau[req->pgbuf].stopped = false;
-                        t->vdau[req->pgbuf].clrfound = true;
-                        t->is_searching[req->pgbuf] = true;
-                        return 0;
-                }
+        case VTXIOCPAGEREQ:
+        {
+                vtx_pagereq_t *req = arg;
+                if (!(req->pagemask & PGMASK_PAGE))
+                        req->page = 0;
+                if (!(req->pagemask & PGMASK_HOUR))
+                        req->hour = 0;
+                if (!(req->pagemask & PGMASK_MINUTE))
+                        req->minute = 0;
+                if (req->page < 0 || req->page > 0x8ff) /* 7FF ?? */
+                        return -EINVAL;
+                req->page &= 0x7ff;
+                if (req->hour < 0 || req->hour > 0x3f || req->minute < 0 || req->minute > 0x7f ||
+                        req->pagemask < 0 || req->pagemask >= PGMASK_MAX || req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
+                        return -EINVAL;
+                t->vdau[req->pgbuf].sregs[0] = (req->pagemask & PG_HUND ? 0x10 : 0) | (req->page / 0x100);
+                t->vdau[req->pgbuf].sregs[1] = (req->pagemask & PG_TEN ? 0x10 : 0) | ((req->page / 0x10) & 0xf);
+                t->vdau[req->pgbuf].sregs[2] = (req->pagemask & PG_UNIT ? 0x10 : 0) | (req->page & 0xf);
+                t->vdau[req->pgbuf].sregs[3] = (req->pagemask & HR_TEN ? 0x10 : 0) | (req->hour / 0x10);
+                t->vdau[req->pgbuf].sregs[4] = (req->pagemask & HR_UNIT ? 0x10 : 0) | (req->hour & 0xf);
+                t->vdau[req->pgbuf].sregs[5] = (req->pagemask & MIN_TEN ? 0x10 : 0) | (req->minute / 0x10);
+                t->vdau[req->pgbuf].sregs[6] = (req->pagemask & MIN_UNIT ? 0x10 : 0) | (req->minute & 0xf);
+                t->vdau[req->pgbuf].stopped = false;
+                t->vdau[req->pgbuf].clrfound = true;
+                t->is_searching[req->pgbuf] = true;
+                return 0;
+        }
 
-                case VTXIOCGETSTAT:
-                {
-                        vtx_pagereq_t *req = arg;
-                        u8 infobits[10];
-                        vtx_pageinfo_t info;
-                        int a;
-
-                        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
-                                return -EINVAL;
-                        if (!t->vdau[req->pgbuf].stopped)
-                        {
-                                if (i2c_senddata(t, 2, 0, -1) ||
-                                        i2c_sendbuf(t, 3, sizeof(t->vdau[0].sregs), t->vdau[req->pgbuf].sregs) ||
-                                        i2c_senddata(t, 8, 0, 25, 0, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', -1) ||
-                                        i2c_senddata(t, 2, 0, t->vdau[req->pgbuf].sregs[0] | 8, -1) ||
-                                        i2c_senddata(t, 8, 0, 25, 0, -1))
-                                        return -EIO;
-                                jdelay(PAGE_WAIT);
-                                if (i2c_getdata(t, 10, infobits))
-                                        return -EIO;
+        case VTXIOCGETSTAT:
+        {
+                vtx_pagereq_t *req = arg;
+                u8 infobits[10];
+                vtx_pageinfo_t info;
+                int a;
+
+                if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
+                        return -EINVAL;
+                if (!t->vdau[req->pgbuf].stopped) {
+                        if (i2c_senddata(t, 2, 0, -1) ||
+                                i2c_sendbuf(t, 3, sizeof(t->vdau[0].sregs), t->vdau[req->pgbuf].sregs) ||
+                                i2c_senddata(t, 8, 0, 25, 0, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', -1) ||
+                                i2c_senddata(t, 2, 0, t->vdau[req->pgbuf].sregs[0] | 8, -1) ||
+                                i2c_senddata(t, 8, 0, 25, 0, -1))
+                                return -EIO;
+                        jdelay(PAGE_WAIT);
+                        if (i2c_getdata(t, 10, infobits))
+                                return -EIO;
 
-                                if (!(infobits[8] & 0x10) && !(infobits[7] & 0xf0) &&   /* check FOUND-bit */
-                                        (memcmp(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits)) ||
-                                        time_after_eq(jiffies, t->vdau[req->pgbuf].expire)))
-                                {               /* check if new page arrived */
-                                        if (i2c_senddata(t, 8, 0, 0, 0, -1) ||
-                                                i2c_getdata(t, VTX_PAGESIZE, t->vdau[req->pgbuf].pgbuf))
+                        if (!(infobits[8] & 0x10) && !(infobits[7] & 0xf0) &&   /* check FOUND-bit */
+                                (memcmp(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits)) ||
+                                time_after_eq(jiffies, t->vdau[req->pgbuf].expire)))
+                        {               /* check if new page arrived */
+                                if (i2c_senddata(t, 8, 0, 0, 0, -1) ||
+                                        i2c_getdata(t, VTX_PAGESIZE, t->vdau[req->pgbuf].pgbuf))
+                                        return -EIO;
+                                t->vdau[req->pgbuf].expire = jiffies + PGBUF_EXPIRE;
+                                memset(t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE, ' ', VTX_VIRTUALSIZE - VTX_PAGESIZE);
+                                if (t->virtual_mode) {
+                                        /* Packet X/24 */
+                                        if (i2c_senddata(t, 8, 0, 0x20, 0, -1) ||
+                                                i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 20 * 40))
+                                                return -EIO;
+                                        /* Packet X/27/0 */
+                                        if (i2c_senddata(t, 8, 0, 0x21, 0, -1) ||
+                                                i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 16 * 40))
+                                                return -EIO;
+                                        /* Packet 8/30/0...8/30/15
+                                         * FIXME: AFAIK, the 5249 does hamming-decoding for some bytes in packet 8/30,
+                                         *        so we should undo this here.
+                                         */
+                                        if (i2c_senddata(t, 8, 0, 0x22, 0, -1) ||
+                                                i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 23 * 40))
                                                 return -EIO;
-                                        t->vdau[req->pgbuf].expire = jiffies + PGBUF_EXPIRE;
-                                        memset(t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE, ' ', VTX_VIRTUALSIZE - VTX_PAGESIZE);
-                                        if (t->virtual_mode)
-                                        {
-                                                /* Packet X/24 */
-                                                if (i2c_senddata(t, 8, 0, 0x20, 0, -1) ||
-                                                        i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 20 * 40))
-                                                        return -EIO;
-                                                /* Packet X/27/0 */
-                                                if (i2c_senddata(t, 8, 0, 0x21, 0, -1) ||
-                                                        i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 16 * 40))
-                                                        return -EIO;
-                                                /* Packet 8/30/0...8/30/15
-                                                 * FIXME: AFAIK, the 5249 does hamming-decoding for some bytes in packet 8/30,
-                                                 *        so we should undo this here.
-                                                 */
-                                                if (i2c_senddata(t, 8, 0, 0x22, 0, -1) ||
-                                                        i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 23 * 40))
-                                                        return -EIO;
-                                        }
-                                        t->vdau[req->pgbuf].clrfound = false;
-                                        memcpy(t->vdau[req->pgbuf].laststat, infobits, sizeof(infobits));
-                                }
-                                else
-                                {
-                                        memcpy(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits));
                                 }
-                        }
-                        else
-                        {
+                                t->vdau[req->pgbuf].clrfound = false;
+                                memcpy(t->vdau[req->pgbuf].laststat, infobits, sizeof(infobits));
+                        } else {
                                 memcpy(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits));
                         }
+                } else {
+                        memcpy(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits));
+                }
 
-                        info.pagenum = ((infobits[8] << 8) & 0x700) | ((infobits[1] << 4) & 0xf0) | (infobits[0] & 0x0f);
-                        if (info.pagenum < 0x100)
-                                info.pagenum += 0x800;
-                        info.hour = ((infobits[5] << 4) & 0x30) | (infobits[4] & 0x0f);
-                        info.minute = ((infobits[3] << 4) & 0x70) | (infobits[2] & 0x0f);
-                        info.charset = ((infobits[7] >> 1) & 7);
-                        info.delete = !!(infobits[3] & 8);
-                        info.headline = !!(infobits[5] & 4);
-                        info.subtitle = !!(infobits[5] & 8);
-                        info.supp_header = !!(infobits[6] & 1);
-                        info.update = !!(infobits[6] & 2);
-                        info.inter_seq = !!(infobits[6] & 4);
-                        info.dis_disp = !!(infobits[6] & 8);
-                        info.serial = !!(infobits[7] & 1);
-                        info.notfound = !!(infobits[8] & 0x10);
-                        info.pblf = !!(infobits[9] & 0x20);
-                        info.hamming = 0;
-                        for (a = 0; a <= 7; a++)
-                        {
-                                if (infobits[a] & 0xf0)
-                                {
-                                        info.hamming = 1;
-                                        break;
-                                }
-                        }
-                        if (t->vdau[req->pgbuf].clrfound)
-                                info.notfound = 1;
-                        if(copy_to_user(req->buffer, &info, sizeof(vtx_pageinfo_t)))
-                                return -EFAULT;
-                        if (!info.hamming && !info.notfound)
-                        {
-                                t->is_searching[req->pgbuf] = false;
+                info.pagenum = ((infobits[8] << 8) & 0x700) | ((infobits[1] << 4) & 0xf0) | (infobits[0] & 0x0f);
+                if (info.pagenum < 0x100)
+                        info.pagenum += 0x800;
+                info.hour = ((infobits[5] << 4) & 0x30) | (infobits[4] & 0x0f);
+                info.minute = ((infobits[3] << 4) & 0x70) | (infobits[2] & 0x0f);
+                info.charset = ((infobits[7] >> 1) & 7);
+                info.delete = !!(infobits[3] & 8);
+                info.headline = !!(infobits[5] & 4);
+                info.subtitle = !!(infobits[5] & 8);
+                info.supp_header = !!(infobits[6] & 1);
+                info.update = !!(infobits[6] & 2);
+                info.inter_seq = !!(infobits[6] & 4);
+                info.dis_disp = !!(infobits[6] & 8);
+                info.serial = !!(infobits[7] & 1);
+                info.notfound = !!(infobits[8] & 0x10);
+                info.pblf = !!(infobits[9] & 0x20);
+                info.hamming = 0;
+                for (a = 0; a <= 7; a++) {
+                        if (infobits[a] & 0xf0) {
+                                info.hamming = 1;
+                                break;
                         }
-                        return 0;
                 }
+                if (t->vdau[req->pgbuf].clrfound)
+                        info.notfound = 1;
+                if (copy_to_user(req->buffer, &info, sizeof(vtx_pageinfo_t)))
+                        return -EFAULT;
+                if (!info.hamming && !info.notfound)
+                        t->is_searching[req->pgbuf] = false;
+                return 0;
+        }
 
-                case VTXIOCGETPAGE:
-                {
-                        vtx_pagereq_t *req = arg;
-                        int start, end;
-
-                        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS || req->start < 0 ||
-                                req->start > req->end || req->end >= (virtual_mode ? VTX_VIRTUALSIZE : VTX_PAGESIZE))
-                                return -EINVAL;
-                        if(copy_to_user(req->buffer, &t->vdau[req->pgbuf].pgbuf[req->start], req->end - req->start + 1))
+        case VTXIOCGETPAGE:
+        {
+                vtx_pagereq_t *req = arg;
+                int start, end;
+
+                if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS || req->start < 0 ||
+                        req->start > req->end || req->end >= (virtual_mode ? VTX_VIRTUALSIZE : VTX_PAGESIZE))
+                        return -EINVAL;
+                if (copy_to_user(req->buffer, &t->vdau[req->pgbuf].pgbuf[req->start], req->end - req->start + 1))
+                        return -EFAULT;
+
+                 /*
+                  *     Always read the time directly from SAA5249
+                  */
+
+                if (req->start <= 39 && req->end >= 32) {
+                        int len;
+                        char buf[16];
+                        start = max(req->start, 32);
+                        end = min(req->end, 39);
+                        len = end - start + 1;
+                        if (i2c_senddata(t, 8, 0, 0, start, -1) ||
+                                i2c_getdata(t, len, buf))
+                                return -EIO;
+                        if (copy_to_user(req->buffer + start - req->start, buf, len))
+                                return -EFAULT;
+                }
+                /* Insert the current header if DAU is still searching for a page */
+                if (req->start <= 31 && req->end >= 7 && t->is_searching[req->pgbuf]) {
+                        char buf[32];
+                        int len;
+
+                        start = max(req->start, 7);
+                        end = min(req->end, 31);
+                        len = end - start + 1;
+                        if (i2c_senddata(t, 8, 0, 0, start, -1) ||
+                                i2c_getdata(t, len, buf))
+                                return -EIO;
+                        if (copy_to_user(req->buffer + start - req->start, buf, len))
                                 return -EFAULT;
-
-                         /*
-                          *     Always read the time directly from SAA5249
-                          */
-
-                        if (req->start <= 39 && req->end >= 32)
-                        {
-                                int len;
-                                char buf[16];
-                                start = max(req->start, 32);
-                                end = min(req->end, 39);
-                                len=end-start+1;
-                                if (i2c_senddata(t, 8, 0, 0, start, -1) ||
-                                        i2c_getdata(t, len, buf))
-                                        return -EIO;
-                                if(copy_to_user(req->buffer+start-req->start, buf, len))
-                                        return -EFAULT;
-                        }
-                        /* Insert the current header if DAU is still searching for a page */
-                        if (req->start <= 31 && req->end >= 7 && t->is_searching[req->pgbuf])
-                        {
-                                char buf[32];
-                                int len;
-                                start = max(req->start, 7);
-                                end = min(req->end, 31);
-                                len=end-start+1;
-                                if (i2c_senddata(t, 8, 0, 0, start, -1) ||
-                                        i2c_getdata(t, len, buf))
-                                        return -EIO;
-                                if(copy_to_user(req->buffer+start-req->start, buf, len))
-                                        return -EFAULT;
-                        }
-                        return 0;
                 }
+                return 0;
+        }
 
-                case VTXIOCSTOPDAU:
-                {
-                        vtx_pagereq_t *req = arg;
+        case VTXIOCSTOPDAU:
+        {
+                vtx_pagereq_t *req = arg;
 
-                        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
-                                return -EINVAL;
-                        t->vdau[req->pgbuf].stopped = true;
-                        t->is_searching[req->pgbuf] = false;
-                        return 0;
-                }
+                if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
+                        return -EINVAL;
+                t->vdau[req->pgbuf].stopped = true;
+                t->is_searching[req->pgbuf] = false;
+                return 0;
+        }
 
-                case VTXIOCPUTPAGE:
-                case VTXIOCSETDISP:
-                case VTXIOCPUTSTAT:
-                        return 0;
+        case VTXIOCPUTPAGE:
+        case VTXIOCSETDISP:
+        case VTXIOCPUTSTAT:
+                return 0;
 
-                case VTXIOCCLRCACHE:
-                {
-                        if (i2c_senddata(t, 0, NUM_DAUS, 0, 8, -1) || i2c_senddata(t, 11,
-                                ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',
-                                ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', -1))
-                                return -EIO;
-                        if (i2c_senddata(t, 3, 0x20, -1))
-                                return -EIO;
-                        jdelay(10 * CLEAR_DELAY);                       /* I have no idea how long we have to wait here */
-                        return 0;
-                }
+        case VTXIOCCLRCACHE:
+        {
+                if (i2c_senddata(t, 0, NUM_DAUS, 0, 8, -1) || i2c_senddata(t, 11,
+                        ' ', ' ', ' ', ' ', ' ', ' ',
+                        ' ', ' ', ' ', ' ', ' ', ' ',
+                        ' ', ' ', ' ', ' ', ' ', ' ',
+                        ' ', ' ', ' ', ' ', ' ', ' ',
+                        -1))
+                        return -EIO;
+                if (i2c_senddata(t, 3, 0x20, -1))
+                        return -EIO;
+                jdelay(10 * CLEAR_DELAY);                       /* I have no idea how long we have to wait here */
+                return 0;
+        }
 
-                case VTXIOCSETVIRT:
-                {
-                        /* The SAA5249 has virtual-row reception turned on always */
-                        t->virtual_mode = (int)(long)arg;
-                        return 0;
-                }
+        case VTXIOCSETVIRT:
+        {
+                /* The SAA5249 has virtual-row reception turned on always */
+                t->virtual_mode = (int)(long)arg;
+                return 0;
+        }
         }
         return -EINVAL;
 }
@@ -616,8 +483,7 @@ static inline unsigned int vtx_fix_command(unsigned int cmd)
 static int saa5249_ioctl(struct inode *inode, struct file *file,
                          unsigned int cmd, unsigned long arg)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5249_device *t=vd->priv;
+        struct saa5249_device *t = video_drvdata(file);
         int err;
 
         cmd = vtx_fix_command(cmd);
@@ -629,32 +495,27 @@ static int saa5249_ioctl(struct inode *inode, struct file *file,
 
 static int saa5249_open(struct inode *inode, struct file *file)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5249_device *t=vd->priv;
-        int err,pgbuf;
+        struct saa5249_device *t = video_drvdata(file);
+        int pgbuf;
 
-        err = video_exclusive_open(inode,file);
-        if (err < 0)
-                return err;
+        if (t->client == NULL)
+                return -ENODEV;
 
-        if (t->client==NULL) {
-                err = -ENODEV;
-                goto fail;
-        }
+        if (test_and_set_bit(0, &t->in_use))
+                return -EBUSY;
 
-        if (i2c_senddata(t, 0, 0, -1) ||                /* Select R11 */
-                                                /* Turn off parity checks (we do this ourselves) */
+        if (i2c_senddata(t, 0, 0, -1) || /* Select R11 */
+                /* Turn off parity checks (we do this ourselves) */
                 i2c_senddata(t, 1, disp_modes[t->disp_mode][0], 0, -1) ||
-                                                /* Display TV-picture, no virtual rows */
-                i2c_senddata(t, 4, NUM_DAUS, disp_modes[t->disp_mode][1], disp_modes[t->disp_mode][2], 7, -1)) /* Set display to page 4 */
-
+                /* Display TV-picture, no virtual rows */
+                i2c_senddata(t, 4, NUM_DAUS, disp_modes[t->disp_mode][1], disp_modes[t->disp_mode][2], 7, -1))
+                /* Set display to page 4 */
         {
-                err = -EIO;
-                goto fail;
+                clear_bit(0, &t->in_use);
+                return -EIO;
         }
 
-        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
-        {
+        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++) {
                 memset(t->vdau[pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
                 memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
                 memset(t->vdau[pgbuf].laststat, 0, sizeof(t->vdau[0].laststat));
@@ -665,39 +526,20 @@ static int saa5249_open(struct inode *inode, struct file *file)
         }
         t->virtual_mode = false;
         return 0;
-
- fail:
-        video_exclusive_release(inode,file);
-        return err;
 }
 
 
 
 static int saa5249_release(struct inode *inode, struct file *file)
 {
-        struct video_device *vd = video_devdata(file);
-        struct saa5249_device *t=vd->priv;
+        struct saa5249_device *t = video_drvdata(file);
+
         i2c_senddata(t, 1, 0x20, -1);           /* Turn off CCT */
         i2c_senddata(t, 5, 3, 3, -1);           /* Turn off TV-display */
-        video_exclusive_release(inode,file);
+        clear_bit(0, &t->in_use);
         return 0;
 }
 
-static int __init init_saa_5249 (void)
-{
-        printk(KERN_INFO "SAA5249 driver (" IF_NAME " interface) for VideoText version %d.%d\n",
-                        VTX_VER_MAJ, VTX_VER_MIN);
-        return i2c_add_driver(&i2c_driver_videotext);
-}
-
-static void __exit cleanup_saa_5249 (void)
-{
-        i2c_del_driver(&i2c_driver_videotext);
-}
-
-module_init(init_saa_5249);
-module_exit(cleanup_saa_5249);
-
 static const struct file_operations saa_fops = {
         .owner          = THIS_MODULE,
         .open           = saa5249_open,
@@ -711,8 +553,84 @@ static const struct file_operations saa_fops = {
 
 static struct video_device saa_template =
 {
-        .name           = IF_NAME,
+        .name           = "saa5249",
         .fops           = &saa_fops,
+        .release        = video_device_release,
 };
 
-MODULE_LICENSE("GPL");
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD;
+
+static int saa5249_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        int pgbuf;
+        int err;
+        struct video_device *vd;
+        struct saa5249_device *t;
+
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
+        v4l_info(client, "VideoText version %d.%d\n",
+                        VTX_VER_MAJ, VTX_VER_MIN);
+        t = kzalloc(sizeof(*t), GFP_KERNEL);
+        if (t == NULL)
+                return -ENOMEM;
+        mutex_init(&t->lock);
+
+        /* Now create a video4linux device */
+        vd = kmalloc(sizeof(struct video_device), GFP_KERNEL);
+        if (vd == NULL) {
+                kfree(client);
+                return -ENOMEM;
+        }
+        i2c_set_clientdata(client, vd);
+        memcpy(vd, &saa_template, sizeof(*vd));
+
+        for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++) {
+                memset(t->vdau[pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
+                memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
+                memset(t->vdau[pgbuf].laststat, 0, sizeof(t->vdau[0].laststat));
+                t->vdau[pgbuf].expire = 0;
+                t->vdau[pgbuf].clrfound = true;
+                t->vdau[pgbuf].stopped = true;
+                t->is_searching[pgbuf] = false;
+        }
+        video_set_drvdata(vd, t);
+
+        /* Register it */
+        err = video_register_device(vd, VFL_TYPE_VTX, -1);
+        if (err < 0) {
+                kfree(t);
+                kfree(vd);
+                return err;
+        }
+        t->client = client;
+        return 0;
+}
+
+static int saa5249_remove(struct i2c_client *client)
+{
+        struct video_device *vd = i2c_get_clientdata(client);
+
+        video_unregister_device(vd);
+        kfree(video_get_drvdata(vd));
+        kfree(vd);
+        return 0;
+}
+
+static const struct i2c_device_id saa5249_id[] = {
+        { "saa5249", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa5249_id);
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+        .name = "saa5249",
+        .driverid = I2C_DRIVERID_SAA5249,
+        .probe = saa5249_probe,
+        .remove = saa5249_remove,
+        .id_table = saa5249_id,
+};
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index ad733caec720..c8e9cb3db30a 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1057,7 +1057,7 @@ static void saa711x_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo
         for (i = 0; i <= 23; i++)
                 lcr[i] = 0xff;
 
-        if (fmt->service_set == 0) {
+        if (fmt == NULL) {
                 /* raw VBI */
                 if (is_50hz)
                         for (i = 6; i <= 23; i++)
@@ -1113,7 +1113,7 @@ static void saa711x_set_lcr(struct i2c_client *client, struct v4l2_sliced_vbi_fo
         }
 
         /* enable/disable raw VBI capturing */
-        saa711x_writeregs(client, fmt->service_set == 0 ?
+        saa711x_writeregs(client, fmt == NULL ?
                                 saa7115_cfg_vbi_on :
                                 saa7115_cfg_vbi_off);
 }
@@ -1153,6 +1153,10 @@ static int saa711x_set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt
                 saa711x_set_lcr(client, &fmt->fmt.sliced);
                 return 0;
         }
+        if (fmt->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+                saa711x_set_lcr(client, NULL);
+                return 0;
+        }
         if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
 
@@ -1309,10 +1313,13 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
         case VIDIOC_INT_S_VIDEO_ROUTING:
         {
                 struct v4l2_routing *route = arg;
+                u32 input = route->input;
+                u8 mask = (state->ident == V4L2_IDENT_SAA7111) ? 0xf8 : 0xf0;
 
                 v4l_dbg(1, debug, client, "decoder set input %d output %d\n", route->input, route->output);
-                /* saa7113 does not have these inputs */
-                if (state->ident == V4L2_IDENT_SAA7113 &&
+                /* saa7111/3 does not have these inputs */
+                if ((state->ident == V4L2_IDENT_SAA7113 ||
+                     state->ident == V4L2_IDENT_SAA7111) &&
                     (route->input == SAA7115_COMPOSITE4 ||
                      route->input == SAA7115_COMPOSITE5)) {
                         return -EINVAL;
@@ -1327,10 +1334,23 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
                         (route->input >= SAA7115_SVIDEO0) ? "S-Video" : "Composite", (route->output == SAA7115_IPORT_ON) ? "iport on" : "iport off");
                 state->input = route->input;
 
+                /* saa7111 has slightly different input numbering */
+                if (state->ident == V4L2_IDENT_SAA7111) {
+                        if (input >= SAA7115_COMPOSITE4)
+                                input -= 2;
+                        /* saa7111 specific */
+                        saa711x_write(client, R_10_CHROMA_CNTL_2,
+                                        (saa711x_read(client, R_10_CHROMA_CNTL_2) & 0x3f) |
+                                        ((route->output & 0xc0) ^ 0x40));
+                        saa711x_write(client, R_13_RT_X_PORT_OUT_CNTL,
+                                        (saa711x_read(client, R_13_RT_X_PORT_OUT_CNTL) & 0xf0) |
+                                        ((route->output & 2) ? 0x0a : 0));
+                }
+
                 /* select mode */
                 saa711x_write(client, R_02_INPUT_CNTL_1,
-                              (saa711x_read(client, R_02_INPUT_CNTL_1) & 0xf0) |
-                               state->input);
+                              (saa711x_read(client, R_02_INPUT_CNTL_1) & mask) |
+                               input);
 
                 /* bypass chrominance trap for S-Video modes */
                 saa711x_write(client, R_09_LUMA_CNTL,
@@ -1384,6 +1404,13 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
                 saa711x_writeregs(client, saa7115_cfg_reset_scaler);
                 break;
 
+        case VIDIOC_INT_S_GPIO:
+                if (state->ident != V4L2_IDENT_SAA7111)
+                        return -EINVAL;
+                saa711x_write(client, 0x11, (saa711x_read(client, 0x11) & 0x7f) |
+                        (*(u32 *)arg ? 0x80 : 0));
+                break;
+
         case VIDIOC_INT_G_VBI_DATA:
         {
                 struct v4l2_sliced_vbi_data *data = arg;
@@ -1539,7 +1566,8 @@ static int saa7115_probe(struct i2c_client *client,
                 state->crystal_freq = SAA7115_FREQ_32_11_MHZ;
                 saa711x_writeregs(client, saa7115_init_auto_input);
         }
-        saa711x_writeregs(client, saa7115_init_misc);
+        if (state->ident != V4L2_IDENT_SAA7111)
+                saa711x_writeregs(client, saa7115_init_misc);
         saa711x_set_v4lstd(client, V4L2_STD_NTSC);
 
         v4l_dbg(1, debug, client, "status: (1E) 0x%02x, (1F) 0x%02x\n",
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 707be175509d..1fb6eccdade3 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -1,3 +1,27 @@
+ /*
+    saa6752hs - i2c-driver for the saa6752hs by Philips
+
+    Copyright (C) 2004 Andrew de Quincey
+
+    AC-3 support:
+
+    Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License vs published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mvss Ave, Cambridge, MA 02139, USA.
+  */
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -10,6 +34,8 @@
 #include <linux/types.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
 
@@ -27,9 +53,6 @@ MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
 MODULE_AUTHOR("Andrew de Quincey");
 MODULE_LICENSE("GPL");
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
-
 enum saa6752hs_videoformat {
         SAA6752HS_VF_D1 = 0,    /* standard D1 video format: 720x576 */
         SAA6752HS_VF_2_3_D1 = 1,/* 2/3D1 video format: 480x576 */
@@ -46,7 +69,9 @@ struct saa6752hs_mpeg_params {
         __u16                           ts_pid_pcr;
 
         /* audio */
-        enum v4l2_mpeg_audio_l2_bitrate au_l2_bitrate;
+        enum v4l2_mpeg_audio_encoding    au_encoding;
+        enum v4l2_mpeg_audio_l2_bitrate  au_l2_bitrate;
+        enum v4l2_mpeg_audio_ac3_bitrate au_ac3_bitrate;
 
         /* video */
         enum v4l2_mpeg_video_aspect     vi_aspect;
@@ -70,7 +95,9 @@ static const struct v4l2_format v4l2_format_table[] =
 };
 
 struct saa6752hs_state {
-        struct i2c_client             client;
+        int                           chip;
+        u32                           revision;
+        int                           has_ac3;
         struct saa6752hs_mpeg_params  params;
         enum saa6752hs_videoformat    video_format;
         v4l2_std_id                   standard;
@@ -145,6 +172,39 @@ static u8 PMT[] = {
         0x00, 0x00, 0x00, 0x00 /* CRC32 */
 };
 
+static u8 PMT_AC3[] = {
+        0xc2, /* i2c register */
+        0x01, /* table number for encoder(1) */
+        0x47, /* sync */
+
+        0x40, /* transport_error_indicator(0), payload_unit_start(1), transport_priority(0) */
+        0x10, /* PMT PID (0x0010) */
+        0x10, /* transport_scrambling_control(00), adaptation_field_control(01), continuity_counter(0) */
+
+        0x00, /* PSI pointer to start of table */
+
+        0x02, /* TID (2) */
+        0xb0, 0x1a, /* section_syntax_indicator(1), section_length(26) */
+
+        0x00, 0x01, /* program_number(1) */
+
+        0xc1, /* version_number(0), current_next_indicator(1) */
+
+        0x00, 0x00, /* section_number(0), last_section_number(0) */
+
+        0xe1, 0x04, /* PCR_PID (0x0104) */
+
+        0xf0, 0x00, /* program_info_length(0) */
+
+        0x02, 0xe1, 0x00, 0xf0, 0x00, /* video stream type(2), pid */
+        0x06, 0xe1, 0x03, 0xf0, 0x03, /* audio stream type(6), pid */
+        0x6a, /* AC3 */
+        0x01, /* Descriptor_length(1) */
+        0x00, /* component_type_flag(0), bsid_flag(0), mainid_flag(0), asvc_flag(0), reserved flags(0) */
+
+        0xED, 0xDE, 0x2D, 0xF3 /* CRC32 BE */
+};
+
 static struct saa6752hs_mpeg_params param_defaults =
 {
         .ts_pid_pmt      = 16,
@@ -157,12 +217,14 @@ static struct saa6752hs_mpeg_params param_defaults =
         .vi_bitrate_peak = 6000,
         .vi_bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,
 
+        .au_encoding     = V4L2_MPEG_AUDIO_ENCODING_LAYER_2,
         .au_l2_bitrate   = V4L2_MPEG_AUDIO_L2_BITRATE_256K,
+        .au_ac3_bitrate  = V4L2_MPEG_AUDIO_AC3_BITRATE_256K,
 };
 
 /* ---------------------------------------------------------------------- */
 
-static int saa6752hs_chip_command(struct i2c_client* client,
+static int saa6752hs_chip_command(struct i2c_client *client,
                                   enum saa6752hs_command command)
 {
         unsigned char buf[3];
@@ -229,45 +291,61 @@ static int saa6752hs_chip_command(struct i2c_client* client,
 }
 
 
-static int saa6752hs_set_bitrate(struct i2c_client* client,
-                                 struct saa6752hs_mpeg_params* params)
+static inline void set_reg8(struct i2c_client *client, uint8_t reg, uint8_t val)
+{
+        u8 buf[2];
+
+        buf[0] = reg;
+        buf[1] = val;
+        i2c_master_send(client, buf, 2);
+}
+
+static inline void set_reg16(struct i2c_client *client, uint8_t reg, uint16_t val)
 {
         u8 buf[3];
+
+        buf[0] = reg;
+        buf[1] = val >> 8;
+        buf[2] = val & 0xff;
+        i2c_master_send(client, buf, 3);
+}
+
+static int saa6752hs_set_bitrate(struct i2c_client *client,
+                                 struct saa6752hs_state *h)
+{
+        struct saa6752hs_mpeg_params *params = &h->params;
         int tot_bitrate;
+        int is_384k;
 
         /* set the bitrate mode */
-        buf[0] = 0x71;
-        buf[1] = (params->vi_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) ? 0 : 1;
-        i2c_master_send(client, buf, 2);
+        set_reg8(client, 0x71,
+                params->vi_bitrate_mode != V4L2_MPEG_VIDEO_BITRATE_MODE_VBR);
 
         /* set the video bitrate */
         if (params->vi_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) {
                 /* set the target bitrate */
-                buf[0] = 0x80;
-                buf[1] = params->vi_bitrate >> 8;
-                buf[2] = params->vi_bitrate & 0xff;
-                i2c_master_send(client, buf, 3);
+                set_reg16(client, 0x80, params->vi_bitrate);
 
                 /* set the max bitrate */
-                buf[0] = 0x81;
-                buf[1] = params->vi_bitrate_peak >> 8;
-                buf[2] = params->vi_bitrate_peak & 0xff;
-                i2c_master_send(client, buf, 3);
+                set_reg16(client, 0x81, params->vi_bitrate_peak);
                 tot_bitrate = params->vi_bitrate_peak;
         } else {
                 /* set the target bitrate (no max bitrate for CBR) */
-                buf[0] = 0x81;
-                buf[1] = params->vi_bitrate >> 8;
-                buf[2] = params->vi_bitrate & 0xff;
-                i2c_master_send(client, buf, 3);
+                set_reg16(client, 0x81, params->vi_bitrate);
                 tot_bitrate = params->vi_bitrate;
         }
 
+        /* set the audio encoding */
+        set_reg8(client, 0x93,
+                        params->au_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3);
+
         /* set the audio bitrate */
-        buf[0] = 0x94;
-        buf[1] = (V4L2_MPEG_AUDIO_L2_BITRATE_256K == params->au_l2_bitrate) ? 0 : 1;
-        i2c_master_send(client, buf, 2);
-        tot_bitrate += (V4L2_MPEG_AUDIO_L2_BITRATE_256K == params->au_l2_bitrate) ? 256 : 384;
+        if (params->au_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3)
+                is_384k = V4L2_MPEG_AUDIO_AC3_BITRATE_384K == params->au_ac3_bitrate;
+        else
+                is_384k = V4L2_MPEG_AUDIO_L2_BITRATE_384K == params->au_l2_bitrate;
+        set_reg8(client, 0x94, is_384k);
+        tot_bitrate += is_384k ? 384 : 256;
 
         /* Note: the total max bitrate is determined by adding the video and audio
            bitrates together and also adding an extra 768kbit/s to stay on the
@@ -278,16 +356,12 @@ static int saa6752hs_set_bitrate(struct i2c_client* client,
                 tot_bitrate = MPEG_TOTAL_TARGET_BITRATE_MAX;
 
         /* set the total bitrate */
-        buf[0] = 0xb1;
-        buf[1] = tot_bitrate >> 8;
-        buf[2] = tot_bitrate & 0xff;
-        i2c_master_send(client, buf, 3);
-
+        set_reg16(client, 0xb1, tot_bitrate);
         return 0;
 }
 
-static void saa6752hs_set_subsampling(struct i2c_client* client,
-                                      struct v4l2_format* f)
+static void saa6752hs_set_subsampling(struct i2c_client *client,
+                                      struct v4l2_format *f)
 {
         struct saa6752hs_state *h = i2c_get_clientdata(client);
         int dist_352, dist_480, dist_720;
@@ -332,7 +406,7 @@ static void saa6752hs_set_subsampling(struct i2c_client* client,
 }
 
 
-static int handle_ctrl(struct saa6752hs_mpeg_params *params,
+static int handle_ctrl(int has_ac3, struct saa6752hs_mpeg_params *params,
                 struct v4l2_ext_control *ctrl, unsigned int cmd)
 {
         int old = 0, new;
@@ -379,8 +453,9 @@ static int handle_ctrl(struct saa6752hs_mpeg_params *params,
                         params->ts_pid_pcr = new;
                         break;
                 case V4L2_CID_MPEG_AUDIO_ENCODING:
-                        old = V4L2_MPEG_AUDIO_ENCODING_LAYER_2;
-                        if (set && new != old)
+                        old = params->au_encoding;
+                        if (set && new != V4L2_MPEG_AUDIO_ENCODING_LAYER_2 &&
+                            (!has_ac3 || new != V4L2_MPEG_AUDIO_ENCODING_AC3))
                                 return -ERANGE;
                         new = old;
                         break;
@@ -395,6 +470,19 @@ static int handle_ctrl(struct saa6752hs_mpeg_params *params,
                                 new = V4L2_MPEG_AUDIO_L2_BITRATE_384K;
                         params->au_l2_bitrate = new;
                         break;
+                case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
+                        if (!has_ac3)
+                                return -EINVAL;
+                        old = params->au_ac3_bitrate;
+                        if (set && new != V4L2_MPEG_AUDIO_AC3_BITRATE_256K &&
+                                   new != V4L2_MPEG_AUDIO_AC3_BITRATE_384K)
+                                return -ERANGE;
+                        if (new <= V4L2_MPEG_AUDIO_AC3_BITRATE_256K)
+                                new = V4L2_MPEG_AUDIO_AC3_BITRATE_256K;
+                        else
+                                new = V4L2_MPEG_AUDIO_AC3_BITRATE_384K;
+                        params->au_ac3_bitrate = new;
+                        break;
                 case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
                         old = V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000;
                         if (set && new != old)
@@ -448,17 +536,19 @@ static int handle_ctrl(struct saa6752hs_mpeg_params *params,
         return 0;
 }
 
-static int saa6752hs_qctrl(struct saa6752hs_mpeg_params *params,
+static int saa6752hs_qctrl(struct saa6752hs_state *h,
                 struct v4l2_queryctrl *qctrl)
 {
+        struct saa6752hs_mpeg_params *params = &h->params;
         int err;
 
         switch (qctrl->id) {
         case V4L2_CID_MPEG_AUDIO_ENCODING:
                 return v4l2_ctrl_query_fill(qctrl,
                                 V4L2_MPEG_AUDIO_ENCODING_LAYER_2,
-                                V4L2_MPEG_AUDIO_ENCODING_LAYER_2, 1,
-                                V4L2_MPEG_AUDIO_ENCODING_LAYER_2);
+                                h->has_ac3 ? V4L2_MPEG_AUDIO_ENCODING_AC3 :
+                                        V4L2_MPEG_AUDIO_ENCODING_LAYER_2,
+                                1, V4L2_MPEG_AUDIO_ENCODING_LAYER_2);
 
         case V4L2_CID_MPEG_AUDIO_L2_BITRATE:
                 return v4l2_ctrl_query_fill(qctrl,
@@ -466,6 +556,14 @@ static int saa6752hs_qctrl(struct saa6752hs_mpeg_params *params,
                                 V4L2_MPEG_AUDIO_L2_BITRATE_384K, 1,
                                 V4L2_MPEG_AUDIO_L2_BITRATE_256K);
 
+        case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
+                if (!h->has_ac3)
+                        return -EINVAL;
+                return v4l2_ctrl_query_fill(qctrl,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_256K,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_384K, 1,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_256K);
+
         case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
                 return v4l2_ctrl_query_fill(qctrl,
                                 V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000,
@@ -512,44 +610,57 @@ static int saa6752hs_qctrl(struct saa6752hs_mpeg_params *params,
         return -EINVAL;
 }
 
-static int saa6752hs_qmenu(struct saa6752hs_mpeg_params *params,
+static int saa6752hs_qmenu(struct saa6752hs_state *h,
                 struct v4l2_querymenu *qmenu)
 {
-        static const char *mpeg_audio_l2_bitrate[] = {
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "",
-                "256 kbps",
-                "",
-                "384 kbps",
-                NULL
+        static const u32 mpeg_audio_encoding[] = {
+                V4L2_MPEG_AUDIO_ENCODING_LAYER_2,
+                V4L2_CTRL_MENU_IDS_END
+        };
+        static const u32 mpeg_audio_ac3_encoding[] = {
+                V4L2_MPEG_AUDIO_ENCODING_LAYER_2,
+                V4L2_MPEG_AUDIO_ENCODING_AC3,
+                V4L2_CTRL_MENU_IDS_END
+        };
+        static u32 mpeg_audio_l2_bitrate[] = {
+                V4L2_MPEG_AUDIO_L2_BITRATE_256K,
+                V4L2_MPEG_AUDIO_L2_BITRATE_384K,
+                V4L2_CTRL_MENU_IDS_END
+        };
+        static u32 mpeg_audio_ac3_bitrate[] = {
+                V4L2_MPEG_AUDIO_AC3_BITRATE_256K,
+                V4L2_MPEG_AUDIO_AC3_BITRATE_384K,
+                V4L2_CTRL_MENU_IDS_END
         };
         struct v4l2_queryctrl qctrl;
         int err;
 
         qctrl.id = qmenu->id;
-        err = saa6752hs_qctrl(params, &qctrl);
+        err = saa6752hs_qctrl(h, &qctrl);
         if (err)
                 return err;
-        if (qmenu->id == V4L2_CID_MPEG_AUDIO_L2_BITRATE)
-                return v4l2_ctrl_query_menu(qmenu, &qctrl,
+        switch (qmenu->id) {
+        case V4L2_CID_MPEG_AUDIO_L2_BITRATE:
+                return v4l2_ctrl_query_menu_valid_items(qmenu,
                                 mpeg_audio_l2_bitrate);
-        return v4l2_ctrl_query_menu(qmenu, &qctrl,
-                        v4l2_ctrl_get_menu(qmenu->id));
+        case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
+                if (!h->has_ac3)
+                        return -EINVAL;
+                return v4l2_ctrl_query_menu_valid_items(qmenu,
+                                mpeg_audio_ac3_bitrate);
+        case V4L2_CID_MPEG_AUDIO_ENCODING:
+                return v4l2_ctrl_query_menu_valid_items(qmenu,
+                        h->has_ac3 ? mpeg_audio_ac3_encoding :
+                                mpeg_audio_encoding);
+        }
+        return v4l2_ctrl_query_menu(qmenu, &qctrl, NULL);
 }
 
-static int saa6752hs_init(struct i2c_client* client)
+static int saa6752hs_init(struct i2c_client *client, u32 leading_null_bytes)
 {
         unsigned char buf[9], buf2[4];
         struct saa6752hs_state *h;
+        unsigned size;
         u32 crc;
         unsigned char localPAT[256];
         unsigned char localPMT[256];
@@ -557,45 +668,31 @@ static int saa6752hs_init(struct i2c_client* client)
         h = i2c_get_clientdata(client);
 
         /* Set video format - must be done first as it resets other settings */
-        buf[0] = 0x41;
-        buf[1] = h->video_format;
-        i2c_master_send(client, buf, 2);
+        set_reg8(client, 0x41, h->video_format);
 
         /* Set number of lines in input signal */
-        buf[0] = 0x40;
-        buf[1] = 0x00;
-        if (h->standard & V4L2_STD_525_60)
-                buf[1] = 0x01;
-        i2c_master_send(client, buf, 2);
+        set_reg8(client, 0x40, (h->standard & V4L2_STD_525_60) ? 1 : 0);
 
         /* set bitrate */
-        saa6752hs_set_bitrate(client, &h->params);
+        saa6752hs_set_bitrate(client, h);
 
         /* Set GOP structure {3, 13} */
-        buf[0] = 0x72;
-        buf[1] = 0x03;
-        buf[2] = 0x0D;
-        i2c_master_send(client,buf,3);
+        set_reg16(client, 0x72, 0x030d);
 
         /* Set minimum Q-scale {4} */
-        buf[0] = 0x82;
-        buf[1] = 0x04;
-        i2c_master_send(client,buf,2);
+        set_reg8(client, 0x82, 0x04);
 
         /* Set maximum Q-scale {12} */
-        buf[0] = 0x83;
-        buf[1] = 0x0C;
-        i2c_master_send(client,buf,2);
+        set_reg8(client, 0x83, 0x0c);
 
         /* Set Output Protocol */
-        buf[0] = 0xD0;
-        buf[1] = 0x81;
-        i2c_master_send(client,buf,2);
+        set_reg8(client, 0xd0, 0x81);
 
         /* Set video output stream format {TS} */
-        buf[0] = 0xB0;
-        buf[1] = 0x05;
-        i2c_master_send(client,buf,2);
+        set_reg8(client, 0xb0, 0x05);
+
+        /* Set leading null byte for TS */
+        set_reg16(client, 0xf6, leading_null_bytes);
 
         /* compute PAT */
         memcpy(localPAT, PAT, sizeof(PAT));
@@ -608,7 +705,13 @@ static int saa6752hs_init(struct i2c_client* client)
         localPAT[sizeof(PAT) - 1] = crc & 0xFF;
 
         /* compute PMT */
-        memcpy(localPMT, PMT, sizeof(PMT));
+        if (h->params.au_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3) {
+                size = sizeof(PMT_AC3);
+                memcpy(localPMT, PMT_AC3, size);
+        } else {
+                size = sizeof(PMT);
+                memcpy(localPMT, PMT, size);
+        }
         localPMT[3] = 0x40 | ((h->params.ts_pid_pmt >> 8) & 0x0f);
         localPMT[4] = h->params.ts_pid_pmt & 0xff;
         localPMT[15] = 0xE0 | ((h->params.ts_pid_pcr >> 8) & 0x0F);
@@ -617,40 +720,28 @@ static int saa6752hs_init(struct i2c_client* client)
         localPMT[21] = h->params.ts_pid_video & 0xFF;
         localPMT[25] = 0xE0 | ((h->params.ts_pid_audio >> 8) & 0x0F);
         localPMT[26] = h->params.ts_pid_audio & 0xFF;
-        crc = crc32_be(~0, &localPMT[7], sizeof(PMT) - 7 - 4);
-        localPMT[sizeof(PMT) - 4] = (crc >> 24) & 0xFF;
-        localPMT[sizeof(PMT) - 3] = (crc >> 16) & 0xFF;
-        localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF;
-        localPMT[sizeof(PMT) - 1] = crc & 0xFF;
+        crc = crc32_be(~0, &localPMT[7], size - 7 - 4);
+        localPMT[size - 4] = (crc >> 24) & 0xFF;
+        localPMT[size - 3] = (crc >> 16) & 0xFF;
+        localPMT[size - 2] = (crc >> 8) & 0xFF;
+        localPMT[size - 1] = crc & 0xFF;
 
         /* Set Audio PID */
-        buf[0] = 0xC1;
-        buf[1] = (h->params.ts_pid_audio >> 8) & 0xFF;
-        buf[2] = h->params.ts_pid_audio & 0xFF;
-        i2c_master_send(client,buf,3);
+        set_reg16(client, 0xc1, h->params.ts_pid_audio);
 
         /* Set Video PID */
-        buf[0] = 0xC0;
-        buf[1] = (h->params.ts_pid_video >> 8) & 0xFF;
-        buf[2] = h->params.ts_pid_video & 0xFF;
-        i2c_master_send(client,buf,3);
+        set_reg16(client, 0xc0, h->params.ts_pid_video);
 
         /* Set PCR PID */
-        buf[0] = 0xC4;
-        buf[1] = (h->params.ts_pid_pcr >> 8) & 0xFF;
-        buf[2] = h->params.ts_pid_pcr & 0xFF;
-        i2c_master_send(client,buf,3);
+        set_reg16(client, 0xc4, h->params.ts_pid_pcr);
 
         /* Send SI tables */
-        i2c_master_send(client,localPAT,sizeof(PAT));
-        i2c_master_send(client,localPMT,sizeof(PMT));
+        i2c_master_send(client, localPAT, sizeof(PAT));
+        i2c_master_send(client, localPMT, size);
 
         /* mute then unmute audio. This removes buzzing artefacts */
-        buf[0] = 0xa4;
-        buf[1] = 1;
-        i2c_master_send(client, buf, 2);
-        buf[1] = 0;
-        i2c_master_send(client, buf, 2);
+        set_reg8(client, 0xa4, 1);
+        set_reg8(client, 0xa4, 0);
 
         /* start it going */
         saa6752hs_chip_command(client, SAA6752HS_COMMAND_START);
@@ -688,45 +779,6 @@ static int saa6752hs_init(struct i2c_client* client)
         return 0;
 }
 
-static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-        struct saa6752hs_state *h;
-
-
-        if (NULL == (h = kzalloc(sizeof(*h), GFP_KERNEL)))
-                return -ENOMEM;
-        h->client = client_template;
-        h->params = param_defaults;
-        h->client.adapter = adap;
-        h->client.addr = addr;
-
-        /* Assume 625 input lines */
-        h->standard = 0;
-
-        i2c_set_clientdata(&h->client, h);
-        i2c_attach_client(&h->client);
-
-        v4l_info(&h->client,"saa6752hs: chip found @ 0x%x\n", addr<<1);
-        return 0;
-}
-
-static int saa6752hs_probe(struct i2c_adapter *adap)
-{
-        if (adap->class & I2C_CLASS_TV_ANALOG)
-                return i2c_probe(adap, &addr_data, saa6752hs_attach);
-        return 0;
-}
-
-static int saa6752hs_detach(struct i2c_client *client)
-{
-        struct saa6752hs_state *h;
-
-        h = i2c_get_clientdata(client);
-        i2c_detach_client(client);
-        kfree(h);
-        return 0;
-}
-
 static int
 saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
@@ -737,14 +789,13 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
         int i;
 
         switch (cmd) {
+        case VIDIOC_INT_INIT:
+                /* apply settings and start encoder */
+                saa6752hs_init(client, *(u32 *)arg);
+                break;
         case VIDIOC_S_EXT_CTRLS:
                 if (ctrls->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                         return -EINVAL;
-                if (ctrls->count == 0) {
-                        /* apply settings and start encoder */
-                        saa6752hs_init(client);
-                        break;
-                }
                 /* fall through */
         case VIDIOC_TRY_EXT_CTRLS:
         case VIDIOC_G_EXT_CTRLS:
@@ -752,7 +803,8 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         return -EINVAL;
                 params = h->params;
                 for (i = 0; i < ctrls->count; i++) {
-                        if ((err = handle_ctrl(&params, ctrls->controls + i, cmd))) {
+                        err = handle_ctrl(h->has_ac3, &params, ctrls->controls + i, cmd);
+                        if (err) {
                                 ctrls->error_idx = i;
                                 return err;
                         }
@@ -760,9 +812,9 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 h->params = params;
                 break;
         case VIDIOC_QUERYCTRL:
-                return saa6752hs_qctrl(&h->params, arg);
+                return saa6752hs_qctrl(h, arg);
         case VIDIOC_QUERYMENU:
-                return saa6752hs_qmenu(&h->params, arg);
+                return saa6752hs_qmenu(h, arg);
         case VIDIOC_G_FMT:
         {
            struct v4l2_format *f = arg;
@@ -785,6 +837,11 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
         case VIDIOC_S_STD:
                 h->standard = *((v4l2_std_id *) arg);
                 break;
+
+        case VIDIOC_G_CHIP_IDENT:
+                return v4l2_chip_ident_i2c_client(client,
+                                arg, h->chip, h->revision);
+
         default:
                 /* nothing */
                 break;
@@ -793,36 +850,55 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return err;
 }
 
-/* ----------------------------------------------------------------------- */
+static int saa6752hs_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        struct saa6752hs_state *h = kzalloc(sizeof(*h), GFP_KERNEL);
+        u8 addr = 0x13;
+        u8 data[12];
 
-static struct i2c_driver driver = {
-        .driver = {
-                .name   = "saa6752hs",
-        },
-        .id             = I2C_DRIVERID_SAA6752HS,
-        .attach_adapter = saa6752hs_probe,
-        .detach_client  = saa6752hs_detach,
-        .command        = saa6752hs_command,
-};
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
+        if (h == NULL)
+                return -ENOMEM;
 
-static struct i2c_client client_template =
-{
-        .name       = "saa6752hs",
-        .driver     = &driver,
-};
+        i2c_master_send(client, &addr, 1);
+        i2c_master_recv(client, data, sizeof(data));
+        h->chip = V4L2_IDENT_SAA6752HS;
+        h->revision = (data[8] << 8) | data[9];
+        h->has_ac3 = 0;
+        if (h->revision == 0x0206) {
+                h->chip = V4L2_IDENT_SAA6752HS_AC3;
+                h->has_ac3 = 1;
+                v4l_info(client, "support AC-3\n");
+        }
+        h->params = param_defaults;
+        h->standard = 0; /* Assume 625 input lines */
 
-static int __init saa6752hs_init_module(void)
-{
-        return i2c_add_driver(&driver);
+        i2c_set_clientdata(client, h);
+        return 0;
 }
 
-static void __exit saa6752hs_cleanup_module(void)
+static int saa6752hs_remove(struct i2c_client *client)
 {
-        i2c_del_driver(&driver);
+        kfree(i2c_get_clientdata(client));
+        return 0;
 }
 
-module_init(saa6752hs_init_module);
-module_exit(saa6752hs_cleanup_module);
+static const struct i2c_device_id saa6752hs_id[] = {
+        { "saa6752hs", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa6752hs_id);
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+        .name = "saa6752hs",
+        .driverid = I2C_DRIVERID_SAA6752HS,
+        .command = saa6752hs_command,
+        .probe = saa6752hs_probe,
+        .remove = saa6752hs_remove,
+        .id_table = saa6752hs_id,
+};
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 98364d171def..ddc5402c5fb0 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3260,6 +3260,7 @@ struct saa7134_board saa7134_boards[] = {
         },
         [SAA7134_BOARD_HAUPPAUGE_HVR1110] = {
                 /* Thomas Genty <tomlohave@gmail.com> */
+                /* David Bentham <db260179@hotmail.com> */
                 .name           = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid",
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
@@ -3268,23 +3269,26 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tuner_config   = 1,
                 .mpeg           = SAA7134_MPEG_DVB,
+                .gpiomask       = 0x0200100,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
                         .amux = TV,
                         .tv   = 1,
-                },{
-                        .name   = name_comp1,
-                        .vmux   = 3,
-                        .amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */
-                },{
-                        .name   = name_svideo,
-                        .vmux   = 8,
-                        .amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */
-                }},
+                        .gpio = 0x0000100,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                } },
                 .radio = {
                         .name = name_radio,
-                        .amux   = TV,
+                        .amux = TV,
+                        .gpio = 0x0200100,
                 },
         },
         [SAA7134_BOARD_CINERGY_HT_PCMCIA] = {
@@ -3388,6 +3392,42 @@ struct saa7134_board saa7134_boards[] = {
                         .amux = 0,
                 },
         },
+        [SAA7134_BOARD_ENCORE_ENLTV_FM53] = {
+                .name           = "Encore ENLTV-FM v5.3",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_TNF_5335MF,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0x7000,
+                .inputs         = { {
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = 1,
+                        .tv   = 1,
+                        .gpio = 0x50000,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = 2,
+                        .gpio = 0x2000,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = 2,
+                        .gpio = 0x2000,
+                } },
+                .radio = {
+                        .name = name_radio,
+                        .vmux = 1,
+                        .amux = 1,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .gpio = 0xf000,
+                        .amux = 0,
+                },
+        },
         [SAA7134_BOARD_CINERGY_HT_PCI] = {
                 .name           = "Terratec Cinergy HT PCI",
                 .audio_clock    = 0x00187de7,
@@ -3631,6 +3671,40 @@ struct saa7134_board saa7134_boards[] = {
                         .tv     = 1,
                 }},
         },
+        [SAA7134_BOARD_AVERMEDIA_M135A] = {
+                .name           = "Avermedia PCI pure analog (M135A)",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tuner_config   = 2,
+                .gpiomask       = 0x020200000,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                } },
+                .radio = {
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x00200000,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = TV,
+                        .gpio = 0x01,
+                },
+        },
         [SAA7134_BOARD_BEHOLD_401] = {
                 /*       Beholder Intl. Ltd. 2008      */
                 /*Dmitry Belimov <d.belimov@gmail.com> */
@@ -4409,6 +4483,129 @@ struct saa7134_board saa7134_boards[] = {
                 /* no DVB support for now */
                 /* .mpeg           = SAA7134_MPEG_DVB, */
         },
+        [SAA7134_BOARD_ASUSTeK_TIGER_3IN1] = {
+                .name           = "Asus Tiger 3in1",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tuner_config   = 2,
+                .gpiomask       = 1 << 21,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp,
+                        .vmux = 0,
+                        .amux = LINE2,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                } },
+                .radio = {
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x0200000,
+                },
+        },
+        [SAA7134_BOARD_REAL_ANGEL_220] = {
+                .name           = "Zogis Real Angel 220",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_TNF_5335MF,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0x801a8087,
+                .inputs = { {
+                        .name   = name_tv,
+                        .vmux   = 3,
+                        .amux   = LINE2,
+                        .tv     = 1,
+                        .gpio   = 0x624000,
+                }, {
+                        .name   = name_comp1,
+                        .vmux   = 1,
+                        .amux   = LINE1,
+                        .gpio   = 0x624000,
+                }, {
+                        .name   = name_svideo,
+                        .vmux   = 1,
+                        .amux   = LINE1,
+                        .gpio   = 0x624000,
+                } },
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = LINE2,
+                        .gpio   = 0x624001,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = TV,
+                },
+        },
+        [SAA7134_BOARD_ADS_INSTANT_HDTV_PCI] = {
+                .name           = "ADS Tech Instant HDTV",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TUV1236D,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs         = { {
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp,
+                        .vmux = 4,
+                        .amux = LINE1,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                } },
+        },
+        [SAA7134_BOARD_ASUSTeK_TIGER] = {
+                .name           = "Asus Tiger Rev:1.00",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tuner_config   = 0,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .gpiomask       = 0x0200000,
+                .inputs = { {
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                }, {
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE2,
+                }, {
+                        .name   = name_comp2,
+                        .vmux   = 0,
+                        .amux   = LINE2,
+                }, {
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE2,
+                } },
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = TV,
+                        .gpio   = 0x0200000,
+                },
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4777,6 +4974,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
 
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1461, /* Avermedia Technologies Inc */
+                .subdevice    = 0xf11d,
+                .driver_data  = SAA7134_BOARD_AVERMEDIA_M135A,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
                 .subvendor    = PCI_VENDOR_ID_PHILIPS,
                 .subdevice    = 0x2004,
@@ -5157,6 +5360,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .driver_data  = SAA7134_BOARD_ENCORE_ENLTV_FM,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x1a7f,
+                .subdevice    = 0x2008,
+                .driver_data  = SAA7134_BOARD_ENCORE_ENLTV_FM53,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x153b,
                 .subdevice    = 0x1175,
@@ -5183,8 +5392,8 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x1043,
-                .subdevice    = 0x4857,
-                .driver_data  = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
+                .subdevice    = 0x4857,         /* REV:1.00 */
+                .driver_data  = SAA7134_BOARD_ASUSTeK_TIGER,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -5415,6 +5624,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .driver_data  = SAA7134_BOARD_VIDEOMATE_T750,
         }, {
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
+                .subvendor    = 0x1421,
+                .subdevice    = 0x0380,
+                .driver_data  = SAA7134_BOARD_ADS_INSTANT_HDTV_PCI,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x5169,
                 .subdevice    = 0x1502,
@@ -5432,6 +5647,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0xf636,
                 .driver_data  = SAA7134_BOARD_AVERMEDIA_M103,
         }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1043,
+                .subdevice    = 0x4878, /* REV:1.02G */
+                .driver_data  = SAA7134_BOARD_ASUSTeK_TIGER_3IN1,
+        }, {
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -5540,7 +5761,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev,
         return 0;
 }
 
-int saa7134_tuner_callback(void *priv, int command, int arg)
+int saa7134_tuner_callback(void *priv, int component, int command, int arg)
 {
         struct saa7134_dev *dev = priv;
         if (dev != NULL) {
@@ -5620,6 +5841,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_STUDIO_507:
         case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
         case SAA7134_BOARD_AVERMEDIA_777:
+        case SAA7134_BOARD_AVERMEDIA_M135A:
 /*      case SAA7134_BOARD_SABRENT_SBTTVFM:  */ /* not finished yet */
         case SAA7134_BOARD_VIDEOMATE_TV_PVR:
         case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS:
@@ -5644,6 +5866,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_A16AR:
         case SAA7134_BOARD_ENCORE_ENLTV:
         case SAA7134_BOARD_ENCORE_ENLTV_FM:
+        case SAA7134_BOARD_ENCORE_ENLTV_FM53:
         case SAA7134_BOARD_10MOONSTVMASTER3:
         case SAA7134_BOARD_BEHOLD_401:
         case SAA7134_BOARD_BEHOLD_403:
@@ -5656,6 +5879,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_BEHOLD_505FM:
         case SAA7134_BOARD_BEHOLD_507_9FM:
         case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
+        case SAA7134_BOARD_REAL_ANGEL_220:
                 dev->has_remote = SAA7134_REMOTE_GPIO;
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
@@ -5745,6 +5969,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_PINNACLE_PCTV_110i:
         case SAA7134_BOARD_PINNACLE_PCTV_310i:
         case SAA7134_BOARD_UPMOST_PURPLE_TV:
+        case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
         case SAA7134_BOARD_HAUPPAUGE_HVR1110:
         case SAA7134_BOARD_BEHOLD_607_9FM:
         case SAA7134_BOARD_BEHOLD_M6:
@@ -5987,6 +6212,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
         case SAA7134_BOARD_PINNACLE_PCTV_310i:
         case SAA7134_BOARD_KWORLD_DVBT_210:
         case SAA7134_BOARD_TEVION_DVBT_220RF:
+        case SAA7134_BOARD_ASUSTeK_TIGER:
         case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
         case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
         case SAA7134_BOARD_MEDION_MD8800_QUADRO:
@@ -6002,6 +6228,14 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                 i2c_transfer(&dev->i2c_adap, &msg, 1);
                 break;
         }
+        case SAA7134_BOARD_ASUSTeK_TIGER_3IN1:
+        {
+                u8 data[] = { 0x3c, 0x33, 0x60};
+                struct i2c_msg msg = {.addr = 0x0b, .flags = 0, .buf = data,
+                                                        .len = sizeof(data)};
+                i2c_transfer(&dev->i2c_adap, &msg, 1);
+                break;
+        }
         case SAA7134_BOARD_FLYDVB_TRIO:
         {
                 u8 data[] = { 0x3c, 0x33, 0x62};
@@ -6027,6 +6261,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                 i2c_transfer(&dev->i2c_adap, &msg, 1);
                 break;
         }
+        case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:
         case SAA7134_BOARD_KWORLD_ATSC110:
         {
                 /* enable tuner */
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 75d618415f4f..b686bfabbde0 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -215,7 +215,7 @@ unsigned long saa7134_buffer_base(struct saa7134_buf *buf)
 int saa7134_pgtable_alloc(struct pci_dev *pci, struct saa7134_pgtable *pt)
 {
         __le32       *cpu;
-        dma_addr_t   dma_addr;
+        dma_addr_t   dma_addr = 0;
 
         cpu = pci_alloc_consistent(pci, SAA7134_PGTABLE_SIZE, &dma_addr);
         if (NULL == cpu)
@@ -359,32 +359,6 @@ void saa7134_buffer_timeout(unsigned long data)
         spin_unlock_irqrestore(&dev->slock,flags);
 }
 
-/* resends a current buffer in queue after resume */
-
-static int saa7134_buffer_requeue(struct saa7134_dev *dev,
-                                  struct saa7134_dmaqueue *q)
-{
-        struct saa7134_buf *buf, *next;
-
-        assert_spin_locked(&dev->slock);
-
-        buf  = q->curr;
-        next = buf;
-        dprintk("buffer_requeue\n");
-
-        if (!buf)
-                return 0;
-
-        dprintk("buffer_requeue : resending active buffers \n");
-
-        if (!list_empty(&q->queue))
-                next = list_entry(q->queue.next, struct saa7134_buf,
-                                          vb.queue);
-        buf->activate(dev, buf, next);
-
-        return 0;
-}
-
 /* ------------------------------------------------------------------ */
 
 int saa7134_set_dmabits(struct saa7134_dev *dev)
@@ -442,9 +416,7 @@ int saa7134_set_dmabits(struct saa7134_dev *dev)
         /* TS capture -- dma 5 */
         if (dev->ts_q.curr) {
                 ctrl |= SAA7134_MAIN_CTRL_TE5;
-                irq  |= SAA7134_IRQ1_INTE_RA2_3 |
-                        SAA7134_IRQ1_INTE_RA2_2 |
-                        SAA7134_IRQ1_INTE_RA2_1 |
+                irq  |= SAA7134_IRQ1_INTE_RA2_1 |
                         SAA7134_IRQ1_INTE_RA2_0;
         }
 
@@ -727,6 +699,10 @@ static int saa7134_hw_enable2(struct saa7134_dev *dev)
                         irq2_mask |= SAA7134_IRQ2_INTE_GPIO18A;
         }
 
+        if (dev->has_remote == SAA7134_REMOTE_I2C) {
+                request_module("ir-kbd-i2c");
+        }
+
         saa_writel(SAA7134_IRQ1, 0);
         saa_writel(SAA7134_IRQ2, irq2_mask);
 
@@ -1139,6 +1115,32 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
 }
 
 #ifdef CONFIG_PM
+
+/* resends a current buffer in queue after resume */
+static int saa7134_buffer_requeue(struct saa7134_dev *dev,
+                                  struct saa7134_dmaqueue *q)
+{
+        struct saa7134_buf *buf, *next;
+
+        assert_spin_locked(&dev->slock);
+
+        buf  = q->curr;
+        next = buf;
+        dprintk("buffer_requeue\n");
+
+        if (!buf)
+                return 0;
+
+        dprintk("buffer_requeue : resending active buffers \n");
+
+        if (!list_empty(&q->queue))
+                next = list_entry(q->queue.next, struct saa7134_buf,
+                                          vb.queue);
+        buf->activate(dev, buf, next);
+
+        return 0;
+}
+
 static int saa7134_suspend(struct pci_dev *pci_dev , pm_message_t state)
 {
 
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index be48b9b66a67..87c10983266f 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -553,7 +553,6 @@ static int configure_tda827x_fe(struct saa7134_dev *dev,
 /* ------------------------------------------------------------------ */
 
 static struct tda827x_config tda827x_cfg_0 = {
-        .tuner_callback = saa7134_tuner_callback,
         .init = philips_tda827x_tuner_init,
         .sleep = philips_tda827x_tuner_sleep,
         .config = 0,
@@ -561,7 +560,6 @@ static struct tda827x_config tda827x_cfg_0 = {
 };
 
 static struct tda827x_config tda827x_cfg_1 = {
-        .tuner_callback = saa7134_tuner_callback,
         .init = philips_tda827x_tuner_init,
         .sleep = philips_tda827x_tuner_sleep,
         .config = 1,
@@ -569,7 +567,6 @@ static struct tda827x_config tda827x_cfg_1 = {
 };
 
 static struct tda827x_config tda827x_cfg_2 = {
-        .tuner_callback = saa7134_tuner_callback,
         .init = philips_tda827x_tuner_init,
         .sleep = philips_tda827x_tuner_sleep,
         .config = 2,
@@ -577,7 +574,6 @@ static struct tda827x_config tda827x_cfg_2 = {
 };
 
 static struct tda827x_config tda827x_cfg_2_sw42 = {
-        .tuner_callback = saa7134_tuner_callback,
         .init = philips_tda827x_tuner_init,
         .sleep = philips_tda827x_tuner_sleep,
         .config = 2,
@@ -799,6 +795,20 @@ static struct tda1004x_config twinhan_dtv_dvb_3056_config = {
         .request_firmware = philips_tda1004x_request_firmware
 };
 
+static struct tda1004x_config asus_tiger_3in1_config = {
+        .demod_address = 0x0b,
+        .invert        = 1,
+        .invert_oclk   = 0,
+        .xtal_freq     = TDA10046_XTAL_16M,
+        .agc_config    = TDA10046_AGC_TDA827X,
+        .gpio_config   = TDA10046_GP11_I,
+        .if_freq       = TDA10046_FREQ_045,
+        .i2c_gate      = 0x4b,
+        .tuner_address = 0x61,
+        .antenna_switch = 1,
+        .request_firmware = philips_tda1004x_request_firmware
+};
+
 /* ------------------------------------------------------------------
  * special case: this card uses saa713x GPIO22 for the mode switch
  */
@@ -822,7 +832,6 @@ static int ads_duo_tuner_sleep(struct dvb_frontend *fe)
 }
 
 static struct tda827x_config ads_duo_cfg = {
-        .tuner_callback = saa7134_tuner_callback,
         .init = ads_duo_tuner_init,
         .sleep = ads_duo_tuner_sleep,
         .config = 0
@@ -1147,6 +1156,7 @@ static int dvb_init(struct saa7134_dev *dev)
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                    NULL, DVB_PLL_TDHU2);
                 break;
+        case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:
         case SAA7134_BOARD_KWORLD_ATSC110:
                 dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110,
                                                &dev->i2c_adap);
@@ -1300,6 +1310,36 @@ static int dvb_init(struct saa7134_dev *dev)
                                                 &dev->i2c_adap);
                 attach_xc3028 = 1;
                 break;
+        case SAA7134_BOARD_ASUSTeK_TIGER_3IN1:
+                if (!use_frontend) {     /* terrestrial */
+                        if (configure_tda827x_fe(dev, &asus_tiger_3in1_config,
+                                                        &tda827x_cfg_2) < 0)
+                                goto dettach_frontend;
+                } else {                /* satellite */
+                        dev->dvb.frontend = dvb_attach(tda10086_attach,
+                                                &flydvbs, &dev->i2c_adap);
+                        if (dev->dvb.frontend) {
+                                if (dvb_attach(tda826x_attach,
+                                                dev->dvb.frontend, 0x60,
+                                                &dev->i2c_adap, 0) == NULL) {
+                                        wprintk("%s: Asus Tiger 3in1, no "
+                                                "tda826x found!\n", __func__);
+                                        goto dettach_frontend;
+                                }
+                                if (dvb_attach(lnbp21_attach, dev->dvb.frontend,
+                                                &dev->i2c_adap, 0, 0) == NULL) {
+                                        wprintk("%s: Asus Tiger 3in1, no lnbp21"
+                                                " found!\n", __func__);
+                                        goto dettach_frontend;
+                                }
+                        }
+                }
+                break;
+        case SAA7134_BOARD_ASUSTeK_TIGER:
+                if (configure_tda827x_fe(dev, &philips_tiger_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
+                break;
         default:
                 wprintk("Huh? unknown DVB card?\n");
                 break;
@@ -1327,6 +1367,8 @@ static int dvb_init(struct saa7134_dev *dev)
                 printk(KERN_ERR "%s/dvb: frontend initialization failed\n", dev->name);
                 return -1;
         }
+        /* define general-purpose callback pointer */
+        dev->dvb.frontend->callback = saa7134_tuner_callback;
 
         /* register everything else */
         ret = videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev, &dev->pci->dev,
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index c0c5d7509c25..9a8766a78a0c 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -29,6 +29,7 @@
 
 #include <media/saa6752hs.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
 
 /* ------------------------------------------------------------------ */
 
@@ -63,10 +64,19 @@ static void ts_reset_encoder(struct saa7134_dev* dev)
 
 static int ts_init_encoder(struct saa7134_dev* dev)
 {
-        struct v4l2_ext_controls ctrls = { V4L2_CTRL_CLASS_MPEG, 0 };
+        u32 leading_null_bytes = 0;
 
+        /* If more cards start to need this, then this
+           should probably be added to the card definitions. */
+        switch (dev->board) {
+        case SAA7134_BOARD_BEHOLD_M6:
+        case SAA7134_BOARD_BEHOLD_M63:
+        case SAA7134_BOARD_BEHOLD_M6_EXTRA:
+                leading_null_bytes = 1;
+                break;
+        }
         ts_reset_encoder(dev);
-        saa7134_i2c_call_clients(dev, VIDIOC_S_EXT_CTRLS, &ctrls);
+        saa7134_i2c_call_clients(dev, VIDIOC_INT_INIT, &leading_null_bytes);
         dev->empress_started = 1;
         return 0;
 }
@@ -79,9 +89,11 @@ static int ts_open(struct inode *inode, struct file *file)
         struct saa7134_dev *dev;
         int err;
 
+        lock_kernel();
         list_for_each_entry(dev, &saa7134_devlist, devlist)
                 if (dev->empress_dev && dev->empress_dev->minor == minor)
                         goto found;
+        unlock_kernel();
         return -ENODEV;
  found:
 
@@ -103,6 +115,7 @@ static int ts_open(struct inode *inode, struct file *file)
 done_up:
         mutex_unlock(&dev->empress_tsq.vb_lock);
 done:
+        unlock_kernel();
         return err;
 }
 
@@ -290,15 +303,6 @@ static int empress_streamoff(struct file *file, void *priv,
         return videobuf_streamoff(&dev->empress_tsq);
 }
 
-static int saa7134_i2c_call_saa6752(struct saa7134_dev *dev,
-                                              unsigned int cmd, void *arg)
-{
-        if (dev->mpeg_i2c_client == NULL)
-                return -EINVAL;
-        return dev->mpeg_i2c_client->driver->command(dev->mpeg_i2c_client,
-                                                                cmd, arg);
-}
-
 static int empress_s_ext_ctrls(struct file *file, void *priv,
                                struct v4l2_ext_controls *ctrls)
 {
@@ -400,6 +404,39 @@ static int empress_querymenu(struct file *file, void *priv,
         return saa7134_i2c_call_saa6752(dev, VIDIOC_QUERYMENU, c);
 }
 
+static int empress_g_chip_ident(struct file *file, void *fh,
+               struct v4l2_chip_ident *chip)
+{
+        struct saa7134_dev *dev = file->private_data;
+
+        chip->ident = V4L2_IDENT_NONE;
+        chip->revision = 0;
+        if (dev->mpeg_i2c_client == NULL)
+                return -EINVAL;
+        if (chip->match_type == V4L2_CHIP_MATCH_I2C_DRIVER &&
+            chip->match_chip == I2C_DRIVERID_SAA6752HS)
+                return saa7134_i2c_call_saa6752(dev, VIDIOC_G_CHIP_IDENT, chip);
+        if (chip->match_type == V4L2_CHIP_MATCH_I2C_ADDR &&
+            chip->match_chip == dev->mpeg_i2c_client->addr)
+                return saa7134_i2c_call_saa6752(dev, VIDIOC_G_CHIP_IDENT, chip);
+        return -EINVAL;
+}
+
+static int empress_s_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct saa7134_dev *dev = file->private_data;
+
+        return saa7134_s_std_internal(dev, NULL, id);
+}
+
+static int empress_g_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct saa7134_dev *dev = file->private_data;
+
+        *id = dev->tvnorm->id;
+        return 0;
+}
+
 static const struct file_operations ts_fops =
 {
         .owner    = THIS_MODULE,
@@ -428,11 +465,13 @@ static const struct v4l2_ioctl_ops ts_ioctl_ops = {
         .vidioc_enum_input              = empress_enum_input,
         .vidioc_g_input                 = empress_g_input,
         .vidioc_s_input                 = empress_s_input,
-
         .vidioc_queryctrl               = empress_queryctrl,
         .vidioc_querymenu               = empress_querymenu,
         .vidioc_g_ctrl                  = empress_g_ctrl,
         .vidioc_s_ctrl                  = empress_s_ctrl,
+        .vidioc_g_chip_ident            = empress_g_chip_ident,
+        .vidioc_s_std                   = empress_s_std,
+        .vidioc_g_std                   = empress_g_std,
 };
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 5f713e637683..20c1b33caf7b 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -337,6 +337,7 @@ static int attach_inform(struct i2c_client *client)
                 case 0x47:
                 case 0x71:
                 case 0x2d:
+                case 0x30:
                 {
                         struct IR_i2c *ir = i2c_get_clientdata(client);
                         d1printk("%s i2c IR detected (%s).\n",
@@ -427,6 +428,16 @@ void saa7134_i2c_call_clients(struct saa7134_dev *dev,
         i2c_clients_command(&dev->i2c_adap, cmd, arg);
 }
 
+int saa7134_i2c_call_saa6752(struct saa7134_dev *dev,
+                                              unsigned int cmd, void *arg)
+{
+        if (dev->mpeg_i2c_client == NULL)
+                return -EINVAL;
+        return dev->mpeg_i2c_client->driver->command(dev->mpeg_i2c_client,
+                                                                cmd, arg);
+}
+EXPORT_SYMBOL_GPL(saa7134_i2c_call_saa6752);
+
 int saa7134_i2c_register(struct saa7134_dev *dev)
 {
         dev->i2c_adap = saa7134_adap_template;
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index ad08d13dffdd..c53fd5f9f6b5 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -62,8 +62,11 @@ MODULE_PARM_DESC(disable_other_ir, "disable full codes of "
 #define i2cdprintk(fmt, arg...)    if (ir_debug) \
         printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg)
 
-/** rc5 functions */
+/* Helper functions for RC5 and NEC decoding at GPIO16 or GPIO18 */
 static int saa7134_rc5_irq(struct saa7134_dev *dev);
+static int saa7134_nec_irq(struct saa7134_dev *dev);
+static void nec_task(unsigned long data);
+static void saa7134_nec_timer(unsigned long data);
 
 /* -------------------- GPIO generic keycode builder -------------------- */
 
@@ -115,6 +118,53 @@ static int build_key(struct saa7134_dev *dev)
 
 /* --------------------- Chip specific I2C key builders ----------------- */
 
+static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key,
+                                       u32 *ir_raw)
+{
+        unsigned char b;
+        int gpio;
+
+        /* <dev> is needed to access GPIO. Used by the saa_readl macro. */
+        struct saa7134_dev *dev = ir->c.adapter->algo_data;
+        if (dev == NULL) {
+                dprintk("get_key_msi_tvanywhere_plus: "
+                        "gir->c.adapter->algo_data is NULL!\n");
+                return -EIO;
+        }
+
+        /* rising SAA7134_GPIO_GPRESCAN reads the status */
+
+        saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+        saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+
+        gpio = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2);
+
+        /* GPIO&0x40 is pulsed low when a button is pressed. Don't do
+           I2C receive if gpio&0x40 is not low. */
+
+        if (gpio & 0x40)
+                return 0;       /* No button press */
+
+        /* GPIO says there is a button press. Get it. */
+
+        if (1 != i2c_master_recv(&ir->c, &b, 1)) {
+                i2cdprintk("read error\n");
+                return -EIO;
+        }
+
+        /* No button press */
+
+        if (b == 0xff)
+                return 0;
+
+        /* Button pressed */
+
+        dprintk("get_key_msi_tvanywhere_plus: Key = 0x%02X\n", b);
+        *ir_key = b;
+        *ir_raw = b;
+        return 1;
+}
+
 static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
         unsigned char b;
@@ -280,7 +330,9 @@ void saa7134_input_irq(struct saa7134_dev *dev)
 {
         struct card_ir *ir = dev->remote;
 
-        if (!ir->polling && !ir->rc5_gpio) {
+        if (ir->nec_gpio) {
+                saa7134_nec_irq(dev);
+        } else if (!ir->polling && !ir->rc5_gpio) {
                 build_key(dev);
         } else if (ir->rc5_gpio) {
                 saa7134_rc5_irq(dev);
@@ -316,6 +368,10 @@ void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir)
                 ir->addr = 0x17;
                 ir->rc5_key_timeout = ir_rc5_key_timeout;
                 ir->rc5_remote_gap = ir_rc5_remote_gap;
+        } else if (ir->nec_gpio) {
+                setup_timer(&ir->timer_keyup, saa7134_nec_timer,
+                            (unsigned long)dev);
+                tasklet_init(&ir->tlet, nec_task, (unsigned long)dev);
         }
 }
 
@@ -335,6 +391,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         u32 mask_keyup   = 0;
         int polling      = 0;
         int rc5_gpio     = 0;
+        int nec_gpio     = 0;
         int ir_type      = IR_TYPE_OTHER;
         int err;
 
@@ -391,6 +448,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 saa_setb(SAA7134_GPIO_GPMODE0, 0x4);
                 saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
                 break;
+        case SAA7134_BOARD_AVERMEDIA_M135A:
+                ir_codes     = ir_codes_avermedia_m135a;
+                mask_keydown = 0x0040000;
+                mask_keycode = 0x00013f;
+                nec_gpio     = 1;
+                break;
         case SAA7134_BOARD_AVERMEDIA_777:
         case SAA7134_BOARD_AVERMEDIA_A16AR:
                 ir_codes     = ir_codes_avermedia;
@@ -499,6 +562,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keyup   = 0x040000;
                 polling      = 50; // ms
                 break;
+        case SAA7134_BOARD_ENCORE_ENLTV_FM53:
+                ir_codes     = ir_codes_encore_enltv_fm53;
+                mask_keydown = 0x0040000;
+                mask_keycode = 0x00007f;
+                nec_gpio = 1;
+                break;
         case SAA7134_BOARD_10MOONSTVMASTER3:
                 ir_codes     = ir_codes_encore_enltv;
                 mask_keycode = 0x5f80000;
@@ -511,6 +580,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keydown = 0xf00000;
                 polling = 50; /* ms */
                 break;
+        case SAA7134_BOARD_REAL_ANGEL_220:
+                ir_codes     = ir_codes_real_audio_220_32_keys;
+                mask_keycode = 0x3f00;
+                mask_keyup   = 0x4000;
+                polling = 50; /* ms */
+                break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
@@ -533,6 +608,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         ir->mask_keyup   = mask_keyup;
         ir->polling      = polling;
         ir->rc5_gpio     = rc5_gpio;
+        ir->nec_gpio     = nec_gpio;
 
         /* init input device */
         snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)",
@@ -612,6 +688,11 @@ void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
                 ir->get_key   = get_key_purpletv;
                 ir->ir_codes  = ir_codes_purpletv;
                 break;
+        case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
+                snprintf(ir->c.name, sizeof(ir->c.name), "MSI TV@nywhere Plus");
+                ir->get_key  = get_key_msi_tvanywhere_plus;
+                ir->ir_codes = ir_codes_msi_tvanywhere_plus;
+                break;
         case SAA7134_BOARD_HAUPPAUGE_HVR1110:
                 snprintf(ir->c.name, sizeof(ir->c.name), "HVR 1110");
                 ir->get_key   = get_key_hvr1110;
@@ -675,8 +756,125 @@ static int saa7134_rc5_irq(struct saa7134_dev *dev)
         return 1;
 }
 
-/* ----------------------------------------------------------------------
- * Local variables:
- * c-basic-offset: 8
- * End:
+
+/* On NEC protocol, One has 2.25 ms, and zero has 1.125 ms
+   The first pulse (start) has 9 + 4.5 ms
  */
+
+static void saa7134_nec_timer(unsigned long data)
+{
+        struct saa7134_dev *dev = (struct saa7134_dev *) data;
+        struct card_ir *ir = dev->remote;
+
+        dprintk("Cancel key repeat\n");
+
+        ir_input_nokey(ir->dev, &ir->ir);
+}
+
+static void nec_task(unsigned long data)
+{
+        struct saa7134_dev *dev = (struct saa7134_dev *) data;
+        struct card_ir *ir;
+        struct timeval tv;
+        int count, pulse, oldpulse, gap;
+        u32 ircode = 0, not_code = 0;
+        int ngap = 0;
+
+        if (!data) {
+                printk(KERN_ERR "saa713x/ir: Can't recover dev struct\n");
+                /* GPIO will be kept disabled */
+                return;
+        }
+
+        ir = dev->remote;
+
+        /* rising SAA7134_GPIO_GPRESCAN reads the status */
+        saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+        saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+
+        oldpulse = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2) & ir->mask_keydown;
+        pulse = oldpulse;
+
+        do_gettimeofday(&tv);
+        ir->base_time = tv;
+
+        /* Decode NEC pulsecode. This code can take up to 76.5 ms to run.
+           Unfortunately, using IRQ to decode pulse didn't work, since it uses
+           a pulse train of 38KHz. This means one pulse on each 52 us
+         */
+        do {
+                /* Wait until the end of pulse/space or 5 ms */
+                for (count = 0; count < 500; count++)  {
+                        udelay(10);
+                        /* rising SAA7134_GPIO_GPRESCAN reads the status */
+                        saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+                        saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
+                        pulse = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2)
+                                & ir->mask_keydown;
+                        if (pulse != oldpulse)
+                                break;
+                }
+
+                do_gettimeofday(&tv);
+                gap = 1000000 * (tv.tv_sec - ir->base_time.tv_sec) +
+                                tv.tv_usec - ir->base_time.tv_usec;
+
+                if (!pulse) {
+                        /* Bit 0 has 560 us, while bit 1 has 1120 us.
+                           Do something only if bit == 1
+                         */
+                        if (ngap && (gap > 560 + 280)) {
+                                unsigned int shift = ngap - 1;
+
+                                /* Address first, then command */
+                                if (shift < 8) {
+                                        shift += 8;
+                                        ircode |= 1 << shift;
+                                } else if (shift < 16) {
+                                        not_code |= 1 << shift;
+                                } else if (shift < 24) {
+                                        shift -= 16;
+                                        ircode |= 1 << shift;
+                                } else {
+                                        shift -= 24;
+                                        not_code |= 1 << shift;
+                                }
+                        }
+                        ngap++;
+                }
+
+
+                ir->base_time = tv;
+
+                /* TIMEOUT - Long pulse */
+                if (gap >= 5000)
+                        break;
+                oldpulse = pulse;
+        } while (ngap < 32);
+
+        if (ngap == 32) {
+                /* FIXME: should check if not_code == ~ircode */
+                ir->code = ir_extract_bits(ircode, ir->mask_keycode);
+
+                dprintk("scancode = 0x%02x (code = 0x%02x, notcode= 0x%02x)\n",
+                         ir->code, ircode, not_code);
+
+                ir_input_keydown(ir->dev, &ir->ir, ir->code, ir->code);
+        } else
+                dprintk("Repeat last key\n");
+
+        /* Keep repeating the last key */
+        mod_timer(&ir->timer_keyup, jiffies + msecs_to_jiffies(150));
+
+        saa_setl(SAA7134_IRQ2, SAA7134_IRQ2_INTE_GPIO18);
+}
+
+static int saa7134_nec_irq(struct saa7134_dev *dev)
+{
+        struct card_ir *ir = dev->remote;
+
+        saa_clearl(SAA7134_IRQ2, SAA7134_IRQ2_INTE_GPIO18);
+        tasklet_schedule(&ir->tlet);
+
+        return 1;
+}
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index eae72fd60cec..ef55a59f0cda 100644
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/drivers/media/video/saa7134/saa7134-ts.c
@@ -66,11 +66,29 @@ static int buffer_activate(struct saa7134_dev *dev,
         saa7134_set_dmabits(dev);
 
         mod_timer(&dev->ts_q.timeout, jiffies+BUFFER_TIMEOUT);
+
+        if (dev->ts_state == SAA7134_TS_BUFF_DONE) {
+                /* Clear TS cache */
+                dev->buff_cnt = 0;
+                saa_writeb(SAA7134_TS_SERIAL1, 0x00);
+                saa_writeb(SAA7134_TS_SERIAL1, 0x03);
+                saa_writeb(SAA7134_TS_SERIAL1, 0x00);
+                saa_writeb(SAA7134_TS_SERIAL1, 0x01);
+
+                /* TS clock non-inverted */
+                saa_writeb(SAA7134_TS_SERIAL1, 0x00);
+
+                /* Start TS stream */
+                saa_writeb(SAA7134_TS_SERIAL0, 0x40);
+                saa_writeb(SAA7134_TS_PARALLEL, 0xEC);
+                dev->ts_state = SAA7134_TS_STARTED;
+        }
+
         return 0;
 }
 
 static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
-                          enum v4l2_field field)
+                enum v4l2_field field)
 {
         struct saa7134_dev *dev = q->priv_data;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
@@ -110,16 +128,22 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                         goto oops;
         }
 
-        /* dma: setup channel 5 (= TS) */
-        control = SAA7134_RS_CONTROL_BURST_16 |
-                  SAA7134_RS_CONTROL_ME |
-                  (buf->pt->dma >> 12);
-
-        saa_writeb(SAA7134_TS_DMA0, ((lines-1)&0xff));
-        saa_writeb(SAA7134_TS_DMA1, (((lines-1)>>8)&0xff));
-        saa_writeb(SAA7134_TS_DMA2, ((((lines-1)>>16)&0x3f) | 0x00)); /* TSNOPIT=0, TSCOLAP=0 */
-        saa_writel(SAA7134_RS_PITCH(5),TS_PACKET_SIZE);
-        saa_writel(SAA7134_RS_CONTROL(5),control);
+        dev->buff_cnt++;
+
+        if (dev->buff_cnt == dev->ts.nr_bufs) {
+                dev->ts_state = SAA7134_TS_BUFF_DONE;
+                /* dma: setup channel 5 (= TS) */
+                control = SAA7134_RS_CONTROL_BURST_16 |
+                        SAA7134_RS_CONTROL_ME |
+                        (buf->pt->dma >> 12);
+
+                saa_writeb(SAA7134_TS_DMA0, (lines - 1) & 0xff);
+                saa_writeb(SAA7134_TS_DMA1, ((lines - 1) >> 8) & 0xff);
+                /* TSNOPIT=0, TSCOLAP=0 */
+                saa_writeb(SAA7134_TS_DMA2, (((lines - 1) >> 16) & 0x3f) | 0x00);
+                saa_writel(SAA7134_RS_PITCH(5), TS_PACKET_SIZE);
+                saa_writel(SAA7134_RS_CONTROL(5), control);
+        }
 
         buf->vb.state = VIDEOBUF_PREPARED;
         buf->activate = buffer_activate;
@@ -140,6 +164,8 @@ buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
         if (0 == *count)
                 *count = dev->ts.nr_bufs;
         *count = saa7134_buffer_count(*size,*count);
+        dev->buff_cnt = 0;
+        dev->ts_state = SAA7134_TS_STOPPED;
         return 0;
 }
 
@@ -154,7 +180,13 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
+        struct saa7134_dev *dev = q->priv_data;
 
+        if (dev->ts_state == SAA7134_TS_STARTED) {
+                /* Stop TS transport */
+                saa_writeb(SAA7134_TS_PARALLEL, 0x6c);
+                dev->ts_state = SAA7134_TS_STOPPED;
+        }
         saa7134_dma_free(q,buf);
 }
 
@@ -182,7 +214,7 @@ int saa7134_ts_init_hw(struct saa7134_dev *dev)
         /* deactivate TS softreset */
         saa_writeb(SAA7134_TS_SERIAL1, 0x00);
         /* TSSOP high active, TSVAL high active, TSLOCK ignored */
-        saa_writeb(SAA7134_TS_PARALLEL, 0xec);
+        saa_writeb(SAA7134_TS_PARALLEL, 0x6c);
         saa_writeb(SAA7134_TS_PARALLEL_SERIAL, (TS_PACKET_SIZE-1));
         saa_writeb(SAA7134_TS_DMA0, ((dev->ts.nr_packets-1)&0xff));
         saa_writeb(SAA7134_TS_DMA1, (((dev->ts.nr_packets-1)>>8)&0xff));
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 68c268981861..02bb6747a39c 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -628,6 +628,9 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev)
 
         if (card_in(dev, dev->ctl_input).tv)
                 saa7134_i2c_call_clients(dev, VIDIOC_S_STD, &dev->tvnorm->id);
+        /* Set the correct norm for the saa6752hs. This function
+           does nothing if there is no saa6752hs. */
+        saa7134_i2c_call_saa6752(dev, VIDIOC_S_STD, &dev->tvnorm->id);
 }
 
 static void set_h_prescale(struct saa7134_dev *dev, int task, int prescale)
@@ -1330,6 +1333,8 @@ static int video_open(struct inode *inode, struct file *file)
         struct saa7134_fh *fh;
         enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         int radio = 0;
+
+        lock_kernel();
         list_for_each_entry(dev, &saa7134_devlist, devlist) {
                 if (dev->video_dev && (dev->video_dev->minor == minor))
                         goto found;
@@ -1342,6 +1347,7 @@ static int video_open(struct inode *inode, struct file *file)
                         goto found;
                 }
         }
+        unlock_kernel();
         return -ENODEV;
  found:
 
@@ -1350,8 +1356,10 @@ static int video_open(struct inode *inode, struct file *file)
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -1384,6 +1392,7 @@ static int video_open(struct inode *inode, struct file *file)
                 /* switch to video/vbi mode */
                 video_mux(dev,dev->ctl_input);
         }
+        unlock_kernel();
         return 0;
 }
 
@@ -1790,18 +1799,25 @@ static int saa7134_querycap(struct file *file, void  *priv,
                 return 0;
 }
 
-static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
+int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id *id)
 {
-        struct saa7134_fh *fh = priv;
-        struct saa7134_dev *dev = fh->dev;
         unsigned long flags;
         unsigned int i;
         v4l2_std_id fixup;
         int err;
 
-        err = v4l2_prio_check(&dev->prio, &fh->prio);
-        if (0 != err)
-                return err;
+        /* When called from the empress code fh == NULL.
+           That needs to be fixed somehow, but for now this is
+           good enough. */
+        if (fh) {
+                err = v4l2_prio_check(&dev->prio, &fh->prio);
+                if (0 != err)
+                        return err;
+        } else if (res_locked(dev, RESOURCE_OVERLAY)) {
+                /* Don't change the std from the mpeg device
+                   if overlay is active. */
+                return -EBUSY;
+        }
 
         for (i = 0; i < TVNORMS; i++)
                 if (*id == tvnorms[i].id)
@@ -1834,7 +1850,7 @@ static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
         *id = tvnorms[i].id;
 
         mutex_lock(&dev->lock);
-        if (res_check(fh, RESOURCE_OVERLAY)) {
+        if (fh && res_check(fh, RESOURCE_OVERLAY)) {
                 spin_lock_irqsave(&dev->slock, flags);
                 stop_preview(dev, fh);
                 spin_unlock_irqrestore(&dev->slock, flags);
@@ -1851,6 +1867,23 @@ static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
         mutex_unlock(&dev->lock);
         return 0;
 }
+EXPORT_SYMBOL_GPL(saa7134_s_std_internal);
+
+static int saa7134_s_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct saa7134_fh *fh = priv;
+
+        return saa7134_s_std_internal(fh->dev, fh, id);
+}
+
+static int saa7134_g_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+        struct saa7134_fh *fh = priv;
+        struct saa7134_dev *dev = fh->dev;
+
+        *id = dev->tvnorm->id;
+        return 0;
+}
 
 static int saa7134_cropcap(struct file *file, void *priv,
                                         struct v4l2_cropcap *cap)
@@ -2077,18 +2110,6 @@ static int saa7134_enum_fmt_vid_overlay(struct file *file, void  *priv,
         return 0;
 }
 
-static int saa7134_enum_fmt_vbi_cap(struct file *file, void  *priv,
-                                        struct v4l2_fmtdesc *f)
-{
-        if (0 != f->index)
-                return -EINVAL;
-
-        f->pixelformat = V4L2_PIX_FMT_GREY;
-        strcpy(f->description, "vbi data");
-
-        return 0;
-}
-
 static int saa7134_g_fbuf(struct file *file, void *f,
                                 struct v4l2_framebuffer *fb)
 {
@@ -2379,7 +2400,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_g_fmt_vid_overlay       = saa7134_g_fmt_vid_overlay,
         .vidioc_try_fmt_vid_overlay     = saa7134_try_fmt_vid_overlay,
         .vidioc_s_fmt_vid_overlay       = saa7134_s_fmt_vid_overlay,
-        .vidioc_enum_fmt_vbi_cap        = saa7134_enum_fmt_vbi_cap,
         .vidioc_g_fmt_vbi_cap           = saa7134_try_get_set_fmt_vbi_cap,
         .vidioc_try_fmt_vbi_cap         = saa7134_try_get_set_fmt_vbi_cap,
         .vidioc_s_fmt_vbi_cap           = saa7134_try_get_set_fmt_vbi_cap,
@@ -2391,6 +2411,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_qbuf                    = saa7134_qbuf,
         .vidioc_dqbuf                   = saa7134_dqbuf,
         .vidioc_s_std                   = saa7134_s_std,
+        .vidioc_g_std                   = saa7134_g_std,
         .vidioc_enum_input              = saa7134_enum_input,
         .vidioc_g_input                 = saa7134_g_input,
         .vidioc_s_input                 = saa7134_s_input,
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index a0884f639f65..491ab1f8fdd3 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -269,6 +269,12 @@ struct saa7134_format {
 #define SAA7134_BOARD_BEHOLD_M6_EXTRA    144
 #define SAA7134_BOARD_AVERMEDIA_M103    145
 #define SAA7134_BOARD_ASUSTeK_P7131_ANALOG 146
+#define SAA7134_BOARD_ASUSTeK_TIGER_3IN1   147
+#define SAA7134_BOARD_ENCORE_ENLTV_FM53 148
+#define SAA7134_BOARD_AVERMEDIA_M135A    149
+#define SAA7134_BOARD_REAL_ANGEL_220     150
+#define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI  151
+#define SAA7134_BOARD_ASUSTeK_TIGER         152
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
@@ -462,6 +468,12 @@ struct saa7134_mpeg_ops {
         void                       (*signal_change)(struct saa7134_dev *dev);
 };
 
+enum saa7134_ts_status {
+        SAA7134_TS_STOPPED,
+        SAA7134_TS_BUFF_DONE,
+        SAA7134_TS_STARTED,
+};
+
 /* global device status */
 struct saa7134_dev {
         struct list_head           devlist;
@@ -555,6 +567,8 @@ struct saa7134_dev {
         /* SAA7134_MPEG_* */
         struct saa7134_ts          ts;
         struct saa7134_dmaqueue    ts_q;
+        enum saa7134_ts_status     ts_state;
+        unsigned int               buff_cnt;
         struct saa7134_mpeg_ops    *mops;
         struct i2c_client          *mpeg_i2c_client;
 
@@ -644,7 +658,7 @@ extern struct pci_device_id __devinitdata saa7134_pci_tbl[];
 
 extern int saa7134_board_init1(struct saa7134_dev *dev);
 extern int saa7134_board_init2(struct saa7134_dev *dev);
-int saa7134_tuner_callback(void *priv, int command, int arg);
+int saa7134_tuner_callback(void *priv, int component, int command, int arg);
 
 
 /* ----------------------------------------------------------- */
@@ -654,6 +668,8 @@ int saa7134_i2c_register(struct saa7134_dev *dev);
 int saa7134_i2c_unregister(struct saa7134_dev *dev);
 void saa7134_i2c_call_clients(struct saa7134_dev *dev,
                               unsigned int cmd, void *arg);
+int saa7134_i2c_call_saa6752(struct saa7134_dev *dev,
+                              unsigned int cmd, void *arg);
 
 
 /* ----------------------------------------------------------- */
@@ -666,6 +682,7 @@ extern struct video_device saa7134_radio_template;
 int saa7134_s_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, struct v4l2_control *c);
 int saa7134_g_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, struct v4l2_control *c);
 int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c);
+int saa7134_s_std_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, v4l2_std_id *id);
 
 int saa7134_videoport_init(struct saa7134_dev *dev);
 void saa7134_set_tvnorm_hw(struct saa7134_dev *dev);
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index acceed5d04ae..ae3949180c4e 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -288,7 +288,7 @@ static void se401_button_irq(struct urb *urb)
         int status;
 
         if (!se401->dev) {
-                info("ohoh: device vapourished");
+                dev_info(&urb->dev->dev, "device vapourished\n");
                 return;
         }
 
@@ -328,7 +328,7 @@ static void se401_video_irq(struct urb *urb)
                 return;
 
         if (!se401->dev) {
-                info ("ohoh: device vapourished");
+                dev_info(&urb->dev->dev, "device vapourished\n");
                 return;
         }
 
@@ -375,7 +375,7 @@ static void se401_video_irq(struct urb *urb)
         urb->status=0;
         urb->dev=se401->dev;
         if(usb_submit_urb(urb, GFP_KERNEL))
-                info("urb burned down");
+                dev_info(&urb->dev->dev, "urb burned down\n");
         return;
 }
 
@@ -860,7 +860,8 @@ static int se401_newframe(struct usb_se401 *se401, int framenr)
                 );
                 if (se401->nullpackets > SE401_MAX_NULLPACKETS) {
                         se401->nullpackets=0;
-                        info("to many null length packets, restarting capture");
+                        dev_info(&se401->dev->dev,
+                                 "too many null length packets, restarting capture\n");
                         se401_stop_stream(se401);
                         se401_start_stream(se401);
                 } else {
@@ -880,7 +881,8 @@ static int se401_newframe(struct usb_se401 *se401, int framenr)
                                 se401->scratch_use=0;
                         if (errors > SE401_MAX_ERRORS) {
                                 errors=0;
-                                info("to much errors, restarting capture");
+                                dev_info(&se401->dev->dev,
+                                         "too many errors, restarting capture\n");
                                 se401_stop_stream(se401);
                                 se401_start_stream(se401);
                         }
@@ -913,7 +915,7 @@ static void usb_se401_remove_disconnected (struct usb_se401 *se401)
                 usb_kill_urb(se401->inturb);
                 usb_free_urb(se401->inturb);
         }
-        info("%s disconnected", se401->camera_name);
+        dev_info(&se401->dev->dev, "%s disconnected", se401->camera_name);
 
         /* Free the memory */
         kfree(se401->width);
@@ -936,14 +938,18 @@ static int se401_open(struct inode *inode, struct file *file)
         struct usb_se401 *se401 = (struct usb_se401 *)dev;
         int err = 0;
 
-        if (se401->user)
+        lock_kernel();
+        if (se401->user) {
+                unlock_kernel();
                 return -EBUSY;
+        }
         se401->fbuf = rvmalloc(se401->maxframesize * SE401_NUMFRAMES);
         if (se401->fbuf)
                 file->private_data = dev;
         else
                 err = -ENOMEM;
         se401->user = !err;
+        unlock_kernel();
 
         return err;
 }
@@ -956,8 +962,8 @@ static int se401_close(struct inode *inode, struct file *file)
 
         rvfree(se401->fbuf, se401->maxframesize * SE401_NUMFRAMES);
         if (se401->removed) {
+                dev_info(&se401->dev->dev, "device unregistered\n");
                 usb_se401_remove_disconnected(se401);
-                info("device unregistered");
         } else {
                 for (i=0; i<SE401_NUMFRAMES; i++)
                         se401->frame[i].grabstate=FRAME_UNUSED;
@@ -1232,6 +1238,7 @@ static const struct file_operations se401_fops = {
 static struct video_device se401_template = {
         .name =         "se401 USB camera",
         .fops =         &se401_fops,
+        .release = video_device_release_empty,
 };
 
 
@@ -1271,7 +1278,7 @@ static int se401_init(struct usb_se401 *se401, int button)
         for (i=0; i<se401->sizes; i++) {
                 sprintf(temp, "%s %dx%d", temp, se401->width[i], se401->height[i]);
         }
-        info("%s", temp);
+        dev_info(&se401->dev->dev, "%s\n", temp);
         se401->maxframesize=se401->width[se401->sizes-1]*se401->height[se401->sizes-1]*3;
 
         rc=se401_sndctrl(0, se401, SE401_REQ_GET_WIDTH, 0, cp, sizeof(cp));
@@ -1305,7 +1312,8 @@ static int se401_init(struct usb_se401 *se401, int button)
         if (button) {
                 se401->inturb=usb_alloc_urb(0, GFP_KERNEL);
                 if (!se401->inturb) {
-                        info("Allocation of inturb failed");
+                        dev_info(&se401->dev->dev,
+                                 "Allocation of inturb failed\n");
                         return 1;
                 }
                 usb_fill_int_urb(se401->inturb, se401->dev,
@@ -1316,7 +1324,7 @@ static int se401_init(struct usb_se401 *se401, int button)
                     8
                 );
                 if (usb_submit_urb(se401->inturb, GFP_KERNEL)) {
-                        info("int urb burned down");
+                        dev_info(&se401->dev->dev, "int urb burned down\n");
                         return 1;
                 }
         } else
@@ -1373,7 +1381,7 @@ static int se401_probe(struct usb_interface *intf,
                 return -ENODEV;
 
         /* We found one */
-        info("SE401 camera found: %s", camera_name);
+        dev_info(&intf->dev, "SE401 camera found: %s\n", camera_name);
 
         if ((se401 = kzalloc(sizeof(*se401), GFP_KERNEL)) == NULL) {
                 err("couldn't kmalloc se401 struct");
@@ -1384,7 +1392,8 @@ static int se401_probe(struct usb_interface *intf,
         se401->iface = interface->bInterfaceNumber;
         se401->camera_name = camera_name;
 
-        info("firmware version: %02x", le16_to_cpu(dev->descriptor.bcdDevice) & 255);
+        dev_info(&intf->dev, "firmware version: %02x\n",
+                 le16_to_cpu(dev->descriptor.bcdDevice) & 255);
 
         if (se401_init(se401, button)) {
                 kfree(se401);
@@ -1402,7 +1411,8 @@ static int se401_probe(struct usb_interface *intf,
                 err("video_register_device failed");
                 return -EIO;
         }
-        info("registered new video device: video%d", se401->vdev.minor);
+        dev_info(&intf->dev, "registered new video device: video%d\n",
+                 se401->vdev.minor);
 
         usb_set_intfdata (intf, se401);
         return 0;
@@ -1446,10 +1456,10 @@ static struct usb_driver se401_driver = {
 
 static int __init usb_se401_init(void)
 {
-        info("SE401 usb camera driver version %s registering", version);
+        printk(KERN_INFO "SE401 usb camera driver version %s registering\n", version);
         if (flickerless)
                 if (flickerless!=50 && flickerless!=60) {
-                        info("Invallid flickerless value, use 0, 50 or 60.");
+                        printk(KERN_ERR "Invallid flickerless value, use 0, 50 or 60.\n");
                         return -1;
         }
         return usb_register(&se401_driver);
@@ -1458,7 +1468,7 @@ static int __init usb_se401_init(void)
 static void __exit usb_se401_exit(void)
 {
         usb_deregister(&se401_driver);
-        info("SE401 driver deregistered");
+        printk(KERN_INFO "SE401 driver deregistered\frame");
 }
 
 module_init(usb_se401_init);
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index 318754e73132..76838091dc66 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -304,9 +304,6 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
                  "SuperH Mobile CEU driver attached to camera %d\n",
                  icd->devnum);
 
-        if (pcdev->pdata->enable_camera)
-                pcdev->pdata->enable_camera();
-
         ret = icd->ops->init(icd);
         if (ret)
                 goto err;
@@ -333,8 +330,6 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)
         ceu_write(pcdev, CEIER, 0);
         ceu_write(pcdev, CAPSR, 1 << 16); /* reset */
         icd->ops->release(icd);
-        if (pcdev->pdata->disable_camera)
-                pcdev->pdata->disable_camera();
 
         dev_info(&icd->dev,
                  "SuperH Mobile CEU driver detached from camera %d\n",
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 2da6938718f2..20e30bd9364b 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -116,6 +116,26 @@ MODULE_PARM_DESC(debug,
                  "\n");
 #endif
 
+/*
+   Add the probe entries to this table. Be sure to add the entry in the right
+   place, since, on failure, the next probing routine is called according to
+   the order of the list below, from top to bottom.
+*/
+static int (*sn9c102_sensor_table[])(struct sn9c102_device *) = {
+        &sn9c102_probe_hv7131d, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_hv7131r, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_mi0343, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_mi0360, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_mt9v111, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_pas106b, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_pas202bcb, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_ov7630, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_ov7660, /* strong detection based on SENSOR ids */
+        &sn9c102_probe_tas5110c1b, /* detection based on USB pid/vid */
+        &sn9c102_probe_tas5110d, /* detection based on USB pid/vid */
+        &sn9c102_probe_tas5130d1b, /* detection based on USB pid/vid */
+};
+
 /*****************************************************************************/
 
 static u32
@@ -1746,7 +1766,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
         if (!down_read_trylock(&sn9c102_dev_lock))
                 return -ERESTARTSYS;
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         if (wait_for_completion_interruptible(&cam->probe)) {
                 up_read(&sn9c102_dev_lock);
@@ -1843,7 +1863,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)
 
         down_write(&sn9c102_dev_lock);
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         sn9c102_stop_transfer(cam);
         sn9c102_release_buffers(cam);
@@ -1863,7 +1883,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)
 static ssize_t
 sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device *cam = video_drvdata(filp);
         struct sn9c102_frame_t* f, * i;
         unsigned long lock_flags;
         long timeout;
@@ -1987,7 +2007,7 @@ exit:
 
 static unsigned int sn9c102_poll(struct file *filp, poll_table *wait)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device *cam = video_drvdata(filp);
         struct sn9c102_frame_t* f;
         unsigned long lock_flags;
         unsigned int mask = 0;
@@ -2063,7 +2083,7 @@ static struct vm_operations_struct sn9c102_vm_ops = {
 
 static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device *cam = video_drvdata(filp);
         unsigned long size = vma->vm_end - vma->vm_start,
                       start = vma->vm_start;
         void *pos;
@@ -3075,7 +3095,7 @@ sn9c102_vidioc_s_audio(struct sn9c102_device* cam, void __user * arg)
 static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
                               unsigned int cmd, void __user * arg)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device *cam = video_drvdata(filp);
 
         switch (cmd) {
 
@@ -3179,7 +3199,7 @@ static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
 static int sn9c102_ioctl(struct inode* inode, struct file* filp,
                          unsigned int cmd, unsigned long arg)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_device *cam = video_drvdata(filp);
         int err = 0;
 
         if (mutex_lock_interruptible(&cam->fileop_mutex))
diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/video/sn9c102/sn9c102_devtable.h
index 90a401dc3884..e23734f6d6e2 100644
--- a/drivers/media/video/sn9c102/sn9c102_devtable.h
+++ b/drivers/media/video/sn9c102/sn9c102_devtable.h
@@ -140,24 +140,4 @@ extern int sn9c102_probe_tas5110c1b(struct sn9c102_device* cam);
 extern int sn9c102_probe_tas5110d(struct sn9c102_device* cam);
 extern int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam);
 
-/*
-   Add the above entries to this table. Be sure to add the entry in the right
-   place, since, on failure, the next probing routine is called according to
-   the order of the list below, from top to bottom.
-*/
-static int (*sn9c102_sensor_table[])(struct sn9c102_device*) = {
-        &sn9c102_probe_hv7131d, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_hv7131r, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_mi0343, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_mi0360, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_mt9v111, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_pas106b, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_pas202bcb, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_ov7630, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_ov7660, /* strong detection based on SENSOR ids */
-        &sn9c102_probe_tas5110c1b, /* detection based on USB pid/vid */
-        &sn9c102_probe_tas5110d, /* detection based on USB pid/vid */
-        &sn9c102_probe_tas5130d1b, /* detection based on USB pid/vid */
-};
-
 #endif /* _SN9C102_DEVTABLE_H_ */
diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131d.c b/drivers/media/video/sn9c102/sn9c102_hv7131d.c
index eaf9ad0dc8a6..db2434948939 100644
--- a/drivers/media/video/sn9c102/sn9c102_hv7131d.c
+++ b/drivers/media/video/sn9c102/sn9c102_hv7131d.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int hv7131d_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131r.c b/drivers/media/video/sn9c102/sn9c102_hv7131r.c
index 0fc401223cfc..4295887ff609 100644
--- a/drivers/media/video/sn9c102/sn9c102_hv7131r.c
+++ b/drivers/media/video/sn9c102/sn9c102_hv7131r.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int hv7131r_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_mi0343.c b/drivers/media/video/sn9c102/sn9c102_mi0343.c
index 00b134ca0a3d..1f5b09bec89c 100644
--- a/drivers/media/video/sn9c102/sn9c102_mi0343.c
+++ b/drivers/media/video/sn9c102/sn9c102_mi0343.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int mi0343_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_mi0360.c b/drivers/media/video/sn9c102/sn9c102_mi0360.c
index f8d81d82e8d5..d973fc1973d9 100644
--- a/drivers/media/video/sn9c102/sn9c102_mi0360.c
+++ b/drivers/media/video/sn9c102/sn9c102_mi0360.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int mi0360_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_mt9v111.c b/drivers/media/video/sn9c102/sn9c102_mt9v111.c
index 3b98ac3bbc38..95986eb492e4 100644
--- a/drivers/media/video/sn9c102/sn9c102_mt9v111.c
+++ b/drivers/media/video/sn9c102/sn9c102_mt9v111.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int mt9v111_init(struct sn9c102_device *cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_ov7630.c b/drivers/media/video/sn9c102/sn9c102_ov7630.c
index e4856fd77982..803712c29f02 100644
--- a/drivers/media/video/sn9c102/sn9c102_ov7630.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7630.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int ov7630_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_ov7660.c b/drivers/media/video/sn9c102/sn9c102_ov7660.c
index 8aae416ba8ec..7977795d342b 100644
--- a/drivers/media/video/sn9c102/sn9c102_ov7660.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7660.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int ov7660_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_pas106b.c b/drivers/media/video/sn9c102/sn9c102_pas106b.c
index 360f2a848bc0..81cd969c1b7b 100644
--- a/drivers/media/video/sn9c102/sn9c102_pas106b.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas106b.c
@@ -21,6 +21,7 @@
 
 #include <linux/delay.h>
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int pas106b_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
index ca4a1506ed3d..2782f94cf6f8 100644
--- a/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
+++ b/drivers/media/video/sn9c102/sn9c102_pas202bcb.c
@@ -26,6 +26,7 @@
 
 #include <linux/delay.h>
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int pas202bcb_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
index e7d2de2bace1..04cdfdde8564 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5110c1b.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int tas5110c1b_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5110d.c b/drivers/media/video/sn9c102/sn9c102_tas5110d.c
index d32fdbccdc5e..9372e6f9fcff 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5110d.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5110d.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int tas5110d_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
index 56fb1d575a8a..a30bbc4389f5 100644
--- a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
+++ b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "sn9c102_sensor.h"
+#include "sn9c102_devtable.h"
 
 
 static int tas5130d1b_init(struct sn9c102_device* cam)
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index ad36af30e099..db69bc5556d6 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -65,22 +65,6 @@ static struct usb_device_id stkwebcam_table[] = {
 };
 MODULE_DEVICE_TABLE(usb, stkwebcam_table);
 
-static void stk_camera_cleanup(struct kref *kref)
-{
-        struct stk_camera *dev = to_stk_camera(kref);
-
-        STK_INFO("Syntek USB2.0 Camera release resources"
-                " video device /dev/video%d\n", dev->vdev.minor);
-        video_unregister_device(&dev->vdev);
-        dev->vdev.priv = NULL;
-
-        if (dev->sio_bufs != NULL || dev->isobufs != NULL)
-                STK_ERROR("We are leaking memory\n");
-        usb_put_intf(dev->interface);
-        kfree(dev);
-}
-
-
 /*
  * Basic stuff
  */
@@ -689,34 +673,24 @@ static int v4l_stk_open(struct inode *inode, struct file *fp)
         vdev = video_devdata(fp);
         dev = vdev_to_camera(vdev);
 
-        if (dev == NULL || !is_present(dev))
+        lock_kernel();
+        if (dev == NULL || !is_present(dev)) {
+                unlock_kernel();
                 return -ENXIO;
-        fp->private_data = vdev;
-        kref_get(&dev->kref);
+        }
+        fp->private_data = dev;
         usb_autopm_get_interface(dev->interface);
+        unlock_kernel();
 
         return 0;
 }
 
 static int v4l_stk_release(struct inode *inode, struct file *fp)
 {
-        struct stk_camera *dev;
-        struct video_device *vdev;
-
-        vdev = video_devdata(fp);
-        if (vdev == NULL) {
-                STK_ERROR("v4l_release called w/o video devdata\n");
-                return -EFAULT;
-        }
-        dev = vdev_to_camera(vdev);
-        if (dev == NULL) {
-                STK_ERROR("v4l_release called on removed device\n");
-                return -ENODEV;
-        }
+        struct stk_camera *dev = fp->private_data;
 
         if (dev->owner != fp) {
                 usb_autopm_put_interface(dev->interface);
-                kref_put(&dev->kref, stk_camera_cleanup);
                 return 0;
         }
 
@@ -727,7 +701,6 @@ static int v4l_stk_release(struct inode *inode, struct file *fp)
         dev->owner = NULL;
 
         usb_autopm_put_interface(dev->interface);
-        kref_put(&dev->kref, stk_camera_cleanup);
 
         return 0;
 }
@@ -738,14 +711,8 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,
         int i;
         int ret;
         unsigned long flags;
-        struct stk_camera *dev;
-        struct video_device *vdev;
         struct stk_sio_buffer *sbuf;
-
-        vdev = video_devdata(fp);
-        if (vdev == NULL)
-                return -EFAULT;
-        dev = vdev_to_camera(vdev);
+        struct stk_camera *dev = fp->private_data;
 
         if (dev == NULL)
                 return -EIO;
@@ -804,15 +771,8 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,
 
 static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait)
 {
-        struct stk_camera *dev;
-        struct video_device *vdev;
-
-        vdev = video_devdata(fp);
-
-        if (vdev == NULL)
-                return -EFAULT;
+        struct stk_camera *dev = fp->private_data;
 
-        dev = vdev_to_camera(vdev);
         if (dev == NULL)
                 return -ENODEV;
 
@@ -850,16 +810,12 @@ static int v4l_stk_mmap(struct file *fp, struct vm_area_struct *vma)
         unsigned int i;
         int ret;
         unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
-        struct stk_camera *dev;
-        struct video_device *vdev;
+        struct stk_camera *dev = fp->private_data;
         struct stk_sio_buffer *sbuf = NULL;
 
         if (!(vma->vm_flags & VM_WRITE) || !(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vdev = video_devdata(fp);
-        dev = vdev_to_camera(vdev);
-
         for (i = 0; i < dev->n_sbufs; i++) {
                 if (dev->sio_bufs[i].v4lbuf.m.offset == offset) {
                         sbuf = dev->sio_bufs + i;
@@ -1355,6 +1311,12 @@ static const struct v4l2_ioctl_ops v4l_stk_ioctl_ops = {
 
 static void stk_v4l_dev_release(struct video_device *vd)
 {
+        struct stk_camera *dev = vdev_to_camera(vd);
+
+        if (dev->sio_bufs != NULL || dev->isobufs != NULL)
+                STK_ERROR("We are leaking memory\n");
+        usb_put_intf(dev->interface);
+        kfree(dev);
 }
 
 static struct video_device stk_v4l_data = {
@@ -1375,7 +1337,6 @@ static int stk_register_video_device(struct stk_camera *dev)
         dev->vdev = stk_v4l_data;
         dev->vdev.debug = debug;
         dev->vdev.parent = &dev->interface->dev;
-        dev->vdev.priv = dev;
         err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
         if (err)
                 STK_ERROR("v4l registration failed\n");
@@ -1392,7 +1353,7 @@ static int stk_camera_probe(struct usb_interface *interface,
                 const struct usb_device_id *id)
 {
         int i;
-        int err;
+        int err = 0;
 
         struct stk_camera *dev = NULL;
         struct usb_device *udev = interface_to_usbdev(interface);
@@ -1405,7 +1366,6 @@ static int stk_camera_probe(struct usb_interface *interface,
                 return -ENOMEM;
         }
 
-        kref_init(&dev->kref);
         spin_lock_init(&dev->spinlock);
         init_waitqueue_head(&dev->wait_frame);
 
@@ -1438,8 +1398,8 @@ static int stk_camera_probe(struct usb_interface *interface,
         }
         if (!dev->isoc_ep) {
                 STK_ERROR("Could not find isoc-in endpoint");
-                kref_put(&dev->kref, stk_camera_cleanup);
-                return -ENODEV;
+                err = -ENODEV;
+                goto error;
         }
         dev->vsettings.brightness = 0x7fff;
         dev->vsettings.palette = V4L2_PIX_FMT_RGB565;
@@ -1453,14 +1413,17 @@ static int stk_camera_probe(struct usb_interface *interface,
 
         err = stk_register_video_device(dev);
         if (err) {
-                kref_put(&dev->kref, stk_camera_cleanup);
-                return err;
+                goto error;
         }
 
         stk_create_sysfs_files(&dev->vdev);
         usb_autopm_enable(dev->interface);
 
         return 0;
+
+error:
+        kfree(dev);
+        return err;
 }
 
 static void stk_camera_disconnect(struct usb_interface *interface)
@@ -1473,7 +1436,10 @@ static void stk_camera_disconnect(struct usb_interface *interface)
         wake_up_interruptible(&dev->wait_frame);
         stk_remove_sysfs_files(&dev->vdev);
 
-        kref_put(&dev->kref, stk_camera_cleanup);
+        STK_INFO("Syntek USB2.0 Camera release resources"
+                "video device /dev/video%d\n", dev->vdev.minor);
+
+        video_unregister_device(&dev->vdev);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/video/stk-webcam.h
index df4dfefc5327..084a85bdd16e 100644
--- a/drivers/media/video/stk-webcam.h
+++ b/drivers/media/video/stk-webcam.h
@@ -99,7 +99,6 @@ struct stk_camera {
 
         u8 isoc_ep;
 
-        struct kref kref;
         /* Not sure if this is right */
         atomic_t urbs_used;
 
@@ -121,7 +120,6 @@ struct stk_camera {
         unsigned sequence;
 };
 
-#define to_stk_camera(d) container_of(d, struct stk_camera, kref)
 #define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)
 
 void stk_camera_delete(struct kref *);
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 276bded06ab3..bbad54f85c83 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -1882,12 +1882,16 @@ static int saa_open(struct inode *inode, struct file *file)
         struct video_device *vdev = video_devdata(file);
         struct saa7146 *saa = container_of(vdev, struct saa7146, video_dev);
 
+        lock_kernel();
         file->private_data = saa;
 
         saa->user++;
-        if (saa->user > 1)
+        if (saa->user > 1) {
+                unlock_kernel();
                 return 0;       /* device open already, don't reset */
+        }
         saa->writemode = VID_WRITE_MPEG_VID;    /* default to video */
+        unlock_kernel();
         return 0;
 }
 
@@ -1921,6 +1925,7 @@ static struct video_device saa_template = {
         .name = "SAA7146A",
         .fops = &saa_fops,
         .minor = -1,
+        .release = video_device_release_empty,
 };
 
 static int __devinit configure_saa7146(struct pci_dev *pdev, int num)
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index dce947439459..9c549d935994 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -84,7 +84,8 @@ static unsigned int debug;
 #define PDEBUG(level, fmt, args...) \
         do { \
         if (debug >= level)     \
-                info("[%s:%d] " fmt, __func__, __LINE__ , ## args);     \
+                printk(KERN_INFO KBUILD_MODNAME " [%s:%d] \n" fmt,      \
+                        __func__, __LINE__ , ## args);  \
         } while (0)
 
 
@@ -1086,6 +1087,7 @@ static int stv_open (struct inode *inode, struct file *file)
         int err = 0;
 
         /* we are called with the BKL held */
+        lock_kernel();
         stv680->user = 1;
         err = stv_init (stv680);        /* main initialization routine for camera */
 
@@ -1099,6 +1101,7 @@ static int stv_open (struct inode *inode, struct file *file)
         }
         if (err)
                 stv680->user = 0;
+        unlock_kernel();
 
         return err;
 }
@@ -1550,7 +1553,8 @@ static int __init usb_stv680_init (void)
         }
         PDEBUG (0, "STV(i): usb camera driver version %s registering", DRIVER_VERSION);
 
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 }
 
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 2437c1a269c5..1c391f0328fd 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -2,6 +2,7 @@
     tda9840 - i2c-driver for the tda9840 by SGS Thomson
 
     Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
+    Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
 
     The tda9840 is a stereo/dual sound processor with digital
     identification. It can be found at address 0x84 on the i2c-bus.
@@ -28,59 +29,118 @@
 #include <linux/module.h>
 #include <linux/ioctl.h>
 #include <linux/i2c.h>
-
+#include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include "tda9840.h"
 
-static int debug;               /* insmod parameter */
+MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
+MODULE_DESCRIPTION("tda9840 driver");
+MODULE_LICENSE("GPL");
+
+static int debug;
 module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
-#define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
+MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 #define SWITCH          0x00
 #define LEVEL_ADJUST    0x02
 #define STEREO_ADJUST   0x03
 #define TEST            0x04
 
+#define TDA9840_SET_MUTE                0x00
+#define TDA9840_SET_MONO                0x10
+#define TDA9840_SET_STEREO              0x2a
+#define TDA9840_SET_LANG1               0x12
+#define TDA9840_SET_LANG2               0x1e
+#define TDA9840_SET_BOTH                0x1a
+#define TDA9840_SET_BOTH_R              0x16
+#define TDA9840_SET_EXTERNAL            0x7a
+
 /* addresses to scan, found only at 0x42 (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
+static void tda9840_write(struct i2c_client *client, u8 reg, u8 val)
+{
+        if (i2c_smbus_write_byte_data(client, reg, val))
+                v4l_dbg(1, debug, client, "error writing %02x to %02x\n",
+                                val, reg);
+}
 
-static int command(struct i2c_client *client, unsigned int cmd, void *arg)
+static int tda9840_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
-        int result;
         int byte = *(int *)arg;
 
         switch (cmd) {
-        case TDA9840_SWITCH:
-
-                dprintk("TDA9840_SWITCH: 0x%02x\n", byte);
-
-                if (byte != TDA9840_SET_MONO
-                    && byte != TDA9840_SET_MUTE
-                    && byte != TDA9840_SET_STEREO
-                    && byte != TDA9840_SET_LANG1
-                    && byte != TDA9840_SET_LANG2
-                    && byte != TDA9840_SET_BOTH
-                    && byte != TDA9840_SET_BOTH_R
-                    && byte != TDA9840_SET_EXTERNAL) {
+        case VIDIOC_S_TUNER: {
+                struct v4l2_tuner *t = arg;
+                int byte;
+
+                if (t->index)
                         return -EINVAL;
+
+                switch (t->audmode) {
+                case V4L2_TUNER_MODE_STEREO:
+                        byte = TDA9840_SET_STEREO;
+                        break;
+                case V4L2_TUNER_MODE_LANG1_LANG2:
+                        byte = TDA9840_SET_BOTH;
+                        break;
+                case V4L2_TUNER_MODE_LANG1:
+                        byte = TDA9840_SET_LANG1;
+                        break;
+                case V4L2_TUNER_MODE_LANG2:
+                        byte = TDA9840_SET_LANG2;
+                        break;
+                default:
+                        byte = TDA9840_SET_MONO;
+                        break;
+                }
+                v4l_dbg(1, debug, client, "TDA9840_SWITCH: 0x%02x\n", byte);
+                tda9840_write(client, SWITCH, byte);
+                break;
+        }
+
+        case VIDIOC_G_TUNER: {
+                struct v4l2_tuner *t = arg;
+                u8 byte;
+
+                t->rxsubchans = V4L2_TUNER_SUB_MONO;
+                if (1 != i2c_master_recv(client, &byte, 1)) {
+                        v4l_dbg(1, debug, client,
+                                "i2c_master_recv() failed\n");
+                        return -EIO;
                 }
 
-                result = i2c_smbus_write_byte_data(client, SWITCH, byte);
-                if (result)
-                        dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
+                if (byte & 0x80) {
+                        v4l_dbg(1, debug, client,
+                                "TDA9840_DETECT: register contents invalid\n");
+                        return -EINVAL;
+                }
+
+                v4l_dbg(1, debug, client, "TDA9840_DETECT: byte: 0x%02x\n", byte);
+
+                switch (byte & 0x60) {
+                case 0x00:
+                        t->rxsubchans = V4L2_TUNER_SUB_MONO;
+                        break;
+                case 0x20:
+                        t->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
+                        break;
+                case 0x40:
+                        t->rxsubchans = V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;
+                        break;
+                default: /* Incorrect detect */
+                        t->rxsubchans = V4L2_TUNER_MODE_MONO;
+                        break;
+                }
                 break;
+        }
 
         case TDA9840_LEVEL_ADJUST:
-
-                dprintk("TDA9840_LEVEL_ADJUST: %d\n", byte);
+                v4l_dbg(1, debug, client, "TDA9840_LEVEL_ADJUST: %d\n", byte);
 
                 /* check for correct range */
                 if (byte > 25 || byte < -20)
@@ -92,15 +152,11 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
                         byte += 0x8;
                 else
                         byte = -byte;
-
-                result = i2c_smbus_write_byte_data(client, LEVEL_ADJUST, byte);
-                if (result)
-                        dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
+                tda9840_write(client, LEVEL_ADJUST, byte);
                 break;
 
         case TDA9840_STEREO_ADJUST:
-
-                dprintk("TDA9840_STEREO_ADJUST: %d\n", byte);
+                v4l_dbg(1, debug, client, "TDA9840_STEREO_ADJUST: %d\n", byte);
 
                 /* check for correct range */
                 if (byte > 25 || byte < -24)
@@ -113,143 +169,59 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
                 else
                         byte = -byte;
 
-                result = i2c_smbus_write_byte_data(client, STEREO_ADJUST, byte);
-                if (result)
-                        dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
-                break;
-
-        case TDA9840_DETECT: {
-                int *ret = (int *)arg;
-
-                byte = i2c_smbus_read_byte_data(client, STEREO_ADJUST);
-                if (byte == -1) {
-                        dprintk("i2c_smbus_read_byte_data() failed\n");
-                        return -EIO;
-                }
-
-                if (0 != (byte & 0x80)) {
-                        dprintk("TDA9840_DETECT: register contents invalid\n");
-                        return -EINVAL;
-                }
-
-                dprintk("TDA9840_DETECT: byte: 0x%02x\n", byte);
-                *ret = ((byte & 0x60) >> 5);
-                result = 0;
-                break;
-        }
-        case TDA9840_TEST:
-                dprintk("TDA9840_TEST: 0x%02x\n", byte);
-
-                /* mask out irrelevant bits */
-                byte &= 0x3;
-
-                result = i2c_smbus_write_byte_data(client, TEST, byte);
-                if (result)
-                        dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
+                tda9840_write(client, STEREO_ADJUST, byte);
                 break;
         default:
                 return -ENOIOCTLCMD;
         }
 
-        if (result)
-                return -EIO;
-
         return 0;
 }
 
-static int detect(struct i2c_adapter *adapter, int address, int kind)
+static int tda9840_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
 {
-        struct i2c_client *client;
-        int result = 0;
-
-        int byte = 0x0;
+        int result;
+        int byte;
 
         /* let's see whether this adapter can support what we need */
-        if (0 == i2c_check_functionality(adapter,
-                                    I2C_FUNC_SMBUS_READ_BYTE_DATA |
-                                    I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) {
+        if (!i2c_check_functionality(client->adapter,
+                        I2C_FUNC_SMBUS_READ_BYTE_DATA |
+                        I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
                 return 0;
-        }
-
-        /* allocate memory for client structure */
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (!client) {
-                printk("not enough kernel memory\n");
-                return -ENOMEM;
-        }
-
-        /* fill client structure */
-        memcpy(client, &client_template, sizeof(struct i2c_client));
-        client->addr = address;
-        client->adapter = adapter;
 
-        /* tell the i2c layer a new client has arrived */
-        if (0 != (result = i2c_attach_client(client))) {
-                kfree(client);
-                return result;
-        }
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
 
         /* set initial values for level & stereo - adjustment, mode */
         byte = 0;
-        result  = command(client, TDA9840_LEVEL_ADJUST, &byte);
-        result += command(client, TDA9840_STEREO_ADJUST, &byte);
-        byte = TDA9840_SET_MONO;
-        result = command(client, TDA9840_SWITCH, &byte);
+        result = tda9840_command(client, TDA9840_LEVEL_ADJUST, &byte);
+        result += tda9840_command(client, TDA9840_STEREO_ADJUST, &byte);
+        tda9840_write(client, SWITCH, TDA9840_SET_STEREO);
         if (result) {
-                dprintk("could not initialize tda9840\n");
+                v4l_dbg(1, debug, client, "could not initialize tda9840\n");
                 return -ENODEV;
         }
-
-        printk("tda9840: detected @ 0x%02x on adapter %s\n", address, &client->adapter->name[0]);
         return 0;
 }
 
-static int attach(struct i2c_adapter *adapter)
-{
-        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_HW_SAA7146) {
-                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
-                return -ENODEV;
-        }
-
-        return i2c_probe(adapter, &addr_data, &detect);
-}
-
-static int detach(struct i2c_client *client)
+static int tda9840_legacy_probe(struct i2c_adapter *adapter)
 {
-        int ret = i2c_detach_client(client);
-        kfree(client);
-        return ret;
+        /* Let's see whether this is a known adapter we can attach to.
+           Prevents conflicts with tvaudio.c. */
+        return adapter->id == I2C_HW_SAA7146;
 }
-
-static struct i2c_driver driver = {
-        .driver = {
-                .name = "tda9840",
-        },
-        .id     = I2C_DRIVERID_TDA9840,
-        .attach_adapter = attach,
-        .detach_client  = detach,
-        .command        = command,
+static const struct i2c_device_id tda9840_id[] = {
+        { "tda9840", 0 },
+        { }
 };
+MODULE_DEVICE_TABLE(i2c, tda9840_id);
 
-static struct i2c_client client_template = {
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tda9840",
-        .driver = &driver,
+        .driverid = I2C_DRIVERID_TDA9840,
+        .command = tda9840_command,
+        .probe = tda9840_probe,
+        .legacy_probe = tda9840_legacy_probe,
+        .id_table = tda9840_id,
 };
-
-static int __init this_module_init(void)
-{
-        return i2c_add_driver(&driver);
-}
-
-static void __exit this_module_exit(void)
-{
-        i2c_del_driver(&driver);
-}
-
-module_init(this_module_init);
-module_exit(this_module_exit);
-
-MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
-MODULE_DESCRIPTION("tda9840 driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/tda9840.h b/drivers/media/video/tda9840.h
index 7da8432cdca7..dc12ae7caf6f 100644
--- a/drivers/media/video/tda9840.h
+++ b/drivers/media/video/tda9840.h
@@ -3,24 +3,6 @@
 
 #define I2C_ADDR_TDA9840                0x42
 
-#define TDA9840_DETECT          _IOR('v',1,int)
-/* return values for TDA9840_DETCT */
-#define TDA9840_MONO_DETECT             0x0
-#define TDA9840_DUAL_DETECT             0x1
-#define TDA9840_STEREO_DETECT           0x2
-#define TDA9840_INCORRECT_DETECT        0x3
-
-#define TDA9840_SWITCH          _IOW('v',2,int)
-/* modes than can be set with TDA9840_SWITCH */
-#define TDA9840_SET_MUTE                0x00
-#define TDA9840_SET_MONO                0x10
-#define TDA9840_SET_STEREO              0x2a
-#define TDA9840_SET_LANG1               0x12
-#define TDA9840_SET_LANG2               0x1e
-#define TDA9840_SET_BOTH                0x1a
-#define TDA9840_SET_BOTH_R              0x16
-#define TDA9840_SET_EXTERNAL            0x7a
-
 /* values may range between +2.5 and -2.0;
    the value has to be multiplied with 10 */
 #define TDA9840_LEVEL_ADJUST    _IOW('v',3,int)
@@ -29,7 +11,4 @@
    the value has to be multiplied with 10 */
 #define TDA9840_STEREO_ADJUST   _IOW('v',4,int)
 
-/* currently not implemented */
-#define TDA9840_TEST            _IOW('v',5,int)
-
 #endif
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 421c1445e96c..cde092adbb5a 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -2,6 +2,7 @@
     tea6415c - i2c-driver for the tea6415c by SGS Thomson
 
     Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
+    Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
 
     The tea6415c is a bus controlled video-matrix-switch
     with 8 inputs and 6 outputs.
@@ -30,18 +31,18 @@
 #include <linux/module.h>
 #include <linux/ioctl.h>
 #include <linux/i2c.h>
-
+#include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include "tea6415c.h"
 
-static int debug;               /* insmod parameter */
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
+MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
+MODULE_DESCRIPTION("tea6415c driver");
+MODULE_LICENSE("GPL");
 
-#define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
+static int debug;
+module_param(debug, int, 0644);
 
-#define TEA6415C_NUM_INPUTS     8
-#define TEA6415C_NUM_OUTPUTS    6
+MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* addresses to scan, found only at 0x03 and/or 0x43 (7-bit) */
 static unsigned short normal_i2c[] = { I2C_TEA6415C_1, I2C_TEA6415C_2, I2C_CLIENT_END };
@@ -49,60 +50,6 @@ static unsigned short normal_i2c[] = { I2C_TEA6415C_1, I2C_TEA6415C_2, I2C_CLIEN
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
-
-/* this function is called by i2c_probe */
-static int detect(struct i2c_adapter *adapter, int address, int kind)
-{
-        struct i2c_client *client = NULL;
-        int err = 0;
-
-        /* let's see whether this adapter can support what we need */
-        if (0 == i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE)) {
-                return 0;
-        }
-
-        /* allocate memory for client structure */
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (!client) {
-                return -ENOMEM;
-        }
-
-        /* fill client structure */
-        memcpy(client, &client_template, sizeof(struct i2c_client));
-        client->addr = address;
-        client->adapter = adapter;
-
-        /* tell the i2c layer a new client has arrived */
-        if (0 != (err = i2c_attach_client(client))) {
-                kfree(client);
-                return err;
-        }
-
-        printk("tea6415c: detected @ 0x%02x on adapter %s\n", address, &client->adapter->name[0]);
-
-        return 0;
-}
-
-static int attach(struct i2c_adapter *adapter)
-{
-        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_HW_SAA7146) {
-                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
-                return -ENODEV;
-        }
-
-        return i2c_probe(adapter, &addr_data, &detect);
-}
-
-static int detach(struct i2c_client *client)
-{
-        int ret = i2c_detach_client(client);
-        kfree(client);
-        return ret;
-}
-
 /* makes a connection between the input-pin 'i' and the output-pin 'o'
    for the tea6415c-client 'client' */
 static int switch_matrix(struct i2c_client *client, int i, int o)
@@ -110,7 +57,7 @@ static int switch_matrix(struct i2c_client *client, int i, int o)
         u8 byte = 0;
         int ret;
 
-        dprintk("adr:0x%02x, i:%d, o:%d\n", client->addr, i, o);
+        v4l_dbg(1, debug, client, "i=%d, o=%d\n", i, o);
 
         /* check if the pins are valid */
         if (0 == ((1 == i ||  3 == i ||  5 == i ||  6 == i ||  8 == i || 10 == i || 20 == i || 11 == i)
@@ -168,14 +115,14 @@ static int switch_matrix(struct i2c_client *client, int i, int o)
 
         ret = i2c_smbus_write_byte(client, byte);
         if (ret) {
-                dprintk("i2c_smbus_write_byte() failed, ret:%d\n", ret);
+                v4l_dbg(1, debug, client,
+                        "i2c_smbus_write_byte() failed, ret:%d\n", ret);
                 return -EIO;
         }
-
         return ret;
 }
 
-static int command(struct i2c_client *client, unsigned int cmd, void *arg)
+static int tea6415c_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
         struct tea6415c_multiplex *v = (struct tea6415c_multiplex *)arg;
         int result = 0;
@@ -187,38 +134,40 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
         default:
                 return -ENOIOCTLCMD;
         }
-
         return result;
 }
 
-static struct i2c_driver driver = {
-        .driver = {
-                .name = "tea6415c",
-        },
-        .id     = I2C_DRIVERID_TEA6415C,
-        .attach_adapter = attach,
-        .detach_client  = detach,
-        .command        = command,
-};
-
-static struct i2c_client client_template = {
-        .name = "tea6415c",
-        .driver = &driver,
-};
-
-static int __init this_module_init(void)
+/* this function is called by i2c_probe */
+static int tea6415c_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
 {
-        return i2c_add_driver(&driver);
+        /* let's see whether this adapter can support what we need */
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WRITE_BYTE))
+                return 0;
+
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
+        return 0;
 }
 
-static void __exit this_module_exit(void)
+static int tea6415c_legacy_probe(struct i2c_adapter *adapter)
 {
-        i2c_del_driver(&driver);
+        /* Let's see whether this is a known adapter we can attach to.
+           Prevents conflicts with tvaudio.c. */
+        return adapter->id == I2C_HW_SAA7146;
 }
 
-module_init(this_module_init);
-module_exit(this_module_exit);
+static const struct i2c_device_id tea6415c_id[] = {
+        { "tea6415c", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, tea6415c_id);
 
-MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
-MODULE_DESCRIPTION("tea6415c driver");
-MODULE_LICENSE("GPL");
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+        .name = "tea6415c",
+        .driverid = I2C_DRIVERID_TEA6415C,
+        .command = tea6415c_command,
+        .probe = tea6415c_probe,
+        .legacy_probe = tea6415c_legacy_probe,
+        .id_table = tea6415c_id,
+};
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index b5c8957d130e..e50820969e64 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -2,6 +2,7 @@
     tea6420 - i2c-driver for the tea6420 by SGS Thomson
 
     Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
+    Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
 
     The tea6420 is a bus controlled audio-matrix with 5 stereo inputs,
     4 stereo outputs and gain control for each output.
@@ -30,15 +31,18 @@
 #include <linux/module.h>
 #include <linux/ioctl.h>
 #include <linux/i2c.h>
-
+#include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include "tea6420.h"
 
-static int debug;               /* insmod parameter */
+MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
+MODULE_DESCRIPTION("tea6420 driver");
+MODULE_LICENSE("GPL");
+
+static int debug;
 module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
-#define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __func__, __LINE__); printk(args); } } while (0)
+MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I2C_CLIENT_END };
@@ -46,23 +50,20 @@ static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
-
 /* make a connection between the input 'i' and the output 'o'
    with gain 'g' for the tea6420-client 'client' (note: i = 6 means 'mute') */
 static int tea6420_switch(struct i2c_client *client, int i, int o, int g)
 {
-        u8 byte = 0;
+        u8 byte;
         int ret;
 
-        dprintk("adr:0x%02x, i:%d, o:%d, g:%d\n", client->addr, i, o, g);
+        v4l_dbg(1, debug, client, "i=%d, o=%d, g=%d\n", i, o, g);
 
         /* check if the parameters are valid */
         if (i < 1 || i > 6 || o < 1 || o > 4 || g < 0 || g > 6 || g % 2 != 0)
                 return -1;
 
-        byte  = ((o - 1) << 5);
+        byte = ((o - 1) << 5);
         byte |= (i - 1);
 
         /* to understand this, have a look at the tea6420-specs (p.5) */
@@ -82,40 +83,41 @@ static int tea6420_switch(struct i2c_client *client, int i, int o, int g)
 
         ret = i2c_smbus_write_byte(client, byte);
         if (ret) {
-                dprintk("i2c_smbus_write_byte() failed, ret:%d\n", ret);
+                v4l_dbg(1, debug, client,
+                        "i2c_smbus_write_byte() failed, ret:%d\n", ret);
                 return -EIO;
         }
-
         return 0;
 }
 
-/* this function is called by i2c_probe */
-static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
+static int tea6420_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
-        struct i2c_client *client;
-        int err = 0, i = 0;
+        struct tea6420_multiplex *a = (struct tea6420_multiplex *)arg;
+        int result = 0;
 
-        /* let's see whether this adapter can support what we need */
-        if (0 == i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE)) {
-                return 0;
+        switch (cmd) {
+        case TEA6420_SWITCH:
+                result = tea6420_switch(client, a->in, a->out, a->gain);
+                break;
+        default:
+                return -ENOIOCTLCMD;
         }
 
-        /* allocate memory for client structure */
-        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (!client) {
-                return -ENOMEM;
-        }
+        return result;
+}
 
-        /* fill client structure */
-        memcpy(client, &client_template, sizeof(struct i2c_client));
-        client->addr = address;
-        client->adapter = adapter;
+/* this function is called by i2c_probe */
+static int tea6420_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
+{
+        int err, i;
 
-        /* tell the i2c layer a new client has arrived */
-        if (0 != (err = i2c_attach_client(client))) {
-                kfree(client);
-                return err;
-        }
+        /* let's see whether this adapter can support what we need */
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WRITE_BYTE))
+                return -EIO;
+
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
 
         /* set initial values: set "mute"-input to all outputs at gain 0 */
         err = 0;
@@ -123,78 +125,31 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
                 err += tea6420_switch(client, 6, i, 0);
         }
         if (err) {
-                dprintk("could not initialize tea6420\n");
+                v4l_dbg(1, debug, client, "could not initialize tea6420\n");
                 kfree(client);
                 return -ENODEV;
         }
-
-        printk("tea6420: detected @ 0x%02x on adapter %s\n", address, &client->adapter->name[0]);
-
         return 0;
 }
 
-static int attach(struct i2c_adapter *adapter)
+static int tea6420_legacy_probe(struct i2c_adapter *adapter)
 {
-        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_HW_SAA7146) {
-                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
-                return -ENODEV;
-        }
-
-        return i2c_probe(adapter, &addr_data, &tea6420_detect);
-}
-
-static int detach(struct i2c_client *client)
-{
-        int ret = i2c_detach_client(client);
-        kfree(client);
-        return ret;
-}
-
-static int command(struct i2c_client *client, unsigned int cmd, void *arg)
-{
-        struct tea6420_multiplex *a = (struct tea6420_multiplex *)arg;
-        int result = 0;
-
-        switch (cmd) {
-        case TEA6420_SWITCH:
-                result = tea6420_switch(client, a->in, a->out, a->gain);
-                break;
-        default:
-                return -ENOIOCTLCMD;
-        }
-
-        return result;
+        /* Let's see whether this is a known adapter we can attach to.
+           Prevents conflicts with tvaudio.c. */
+        return adapter->id == I2C_HW_SAA7146;
 }
 
-static struct i2c_driver driver = {
-        .driver = {
-                .name = "tea6420",
-        },
-        .id     = I2C_DRIVERID_TEA6420,
-        .attach_adapter = attach,
-        .detach_client  = detach,
-        .command        = command,
+static const struct i2c_device_id tea6420_id[] = {
+        { "tea6420", 0 },
+        { }
 };
+MODULE_DEVICE_TABLE(i2c, tea6420_id);
 
-static struct i2c_client client_template = {
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tea6420",
-        .driver = &driver,
+        .driverid = I2C_DRIVERID_TEA6420,
+        .command = tea6420_command,
+        .probe = tea6420_probe,
+        .legacy_probe = tea6420_legacy_probe,
+        .id_table = tea6420_id,
 };
-
-static int __init this_module_init(void)
-{
-        return i2c_add_driver(&driver);
-}
-
-static void __exit this_module_exit(void)
-{
-        i2c_del_driver(&driver);
-}
-
-module_init(this_module_init);
-module_exit(this_module_exit);
-
-MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
-MODULE_DESCRIPTION("tea6420 driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
deleted file mode 100644
index bdf506e6ae27..000000000000
--- a/drivers/media/video/tuner-3036.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Driver for Philips SAB3036 "CITAC" tuner control chip.
- *
- * Author: Phil Blundell <philb@gnu.org>
- *
- * The SAB3036 is just about different enough from the chips that
- * tuner.c copes with to make it not worth the effort to crowbar
- * the support into that file.  So instead we have a separate driver.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-
-#include <linux/i2c.h>
-#include <linux/videodev.h>
-#include <media/v4l2-common.h>
-
-#include <media/tuner.h>
-
-static int debug;       /* insmod parameter */
-static int this_adap;
-
-static struct i2c_client client_template;
-
-/* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x60, 0x61, I2C_CLIENT_END };
-static unsigned short ignore = I2C_CLIENT_END;
-
-static struct i2c_client_address_data addr_data = {
-        .normal_i2c     = normal_i2c,
-        .probe          = &ignore,
-        .ignore         = &ignore,
-};
-
-/* ---------------------------------------------------------------------- */
-
-static unsigned char
-tuner_getstatus (struct i2c_client *c)
-{
-        unsigned char byte;
-        if (i2c_master_recv(c, &byte, 1) != 1)
-                printk(KERN_ERR "tuner-3036: I/O error.\n");
-        return byte;
-}
-
-#define TUNER_FL        0x80
-
-static int
-tuner_islocked (struct i2c_client *c)
-{
-        return (tuner_getstatus(c) & TUNER_FL);
-}
-
-/* ---------------------------------------------------------------------- */
-
-static void
-set_tv_freq(struct i2c_client *c, int freq)
-{
-        u16 div = ((freq * 20) / 16);
-        unsigned long give_up = jiffies + HZ;
-        unsigned char buffer[2];
-
-        if (debug)
-                printk(KERN_DEBUG "tuner: setting frequency %dMHz, divisor %x\n", freq / 16, div);
-
-        /* Select high tuning current */
-        buffer[0] = 0x29;
-        buffer[1] = 0x3e;
-
-        if (i2c_master_send(c, buffer, 2) != 2)
-                printk("tuner: i2c i/o error 1\n");
-
-        buffer[0] = 0x80 | ((div>>8) & 0x7f);
-        buffer[1] = div & 0xff;
-
-        if (i2c_master_send(c, buffer, 2) != 2)
-                printk("tuner: i2c i/o error 2\n");
-
-        while (!tuner_islocked(c) && time_before(jiffies, give_up))
-                schedule();
-
-        if (!tuner_islocked(c))
-                printk(KERN_WARNING "tuner: failed to achieve PLL lock\n");
-
-        /* Select low tuning current and engage AFC */
-        buffer[0] = 0x29;
-        buffer[1] = 0xb2;
-
-        if (i2c_master_send(c, buffer, 2) != 2)
-                printk("tuner: i2c i/o error 3\n");
-
-        if (debug)
-                printk(KERN_DEBUG "tuner: status %02x\n", tuner_getstatus(c));
-}
-
-/* ---------------------------------------------------------------------- */
-
-static int
-tuner_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-        static unsigned char buffer[] = { 0x29, 0x32, 0x2a, 0, 0x2b, 0 };
-
-        struct i2c_client *client;
-
-        if (this_adap > 0)
-                return -1;
-        this_adap++;
-
-        client_template.adapter = adap;
-        client_template.addr = addr;
-
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &client_template, sizeof(struct i2c_client));
-
-        printk("tuner: SAB3036 found, status %02x\n", tuner_getstatus(client));
-
-        i2c_attach_client(client);
-
-        if (i2c_master_send(client, buffer, 2) != 2)
-                printk("tuner: i2c i/o error 1\n");
-        if (i2c_master_send(client, buffer+2, 2) != 2)
-                printk("tuner: i2c i/o error 2\n");
-        if (i2c_master_send(client, buffer+4, 2) != 2)
-                printk("tuner: i2c i/o error 3\n");
-        return 0;
-}
-
-static int
-tuner_detach(struct i2c_client *c)
-{
-        return 0;
-}
-
-static int
-tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
-{
-        int *iarg = (int*)arg;
-
-        switch (cmd)
-        {
-                case VIDIOCSFREQ:
-                        set_tv_freq(client, *iarg);
-                        break;
-
-                default:
-                        return -EINVAL;
-        }
-        return 0;
-}
-
-static int
-tuner_probe(struct i2c_adapter *adap)
-{
-        this_adap = 0;
-        if (adap->id == I2C_HW_B_LP)
-                return i2c_probe(adap, &addr_data, tuner_attach);
-        return 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
-static struct i2c_driver
-i2c_driver_tuner =
-{
-        .driver = {
-                .name   =       "sab3036",
-        },
-        .id             =       I2C_DRIVERID_SAB3036,
-        .attach_adapter =       tuner_probe,
-        .detach_client  =       tuner_detach,
-        .command        =       tuner_command
-};
-
-static struct i2c_client client_template =
-{
-        .driver         = &i2c_driver_tuner,
-        .name           = "SAB3036",
-};
-
-static int __init
-tuner3036_init(void)
-{
-        return i2c_add_driver(&i2c_driver_tuner);
-}
-
-static void __exit
-tuner3036_exit(void)
-{
-        i2c_del_driver(&i2c_driver_tuner);
-}
-
-MODULE_DESCRIPTION("SAB3036 tuner driver");
-MODULE_AUTHOR("Philip Blundell <philb@gnu.org>");
-MODULE_LICENSE("GPL");
-
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug,"Enable debugging output");
-
-module_init(tuner3036_init);
-module_exit(tuner3036_exit);
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index d806a3556eed..4a7735c6c1a6 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -92,7 +92,6 @@ struct tuner {
 
         unsigned int        type; /* chip type id */
         unsigned int        config;
-        int (*tuner_callback) (void *dev, int command, int arg);
         const char          *name;
 };
 
@@ -346,7 +345,7 @@ static struct xc5000_config xc5000_cfg;
 
 static void set_type(struct i2c_client *c, unsigned int type,
                      unsigned int new_mode_mask, unsigned int new_config,
-                     int (*tuner_callback) (void *dev, int command,int arg))
+                     int (*tuner_callback) (void *dev, int component, int cmd, int arg))
 {
         struct tuner *t = i2c_get_clientdata(c);
         struct dvb_tuner_ops *fe_tuner_ops = &t->fe.ops.tuner_ops;
@@ -362,7 +361,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
         t->config = new_config;
         if (tuner_callback != NULL) {
                 tuner_dbg("defining GPIO callback\n");
-                t->tuner_callback = tuner_callback;
+                t->fe.callback = tuner_callback;
         }
 
         if (t->mode == T_UNINITIALIZED) {
@@ -385,7 +384,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
         {
                 struct tda829x_config cfg = {
                         .lna_cfg        = t->config,
-                        .tuner_callback = t->tuner_callback,
                 };
                 if (!dvb_attach(tda829x_attach, &t->fe, t->i2c->adapter,
                                 t->i2c->addr, &cfg))
@@ -433,7 +431,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 struct xc2028_config cfg = {
                         .i2c_adap  = t->i2c->adapter,
                         .i2c_addr  = t->i2c->addr,
-                        .callback  = t->tuner_callback,
                 };
                 if (!dvb_attach(xc2028_attach, &t->fe, &cfg))
                         goto attach_failed;
@@ -450,10 +447,8 @@ static void set_type(struct i2c_client *c, unsigned int type,
 
                 xc5000_cfg.i2c_address    = t->i2c->addr;
                 xc5000_cfg.if_khz         = 5380;
-                xc5000_cfg.tuner_callback = t->tuner_callback;
                 if (!dvb_attach(xc5000_attach,
-                                &t->fe, t->i2c->adapter, &xc5000_cfg,
-                                c->adapter->algo_data))
+                                &t->fe, t->i2c->adapter, &xc5000_cfg))
                         goto attach_failed;
 
                 xc_tuner_ops = &t->fe.ops.tuner_ops;
@@ -1225,7 +1220,7 @@ register_client:
         } else {
                 t->mode = V4L2_TUNER_DIGITAL_TV;
         }
-        set_type(client, t->type, t->mode_mask, t->config, t->tuner_callback);
+        set_type(client, t->type, t->mode_mask, t->config, t->fe.callback);
         list_add_tail(&t->list, &tuner_list);
         return 0;
 }
diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index cc27efe121dd..28421d386f1e 100644
--- a/drivers/media/video/usbvideo/ibmcam.c
+++ b/drivers/media/video/usbvideo/ibmcam.c
@@ -258,7 +258,9 @@ static enum ParseState ibmcam_find_header(struct uvd *uvd) /* FIXME: Add frame h
                             (RING_QUEUE_PEEK(&uvd->dp, 2) == 0x00))
                         {
 #if 0                           /* This code helps to detect new frame markers */
-                                info("Header sig: 00 FF 00 %02X", RING_QUEUE_PEEK(&uvd->dp, 3));
+                                dev_info(&uvd->dev->dev,
+                                         "Header sig: 00 FF 00 %02X\n",
+                                         RING_QUEUE_PEEK(&uvd->dp, 3));
 #endif
                                 frame->header = RING_QUEUE_PEEK(&uvd->dp, 3);
                                 if ((frame->header == HDRSIG_MODEL1_128x96) ||
@@ -266,7 +268,8 @@ static enum ParseState ibmcam_find_header(struct uvd *uvd) /* FIXME: Add frame h
                                     (frame->header == HDRSIG_MODEL1_352x288))
                                 {
 #if 0
-                                        info("Header found.");
+                                        dev_info(&uvd->dev->dev,
+                                                 "Header found.\n");
 #endif
                                         RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len);
                                         icam->has_hdr = 1;
@@ -295,7 +298,7 @@ case IBMCAM_MODEL_4:
                             (RING_QUEUE_PEEK(&uvd->dp, 1) == 0xFF))
                         {
 #if 0
-                                info("Header found.");
+                                dev_info(&uvd->dev->dev, "Header found.\n");
 #endif
                                 RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len);
                                 icam->has_hdr = 1;
@@ -338,7 +341,7 @@ case IBMCAM_MODEL_4:
                                 byte4 = RING_QUEUE_PEEK(&uvd->dp, 3);
                                 frame->header = (byte3 << 8) | byte4;
 #if 0
-                                info("Header found.");
+                                dev_info(&uvd->dev->dev, "Header found.\n");
 #endif
                                 RING_QUEUE_DEQUEUE_BYTES(&uvd->dp, marker_len);
                                 icam->has_hdr = 1;
@@ -354,7 +357,8 @@ case IBMCAM_MODEL_4:
         }
         if (!icam->has_hdr) {
                 if (uvd->debug > 2)
-                        info("Skipping frame, no header");
+                        dev_info(&uvd->dev->dev,
+                                 "Skipping frame, no header\n");
                 return scan_EndParse;
         }
 
@@ -881,7 +885,9 @@ static enum ParseState ibmcam_model3_parse_lines(
          */
         if ((frame->curline + 1) >= data_h) {
                 if (uvd->debug >= 3)
-                        info("Reached line %d. (frame is done)", frame->curline);
+                        dev_info(&uvd->dev->dev,
+                                 "Reached line %d. (frame is done)\n",
+                                 frame->curline);
                 return scan_NextFrame;
         }
 
@@ -954,8 +960,9 @@ static enum ParseState ibmcam_model3_parse_lines(
 
         if (frame->curline >= VIDEOSIZE_Y(frame->request)) {
                 if (uvd->debug >= 3) {
-                        info("All requested lines (%ld.) done.",
-                             VIDEOSIZE_Y(frame->request));
+                        dev_info(&uvd->dev->dev,
+                                 "All requested lines (%ld.) done.\n",
+                                 VIDEOSIZE_Y(frame->request));
                 }
                 return scan_NextFrame;
         } else
@@ -1000,7 +1007,9 @@ static enum ParseState ibmcam_model4_128x96_parse_lines(
          */
         if ((frame->curline + 1) >= data_h) {
                 if (uvd->debug >= 3)
-                        info("Reached line %d. (frame is done)", frame->curline);
+                        dev_info(&uvd->dev->dev,
+                                 "Reached line %d. (frame is done)\n",
+                                 frame->curline);
                 return scan_NextFrame;
         }
 
@@ -1049,8 +1058,9 @@ static enum ParseState ibmcam_model4_128x96_parse_lines(
 
         if (frame->curline >= VIDEOSIZE_Y(frame->request)) {
                 if (uvd->debug >= 3) {
-                        info("All requested lines (%ld.) done.",
-                             VIDEOSIZE_Y(frame->request));
+                        dev_info(&uvd->dev->dev,
+                                 "All requested lines (%ld.) done.\n",
+                                 VIDEOSIZE_Y(frame->request));
                 }
                 return scan_NextFrame;
         } else
@@ -1171,10 +1181,11 @@ static int ibmcam_veio(
                         sizeof(cp),
                         1000);
 #if 0
-                info("USB => %02x%02x%02x%02x%02x%02x%02x%02x "
-                       "(req=$%02x val=$%04x ind=$%04x)",
-                       cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],
-                       req, value, index);
+                dev_info(&uvd->dev->dev,
+                         "USB => %02x%02x%02x%02x%02x%02x%02x%02x "
+                         "(req=$%02x val=$%04x ind=$%04x)\n",
+                         cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],
+                         req, value, index);
 #endif
         } else {
                 i = usb_control_msg(
@@ -1449,10 +1460,9 @@ static void ibmcam_adjust_contrast(struct uvd *uvd)
  */
 static void ibmcam_change_lighting_conditions(struct uvd *uvd)
 {
-        static const char proc[] = "ibmcam_change_lighting_conditions";
-
         if (debug > 0)
-                info("%s: Set lighting to %hu.", proc, lighting);
+                dev_info(&uvd->dev->dev,
+                         "%s: Set lighting to %hu.\n", __func__, lighting);
 
         switch (IBMCAM_T(uvd)->camera_model) {
         case IBMCAM_MODEL_1:
@@ -1495,8 +1505,6 @@ static void ibmcam_change_lighting_conditions(struct uvd *uvd)
  */
 static void ibmcam_set_sharpness(struct uvd *uvd)
 {
-        static const char proc[] = "ibmcam_set_sharpness";
-
         switch (IBMCAM_T(uvd)->camera_model) {
         case IBMCAM_MODEL_1:
         {
@@ -1505,7 +1513,8 @@ static void ibmcam_set_sharpness(struct uvd *uvd)
 
                 RESTRICT_TO_RANGE(sharpness, SHARPNESS_MIN, SHARPNESS_MAX);
                 if (debug > 0)
-                        info("%s: Set sharpness to %hu.", proc, sharpness);
+                        dev_info(&uvd->dev->dev, "%s: Set sharpness to %hu.\n",
+                                 __func__, sharpness);
 
                 sv = sa[sharpness - SHARPNESS_MIN];
                 for (i=0; i < 2; i++) {
@@ -1564,11 +1573,11 @@ static void ibmcam_set_sharpness(struct uvd *uvd)
  */
 static void ibmcam_set_brightness(struct uvd *uvd)
 {
-        static const char proc[] = "ibmcam_set_brightness";
         static const unsigned short n = 1;
 
         if (debug > 0)
-                info("%s: Set brightness to %hu.", proc, uvd->vpic.brightness);
+                dev_info(&uvd->dev->dev, "%s: Set brightness to %hu.\n",
+                         __func__, uvd->vpic.brightness);
 
         switch (IBMCAM_T(uvd)->camera_model) {
         case IBMCAM_MODEL_1:
@@ -2115,7 +2124,8 @@ static void ibmcam_model2_setup_after_video_if(struct uvd *uvd)
                         break;
                 }
                 if (uvd->debug > 0)
-                        info("Framerate (hardware): %hd.", hw_fps);
+                        dev_info(&uvd->dev->dev, "Framerate (hardware): %hd.\n",
+                                 hw_fps);
                 RESTRICT_TO_RANGE(hw_fps, 0, 31);
                 ibmcam_model2_Packet1(uvd, mod2_set_framerate, hw_fps);
         }
@@ -3487,7 +3497,7 @@ static void ibmcam_model3_setup_after_video_if(struct uvd *uvd)
         /* 01.01.08 - Added for RCA video in support -LO */
         if(init_model3_input) {
                 if (debug > 0)
-                        info("Setting input to RCA.");
+                        dev_info(&uvd->dev->dev, "Setting input to RCA.\n");
                 for (i=0; i < ARRAY_SIZE(initData); i++) {
                         ibmcam_veio(uvd, initData[i].req, initData[i].value, initData[i].index);
                 }
@@ -3685,7 +3695,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
         unsigned char video_ep = 0;
 
         if (debug >= 1)
-                info("ibmcam_probe(%p,%u.)", intf, ifnum);
+                dev_info(&uvd->dev->dev, "ibmcam_probe(%p,%u.)\n", intf, ifnum);
 
         /* We don't handle multi-config cameras */
         if (dev->descriptor.bNumConfigurations != 1)
@@ -3736,14 +3746,16 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                         brand = "IBM PC Camera"; /* a.k.a. Xirlink C-It */
                         break;
                 }
-                info("%s USB camera found (model %d, rev. 0x%04x)",
-                     brand, model, le16_to_cpu(dev->descriptor.bcdDevice));
+                dev_info(&uvd->dev->dev,
+                         "%s USB camera found (model %d, rev. 0x%04x)\n",
+                         brand, model, le16_to_cpu(dev->descriptor.bcdDevice));
         } while (0);
 
         /* Validate found interface: must have one ISO endpoint */
         nas = intf->num_altsetting;
         if (debug > 0)
-                info("Number of alternate settings=%d.", nas);
+                dev_info(&uvd->dev->dev, "Number of alternate settings=%d.\n",
+                         nas);
         if (nas < 2) {
                 err("Too few alternate settings for this camera!");
                 return -ENODEV;
@@ -3787,7 +3799,9 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                                 actInterface = i;
                                 maxPS = le16_to_cpu(endpoint->wMaxPacketSize);
                                 if (debug > 0)
-                                        info("Active setting=%d. maxPS=%d.", i, maxPS);
+                                        dev_info(&uvd->dev->dev,
+                                                 "Active setting=%d. "
+                                                 "maxPS=%d.\n", i, maxPS);
                         } else
                                 err("More than one active alt. setting! Ignoring #%d.", i);
                 }
@@ -3826,7 +3840,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                         RESTRICT_TO_RANGE(framerate, 0, 5);
                         break;
                 default:
-                        info("IBM camera: using 320x240");
+                        dev_info(&uvd->dev->dev, "IBM camera: using 320x240\n");
                         size = SIZE_320x240;
                         /* No break here */
                 case SIZE_320x240:
@@ -3855,7 +3869,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                         canvasY = 120;
                         break;
                 default:
-                        info("IBM NetCamera: using 176x144");
+                        dev_info(&uvd->dev->dev, "IBM NetCamera: using 176x144\n");
                         size = SIZE_176x144;
                         /* No break here */
                 case SIZE_176x144:
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index 1c180284ec6c..e986c28b7bb0 100644
--- a/drivers/media/video/usbvideo/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -337,7 +337,8 @@ static int konicawc_compress_iso(struct uvd *uvd, struct urb *dataurb, struct ur
                 }
 
                 if((sts > 0x01) && (sts < 0x80)) {
-                        info("unknown status %2.2x", sts);
+                        dev_info(&uvd->dev->dev, "unknown status %2.2x\n",
+                                 sts);
                         bad++;
                         continue;
                 }
@@ -568,8 +569,12 @@ static void konicawc_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)
                                         fdrops = (0x80 + curframe - cam->lastframe) & 0x7F;
                                         fdrops--;
                                         if(fdrops) {
-                                                info("Dropped %d frames (%d -> %d)", fdrops,
-                                                     cam->lastframe, curframe);
+                                                dev_info(&uvd->dev->dev,
+                                                         "Dropped %d frames "
+                                                         "(%d -> %d)\n",
+                                                         fdrops,
+                                                         cam->lastframe,
+                                                         curframe);
                                         }
                                 }
                                 cam->lastframe = curframe;
@@ -784,7 +789,8 @@ static int konicawc_probe(struct usb_interface *intf, const struct usb_device_id
         if (dev->descriptor.bNumConfigurations != 1)
                 return -ENODEV;
 
-        info("Konica Webcam (rev. 0x%04x)", le16_to_cpu(dev->descriptor.bcdDevice));
+        dev_info(&intf->dev, "Konica Webcam (rev. 0x%04x)\n",
+                 le16_to_cpu(dev->descriptor.bcdDevice));
         RESTRICT_TO_RANGE(speed, 0, MAX_SPEED);
 
         /* Validate found interface: must have one ISO endpoint */
@@ -925,7 +931,8 @@ static struct usb_device_id id_table[] = {
 static int __init konicawc_init(void)
 {
         struct usbvideo_cb cbTbl;
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         memset(&cbTbl, 0, sizeof(cbTbl));
         cbTbl.probe = konicawc_probe;
         cbTbl.setupOnOpen = konicawc_setup_on_open;
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index 3d26a30abe1e..05c61b523115 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -1080,7 +1080,8 @@ static struct usbvideo_cb qcm_driver = {
 
 static int __init qcm_init(void)
 {
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         return usbvideo_register(
                 &cams,
diff --git a/drivers/media/video/usbvideo/ultracam.c b/drivers/media/video/usbvideo/ultracam.c
index 9544e644bf0d..9714baab7833 100644
--- a/drivers/media/video/usbvideo/ultracam.c
+++ b/drivers/media/video/usbvideo/ultracam.c
@@ -156,10 +156,11 @@ static int ultracam_veio(
                         sizeof(cp),
                         1000);
 #if 1
-                info("USB => %02x%02x%02x%02x%02x%02x%02x%02x "
-                       "(req=$%02x val=$%04x ind=$%04x)",
-                       cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],
-                       req, value, index);
+                dev_info(&uvd->dev->dev,
+                         "USB => %02x%02x%02x%02x%02x%02x%02x%02x "
+                         "(req=$%02x val=$%04x ind=$%04x)\n",
+                         cp[0],cp[1],cp[2],cp[3],cp[4],cp[5],cp[6],cp[7],
+                         req, value, index);
 #endif
         } else {
                 i = usb_control_msg(
@@ -517,19 +518,20 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id
         unsigned char video_ep = 0;
 
         if (debug >= 1)
-                info("ultracam_probe(%p)", intf);
+                dev_info(&intf->dev, "ultracam_probe\n");
 
         /* We don't handle multi-config cameras */
         if (dev->descriptor.bNumConfigurations != 1)
                 return -ENODEV;
 
-        info("IBM Ultra camera found (rev. 0x%04x)",
-                le16_to_cpu(dev->descriptor.bcdDevice));
+        dev_info(&intf->dev, "IBM Ultra camera found (rev. 0x%04x)\n",
+                 le16_to_cpu(dev->descriptor.bcdDevice));
 
         /* Validate found interface: must have one ISO endpoint */
         nas = intf->num_altsetting;
         if (debug > 0)
-                info("Number of alternate settings=%d.", nas);
+                dev_info(&intf->dev, "Number of alternate settings=%d.\n",
+                         nas);
         if (nas < 8) {
                 err("Too few alternate settings for this camera!");
                 return -ENODEV;
@@ -576,7 +578,9 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id
                                 actInterface = i;
                                 maxPS = le16_to_cpu(endpoint->wMaxPacketSize);
                                 if (debug > 0)
-                                        info("Active setting=%d. maxPS=%d.", i, maxPS);
+                                        dev_info(&intf->dev,
+                                                 "Active setting=%d. "
+                                                 "maxPS=%d.\n", i, maxPS);
                         } else {
                                 /* Got another active alt. setting */
                                 if (maxPS < le16_to_cpu(endpoint->wMaxPacketSize)) {
@@ -584,8 +588,11 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id
                                         actInterface = i;
                                         maxPS = le16_to_cpu(endpoint->wMaxPacketSize);
                                         if (debug > 0) {
-                                                info("Even better ctive setting=%d. maxPS=%d.",
-                                                     i, maxPS);
+                                                dev_info(&intf->dev,
+                                                         "Even better ctive "
+                                                         "setting=%d. "
+                                                         "maxPS=%d.\n",
+                                                         i, maxPS);
                                         }
                                 }
                         }
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index bf1bc2f69b02..07cd87d16f69 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -468,8 +468,9 @@ static void usbvideo_ReportStatistics(const struct uvd *uvd)
                         percent = (100 * goodPackets) / allPackets;
                 else
                         percent = goodPackets / (allPackets / 100);
-                info("Packet Statistics: Total=%lu. Empty=%lu. Usage=%lu%%",
-                     allPackets, badPackets, percent);
+                dev_info(&uvd->dev->dev,
+                         "Packet Statistics: Total=%lu. Empty=%lu. Usage=%lu%%\n",
+                         allPackets, badPackets, percent);
                 if (uvd->iso_packet_len > 0) {
                         unsigned long allBytes, xferBytes;
                         char multiplier = ' ';
@@ -497,8 +498,9 @@ static void usbvideo_ReportStatistics(const struct uvd *uvd)
                                         }
                                 }
                         }
-                        info("Transfer Statistics: Transferred=%lu%cB Usage=%lu%%",
-                             xferBytes, multiplier, percent);
+                        dev_info(&uvd->dev->dev,
+                                 "Transfer Statistics: Transferred=%lu%cB Usage=%lu%%\n",
+                                 xferBytes, multiplier, percent);
                 }
         }
 }
@@ -545,7 +547,7 @@ void usbvideo_TestPattern(struct uvd *uvd, int fullframe, int pmode)
         {       /* For debugging purposes only */
                 char tmp[20];
                 usbvideo_VideosizeToString(tmp, sizeof(tmp), frame->request);
-                info("testpattern: frame=%s", tmp);
+                dev_info(&uvd->dev->dev, "testpattern: frame=%s\n", tmp);
         }
 #endif
         /* Form every scan line */
@@ -854,7 +856,7 @@ static void usbvideo_Disconnect(struct usb_interface *intf)
 
         usbvideo_ClientIncModCount(uvd);
         if (uvd->debug > 0)
-                info("%s(%p.)", __func__, intf);
+                dev_info(&intf->dev, "%s(%p.)\n", __func__, intf);
 
         mutex_lock(&uvd->lock);
         uvd->remove_pending = 1; /* Now all ISO data will be ignored */
@@ -870,14 +872,15 @@ static void usbvideo_Disconnect(struct usb_interface *intf)
 
         video_unregister_device(&uvd->vdev);
         if (uvd->debug > 0)
-                info("%s: Video unregistered.", __func__);
+                dev_info(&intf->dev, "%s: Video unregistered.\n", __func__);
 
         if (uvd->user)
-                info("%s: In use, disconnect pending.", __func__);
+                dev_info(&intf->dev, "%s: In use, disconnect pending.\n",
+                         __func__);
         else
                 usbvideo_CameraRelease(uvd);
         mutex_unlock(&uvd->lock);
-        info("USB camera disconnected.");
+        dev_info(&intf->dev, "USB camera disconnected.\n");
 
         usbvideo_ClientDecModCount(uvd);
 }
@@ -1015,14 +1018,17 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
                 return -EINVAL;
         }
         if (uvd->video_endp == 0) {
-                info("%s: No video endpoint specified; data pump disabled.", __func__);
+                dev_info(&uvd->dev->dev,
+                         "%s: No video endpoint specified; data pump disabled.\n",
+                         __func__);
         }
         if (uvd->paletteBits == 0) {
                 err("%s: No palettes specified!", __func__);
                 return -EINVAL;
         }
         if (uvd->defaultPalette == 0) {
-                info("%s: No default palette!", __func__);
+                dev_info(&uvd->dev->dev, "%s: No default palette!\n",
+                         __func__);
         }
 
         uvd->max_frame_size = VIDEOSIZE_X(uvd->canvas) *
@@ -1031,25 +1037,29 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
         usbvideo_VideosizeToString(tmp2, sizeof(tmp2), uvd->canvas);
 
         if (uvd->debug > 0) {
-                info("%s: iface=%d. endpoint=$%02x paletteBits=$%08lx",
-                     __func__, uvd->iface, uvd->video_endp, uvd->paletteBits);
+                dev_info(&uvd->dev->dev,
+                         "%s: iface=%d. endpoint=$%02x paletteBits=$%08lx\n",
+                         __func__, uvd->iface, uvd->video_endp,
+                         uvd->paletteBits);
         }
         if (uvd->dev == NULL) {
                 err("%s: uvd->dev == NULL", __func__);
                 return -EINVAL;
         }
         uvd->vdev.parent = &uvd->dev->dev;
-        if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
+        uvd->vdev.release = video_device_release_empty;
+        if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
                 err("%s: video_register_device failed", __func__);
                 return -EPIPE;
         }
         if (uvd->debug > 1) {
-                info("%s: video_register_device() successful", __func__);
+                dev_info(&uvd->dev->dev,
+                         "%s: video_register_device() successful\n", __func__);
         }
 
-        info("%s on /dev/video%d: canvas=%s videosize=%s",
-             (uvd->handle != NULL) ? uvd->handle->drvName : "???",
-             uvd->vdev.minor, tmp2, tmp1);
+        dev_info(&uvd->dev->dev, "%s on /dev/video%d: canvas=%s videosize=%s\n",
+                 (uvd->handle != NULL) ? uvd->handle->drvName : "???",
+                 uvd->vdev.minor, tmp2, tmp1);
 
         usb_get_dev(uvd->dev);
         return 0;
@@ -1111,7 +1121,7 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)
         int i, errCode = 0;
 
         if (uvd->debug > 1)
-                info("%s($%p)", __func__, dev);
+                dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, dev);
 
         if (0 < usbvideo_ClientIncModCount(uvd))
                 return -ENODEV;
@@ -1178,19 +1188,25 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)
                 if (errCode == 0) {
                         if (VALID_CALLBACK(uvd, setupOnOpen)) {
                                 if (uvd->debug > 1)
-                                        info("%s: setupOnOpen callback", __func__);
+                                        dev_info(&uvd->dev->dev,
+                                                 "%s: setupOnOpen callback\n",
+                                                 __func__);
                                 errCode = GET_CALLBACK(uvd, setupOnOpen)(uvd);
                                 if (errCode < 0) {
                                         err("%s: setupOnOpen callback failed (%d.).",
                                             __func__, errCode);
                                 } else if (uvd->debug > 1) {
-                                        info("%s: setupOnOpen callback successful", __func__);
+                                        dev_info(&uvd->dev->dev,
+                                                 "%s: setupOnOpen callback successful\n",
+                                                 __func__);
                                 }
                         }
                         if (errCode == 0) {
                                 uvd->settingsAdjusted = 0;
                                 if (uvd->debug > 1)
-                                        info("%s: Open succeeded.", __func__);
+                                        dev_info(&uvd->dev->dev,
+                                                 "%s: Open succeeded.\n",
+                                                 __func__);
                                 uvd->user++;
                                 file->private_data = uvd;
                         }
@@ -1200,7 +1216,8 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)
         if (errCode != 0)
                 usbvideo_ClientDecModCount(uvd);
         if (uvd->debug > 0)
-                info("%s: Returning %d.", __func__, errCode);
+                dev_info(&uvd->dev->dev, "%s: Returning %d.\n", __func__,
+                         errCode);
         return errCode;
 }
 
@@ -1223,7 +1240,7 @@ static int usbvideo_v4l_close(struct inode *inode, struct file *file)
         int i;
 
         if (uvd->debug > 1)
-                info("%s($%p)", __func__, dev);
+                dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, dev);
 
         mutex_lock(&uvd->lock);
         GET_CALLBACK(uvd, stopDataPump)(uvd);
@@ -1243,14 +1260,15 @@ static int usbvideo_v4l_close(struct inode *inode, struct file *file)
         uvd->user--;
         if (uvd->remove_pending) {
                 if (uvd->debug > 0)
-                        info("usbvideo_v4l_close: Final disconnect.");
+                        dev_info(&uvd->dev->dev, "%s: Final disconnect.\n",
+                                 __func__);
                 usbvideo_CameraRelease(uvd);
         }
         mutex_unlock(&uvd->lock);
         usbvideo_ClientDecModCount(uvd);
 
         if (uvd->debug > 1)
-                info("%s: Completed.", __func__);
+                dev_info(&uvd->dev->dev, "%s: Completed.\n", __func__);
         file->private_data = NULL;
         return 0;
 }
@@ -1364,8 +1382,9 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
                         struct video_mmap *vm = arg;
 
                         if (uvd->debug >= 1) {
-                                info("VIDIOCMCAPTURE: frame=%d. size=%dx%d, format=%d.",
-                                     vm->frame, vm->width, vm->height, vm->format);
+                                dev_info(&uvd->dev->dev,
+                                         "VIDIOCMCAPTURE: frame=%d. size=%dx%d, format=%d.\n",
+                                         vm->frame, vm->width, vm->height, vm->format);
                         }
                         /*
                          * Check if the requested size is supported. If the requestor
@@ -1383,18 +1402,24 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
                         if ((vm->width > VIDEOSIZE_X(uvd->canvas)) ||
                             (vm->height > VIDEOSIZE_Y(uvd->canvas))) {
                                 if (uvd->debug > 0) {
-                                        info("VIDIOCMCAPTURE: Size=%dx%d too large; "
-                                             "allowed only up to %ldx%ld", vm->width, vm->height,
-                                             VIDEOSIZE_X(uvd->canvas), VIDEOSIZE_Y(uvd->canvas));
+                                        dev_info(&uvd->dev->dev,
+                                                 "VIDIOCMCAPTURE: Size=%dx%d "
+                                                 "too large; allowed only up "
+                                                 "to %ldx%ld\n", vm->width,
+                                                 vm->height,
+                                                 VIDEOSIZE_X(uvd->canvas),
+                                                 VIDEOSIZE_Y(uvd->canvas));
                                 }
                                 return -EINVAL;
                         }
                         /* Check if the palette is supported */
                         if (((1L << vm->format) & uvd->paletteBits) == 0) {
                                 if (uvd->debug > 0) {
-                                        info("VIDIOCMCAPTURE: format=%d. not supported"
-                                             " (paletteBits=$%08lx)",
-                                             vm->format, uvd->paletteBits);
+                                        dev_info(&uvd->dev->dev,
+                                                 "VIDIOCMCAPTURE: format=%d. "
+                                                 "not supported "
+                                                 "(paletteBits=$%08lx)\n",
+                                                 vm->format, uvd->paletteBits);
                                 }
                                 return -EINVAL;
                         }
@@ -1422,7 +1447,9 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
                                 return -EINVAL;
 
                         if (uvd->debug >= 1)
-                                info("VIDIOCSYNC: syncing to frame %d.", *frameNum);
+                                dev_info(&uvd->dev->dev,
+                                         "VIDIOCSYNC: syncing to frame %d.\n",
+                                         *frameNum);
                         if (uvd->flags & FLAGS_NO_DECODING)
                                 ret = usbvideo_GetFrame(uvd, *frameNum);
                         else if (VALID_CALLBACK(uvd, getFrame)) {
@@ -1504,7 +1531,9 @@ static ssize_t usbvideo_v4l_read(struct file *file, char __user *buf,
                 return -EFAULT;
 
         if (uvd->debug >= 1)
-                info("%s: %Zd. bytes, noblock=%d.", __func__, count, noblock);
+                dev_info(&uvd->dev->dev,
+                         "%s: %Zd. bytes, noblock=%d.\n",
+                         __func__, count, noblock);
 
         mutex_lock(&uvd->lock);
 
@@ -1685,18 +1714,21 @@ static void usbvideo_IsocIrq(struct urb *urb)
                 return;
 #if 0
         if (urb->actual_length > 0) {
-                info("urb=$%p status=%d. errcount=%d. length=%d.",
-                     urb, urb->status, urb->error_count, urb->actual_length);
+                dev_info(&uvd->dev->dev,
+                         "urb=$%p status=%d. errcount=%d. length=%d.\n",
+                         urb, urb->status, urb->error_count,
+                         urb->actual_length);
         } else {
                 static int c = 0;
                 if (c++ % 100 == 0)
-                        info("No Isoc data");
+                        dev_info(&uvd->dev->dev, "No Isoc data\n");
         }
 #endif
 
         if (!uvd->streaming) {
                 if (uvd->debug >= 1)
-                        info("Not streaming, but interrupt!");
+                        dev_info(&uvd->dev->dev,
+                                 "Not streaming, but interrupt!\n");
                 return;
         }
 
@@ -1741,7 +1773,7 @@ static int usbvideo_StartDataPump(struct uvd *uvd)
         int i, errFlag;
 
         if (uvd->debug > 1)
-                info("%s($%p)", __func__, uvd);
+                dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, uvd);
 
         if (!CAMERA_IS_OPERATIONAL(uvd)) {
                 err("%s: Camera is not operational", __func__);
@@ -1789,7 +1821,9 @@ static int usbvideo_StartDataPump(struct uvd *uvd)
 
         uvd->streaming = 1;
         if (uvd->debug > 1)
-                info("%s: streaming=1 video_endp=$%02x", __func__, uvd->video_endp);
+                dev_info(&uvd->dev->dev,
+                         "%s: streaming=1 video_endp=$%02x\n", __func__,
+                         uvd->video_endp);
         return 0;
 }
 
@@ -1811,14 +1845,14 @@ static void usbvideo_StopDataPump(struct uvd *uvd)
                 return;
 
         if (uvd->debug > 1)
-                info("%s($%p)", __func__, uvd);
+                dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, uvd);
 
         /* Unschedule all of the iso td's */
         for (i=0; i < USBVIDEO_NUMSBUF; i++) {
                 usb_kill_urb(uvd->sbuf[i].urb);
         }
         if (uvd->debug > 1)
-                info("%s: streaming=0", __func__);
+                dev_info(&uvd->dev->dev, "%s: streaming=0\n", __func__);
         uvd->streaming = 0;
 
         if (!uvd->remove_pending) {
@@ -1850,7 +1884,8 @@ static int usbvideo_NewFrame(struct uvd *uvd, int framenum)
         int n;
 
         if (uvd->debug > 1)
-                info("usbvideo_NewFrame($%p,%d.)", uvd, framenum);
+                dev_info(&uvd->dev->dev, "usbvideo_NewFrame($%p,%d.)\n", uvd,
+                         framenum);
 
         /* If we're not grabbing a frame right now and the other frame is */
         /*  ready to be grabbed into, then use it instead */
@@ -1955,12 +1990,14 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
         struct usbvideo_frame *frame = &uvd->frame[frameNum];
 
         if (uvd->debug >= 2)
-                info("%s($%p,%d.)", __func__, uvd, frameNum);
+                dev_info(&uvd->dev->dev, "%s($%p,%d.)\n", __func__, uvd,
+                         frameNum);
 
         switch (frame->frameState) {
         case FrameState_Unused:
                 if (uvd->debug >= 2)
-                        info("%s: FrameState_Unused", __func__);
+                        dev_info(&uvd->dev->dev, "%s: FrameState_Unused\n",
+                                 __func__);
                 return -EINVAL;
         case FrameState_Ready:
         case FrameState_Grabbing:
@@ -1970,7 +2007,9 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
         redo:
                 if (!CAMERA_IS_OPERATIONAL(uvd)) {
                         if (uvd->debug >= 2)
-                                info("%s: Camera is not operational (1)", __func__);
+                                dev_info(&uvd->dev->dev,
+                                         "%s: Camera is not operational (1)\n",
+                                         __func__);
                         return -EIO;
                 }
                 ntries = 0;
@@ -1979,24 +2018,33 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                         signalPending = signal_pending(current);
                         if (!CAMERA_IS_OPERATIONAL(uvd)) {
                                 if (uvd->debug >= 2)
-                                        info("%s: Camera is not operational (2)", __func__);
+                                        dev_info(&uvd->dev->dev,
+                                                 "%s: Camera is not "
+                                                 "operational (2)\n", __func__);
                                 return -EIO;
                         }
                         assert(uvd->fbuf != NULL);
                         if (signalPending) {
                                 if (uvd->debug >= 2)
-                                        info("%s: Signal=$%08x", __func__, signalPending);
+                                        dev_info(&uvd->dev->dev,
+                                        "%s: Signal=$%08x\n", __func__,
+                                        signalPending);
                                 if (uvd->flags & FLAGS_RETRY_VIDIOCSYNC) {
                                         usbvideo_TestPattern(uvd, 1, 0);
                                         uvd->curframe = -1;
                                         uvd->stats.frame_num++;
                                         if (uvd->debug >= 2)
-                                                info("%s: Forced test pattern screen", __func__);
+                                                dev_info(&uvd->dev->dev,
+                                                         "%s: Forced test "
+                                                         "pattern screen\n",
+                                                         __func__);
                                         return 0;
                                 } else {
                                         /* Standard answer: Interrupted! */
                                         if (uvd->debug >= 2)
-                                                info("%s: Interrupted!", __func__);
+                                                dev_info(&uvd->dev->dev,
+                                                         "%s: Interrupted!\n",
+                                                         __func__);
                                         return -EINTR;
                                 }
                         } else {
@@ -2010,8 +2058,10 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                         }
                 } while (frame->frameState == FrameState_Grabbing);
                 if (uvd->debug >= 2) {
-                        info("%s: Grabbing done; state=%d. (%lu. bytes)",
-                             __func__, frame->frameState, frame->seqRead_Length);
+                        dev_info(&uvd->dev->dev,
+                                 "%s: Grabbing done; state=%d. (%lu. bytes)\n",
+                                 __func__, frame->frameState,
+                                 frame->seqRead_Length);
                 }
                 if (frame->frameState == FrameState_Error) {
                         int ret = usbvideo_NewFrame(uvd, frameNum);
@@ -2048,7 +2098,9 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                 }
                 frame->frameState = FrameState_Done_Hold;
                 if (uvd->debug >= 2)
-                        info("%s: Entered FrameState_Done_Hold state.", __func__);
+                        dev_info(&uvd->dev->dev,
+                                 "%s: Entered FrameState_Done_Hold state.\n",
+                                 __func__);
                 return 0;
 
         case FrameState_Done_Hold:
@@ -2059,7 +2111,9 @@ static int usbvideo_GetFrame(struct uvd *uvd, int frameNum)
                  * it will be released back into the wild to roam freely.
                  */
                 if (uvd->debug >= 2)
-                        info("%s: FrameState_Done_Hold state.", __func__);
+                        dev_info(&uvd->dev->dev,
+                                 "%s: FrameState_Done_Hold state.\n",
+                                 __func__);
                 return 0;
         }
 
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 2eb45829791c..7a127d6bfdee 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -472,9 +472,8 @@ vicam_ioctl(struct inode *inode, struct file *file, unsigned int ioctlnr, unsign
 static int
 vicam_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vicam_camera *cam =
-            (struct vicam_camera *) dev->priv;
+        struct vicam_camera *cam = video_drvdata(file);
+
         DBG("open\n");
 
         if (!cam) {
@@ -488,20 +487,24 @@ vicam_open(struct inode *inode, struct file *file)
          * rely on this fact forever.
          */
 
+        lock_kernel();
         if (cam->open_count > 0) {
                 printk(KERN_INFO
                        "vicam_open called on already opened camera");
+                unlock_kernel();
                 return -EBUSY;
         }
 
         cam->raw_image = kmalloc(VICAM_MAX_READ_SIZE, GFP_KERNEL);
         if (!cam->raw_image) {
+                unlock_kernel();
                 return -ENOMEM;
         }
 
         cam->framebuf = rvmalloc(VICAM_MAX_FRAME_SIZE * VICAM_FRAMES);
         if (!cam->framebuf) {
                 kfree(cam->raw_image);
+                unlock_kernel();
                 return -ENOMEM;
         }
 
@@ -509,6 +512,7 @@ vicam_open(struct inode *inode, struct file *file)
         if (!cam->cntrlbuf) {
                 kfree(cam->raw_image);
                 rvfree(cam->framebuf, VICAM_MAX_FRAME_SIZE * VICAM_FRAMES);
+                unlock_kernel();
                 return -ENOMEM;
         }
 
@@ -526,6 +530,7 @@ vicam_open(struct inode *inode, struct file *file)
         cam->open_count++;
 
         file->private_data = cam;
+        unlock_kernel();
 
         return 0;
 }
@@ -795,6 +800,7 @@ static struct video_device vicam_template = {
         .name           = "ViCam-based USB Camera",
         .fops           = &vicam_fops,
         .minor          = -1,
+        .release        = video_device_release_empty,
 };
 
 /* table of devices that work with this driver */
@@ -859,9 +865,8 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
 
         mutex_init(&cam->cam_lock);
 
-        memcpy(&cam->vdev, &vicam_template,
-               sizeof (vicam_template));
-        cam->vdev.priv = cam;   // sort of a reverse mapping for those functions that get vdev only
+        memcpy(&cam->vdev, &vicam_template, sizeof(vicam_template));
+        video_set_drvdata(&cam->vdev, cam);
 
         cam->udev = dev;
         cam->bulkEndpoint = bulkEndpoint;
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index c317ed7a8482..b26b563a0b0a 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -84,7 +84,8 @@ MODULE_PARM_DESC(adjust_Y_Offset, "adjust Y offset display [core]");
 #ifdef USBVISION_DEBUG
         #define PDEBUG(level, fmt, args...) { \
                 if (core_debug & (level)) \
-                        info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
+                        printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \
+                                __func__, __LINE__ , ## args); \
         }
 #else
         #define PDEBUG(level, fmt, args...) do {} while(0)
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index a6d00858b07e..92427fdc1459 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -47,7 +47,8 @@ MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
 #define PDEBUG(level, fmt, args...) { \
                 if (i2c_debug & (level)) \
-                        info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
+                        printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \
+                                __func__, __LINE__ , ## args); \
         }
 
 static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf,
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index b977116a0dd9..e10b256aeba4 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -98,7 +98,8 @@ USBVISION_DRIVER_VERSION_PATCHLEVEL)
 #ifdef USBVISION_DEBUG
         #define PDEBUG(level, fmt, args...) { \
                 if (video_debug & (level)) \
-                        info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
+                        printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \
+                                __func__, __LINE__ , ## args); \
         }
 #else
         #define PDEBUG(level, fmt, args...) do {} while(0)
@@ -360,13 +361,12 @@ static void usbvision_remove_sysfs(struct video_device *vdev)
  */
 static int usbvision_v4l2_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int errCode = 0;
 
         PDEBUG(DBG_IO, "open");
 
+        lock_kernel();
         usbvision_reset_powerOffTimer(usbvision);
 
         if (usbvision->user)
@@ -424,6 +424,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
         usbvision_empty_framequeues(usbvision);
 
         PDEBUG(DBG_IO, "success");
+        unlock_kernel();
         return errCode;
 }
 
@@ -437,9 +438,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
  */
 static int usbvision_v4l2_close(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         PDEBUG(DBG_IO, "close");
         mutex_lock(&usbvision->lock);
@@ -484,9 +483,7 @@ static int usbvision_v4l2_close(struct inode *inode, struct file *file)
 static int vidioc_g_register (struct file *file, void *priv,
                                 struct v4l2_register *reg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int errCode;
 
         if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
@@ -505,9 +502,7 @@ static int vidioc_g_register (struct file *file, void *priv,
 static int vidioc_s_register (struct file *file, void *priv,
                                 struct v4l2_register *reg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int errCode;
 
         if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
@@ -526,9 +521,7 @@ static int vidioc_s_register (struct file *file, void *priv,
 static int vidioc_querycap (struct file *file, void  *priv,
                                         struct v4l2_capability *vc)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         strlcpy(vc->driver, "USBVision", sizeof(vc->driver));
         strlcpy(vc->card,
@@ -548,9 +541,7 @@ static int vidioc_querycap (struct file *file, void  *priv,
 static int vidioc_enum_input (struct file *file, void *priv,
                                 struct v4l2_input *vi)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int chan;
 
         if ((vi->index >= usbvision->video_inputs) || (vi->index < 0) )
@@ -603,9 +594,7 @@ static int vidioc_enum_input (struct file *file, void *priv,
 
 static int vidioc_g_input (struct file *file, void *priv, unsigned int *input)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         *input = usbvision->ctl_input;
         return 0;
@@ -613,9 +602,7 @@ static int vidioc_g_input (struct file *file, void *priv, unsigned int *input)
 
 static int vidioc_s_input (struct file *file, void *priv, unsigned int input)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         if ((input >= usbvision->video_inputs) || (input < 0) )
                 return -EINVAL;
@@ -632,9 +619,8 @@ static int vidioc_s_input (struct file *file, void *priv, unsigned int input)
 
 static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
+
         usbvision->tvnormId=*id;
 
         mutex_lock(&usbvision->lock);
@@ -650,9 +636,7 @@ static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *id)
 static int vidioc_g_tuner (struct file *file, void *priv,
                                 struct v4l2_tuner *vt)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         if (!usbvision->have_tuner || vt->index)        // Only tuner 0
                 return -EINVAL;
@@ -671,9 +655,7 @@ static int vidioc_g_tuner (struct file *file, void *priv,
 static int vidioc_s_tuner (struct file *file, void *priv,
                                 struct v4l2_tuner *vt)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         // Only no or one tuner for now
         if (!usbvision->have_tuner || vt->index)
@@ -687,9 +669,7 @@ static int vidioc_s_tuner (struct file *file, void *priv,
 static int vidioc_g_frequency (struct file *file, void *priv,
                                 struct v4l2_frequency *freq)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         freq->tuner = 0; // Only one tuner
         if(usbvision->radio) {
@@ -705,9 +685,7 @@ static int vidioc_g_frequency (struct file *file, void *priv,
 static int vidioc_s_frequency (struct file *file, void *priv,
                                 struct v4l2_frequency *freq)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         // Only no or one tuner for now
         if (!usbvision->have_tuner || freq->tuner)
@@ -721,9 +699,7 @@ static int vidioc_s_frequency (struct file *file, void *priv,
 
 static int vidioc_g_audio (struct file *file, void *priv, struct v4l2_audio *a)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         memset(a,0,sizeof(*a));
         if(usbvision->radio) {
@@ -748,9 +724,7 @@ static int vidioc_s_audio (struct file *file, void *fh,
 static int vidioc_queryctrl (struct file *file, void *priv,
                             struct v4l2_queryctrl *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int id=ctrl->id;
 
         memset(ctrl,0,sizeof(*ctrl));
@@ -767,9 +741,7 @@ static int vidioc_queryctrl (struct file *file, void *priv,
 static int vidioc_g_ctrl (struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         call_i2c_clients(usbvision, VIDIOC_G_CTRL, ctrl);
 
         return 0;
@@ -778,9 +750,7 @@ static int vidioc_g_ctrl (struct file *file, void *priv,
 static int vidioc_s_ctrl (struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         call_i2c_clients(usbvision, VIDIOC_S_CTRL, ctrl);
 
         return 0;
@@ -789,9 +759,7 @@ static int vidioc_s_ctrl (struct file *file, void *priv,
 static int vidioc_reqbufs (struct file *file,
                            void *priv, struct v4l2_requestbuffers *vr)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int ret;
 
         RESTRICT_TO_RANGE(vr->count,1,USBVISION_NUMFRAMES);
@@ -819,9 +787,7 @@ static int vidioc_reqbufs (struct file *file,
 static int vidioc_querybuf (struct file *file,
                             void *priv, struct v4l2_buffer *vb)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         struct usbvision_frame *frame;
 
         /* FIXME : must control
@@ -857,9 +823,7 @@ static int vidioc_querybuf (struct file *file,
 
 static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         struct usbvision_frame *frame;
         unsigned long lock_flags;
 
@@ -896,9 +860,7 @@ static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
 
 static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int ret;
         struct usbvision_frame *f;
         unsigned long lock_flags;
@@ -939,9 +901,7 @@ static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *vb)
 
 static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
         usbvision->streaming = Stream_On;
@@ -953,9 +913,7 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
 static int vidioc_streamoff(struct file *file,
                             void *priv, enum v4l2_buf_type type)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int b=V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
         if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -988,9 +946,7 @@ static int vidioc_enum_fmt_vid_cap (struct file *file, void  *priv,
 static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,
                                         struct v4l2_format *vf)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         vf->fmt.pix.width = usbvision->curwidth;
         vf->fmt.pix.height = usbvision->curheight;
         vf->fmt.pix.pixelformat = usbvision->palette.format;
@@ -1006,9 +962,7 @@ static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,
 static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,
                                struct v4l2_format *vf)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int formatIdx;
 
         /* Find requested format in available ones */
@@ -1036,9 +990,7 @@ static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,
 static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                                struct v4l2_format *vf)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int ret;
 
         if( 0 != (ret=vidioc_try_fmt_vid_cap (file, priv, vf)) ) {
@@ -1066,9 +1018,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
 static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
                       size_t count, loff_t *ppos)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int noblock = file->f_flags & O_NONBLOCK;
         unsigned long lock_flags;
 
@@ -1177,10 +1127,7 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
                 start = vma->vm_start;
         void *pos;
         u32 i;
-
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
 
         PDEBUG(DBG_MMAP, "mmap");
 
@@ -1237,9 +1184,7 @@ static int usbvision_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
  */
 static int usbvision_radio_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int errCode = 0;
 
         PDEBUG(DBG_IO, "%s:", __func__);
@@ -1289,9 +1234,7 @@ out:
 
 static int usbvision_radio_close(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct usb_usbvision *usbvision =
-                (struct usb_usbvision *) video_get_drvdata(dev);
+        struct usb_usbvision *usbvision = video_drvdata(file);
         int errCode = 0;
 
         PDEBUG(DBG_IO, "");
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index feab12aa2c7b..f16aafe9cf14 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -83,6 +83,22 @@ static struct uvc_control_info uvc_ctrls[] = {
         },
         {
                 .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_WHITE_BALANCE_TEMPERATURE_CONTROL,
+                .index          = 6,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_WHITE_BALANCE_COMPONENT_CONTROL,
+                .index          = 7,
+                .size           = 4,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
                 .selector       = PU_BACKLIGHT_COMPENSATION_CONTROL,
                 .index          = 8,
                 .size           = 2,
@@ -114,6 +130,60 @@ static struct uvc_control_info uvc_ctrls[] = {
                                 | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
         },
         {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,
+                .index          = 12,
+                .size           = 1,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
+                                | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL,
+                .index          = 13,
+                .size           = 1,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
+                                | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_DIGITAL_MULTIPLIER_CONTROL,
+                .index          = 14,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL,
+                .index          = 15,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_ANALOG_VIDEO_STANDARD_CONTROL,
+                .index          = 16,
+                .size           = 1,
+                .flags          = UVC_CONTROL_GET_CUR,
+        },
+        {
+                .entity         = UVC_GUID_UVC_PROCESSING,
+                .selector       = PU_ANALOG_LOCK_STATUS_CONTROL,
+                .index          = 17,
+                .size           = 1,
+                .flags          = UVC_CONTROL_GET_CUR,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_SCANNING_MODE_CONTROL,
+                .index          = 0,
+                .size           = 1,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
+                                | UVC_CONTROL_RESTORE,
+        },
+        {
                 .entity         = UVC_GUID_UVC_CAMERA,
                 .selector       = CT_AE_MODE_CONTROL,
                 .index          = 1,
@@ -140,6 +210,14 @@ static struct uvc_control_info uvc_ctrls[] = {
         },
         {
                 .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_EXPOSURE_TIME_RELATIVE_CONTROL,
+                .index          = 4,
+                .size           = 1,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
+                                | UVC_CONTROL_RESTORE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
                 .selector       = CT_FOCUS_ABSOLUTE_CONTROL,
                 .index          = 5,
                 .size           = 2,
@@ -148,42 +226,90 @@ static struct uvc_control_info uvc_ctrls[] = {
         },
         {
                 .entity         = UVC_GUID_UVC_CAMERA,
-                .selector       = CT_FOCUS_AUTO_CONTROL,
-                .index          = 17,
-                .size           = 1,
-                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
-                                | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
+                .selector       = CT_FOCUS_RELATIVE_CONTROL,
+                .index          = 6,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_AUTO_UPDATE,
         },
         {
-                .entity         = UVC_GUID_UVC_PROCESSING,
-                .selector       = PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,
-                .index          = 12,
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_IRIS_ABSOLUTE_CONTROL,
+                .index          = 7,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_IRIS_RELATIVE_CONTROL,
+                .index          = 8,
                 .size           = 1,
                 .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
-                                | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
+                                | UVC_CONTROL_AUTO_UPDATE,
         },
         {
-                .entity         = UVC_GUID_UVC_PROCESSING,
-                .selector       = PU_WHITE_BALANCE_TEMPERATURE_CONTROL,
-                .index          = 6,
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_ZOOM_ABSOLUTE_CONTROL,
+                .index          = 9,
                 .size           = 2,
                 .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
                                 | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
         },
         {
-                .entity         = UVC_GUID_UVC_PROCESSING,
-                .selector       = PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL,
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_ZOOM_RELATIVE_CONTROL,
+                .index          = 10,
+                .size           = 3,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_PANTILT_ABSOLUTE_CONTROL,
+                .index          = 11,
+                .size           = 8,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_PANTILT_RELATIVE_CONTROL,
+                .index          = 12,
+                .size           = 4,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_ROLL_ABSOLUTE_CONTROL,
                 .index          = 13,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_ROLL_RELATIVE_CONTROL,
+                .index          = 14,
+                .size           = 2,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                                | UVC_CONTROL_AUTO_UPDATE,
+        },
+        {
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_FOCUS_AUTO_CONTROL,
+                .index          = 17,
                 .size           = 1,
                 .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
                                 | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
         },
         {
-                .entity         = UVC_GUID_UVC_PROCESSING,
-                .selector       = PU_WHITE_BALANCE_COMPONENT_CONTROL,
-                .index          = 7,
-                .size           = 4,
-                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
+                .entity         = UVC_GUID_UVC_CAMERA,
+                .selector       = CT_PRIVACY_CONTROL,
+                .index          = 18,
+                .size           = 1,
+                .flags          = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
                                 | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,
         },
 };
@@ -711,7 +837,17 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev,
 
         for (i = 0; i < entity->ncontrols; ++i) {
                 ctrl = &entity->controls[i];
-                if (ctrl->info == NULL || !ctrl->dirty)
+                if (ctrl->info == NULL)
+                        continue;
+
+                /* Reset the loaded flag for auto-update controls that were
+                 * marked as loaded in uvc_ctrl_get/uvc_ctrl_set to prevent
+                 * uvc_ctrl_get from using the cached value.
+                 */
+                if (ctrl->info->flags & UVC_CONTROL_AUTO_UPDATE)
+                        ctrl->loaded = 0;
+
+                if (!ctrl->dirty)
                         continue;
 
                 if (!rollback)
@@ -727,9 +863,6 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev,
                                uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP),
                                ctrl->info->size);
 
-                if ((ctrl->info->flags & UVC_CONTROL_GET_CUR) == 0)
-                        ctrl->loaded = 0;
-
                 ctrl->dirty = 0;
 
                 if (ret < 0)
@@ -787,8 +920,7 @@ int uvc_ctrl_get(struct uvc_video_device *video,
                 if (ret < 0)
                         return ret;
 
-                if ((ctrl->info->flags & UVC_CONTROL_AUTO_UPDATE) == 0)
-                        ctrl->loaded = 1;
+                ctrl->loaded = 1;
         }
 
         xctrl->value = uvc_get_le_value(
@@ -839,8 +971,7 @@ int uvc_ctrl_set(struct uvc_video_device *video,
                                 return ret;
                 }
 
-                if ((ctrl->info->flags & UVC_CONTROL_AUTO_UPDATE) == 0)
-                        ctrl->loaded = 1;
+                ctrl->loaded = 1;
         }
 
         if (!ctrl->dirty) {
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index 7e102034d38d..d7ad060640bc 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -1663,7 +1663,7 @@ static int uvc_suspend(struct usb_interface *intf, pm_message_t message)
         return uvc_video_suspend(&dev->video);
 }
 
-static int uvc_resume(struct usb_interface *intf)
+static int __uvc_resume(struct usb_interface *intf, int reset)
 {
         struct uvc_device *dev = usb_get_intfdata(intf);
         int ret;
@@ -1672,7 +1672,7 @@ static int uvc_resume(struct usb_interface *intf)
                 intf->cur_altsetting->desc.bInterfaceNumber);
 
         if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) {
-                if ((ret = uvc_ctrl_resume_device(dev)) < 0)
+                if (reset && (ret = uvc_ctrl_resume_device(dev)) < 0)
                         return ret;
 
                 return uvc_status_resume(dev);
@@ -1687,6 +1687,16 @@ static int uvc_resume(struct usb_interface *intf)
         return uvc_video_resume(&dev->video);
 }
 
+static int uvc_resume(struct usb_interface *intf)
+{
+        return __uvc_resume(intf, 0);
+}
+
+static int uvc_reset_resume(struct usb_interface *intf)
+{
+        return __uvc_resume(intf, 1);
+}
+
 /* ------------------------------------------------------------------------
  * Driver initialization and cleanup
  */
@@ -1902,6 +1912,24 @@ static struct usb_device_id uvc_ids[] = {
           .bInterfaceSubClass   = 1,
           .bInterfaceProtocol   = 0,
           .driver_info          = UVC_QUIRK_PROBE_MINMAX },
+        /* Compaq Presario B1200 - Bison Electronics */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x5986,
+          .idProduct            = 0x0104,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_MINMAX },
+        /* Acer Travelmate 7720 - Bison Electronics */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x5986,
+          .idProduct            = 0x0105,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_MINMAX },
         /* Medion Akoya Mini E1210 - Bison Electronics */
         { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                 | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -1920,6 +1948,24 @@ static struct usb_device_id uvc_ids[] = {
           .bInterfaceSubClass   = 1,
           .bInterfaceProtocol   = 0,
           .driver_info          = UVC_QUIRK_PROBE_MINMAX },
+        /*  Fujitsu Amilo SI2636 - Bison Electronics */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x5986,
+          .idProduct            = 0x0202,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_MINMAX },
+        /*  Advent 4211 - Bison Electronics */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x5986,
+          .idProduct            = 0x0203,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_MINMAX },
         /* Bison Electronics */
         { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                 | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -1952,6 +1998,7 @@ struct uvc_driver uvc_driver = {
                 .disconnect     = uvc_disconnect,
                 .suspend        = uvc_suspend,
                 .resume         = uvc_resume,
+                .reset_resume   = uvc_reset_resume,
                 .id_table       = uvc_ids,
                 .supports_autosuspend = 1,
         },
diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c
index 75e678ac54eb..5d60b264d59a 100644
--- a/drivers/media/video/uvc/uvc_status.c
+++ b/drivers/media/video/uvc/uvc_status.c
@@ -177,9 +177,15 @@ int uvc_status_init(struct uvc_device *dev)
 
         uvc_input_init(dev);
 
+        dev->status = kzalloc(UVC_MAX_STATUS_SIZE, GFP_KERNEL);
+        if (dev->status == NULL)
+                return -ENOMEM;
+
         dev->int_urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (dev->int_urb == NULL)
+        if (dev->int_urb == NULL) {
+                kfree(dev->status);
                 return -ENOMEM;
+        }
 
         pipe = usb_rcvintpipe(dev->udev, ep->desc.bEndpointAddress);
 
@@ -192,7 +198,7 @@ int uvc_status_init(struct uvc_device *dev)
                 interval = fls(interval) - 1;
 
         usb_fill_int_urb(dev->int_urb, dev->udev, pipe,
-                dev->status, sizeof dev->status, uvc_status_complete,
+                dev->status, UVC_MAX_STATUS_SIZE, uvc_status_complete,
                 dev, interval);
 
         return usb_submit_urb(dev->int_urb, GFP_KERNEL);
@@ -202,6 +208,7 @@ void uvc_status_cleanup(struct uvc_device *dev)
 {
         usb_kill_urb(dev->int_urb);
         usb_free_urb(dev->int_urb);
+        kfree(dev->status);
         uvc_input_cleanup(dev);
 }
 
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index d7bd71be40a9..78e4c4e09d89 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -400,15 +400,13 @@ static int uvc_has_privileges(struct uvc_fh *handle)
 
 static int uvc_v4l2_open(struct inode *inode, struct file *file)
 {
-        struct video_device *vdev;
         struct uvc_video_device *video;
         struct uvc_fh *handle;
         int ret = 0;
 
         uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_open\n");
         mutex_lock(&uvc_driver.open_mutex);
-        vdev = video_devdata(file);
-        video = video_get_drvdata(vdev);
+        video = video_drvdata(file);
 
         if (video->dev->state & UVC_DEV_DISCONNECTED) {
                 ret = -ENODEV;
@@ -440,8 +438,7 @@ done:
 
 static int uvc_v4l2_release(struct inode *inode, struct file *file)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct uvc_video_device *video = video_get_drvdata(vdev);
+        struct uvc_video_device *video = video_drvdata(file);
         struct uvc_fh *handle = (struct uvc_fh *)file->private_data;
 
         uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_release\n");
@@ -845,10 +842,6 @@ static int uvc_v4l2_do_ioctl(struct inode *inode, struct file *file,
                 if (ret < 0)
                         return ret;
 
-                if (!(video->streaming->cur_format->flags &
-                    UVC_FMT_FLAG_COMPRESSED))
-                        video->queue.flags |= UVC_QUEUE_DROP_INCOMPLETE;
-
                 rb->count = ret;
                 ret = 0;
                 break;
@@ -1031,8 +1024,7 @@ static struct vm_operations_struct uvc_vm_ops = {
 
 static int uvc_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct uvc_video_device *video = video_get_drvdata(vdev);
+        struct uvc_video_device *video = video_drvdata(file);
         struct uvc_buffer *uninitialized_var(buffer);
         struct page *page;
         unsigned long addr, start, size;
@@ -1085,8 +1077,7 @@ done:
 
 static unsigned int uvc_v4l2_poll(struct file *file, poll_table *wait)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct uvc_video_device *video = video_get_drvdata(vdev);
+        struct uvc_video_device *video = video_drvdata(file);
 
         uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_poll\n");
 
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index 6854ac78a161..b7bb23820d80 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -455,7 +455,8 @@ static void uvc_video_decode_isoc(struct urb *urb,
                         urb->iso_frame_desc[i].actual_length - ret);
 
                 /* Process the header again. */
-                uvc_video_decode_end(video, buf, mem, ret);
+                uvc_video_decode_end(video, buf, mem,
+                        urb->iso_frame_desc[i].actual_length);
 
                 if (buf->state == UVC_BUF_STATE_DONE ||
                     buf->state == UVC_BUF_STATE_ERROR)
@@ -512,7 +513,7 @@ static void uvc_video_decode_bulk(struct urb *urb,
             video->bulk.payload_size >= video->bulk.max_payload_size) {
                 if (!video->bulk.skip_payload && buf != NULL) {
                         uvc_video_decode_end(video, buf, video->bulk.header,
-                                video->bulk.header_size);
+                                video->bulk.payload_size);
                         if (buf->state == UVC_BUF_STATE_DONE ||
                             buf->state == UVC_BUF_STATE_ERROR)
                                 buf = uvc_queue_next_buffer(&video->queue, buf);
@@ -655,7 +656,7 @@ static int uvc_init_video_isoc(struct uvc_video_device *video,
         if (size > UVC_MAX_FRAME_SIZE)
                 return -EINVAL;
 
-        npackets = (size + psize - 1) / psize;
+        npackets = DIV_ROUND_UP(size, psize);
         if (npackets > UVC_MAX_ISO_PACKETS)
                 npackets = UVC_MAX_ISO_PACKETS;
 
@@ -970,6 +971,11 @@ int uvc_video_enable(struct uvc_video_device *video, int enable)
                 return 0;
         }
 
+        if (video->streaming->cur_format->flags & UVC_FMT_FLAG_COMPRESSED)
+                video->queue.flags &= ~UVC_QUEUE_DROP_INCOMPLETE;
+        else
+                video->queue.flags |= UVC_QUEUE_DROP_INCOMPLETE;
+
         if ((ret = uvc_queue_enable(&video->queue, 1)) < 0)
                 return ret;
 
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index bafe3406e305..9a6bc1aafb16 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -303,6 +303,8 @@ struct uvc_xu_control {
 #define UVC_MAX_FRAME_SIZE      (16*1024*1024)
 /* Maximum number of video buffers. */
 #define UVC_MAX_VIDEO_BUFFERS   32
+/* Maximum status buffer size in bytes of interrupt URB. */
+#define UVC_MAX_STATUS_SIZE     16
 
 #define UVC_CTRL_CONTROL_TIMEOUT        300
 #define UVC_CTRL_STREAMING_TIMEOUT      1000
@@ -634,7 +636,7 @@ struct uvc_device {
         /* Status Interrupt Endpoint */
         struct usb_host_endpoint *int_ep;
         struct urb *int_urb;
-        __u8 status[16];
+        __u8 *status;
         struct input_dev *input;
 
         /* Video Streaming interfaces */
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 88ca13104417..20c3be8617ea 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -187,9 +187,11 @@ const char **v4l2_ctrl_get_menu(u32 id)
                 NULL
         };
         static const char *mpeg_audio_encoding[] = {
-                "Layer I",
-                "Layer II",
-                "Layer III",
+                "MPEG-1/2 Layer I",
+                "MPEG-1/2 Layer II",
+                "MPEG-1/2 Layer III",
+                "MPEG-2/4 AAC",
+                "AC-3",
                 NULL
         };
         static const char *mpeg_audio_l1_bitrate[] = {
@@ -243,6 +245,28 @@ const char **v4l2_ctrl_get_menu(u32 id)
                 "320 kbps",
                 NULL
         };
+        static const char *mpeg_audio_ac3_bitrate[] = {
+                "32 kbps",
+                "40 kbps",
+                "48 kbps",
+                "56 kbps",
+                "64 kbps",
+                "80 kbps",
+                "96 kbps",
+                "112 kbps",
+                "128 kbps",
+                "160 kbps",
+                "192 kbps",
+                "224 kbps",
+                "256 kbps",
+                "320 kbps",
+                "384 kbps",
+                "448 kbps",
+                "512 kbps",
+                "576 kbps",
+                "640 kbps",
+                NULL
+        };
         static const char *mpeg_audio_mode[] = {
                 "Stereo",
                 "Joint Stereo",
@@ -271,6 +295,7 @@ const char **v4l2_ctrl_get_menu(u32 id)
         static const char *mpeg_video_encoding[] = {
                 "MPEG-1",
                 "MPEG-2",
+                "MPEG-4 AVC",
                 NULL
         };
         static const char *mpeg_video_aspect[] = {
@@ -311,6 +336,8 @@ const char **v4l2_ctrl_get_menu(u32 id)
                         return mpeg_audio_l2_bitrate;
                 case V4L2_CID_MPEG_AUDIO_L3_BITRATE:
                         return mpeg_audio_l3_bitrate;
+                case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
+                        return mpeg_audio_ac3_bitrate;
                 case V4L2_CID_MPEG_AUDIO_MODE:
                         return mpeg_audio_mode;
                 case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:
@@ -335,62 +362,73 @@ const char **v4l2_ctrl_get_menu(u32 id)
 }
 EXPORT_SYMBOL(v4l2_ctrl_get_menu);
 
-/* Fill in a struct v4l2_queryctrl */
-int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def)
+/* Return the control name. */
+const char *v4l2_ctrl_get_name(u32 id)
 {
-        const char *name;
-
-        qctrl->flags = 0;
-        switch (qctrl->id) {
+        switch (id) {
         /* USER controls */
-        case V4L2_CID_USER_CLASS:       name = "User Controls"; break;
-        case V4L2_CID_AUDIO_VOLUME:     name = "Volume"; break;
-        case V4L2_CID_AUDIO_MUTE:       name = "Mute"; break;
-        case V4L2_CID_AUDIO_BALANCE:    name = "Balance"; break;
-        case V4L2_CID_AUDIO_BASS:       name = "Bass"; break;
-        case V4L2_CID_AUDIO_TREBLE:     name = "Treble"; break;
-        case V4L2_CID_AUDIO_LOUDNESS:   name = "Loudness"; break;
-        case V4L2_CID_BRIGHTNESS:       name = "Brightness"; break;
-        case V4L2_CID_CONTRAST:         name = "Contrast"; break;
-        case V4L2_CID_SATURATION:       name = "Saturation"; break;
-        case V4L2_CID_HUE:              name = "Hue"; break;
+        case V4L2_CID_USER_CLASS:       return "User Controls";
+        case V4L2_CID_AUDIO_VOLUME:     return "Volume";
+        case V4L2_CID_AUDIO_MUTE:       return "Mute";
+        case V4L2_CID_AUDIO_BALANCE:    return "Balance";
+        case V4L2_CID_AUDIO_BASS:       return "Bass";
+        case V4L2_CID_AUDIO_TREBLE:     return "Treble";
+        case V4L2_CID_AUDIO_LOUDNESS:   return "Loudness";
+        case V4L2_CID_BRIGHTNESS:       return "Brightness";
+        case V4L2_CID_CONTRAST:         return "Contrast";
+        case V4L2_CID_SATURATION:       return "Saturation";
+        case V4L2_CID_HUE:              return "Hue";
 
         /* MPEG controls */
-        case V4L2_CID_MPEG_CLASS:               name = "MPEG Encoder Controls"; break;
-        case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: name = "Audio Sampling Frequency"; break;
-        case V4L2_CID_MPEG_AUDIO_ENCODING:      name = "Audio Encoding Layer"; break;
-        case V4L2_CID_MPEG_AUDIO_L1_BITRATE:    name = "Audio Layer I Bitrate"; break;
-        case V4L2_CID_MPEG_AUDIO_L2_BITRATE:    name = "Audio Layer II Bitrate"; break;
-        case V4L2_CID_MPEG_AUDIO_L3_BITRATE:    name = "Audio Layer III Bitrate"; break;
-        case V4L2_CID_MPEG_AUDIO_MODE:          name = "Audio Stereo Mode"; break;
-        case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION: name = "Audio Stereo Mode Extension"; break;
-        case V4L2_CID_MPEG_AUDIO_EMPHASIS:      name = "Audio Emphasis"; break;
-        case V4L2_CID_MPEG_AUDIO_CRC:           name = "Audio CRC"; break;
-        case V4L2_CID_MPEG_AUDIO_MUTE:          name = "Audio Mute"; break;
-        case V4L2_CID_MPEG_VIDEO_ENCODING:      name = "Video Encoding"; break;
-        case V4L2_CID_MPEG_VIDEO_ASPECT:        name = "Video Aspect"; break;
-        case V4L2_CID_MPEG_VIDEO_B_FRAMES:      name = "Video B Frames"; break;
-        case V4L2_CID_MPEG_VIDEO_GOP_SIZE:      name = "Video GOP Size"; break;
-        case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:   name = "Video GOP Closure"; break;
-        case V4L2_CID_MPEG_VIDEO_PULLDOWN:      name = "Video Pulldown"; break;
-        case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:  name = "Video Bitrate Mode"; break;
-        case V4L2_CID_MPEG_VIDEO_BITRATE:       name = "Video Bitrate"; break;
-        case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:  name = "Video Peak Bitrate"; break;
-        case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION: name = "Video Temporal Decimation"; break;
-        case V4L2_CID_MPEG_VIDEO_MUTE:          name = "Video Mute"; break;
-        case V4L2_CID_MPEG_VIDEO_MUTE_YUV:      name = "Video Mute YUV"; break;
-        case V4L2_CID_MPEG_STREAM_TYPE:         name = "Stream Type"; break;
-        case V4L2_CID_MPEG_STREAM_PID_PMT:      name = "Stream PMT Program ID"; break;
-        case V4L2_CID_MPEG_STREAM_PID_AUDIO:    name = "Stream Audio Program ID"; break;
-        case V4L2_CID_MPEG_STREAM_PID_VIDEO:    name = "Stream Video Program ID"; break;
-        case V4L2_CID_MPEG_STREAM_PID_PCR:      name = "Stream PCR Program ID"; break;
-        case V4L2_CID_MPEG_STREAM_PES_ID_AUDIO: name = "Stream PES Audio ID"; break;
-        case V4L2_CID_MPEG_STREAM_PES_ID_VIDEO: name = "Stream PES Video ID"; break;
-        case V4L2_CID_MPEG_STREAM_VBI_FMT:      name = "Stream VBI Format"; break;
+        case V4L2_CID_MPEG_CLASS:               return "MPEG Encoder Controls";
+        case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: return "Audio Sampling Frequency";
+        case V4L2_CID_MPEG_AUDIO_ENCODING:      return "Audio Encoding";
+        case V4L2_CID_MPEG_AUDIO_L1_BITRATE:    return "Audio Layer I Bitrate";
+        case V4L2_CID_MPEG_AUDIO_L2_BITRATE:    return "Audio Layer II Bitrate";
+        case V4L2_CID_MPEG_AUDIO_L3_BITRATE:    return "Audio Layer III Bitrate";
+        case V4L2_CID_MPEG_AUDIO_AAC_BITRATE:   return "Audio AAC Bitrate";
+        case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:   return "Audio AC-3 Bitrate";
+        case V4L2_CID_MPEG_AUDIO_MODE:          return "Audio Stereo Mode";
+        case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION: return "Audio Stereo Mode Extension";
+        case V4L2_CID_MPEG_AUDIO_EMPHASIS:      return "Audio Emphasis";
+        case V4L2_CID_MPEG_AUDIO_CRC:           return "Audio CRC";
+        case V4L2_CID_MPEG_AUDIO_MUTE:          return "Audio Mute";
+        case V4L2_CID_MPEG_VIDEO_ENCODING:      return "Video Encoding";
+        case V4L2_CID_MPEG_VIDEO_ASPECT:        return "Video Aspect";
+        case V4L2_CID_MPEG_VIDEO_B_FRAMES:      return "Video B Frames";
+        case V4L2_CID_MPEG_VIDEO_GOP_SIZE:      return "Video GOP Size";
+        case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:   return "Video GOP Closure";
+        case V4L2_CID_MPEG_VIDEO_PULLDOWN:      return "Video Pulldown";
+        case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:  return "Video Bitrate Mode";
+        case V4L2_CID_MPEG_VIDEO_BITRATE:       return "Video Bitrate";
+        case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:  return "Video Peak Bitrate";
+        case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION: return "Video Temporal Decimation";
+        case V4L2_CID_MPEG_VIDEO_MUTE:          return "Video Mute";
+        case V4L2_CID_MPEG_VIDEO_MUTE_YUV:      return "Video Mute YUV";
+        case V4L2_CID_MPEG_STREAM_TYPE:         return "Stream Type";
+        case V4L2_CID_MPEG_STREAM_PID_PMT:      return "Stream PMT Program ID";
+        case V4L2_CID_MPEG_STREAM_PID_AUDIO:    return "Stream Audio Program ID";
+        case V4L2_CID_MPEG_STREAM_PID_VIDEO:    return "Stream Video Program ID";
+        case V4L2_CID_MPEG_STREAM_PID_PCR:      return "Stream PCR Program ID";
+        case V4L2_CID_MPEG_STREAM_PES_ID_AUDIO: return "Stream PES Audio ID";
+        case V4L2_CID_MPEG_STREAM_PES_ID_VIDEO: return "Stream PES Video ID";
+        case V4L2_CID_MPEG_STREAM_VBI_FMT:      return "Stream VBI Format";
 
         default:
-                return -EINVAL;
+                return NULL;
         }
+}
+EXPORT_SYMBOL(v4l2_ctrl_get_name);
+
+/* Fill in a struct v4l2_queryctrl */
+int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def)
+{
+        const char *name = v4l2_ctrl_get_name(qctrl->id);
+
+        qctrl->flags = 0;
+        if (name == NULL)
+                return -EINVAL;
+
         switch (qctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
         case V4L2_CID_AUDIO_LOUDNESS:
@@ -407,6 +445,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
         case V4L2_CID_MPEG_AUDIO_L1_BITRATE:
         case V4L2_CID_MPEG_AUDIO_L2_BITRATE:
         case V4L2_CID_MPEG_AUDIO_L3_BITRATE:
+        case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
         case V4L2_CID_MPEG_AUDIO_MODE:
         case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:
         case V4L2_CID_MPEG_AUDIO_EMPHASIS:
@@ -493,7 +532,7 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
         case V4L2_CID_MPEG_AUDIO_ENCODING:
                 return v4l2_ctrl_query_fill(qctrl,
                                 V4L2_MPEG_AUDIO_ENCODING_LAYER_1,
-                                V4L2_MPEG_AUDIO_ENCODING_LAYER_3, 1,
+                                V4L2_MPEG_AUDIO_ENCODING_AC3, 1,
                                 V4L2_MPEG_AUDIO_ENCODING_LAYER_2);
         case V4L2_CID_MPEG_AUDIO_L1_BITRATE:
                 return v4l2_ctrl_query_fill(qctrl,
@@ -510,6 +549,13 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
                                 V4L2_MPEG_AUDIO_L3_BITRATE_32K,
                                 V4L2_MPEG_AUDIO_L3_BITRATE_320K, 1,
                                 V4L2_MPEG_AUDIO_L3_BITRATE_192K);
+        case V4L2_CID_MPEG_AUDIO_AAC_BITRATE:
+                return v4l2_ctrl_query_fill(qctrl, 0, 6400, 1, 3200000);
+        case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:
+                return v4l2_ctrl_query_fill(qctrl,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_32K,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_640K, 1,
+                                V4L2_MPEG_AUDIO_AC3_BITRATE_384K);
         case V4L2_CID_MPEG_AUDIO_MODE:
                 return v4l2_ctrl_query_fill(qctrl,
                                 V4L2_MPEG_AUDIO_MODE_STEREO,
@@ -535,7 +581,7 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
         case V4L2_CID_MPEG_VIDEO_ENCODING:
                 return v4l2_ctrl_query_fill(qctrl,
                                 V4L2_MPEG_VIDEO_ENCODING_MPEG_1,
-                                V4L2_MPEG_VIDEO_ENCODING_MPEG_2, 1,
+                                V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC, 1,
                                 V4L2_MPEG_VIDEO_ENCODING_MPEG_2);
         case V4L2_CID_MPEG_VIDEO_ASPECT:
                 return v4l2_ctrl_query_fill(qctrl,
@@ -594,12 +640,17 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
 EXPORT_SYMBOL(v4l2_ctrl_query_fill_std);
 
 /* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and
-   the menu. The qctrl pointer may be NULL, in which case it is ignored. */
+   the menu. The qctrl pointer may be NULL, in which case it is ignored.
+   If menu_items is NULL, then the menu items are retrieved using
+   v4l2_ctrl_get_menu. */
 int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl,
                const char **menu_items)
 {
         int i;
 
+        qmenu->reserved = 0;
+        if (menu_items == NULL)
+                menu_items = v4l2_ctrl_get_menu(qmenu->id);
         if (menu_items == NULL ||
             (qctrl && (qmenu->index < qctrl->minimum || qmenu->index > qctrl->maximum)))
                 return -EINVAL;
@@ -607,11 +658,31 @@ int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qc
         if (menu_items[i] == NULL || menu_items[i][0] == '\0')
                 return -EINVAL;
         snprintf(qmenu->name, sizeof(qmenu->name), menu_items[qmenu->index]);
-        qmenu->reserved = 0;
         return 0;
 }
 EXPORT_SYMBOL(v4l2_ctrl_query_menu);
 
+/* Fill in a struct v4l2_querymenu based on the specified array of valid
+   menu items (terminated by V4L2_CTRL_MENU_IDS_END).
+   Use this if there are 'holes' in the list of valid menu items. */
+int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *ids)
+{
+        const char **menu_items = v4l2_ctrl_get_menu(qmenu->id);
+
+        qmenu->reserved = 0;
+        if (menu_items == NULL || ids == NULL)
+                return -EINVAL;
+        while (*ids != V4L2_CTRL_MENU_IDS_END) {
+                if (*ids++ == qmenu->index) {
+                        snprintf(qmenu->name, sizeof(qmenu->name),
+                                       menu_items[qmenu->index]);
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
+EXPORT_SYMBOL(v4l2_ctrl_query_menu_valid_items);
+
 /* ctrl_classes points to an array of u32 pointers, the last element is
    a NULL pointer. Each u32 array is a 0-terminated array of control IDs.
    Each array must be sorted low to high and belong to the same control
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 155fdec9ac7d..ccd6566a515e 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -42,6 +42,7 @@ static ssize_t show_index(struct device *cd,
                          struct device_attribute *attr, char *buf)
 {
         struct video_device *vfd = container_of(cd, struct video_device, dev);
+
         return sprintf(buf, "%i\n", vfd->index);
 }
 
@@ -49,6 +50,7 @@ static ssize_t show_name(struct device *cd,
                          struct device_attribute *attr, char *buf)
 {
         struct video_device *vfd = container_of(cd, struct video_device, dev);
+
         return sprintf(buf, "%.*s\n", (int)sizeof(vfd->name), vfd->name);
 }
 
@@ -58,12 +60,16 @@ static struct device_attribute video_device_attrs[] = {
         __ATTR_NULL
 };
 
+/*
+ *      Active devices
+ */
+static struct video_device *video_device[VIDEO_NUM_DEVICES];
+static DEFINE_MUTEX(videodev_lock);
+static DECLARE_BITMAP(video_nums[VFL_TYPE_MAX], VIDEO_NUM_DEVICES);
+
 struct video_device *video_device_alloc(void)
 {
-        struct video_device *vfd;
-
-        vfd = kzalloc(sizeof(*vfd), GFP_KERNEL);
-        return vfd;
+        return kzalloc(sizeof(struct video_device), GFP_KERNEL);
 }
 EXPORT_SYMBOL(video_device_alloc);
 
@@ -73,16 +79,52 @@ void video_device_release(struct video_device *vfd)
 }
 EXPORT_SYMBOL(video_device_release);
 
+void video_device_release_empty(struct video_device *vfd)
+{
+        /* Do nothing */
+        /* Only valid when the video_device struct is a static. */
+}
+EXPORT_SYMBOL(video_device_release_empty);
+
+/* Called when the last user of the character device is gone. */
+static void v4l2_chardev_release(struct kobject *kobj)
+{
+        struct video_device *vfd = container_of(kobj, struct video_device, cdev.kobj);
+
+        mutex_lock(&videodev_lock);
+        if (video_device[vfd->minor] != vfd) {
+                mutex_unlock(&videodev_lock);
+                BUG();
+                return;
+        }
+
+        /* Free up this device for reuse */
+        video_device[vfd->minor] = NULL;
+        clear_bit(vfd->num, video_nums[vfd->vfl_type]);
+        mutex_unlock(&videodev_lock);
+
+        /* Release the character device */
+        vfd->cdev_release(kobj);
+        /* Release video_device and perform other
+           cleanups as needed. */
+        if (vfd->release)
+                vfd->release(vfd);
+}
+
+/* The new kobj_type for the character device */
+static struct kobj_type v4l2_ktype_cdev_default = {
+        .release = v4l2_chardev_release,
+};
+
 static void video_release(struct device *cd)
 {
         struct video_device *vfd = container_of(cd, struct video_device, dev);
 
-#if 1
-        /* needed until all drivers are fixed */
-        if (!vfd->release)
-                return;
-#endif
-        vfd->release(vfd);
+        /* It's now safe to delete the char device.
+           This will either trigger the v4l2_chardev_release immediately (if
+           the refcount goes to 0) or later when the last user of the
+           character device closes it. */
+        cdev_del(&vfd->cdev);
 }
 
 static struct class video_class = {
@@ -91,87 +133,12 @@ static struct class video_class = {
         .dev_release = video_release,
 };
 
-/*
- *      Active devices
- */
-
-static struct video_device *video_device[VIDEO_NUM_DEVICES];
-static DEFINE_MUTEX(videodev_lock);
-
 struct video_device *video_devdata(struct file *file)
 {
         return video_device[iminor(file->f_path.dentry->d_inode)];
 }
 EXPORT_SYMBOL(video_devdata);
 
-/*
- *      Open a video device - FIXME: Obsoleted
- */
-static int video_open(struct inode *inode, struct file *file)
-{
-        unsigned int minor = iminor(inode);
-        int err = 0;
-        struct video_device *vfl;
-        const struct file_operations *old_fops;
-
-        if (minor >= VIDEO_NUM_DEVICES)
-                return -ENODEV;
-        lock_kernel();
-        mutex_lock(&videodev_lock);
-        vfl = video_device[minor];
-        if (vfl == NULL) {
-                mutex_unlock(&videodev_lock);
-                request_module("char-major-%d-%d", VIDEO_MAJOR, minor);
-                mutex_lock(&videodev_lock);
-                vfl = video_device[minor];
-                if (vfl == NULL) {
-                        mutex_unlock(&videodev_lock);
-                        unlock_kernel();
-                        return -ENODEV;
-                }
-        }
-        old_fops = file->f_op;
-        file->f_op = fops_get(vfl->fops);
-        if (file->f_op->open)
-                err = file->f_op->open(inode, file);
-        if (err) {
-                fops_put(file->f_op);
-                file->f_op = fops_get(old_fops);
-        }
-        fops_put(old_fops);
-        mutex_unlock(&videodev_lock);
-        unlock_kernel();
-        return err;
-}
-
-/*
- * open/release helper functions -- handle exclusive opens
- * Should be removed soon
- */
-int video_exclusive_open(struct inode *inode, struct file *file)
-{
-        struct video_device *vfl = video_devdata(file);
-        int retval = 0;
-
-        mutex_lock(&vfl->lock);
-        if (vfl->users)
-                retval = -EBUSY;
-        else
-                vfl->users++;
-        mutex_unlock(&vfl->lock);
-        return retval;
-}
-EXPORT_SYMBOL(video_exclusive_open);
-
-int video_exclusive_release(struct inode *inode, struct file *file)
-{
-        struct video_device *vfl = video_devdata(file);
-
-        vfl->users--;
-        return 0;
-}
-EXPORT_SYMBOL(video_exclusive_release);
-
 /**
  * get_index - assign stream number based on parent device
  * @vdev: video_device to assign index number to, vdev->dev should be assigned
@@ -252,33 +219,29 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
                                         int index)
 {
         int i = 0;
-        int base;
-        int end;
         int ret;
-        char *name_base;
+        int minor_offset = 0;
+        int minor_cnt = VIDEO_NUM_DEVICES;
+        const char *name_base;
+        void *priv = video_get_drvdata(vfd);
+
+        /* the release callback MUST be present */
+        BUG_ON(!vfd->release);
 
         if (vfd == NULL)
                 return -EINVAL;
 
         switch (type) {
         case VFL_TYPE_GRABBER:
-                base = MINOR_VFL_TYPE_GRABBER_MIN;
-                end = MINOR_VFL_TYPE_GRABBER_MAX+1;
                 name_base = "video";
                 break;
         case VFL_TYPE_VTX:
-                base = MINOR_VFL_TYPE_VTX_MIN;
-                end = MINOR_VFL_TYPE_VTX_MAX+1;
                 name_base = "vtx";
                 break;
         case VFL_TYPE_VBI:
-                base = MINOR_VFL_TYPE_VBI_MIN;
-                end = MINOR_VFL_TYPE_VBI_MAX+1;
                 name_base = "vbi";
                 break;
         case VFL_TYPE_RADIO:
-                base = MINOR_VFL_TYPE_RADIO_MIN;
-                end = MINOR_VFL_TYPE_RADIO_MAX+1;
                 name_base = "radio";
                 break;
         default:
@@ -287,28 +250,70 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
                 return -EINVAL;
         }
 
+        vfd->vfl_type = type;
+
+#ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES
+        /* Keep the ranges for the first four types for historical
+         * reasons.
+         * Newer devices (not yet in place) should use the range
+         * of 128-191 and just pick the first free minor there
+         * (new style). */
+        switch (type) {
+        case VFL_TYPE_GRABBER:
+                minor_offset = 0;
+                minor_cnt = 64;
+                break;
+        case VFL_TYPE_RADIO:
+                minor_offset = 64;
+                minor_cnt = 64;
+                break;
+        case VFL_TYPE_VTX:
+                minor_offset = 192;
+                minor_cnt = 32;
+                break;
+        case VFL_TYPE_VBI:
+                minor_offset = 224;
+                minor_cnt = 32;
+                break;
+        default:
+                minor_offset = 128;
+                minor_cnt = 64;
+                break;
+        }
+#endif
+
+        /* Initialize the character device */
+        cdev_init(&vfd->cdev, vfd->fops);
+        vfd->cdev.owner = vfd->fops->owner;
         /* pick a minor number */
         mutex_lock(&videodev_lock);
-        if (nr >= 0  &&  nr < end-base) {
-                /* use the one the driver asked for */
-                i = base + nr;
-                if (NULL != video_device[i]) {
-                        mutex_unlock(&videodev_lock);
-                        return -ENFILE;
-                }
-        } else {
-                /* use first free */
-                for (i = base; i < end; i++)
-                        if (NULL == video_device[i])
-                                break;
-                if (i == end) {
-                        mutex_unlock(&videodev_lock);
-                        return -ENFILE;
-                }
+        nr = find_next_zero_bit(video_nums[type], minor_cnt, nr == -1 ? 0 : nr);
+        if (nr == minor_cnt)
+                nr = find_first_zero_bit(video_nums[type], minor_cnt);
+        if (nr == minor_cnt) {
+                printk(KERN_ERR "could not get a free kernel number\n");
+                mutex_unlock(&videodev_lock);
+                return -ENFILE;
         }
-        video_device[i] = vfd;
-        vfd->vfl_type = type;
-        vfd->minor = i;
+#ifdef CONFIG_VIDEO_FIXED_MINOR_RANGES
+        /* 1-on-1 mapping of kernel number to minor number */
+        i = nr;
+#else
+        /* The kernel number and minor numbers are independent */
+        for (i = 0; i < VIDEO_NUM_DEVICES; i++)
+                if (video_device[i] == NULL)
+                        break;
+        if (i == VIDEO_NUM_DEVICES) {
+                mutex_unlock(&videodev_lock);
+                printk(KERN_ERR "could not get a free minor\n");
+                return -ENFILE;
+        }
+#endif
+        vfd->minor = i + minor_offset;
+        vfd->num = nr;
+        set_bit(nr, video_nums[type]);
+        BUG_ON(video_device[vfd->minor]);
+        video_device[vfd->minor] = vfd;
 
         ret = get_index(vfd, index);
         vfd->index = ret;
@@ -320,35 +325,41 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
                 goto fail_minor;
         }
 
-        mutex_init(&vfd->lock);
-
+        ret = cdev_add(&vfd->cdev, MKDEV(VIDEO_MAJOR, vfd->minor), 1);
+        if (ret < 0) {
+                printk(KERN_ERR "%s: cdev_add failed\n", __func__);
+                goto fail_minor;
+        }
         /* sysfs class */
-        memset(&vfd->dev, 0x00, sizeof(vfd->dev));
+        memset(&vfd->dev, 0, sizeof(vfd->dev));
+        /* The memset above cleared the device's drvdata, so
+           put back the copy we made earlier. */
+        video_set_drvdata(vfd, priv);
         vfd->dev.class = &video_class;
         vfd->dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
         if (vfd->parent)
                 vfd->dev.parent = vfd->parent;
-        sprintf(vfd->dev.bus_id, "%s%d", name_base, i - base);
+        sprintf(vfd->dev.bus_id, "%s%d", name_base, nr);
         ret = device_register(&vfd->dev);
         if (ret < 0) {
                 printk(KERN_ERR "%s: device_register failed\n", __func__);
-                goto fail_minor;
+                goto del_cdev;
         }
-
-#if 1
-        /* needed until all drivers are fixed */
-        if (!vfd->release)
-                printk(KERN_WARNING "videodev: \"%s\" has no release callback. "
-                       "Please fix your driver for proper sysfs support, see "
-                       "http://lwn.net/Articles/36850/\n", vfd->name);
-#endif
+        /* Remember the cdev's release function */
+        vfd->cdev_release = vfd->cdev.kobj.ktype->release;
+        /* Install our own */
+        vfd->cdev.kobj.ktype = &v4l2_ktype_cdev_default;
         return 0;
 
+del_cdev:
+        cdev_del(&vfd->cdev);
+
 fail_minor:
         mutex_lock(&videodev_lock);
         video_device[vfd->minor] = NULL;
-        vfd->minor = -1;
+        clear_bit(vfd->num, video_nums[type]);
         mutex_unlock(&videodev_lock);
+        vfd->minor = -1;
         return ret;
 }
 EXPORT_SYMBOL(video_register_device_index);
@@ -363,42 +374,29 @@ EXPORT_SYMBOL(video_register_device_index);
 
 void video_unregister_device(struct video_device *vfd)
 {
-        mutex_lock(&videodev_lock);
-        if (video_device[vfd->minor] != vfd)
-                panic("videodev: bad unregister");
-
-        video_device[vfd->minor] = NULL;
         device_unregister(&vfd->dev);
-        mutex_unlock(&videodev_lock);
 }
 EXPORT_SYMBOL(video_unregister_device);
 
 /*
- * Video fs operations
- */
-static const struct file_operations video_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .open           = video_open,
-};
-
-/*
  *      Initialise video for linux
  */
-
 static int __init videodev_init(void)
 {
+        dev_t dev = MKDEV(VIDEO_MAJOR, 0);
         int ret;
 
         printk(KERN_INFO "Linux video capture interface: v2.00\n");
-        if (register_chrdev(VIDEO_MAJOR, VIDEO_NAME, &video_fops)) {
-                printk(KERN_WARNING "video_dev: unable to get major %d\n", VIDEO_MAJOR);
-                return -EIO;
+        ret = register_chrdev_region(dev, VIDEO_NUM_DEVICES, VIDEO_NAME);
+        if (ret < 0) {
+                printk(KERN_WARNING "videodev: unable to get major %d\n",
+                                VIDEO_MAJOR);
+                return ret;
         }
 
         ret = class_register(&video_class);
         if (ret < 0) {
-                unregister_chrdev(VIDEO_MAJOR, VIDEO_NAME);
+                unregister_chrdev_region(dev, VIDEO_NUM_DEVICES);
                 printk(KERN_WARNING "video_dev: class_register failed\n");
                 return -EIO;
         }
@@ -408,8 +406,10 @@ static int __init videodev_init(void)
 
 static void __exit videodev_exit(void)
 {
+        dev_t dev = MKDEV(VIDEO_MAJOR, 0);
+
         class_unregister(&video_class);
-        unregister_chrdev(VIDEO_MAJOR, VIDEO_NAME);
+        unregister_chrdev_region(dev, VIDEO_NUM_DEVICES);
 }
 
 module_init(videodev_init)
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 140ef92c19c1..155c9d77a463 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -746,18 +746,6 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
                                 ret = ops->vidioc_enum_fmt_vid_overlay(file,
                                         fh, f);
                         break;
-#if 1
-                /* V4L2_BUF_TYPE_VBI_CAPTURE should not support VIDIOC_ENUM_FMT
-                 * according to the spec. The bttv and saa7134 drivers support
-                 * it though, so just warn that this is deprecated and will be
-                 * removed in the near future. */
-                case V4L2_BUF_TYPE_VBI_CAPTURE:
-                        if (ops->vidioc_enum_fmt_vbi_cap) {
-                                printk(KERN_WARNING "vidioc_enum_fmt_vbi_cap will be removed in 2.6.28!\n");
-                                ret = ops->vidioc_enum_fmt_vbi_cap(file, fh, f);
-                        }
-                        break;
-#endif
                 case V4L2_BUF_TYPE_VIDEO_OUTPUT:
                         if (ops->vidioc_enum_fmt_vid_out)
                                 ret = ops->vidioc_enum_fmt_vid_out(file, fh, f);
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 1edda456fc64..8ec57df1904f 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -39,7 +39,6 @@
 #include <linux/i2c-algo-sgi.h>
 
 #include <linux/videodev2.h>
-#include <media/v4l2-ioctl.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/video_decoder.h>
@@ -810,7 +809,7 @@ static void vino_free_buffer_with_count(struct vino_framebuffer *fb,
         dprintk("vino_free_buffer_with_count(): count = %d\n", count);
 
         for (i = 0; i < count; i++) {
-                ClearPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                ClearPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
                 dma_unmap_single(NULL,
                                  fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
                                  PAGE_SIZE, DMA_FROM_DEVICE);
@@ -888,7 +887,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
                                 dma_data_addr + VINO_PAGE_SIZE * j;
                 }
 
-                SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                SetPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
         }
 
         /* page_count needs to be set anyway, because the descriptor table has
@@ -975,7 +974,7 @@ static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
                                 dma_data_addr + VINO_PAGE_SIZE * j;
                 }
 
-                SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                SetPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
         }
 
         /* page_count needs to be set anyway, because the descriptor table has
@@ -4025,8 +4024,7 @@ out:
 
 static int vino_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         int ret = 0;
         dprintk("open(): channel = %c\n",
                (vcs->channel == VINO_CHANNEL_A) ? 'A' : 'B');
@@ -4057,8 +4055,7 @@ static int vino_open(struct inode *inode, struct file *file)
 
 static int vino_close(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         dprintk("close():\n");
 
         mutex_lock(&vcs->mutex);
@@ -4101,8 +4098,7 @@ static struct vm_operations_struct vino_vm_ops = {
 
 static int vino_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
 
         unsigned long start = vma->vm_start;
         unsigned long size = vma->vm_end - vma->vm_start;
@@ -4207,8 +4203,7 @@ out:
 
 static unsigned int vino_poll(struct file *file, poll_table *pt)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         unsigned int outgoing;
         unsigned int ret = 0;
 
@@ -4248,8 +4243,7 @@ error:
 static int vino_do_ioctl(struct inode *inode, struct file *file,
                       unsigned int cmd, void *arg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
 
 #ifdef VINO_DEBUG
         switch (_IOC_TYPE(cmd)) {
@@ -4356,8 +4350,7 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
 static int vino_ioctl(struct inode *inode, struct file *file,
                       unsigned int cmd, unsigned long arg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         int ret;
 
         if (mutex_lock_interruptible(&vcs->mutex))
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 8ba8daafd7ea..65c8af18e767 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -898,9 +898,11 @@ static int vivi_open(struct inode *inode, struct file *file)
 
         printk(KERN_DEBUG "vivi: open called (minor=%d)\n", minor);
 
+        lock_kernel();
         list_for_each_entry(dev, &vivi_devlist, vivi_devlist)
                 if (dev->vfd->minor == minor)
                         goto found;
+        unlock_kernel();
         return -ENODEV;
 
 found:
@@ -925,8 +927,10 @@ found:
         }
 unlock:
         mutex_unlock(&dev->mutex);
-        if (retval)
+        if (retval) {
+                unlock_kernel();
                 return retval;
+        }
 
         file->private_data = fh;
         fh->dev      = dev;
@@ -955,6 +959,7 @@ unlock:
                         sizeof(struct vivi_buffer), fh);
 
         vivi_start_thread(fh);
+        unlock_kernel();
 
         return 0;
 }
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 35293029da02..45be9ec8edc4 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -24,8 +24,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 
-#include <linux/byteorder/swab.h>
-
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index 2ff00bc5ad64..b2dbe48a92bb 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -113,6 +113,7 @@ struct w9966_dev {
         signed char contrast;
         signed char color;
         signed char hue;
+        unsigned long in_use;
 };
 
 /*
@@ -184,10 +185,25 @@ static int w9966_v4l_ioctl(struct inode *inode, struct file *file,
 static ssize_t w9966_v4l_read(struct file *file, char __user *buf,
                               size_t count, loff_t *ppos);
 
+static int w9966_exclusive_open(struct inode *inode, struct file *file)
+{
+        struct w9966_dev *cam = video_drvdata(file);
+
+        return test_and_set_bit(0, &cam->in_use) ? -EBUSY : 0;
+}
+
+static int w9966_exclusive_release(struct inode *inode, struct file *file)
+{
+        struct w9966_dev *cam = video_drvdata(file);
+
+        clear_bit(0, &cam->in_use);
+        return 0;
+}
+
 static const struct file_operations w9966_fops = {
         .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
+        .open           = w9966_exclusive_open,
+        .release        = w9966_exclusive_release,
         .ioctl          = w9966_v4l_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
@@ -198,6 +214,7 @@ static const struct file_operations w9966_fops = {
 static struct video_device w9966_template = {
         .name           = W9966_DRIVERNAME,
         .fops           = &w9966_fops,
+        .release        = video_device_release_empty,
 };
 
 /*
@@ -332,7 +349,7 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port)
 
 // Fill in the video_device struct and register us to v4l
         memcpy(&cam->vdev, &w9966_template, sizeof(struct video_device));
-        cam->vdev.priv = cam;
+        video_set_drvdata(&cam->vdev, cam);
 
         if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, video_nr) < 0)
                 return -1;
@@ -713,8 +730,7 @@ static int w9966_wReg_i2c(struct w9966_dev* cam, int reg, int data)
 static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,
                               unsigned int cmd, void *arg)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct w9966_dev *cam = vdev->priv;
+        struct w9966_dev *cam = video_drvdata(file);
 
         switch(cmd)
         {
@@ -872,8 +888,7 @@ static int w9966_v4l_ioctl(struct inode *inode, struct file *file,
 static ssize_t w9966_v4l_read(struct file *file, char  __user *buf,
                               size_t count, loff_t *ppos)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct w9966_dev *cam = vdev->priv;
+        struct w9966_dev *cam = video_drvdata(file);
         unsigned char addr = 0xa0;      // ECP, read, CCD-transfer, 00000
         unsigned char __user *dest = (unsigned char __user *)buf;
         unsigned long dleft = count;
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 0c3287734c93..6a0902bcba6b 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -657,7 +657,7 @@ static int zc0301_open(struct inode* inode, struct file* filp)
         if (!down_read_trylock(&zc0301_dev_lock))
                 return -EAGAIN;
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         if (wait_for_completion_interruptible(&cam->probe)) {
                 up_read(&zc0301_dev_lock);
@@ -739,7 +739,7 @@ static int zc0301_release(struct inode* inode, struct file* filp)
 
         down_write(&zc0301_dev_lock);
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         zc0301_stop_transfer(cam);
         zc0301_release_buffers(cam);
@@ -759,7 +759,7 @@ static int zc0301_release(struct inode* inode, struct file* filp)
 static ssize_t
 zc0301_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         struct zc0301_frame_t* f, * i;
         unsigned long lock_flags;
         long timeout;
@@ -866,7 +866,7 @@ exit:
 
 static unsigned int zc0301_poll(struct file *filp, poll_table *wait)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         struct zc0301_frame_t* f;
         unsigned long lock_flags;
         unsigned int mask = 0;
@@ -941,7 +941,7 @@ static struct vm_operations_struct zc0301_vm_ops = {
 
 static int zc0301_mmap(struct file* filp, struct vm_area_struct *vma)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         unsigned long size = vma->vm_end - vma->vm_start,
                       start = vma->vm_start;
         void *pos;
@@ -1796,7 +1796,7 @@ zc0301_vidioc_s_parm(struct zc0301_device* cam, void __user * arg)
 static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,
                              unsigned int cmd, void __user * arg)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
 
         switch (cmd) {
 
@@ -1891,7 +1891,7 @@ static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,
 static int zc0301_ioctl(struct inode* inode, struct file* filp,
                         unsigned int cmd, unsigned long arg)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         int err = 0;
 
         if (mutex_lock_interruptible(&cam->fileop_mutex))
diff --git a/drivers/media/video/zoran/Kconfig b/drivers/media/video/zoran/Kconfig
new file mode 100644
index 000000000000..4ea5fa71de89
--- /dev/null
+++ b/drivers/media/video/zoran/Kconfig
@@ -0,0 +1,73 @@
+config VIDEO_ZORAN
+        tristate "Zoran ZR36057/36067 Video For Linux"
+        depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS
+        help
+          Say Y for support for MJPEG capture cards based on the Zoran
+          36057/36067 PCI controller chipset. This includes the Iomega
+          Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is
+          a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For
+          more information, check <file:Documentation/video4linux/Zoran>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called zr36067.
+
+config VIDEO_ZORAN_DC30
+        tristate "Pinnacle/Miro DC30(+) support"
+        depends on VIDEO_ZORAN
+        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
+          card. This also supports really old DC10 cards based on the
+          zr36050 MJPEG codec and zr36016 VFE.
+
+config VIDEO_ZORAN_ZR36060
+        tristate "Zoran ZR36060"
+        depends on VIDEO_ZORAN
+        help
+          Say Y to support Zoran boards based on 36060 chips.
+          This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33
+          and 33 R10 and AverMedia 6 boards.
+
+config VIDEO_ZORAN_BUZ
+        tristate "Iomega Buz support"
+        depends on VIDEO_ZORAN_ZR36060
+        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Support for the Iomega Buz MJPEG capture/playback card.
+
+config VIDEO_ZORAN_DC10
+        tristate "Pinnacle/Miro DC10(+) support"
+        depends on VIDEO_ZORAN_ZR36060
+        select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback
+          card.
+
+config VIDEO_ZORAN_LML33
+        tristate "Linux Media Labs LML33 support"
+        depends on VIDEO_ZORAN_ZR36060
+        select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Support for the Linux Media Labs LML33 MJPEG capture/playback
+          card.
+
+config VIDEO_ZORAN_LML33R10
+        tristate "Linux Media Labs LML33R10 support"
+        depends on VIDEO_ZORAN_ZR36060
+        select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          support for the Linux Media Labs LML33R10 MJPEG capture/playback
+          card.
+
+config VIDEO_ZORAN_AVS6EYES
+        tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"
+        depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1
+        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Support for the AverMedia 6 Eyes video surveillance card.
diff --git a/drivers/media/video/zoran/Makefile b/drivers/media/video/zoran/Makefile
new file mode 100644
index 000000000000..44cc13352c88
--- /dev/null
+++ b/drivers/media/video/zoran/Makefile
@@ -0,0 +1,6 @@
+zr36067-objs    :=      zoran_procfs.o zoran_device.o \
+                        zoran_driver.o zoran_card.o
+
+obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o
+obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o
+obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/zoran/videocodec.c
index cf24956f3204..cf24956f3204 100644
--- a/drivers/media/video/videocodec.c
+++ b/drivers/media/video/zoran/videocodec.c
diff --git a/drivers/media/video/videocodec.h b/drivers/media/video/zoran/videocodec.h
index 97a3bbeda505..97a3bbeda505 100644
--- a/drivers/media/video/videocodec.h
+++ b/drivers/media/video/zoran/videocodec.h
diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran/zoran.h
index 46b7ad477ceb..46b7ad477ceb 100644
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 3282be730298..3282be730298 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
diff --git a/drivers/media/video/zoran_card.h b/drivers/media/video/zoran/zoran_card.h
index e4dc9d29b404..e4dc9d29b404 100644
--- a/drivers/media/video/zoran_card.h
+++ b/drivers/media/video/zoran/zoran_card.h
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index 88d369708e4c..5d948ff7faf0 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran/zoran_device.c
@@ -58,8 +58,6 @@
                    ZR36057_ISR_GIRQ1 | \
                    ZR36057_ISR_JPEGRepIRQ )
 
-extern const struct zoran_format zoran_formats[];
-
 static int lml33dpath;          /* default = 0
                                  * 1 will use digital path in capture
                                  * mode instead of analog. It can be
@@ -377,7 +375,7 @@ zr36057_set_vfe (struct zoran              *zr,
 
         /* horizontal */
         VidWinWid = video_width;
-        X = (VidWinWid * 64 + tvn->Wa - 1) / tvn->Wa;
+        X = DIV_ROUND_UP(VidWinWid * 64, tvn->Wa);
         We = (VidWinWid * 64) / X;
         HorDcm = 64 - X;
         hcrop1 = 2 * ((tvn->Wa - We) / 4);
@@ -403,7 +401,7 @@ zr36057_set_vfe (struct zoran              *zr,
         /* Vertical */
         DispMode = !(video_height > BUZ_MAX_HEIGHT / 2);
         VidWinHt = DispMode ? video_height : video_height / 2;
-        Y = (VidWinHt * 64 * 2 + tvn->Ha - 1) / tvn->Ha;
+        Y = DIV_ROUND_UP(VidWinHt * 64 * 2, tvn->Ha);
         He = (VidWinHt * 64) / Y;
         VerDcm = 64 - Y;
         vcrop1 = (tvn->Ha / 2 - He) / 2;
diff --git a/drivers/media/video/zoran_device.h b/drivers/media/video/zoran/zoran_device.h
index 37fa86a34083..74c6c8edb7d0 100644
--- a/drivers/media/video/zoran_device.h
+++ b/drivers/media/video/zoran/zoran_device.h
@@ -78,6 +78,14 @@ extern void zoran_set_pci_master(struct zoran *zr,
 extern void zoran_init_hardware(struct zoran *zr);
 extern void zr36057_restart(struct zoran *zr);
 
+extern const struct zoran_format zoran_formats[];
+
+extern int v4l_nbufs;
+extern int v4l_bufsize;
+extern int jpg_nbufs;
+extern int jpg_bufsize;
+extern int pass_through;
+
 /* i2c */
 extern int decoder_command(struct zoran *zr,
                            int cmd,
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 2dab9eea4def..25de7631443e 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -194,12 +194,6 @@ const struct zoran_format zoran_formats[] = {
 // RJ: Test only - want to test BUZ_USE_HIMEM even when CONFIG_BIGPHYS_AREA is defined
 
 
-extern int v4l_nbufs;
-extern int v4l_bufsize;
-extern int jpg_nbufs;
-extern int jpg_bufsize;
-extern int pass_through;
-
 static int lock_norm;   /* 0 = default 1 = Don't change TV standard (norm) */
 module_param(lock_norm, int, 0644);
 MODULE_PARM_DESC(lock_norm, "Prevent norm changes (1 = ignore, >1 = fail)");
@@ -1211,6 +1205,7 @@ zoran_open (struct inode *inode,
         struct zoran_fh *fh;
         int i, res, first_open = 0, have_module_locks = 0;
 
+        lock_kernel();
         /* find the device */
         for (i = 0; i < zoran_num; i++) {
                 if (zoran[i]->video_dev->minor == minor) {
@@ -1321,6 +1316,7 @@ zoran_open (struct inode *inode,
         file->private_data = fh;
         fh->zr = zr;
         zoran_open_init_session(file);
+        unlock_kernel();
 
         return 0;
 
@@ -1338,6 +1334,7 @@ open_unlock_and_return:
         if (zr) {
                 /*mutex_unlock(&zr->resource_lock);*/
         }
+        unlock_kernel();
 
         return res;
 }
@@ -2920,6 +2917,8 @@ zoran_do_ioctl (struct inode *inode,
                                 fmt->fmt.pix.bytesperline = 0;
                                 fmt->fmt.pix.sizeimage =
                                     fh->jpg_buffers.buffer_size;
+                                fmt->fmt.pix.colorspace =
+                                    V4L2_COLORSPACE_SMPTE170M;
 
                                 /* we hereby abuse this variable to show that
                                  * we're gonna do mjpeg capture */
@@ -2979,6 +2978,8 @@ zoran_do_ioctl (struct inode *inode,
                                 fmt->fmt.pix.sizeimage =
                                         fh->v4l_settings.height *
                                         fh->v4l_settings.bytesperline;
+                                fmt->fmt.pix.colorspace =
+                                        fh->v4l_settings.format->colorspace;
                                 if (BUZ_MAX_HEIGHT <
                                     (fh->v4l_settings.height * 2))
                                         fmt->fmt.pix.field =
diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran/zoran_procfs.c
index 870bc5a70e3f..870bc5a70e3f 100644
--- a/drivers/media/video/zoran_procfs.c
+++ b/drivers/media/video/zoran/zoran_procfs.c
diff --git a/drivers/media/video/zoran_procfs.h b/drivers/media/video/zoran/zoran_procfs.h
index f2d5b1ba448f..f2d5b1ba448f 100644
--- a/drivers/media/video/zoran_procfs.h
+++ b/drivers/media/video/zoran/zoran_procfs.h
diff --git a/drivers/media/video/zr36016.c b/drivers/media/video/zoran/zr36016.c
index 00d132bcd1e4..00d132bcd1e4 100644
--- a/drivers/media/video/zr36016.c
+++ b/drivers/media/video/zoran/zr36016.c
diff --git a/drivers/media/video/zr36016.h b/drivers/media/video/zoran/zr36016.h
index 8c79229f69d1..8c79229f69d1 100644
--- a/drivers/media/video/zr36016.h
+++ b/drivers/media/video/zoran/zr36016.h
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zoran/zr36050.c
index cf8b271a1c8f..cf8b271a1c8f 100644
--- a/drivers/media/video/zr36050.c
+++ b/drivers/media/video/zoran/zr36050.c
diff --git a/drivers/media/video/zr36050.h b/drivers/media/video/zoran/zr36050.h
index 9f52f0cdde50..9f52f0cdde50 100644
--- a/drivers/media/video/zr36050.h
+++ b/drivers/media/video/zoran/zr36050.h
diff --git a/drivers/media/video/zr36057.h b/drivers/media/video/zoran/zr36057.h
index 54c9362aa980..54c9362aa980 100644
--- a/drivers/media/video/zr36057.h
+++ b/drivers/media/video/zoran/zr36057.h
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zoran/zr36060.c
index 8e74054d5ef1..8e74054d5ef1 100644
--- a/drivers/media/video/zr36060.c
+++ b/drivers/media/video/zoran/zr36060.c
diff --git a/drivers/media/video/zr36060.h b/drivers/media/video/zoran/zr36060.h
index 914ffa4ad8d3..914ffa4ad8d3 100644
--- a/drivers/media/video/zr36060.h
+++ b/drivers/media/video/zoran/zr36060.h
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 18d1c4ba79fb..7cdac99deea6 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -52,7 +52,7 @@
 
 
 /* Debug macro */
-#define DBG(x...) if (debug) info(x)
+#define DBG(x...) if (debug) printk(KERN_INFO KBUILD_MODNAME x)
 
 
 /* Init methods, need to find nicer names for these
@@ -116,6 +116,7 @@ struct zr364xx_camera {
         int height;
         int method;
         struct mutex lock;
+        int users;
 };
 
 
@@ -127,7 +128,7 @@ static int send_control_msg(struct usb_device *udev, u8 request, u16 value,
 
         unsigned char *transfer_buffer = kmalloc(size, GFP_KERNEL);
         if (!transfer_buffer) {
-                info("kmalloc(%d) failed", size);
+                dev_err(&udev->dev, "kmalloc(%d) failed\n", size);
                 return -ENOMEM;
         }
 
@@ -143,7 +144,8 @@ static int send_control_msg(struct usb_device *udev, u8 request, u16 value,
         kfree(transfer_buffer);
 
         if (status < 0)
-                info("Failed sending control message, error %d.", status);
+                dev_err(&udev->dev,
+                        "Failed sending control message, error %d.\n", status);
 
         return status;
 }
@@ -303,11 +305,11 @@ static int read_frame(struct zr364xx_camera *cam, int framenum)
                 DBG("buffer : %d %d", cam->buffer[0], cam->buffer[1]);
                 DBG("bulk : n=%d size=%d", n, actual_length);
                 if (n < 0) {
-                        info("error reading bulk msg");
+                        dev_err(&cam->udev->dev, "error reading bulk msg\n");
                         return 0;
                 }
                 if (actual_length < 0 || actual_length > BUFFER_SIZE) {
-                        info("wrong number of bytes");
+                        dev_err(&cam->udev->dev, "wrong number of bytes\n");
                         return 0;
                 }
 
@@ -641,42 +643,47 @@ static int zr364xx_open(struct inode *inode, struct file *file)
 
         DBG("zr364xx_open");
 
-        cam->skip = 2;
+        mutex_lock(&cam->lock);
 
-        err = video_exclusive_open(inode, file);
-        if (err < 0)
-                return err;
+        if (cam->users) {
+                err = -EBUSY;
+                goto out;
+        }
 
         if (!cam->framebuf) {
                 cam->framebuf = vmalloc_32(MAX_FRAME_SIZE * FRAMES);
                 if (!cam->framebuf) {
-                        info("vmalloc_32 failed!");
-                        return -ENOMEM;
+                        dev_err(&cam->udev->dev, "vmalloc_32 failed!\n");
+                        err = -ENOMEM;
+                        goto out;
                 }
         }
 
-        mutex_lock(&cam->lock);
         for (i = 0; init[cam->method][i].size != -1; i++) {
                 err =
                     send_control_msg(udev, 1, init[cam->method][i].value,
                                      0, init[cam->method][i].bytes,
                                      init[cam->method][i].size);
                 if (err < 0) {
-                        info("error during open sequence: %d", i);
-                        mutex_unlock(&cam->lock);
-                        return err;
+                        dev_err(&cam->udev->dev,
+                                "error during open sequence: %d\n", i);
+                        goto out;
                 }
         }
 
+        cam->skip = 2;
+        cam->users++;
         file->private_data = vdev;
 
         /* Added some delay here, since opening/closing the camera quickly,
          * like Ekiga does during its startup, can crash the webcam
          */
         mdelay(100);
+        err = 0;
 
+out:
         mutex_unlock(&cam->lock);
-        return 0;
+        return err;
 }
 
 
@@ -697,28 +704,30 @@ static int zr364xx_release(struct inode *inode, struct file *file)
         udev = cam->udev;
 
         mutex_lock(&cam->lock);
+
+        cam->users--;
+        file->private_data = NULL;
+
         for (i = 0; i < 2; i++) {
                 err =
                     send_control_msg(udev, 1, init[cam->method][i].value,
                                      0, init[i][cam->method].bytes,
                                      init[cam->method][i].size);
                 if (err < 0) {
-                        info("error during release sequence");
-                        mutex_unlock(&cam->lock);
-                        return err;
+                        dev_err(&udev->dev, "error during release sequence\n");
+                        goto out;
                 }
         }
 
-        file->private_data = NULL;
-        video_exclusive_release(inode, file);
-
         /* Added some delay here, since opening/closing the camera quickly,
          * like Ekiga does during its startup, can crash the webcam
          */
         mdelay(100);
+        err = 0;
 
+out:
         mutex_unlock(&cam->lock);
-        return 0;
+        return err;
 }
 
 
@@ -801,13 +810,14 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         DBG("probing...");
 
-        info(DRIVER_DESC " compatible webcam plugged");
-        info("model %04x:%04x detected", udev->descriptor.idVendor,
-             udev->descriptor.idProduct);
+        dev_info(&intf->dev, DRIVER_DESC " compatible webcam plugged\n");
+        dev_info(&intf->dev, "model %04x:%04x detected\n",
+                 le16_to_cpu(udev->descriptor.idVendor),
+                 le16_to_cpu(udev->descriptor.idProduct));
 
         cam = kzalloc(sizeof(struct zr364xx_camera), GFP_KERNEL);
         if (cam == NULL) {
-                info("cam: out of memory !");
+                dev_err(&udev->dev, "cam: out of memory !\n");
                 return -ENOMEM;
         }
         /* save the init method used by this camera */
@@ -815,7 +825,7 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         cam->vdev = video_device_alloc();
         if (cam->vdev == NULL) {
-                info("cam->vdev: out of memory !");
+                dev_err(&udev->dev, "cam->vdev: out of memory !\n");
                 kfree(cam);
                 return -ENOMEM;
         }
@@ -827,7 +837,7 @@ static int zr364xx_probe(struct usb_interface *intf,
         cam->udev = udev;
 
         if ((cam->buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL)) == NULL) {
-                info("cam->buffer: out of memory !");
+                dev_info(&udev->dev, "cam->buffer: out of memory !\n");
                 video_device_release(cam->vdev);
                 kfree(cam);
                 return -ENODEV;
@@ -835,17 +845,17 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         switch (mode) {
         case 1:
-                info("160x120 mode selected");
+                dev_info(&udev->dev, "160x120 mode selected\n");
                 cam->width = 160;
                 cam->height = 120;
                 break;
         case 2:
-                info("640x480 mode selected");
+                dev_info(&udev->dev, "640x480 mode selected\n");
                 cam->width = 640;
                 cam->height = 480;
                 break;
         default:
-                info("320x240 mode selected");
+                dev_info(&udev->dev, "320x240 mode selected\n");
                 cam->width = 320;
                 cam->height = 240;
                 break;
@@ -865,7 +875,7 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         err = video_register_device(cam->vdev, VFL_TYPE_GRABBER, -1);
         if (err) {
-                info("video_register_device failed");
+                dev_err(&udev->dev, "video_register_device failed\n");
                 video_device_release(cam->vdev);
                 kfree(cam->buffer);
                 kfree(cam);
@@ -874,7 +884,8 @@ static int zr364xx_probe(struct usb_interface *intf,
 
         usb_set_intfdata(intf, cam);
 
-        info(DRIVER_DESC " controlling video device %d", cam->vdev->minor);
+        dev_info(&udev->dev, DRIVER_DESC " controlling video device %d\n",
+                 cam->vdev->minor);
         return 0;
 }
 
@@ -884,7 +895,7 @@ static void zr364xx_disconnect(struct usb_interface *intf)
         struct zr364xx_camera *cam = usb_get_intfdata(intf);
         usb_set_intfdata(intf, NULL);
         dev_set_drvdata(&intf->dev, NULL);
-        info(DRIVER_DESC " webcam unplugged");
+        dev_info(&intf->dev, DRIVER_DESC " webcam unplugged\n");
         if (cam->vdev)
                 video_unregister_device(cam->vdev);
         cam->vdev = NULL;
@@ -913,16 +924,16 @@ static int __init zr364xx_init(void)
         int retval;
         retval = usb_register(&zr364xx_driver);
         if (retval)
-                info("usb_register failed!");
+                printk(KERN_ERR KBUILD_MODNAME ": usb_register failed!\n");
         else
-                info(DRIVER_DESC " module loaded");
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
         return retval;
 }
 
 
 static void __exit zr364xx_exit(void)
 {
-        info(DRIVER_DESC " module unloaded");
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " module unloaded\n");
         usb_deregister(&zr364xx_driver);
 }