191 files changed, 3916 insertions, 3415 deletions

diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index 1022e38994c2..0f2805899210 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -496,7 +496,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                         arg = arg->common.next;
                 }
 
-                ACPI_ERROR((AE_INFO,
+                ACPI_WARNING((AE_INFO,
                             "Package List length (%X) larger than NumElements count (%X), truncated\n",
                             i, element_count));
         } else if (i < element_count) {
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 80e32093e977..80c251ec6d2a 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -71,7 +71,7 @@ static DEFINE_MUTEX(performance_mutex);
  *  1 -> ignore _PPC totally -> forced by user through boot param
  */
 static int ignore_ppc = -1;
-module_param(ignore_ppc, uint, 0644);
+module_param(ignore_ppc, int, 0644);
 MODULE_PARM_DESC(ignore_ppc, "If the frequency of your machine gets wrongly" \
                  "limited by BIOS, this should help");
 
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index bcf2c70fca87..a4e3767b8c64 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -107,6 +107,13 @@ static int wait_transaction_complete(struct acpi_smb_hc *hc, int timeout)
         if (wait_event_timeout(hc->wait, smb_check_done(hc),
                                msecs_to_jiffies(timeout)))
                 return 0;
+        /*
+         * After the timeout happens, OS will try to check the status of SMbus.
+         * If the status is what OS expected, it will be regarded as the bogus
+         * timeout.
+         */
+        if (smb_check_done(hc))
+                return 0;
         else
                 return -ETIME;
 }
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index c3419182c9a7..775c97a282bd 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -300,6 +300,8 @@ int __init acpi_table_init(void)
 
 static int __init acpi_parse_apic_instance(char *str)
 {
+        if (!str)
+                return -EINVAL;
 
         acpi_apic_instance = simple_strtoul(str, NULL, 0);
 
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index ae8494944c45..11c8c19f0fb7 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -448,8 +448,10 @@ config PATA_MARVELL
         tristate "Marvell PATA support via legacy mode"
         depends on PCI
         help
-          This option enables limited support for the Marvell 88SE6145 ATA
-          controller.
+          This option enables limited support for the Marvell 88SE61xx ATA
+          controllers. If you wish to use only the SATA ports then select
+          the AHCI driver alone. If you wish to the use the PATA port or
+          both SATA and PATA include this driver.
 
           If unsure, say N.
 
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index c729e6988bbb..2e1a7cb2ed5f 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -420,7 +420,7 @@ static const struct ata_port_info ahci_port_info[] = {
         /* board_ahci_mv */
         {
                 AHCI_HFLAGS     (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI |
-                                 AHCI_HFLAG_MV_PATA),
+                                 AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP),
                 .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,
                 .pio_mask       = 0x1f, /* pio0-4 */
@@ -487,7 +487,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */
         { PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 */
         { PCI_VDEVICE(INTEL, 0x3b24), board_ahci }, /* PCH RAID */
+        { PCI_VDEVICE(INTEL, 0x3b25), board_ahci }, /* PCH RAID */
         { PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */
+        { PCI_VDEVICE(INTEL, 0x3b2c), board_ahci }, /* PCH RAID */
 
         /* JMicron 360/1/3/5/6, match class to avoid IDE function */
         { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -610,6 +612,15 @@ module_param(ahci_em_messages, int, 0444);
 MODULE_PARM_DESC(ahci_em_messages,
         "Set AHCI Enclosure Management Message type (0 = disabled, 1 = LED");
 
+#if defined(CONFIG_PATA_MARVELL) || defined(CONFIG_PATA_MARVELL_MODULE)
+static int marvell_enable;
+#else
+static int marvell_enable = 1;
+#endif
+module_param(marvell_enable, int, 0644);
+MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");
+
+
 static inline int ahci_nr_ports(u32 cap)
 {
         return (cap & 0x1f) + 1;
@@ -732,6 +743,8 @@ static void ahci_save_initial_config(struct pci_dev *pdev,
                            "MV_AHCI HACK: port_map %x -> %x\n",
                            port_map,
                            port_map & mv);
+                dev_printk(KERN_ERR, &pdev->dev,
+                          "Disabling your PATA port. Use the boot option 'ahci.marvell_enable=0' to avoid this.\n");
 
                 port_map &= mv;
         }
@@ -2533,6 +2546,12 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
 
+        /* The AHCI driver can only drive the SATA ports, the PATA driver
+           can drive them all so if both drivers are selected make sure
+           AHCI stays out of the way */
+        if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
+                return -ENODEV;
+
         /* acquire resources */
         rc = pcim_enable_device(pdev);
         if (rc)
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 304fdc6f1dc2..2a4c516894f0 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -1315,11 +1315,6 @@ fsm_start:
                 break;
 
         case HSM_ST_ERR:
-                /* make sure qc->err_mask is available to
-                 * know what's wrong and recover
-                 */
-                WARN_ON(!(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM)));
-
                 ap->hsm_task_state = HSM_ST_IDLE;
 
                 /* complete taskfile transaction */
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 24a011b25024..0d87eec84966 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -20,29 +20,30 @@
 #include <linux/ata.h>
 
 #define DRV_NAME        "pata_marvell"
-#define DRV_VERSION     "0.1.4"
+#define DRV_VERSION     "0.1.6"
 
 /**
- *      marvell_pre_reset       -       check for 40/80 pin
- *      @link: link
- *      @deadline: deadline jiffies for the operation
+ *      marvell_pata_active     -       check if PATA is active
+ *      @pdev: PCI device
  *
- *      Perform the PATA port setup we need.
+ *      Returns 1 if the PATA port may be active. We know how to check this
+ *      for the 6145 but not the other devices
  */
 
-static int marvell_pre_reset(struct ata_link *link, unsigned long deadline)
+static int marvell_pata_active(struct pci_dev *pdev)
 {
-        struct ata_port *ap = link->ap;
-        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
+        int i;
         u32 devices;
         void __iomem *barp;
-        int i;
 
-        /* Check if our port is enabled */
+        /* We don't yet know how to do this for other devices */
+        if (pdev->device != 0x6145)
+                return 1;       
 
         barp = pci_iomap(pdev, 5, 0x10);
         if (barp == NULL)
                 return -ENOMEM;
+
         printk("BAR5:");
         for(i = 0; i <= 0x0F; i++)
                 printk("%02X:%02X ", i, ioread8(barp + i));
@@ -51,9 +52,27 @@ static int marvell_pre_reset(struct ata_link *link, unsigned long deadline)
         devices = ioread32(barp + 0x0C);
         pci_iounmap(pdev, barp);
 
-        if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
-            (!(devices & 0x10)))        /* PATA enable ? */
-                return -ENOENT;
+        if (devices & 0x10)
+                return 1;
+        return 0;
+}
+
+/**
+ *      marvell_pre_reset       -       check for 40/80 pin
+ *      @link: link
+ *      @deadline: deadline jiffies for the operation
+ *
+ *      Perform the PATA port setup we need.
+ */
+
+static int marvell_pre_reset(struct ata_link *link, unsigned long deadline)
+{
+        struct ata_port *ap = link->ap;
+        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
+
+        if (pdev->device == 0x6145 && ap->port_no == 0 &&
+                !marvell_pata_active(pdev))     /* PATA enable ? */
+                        return -ENOENT;
 
         return ata_sff_prereset(link, deadline);
 }
@@ -128,6 +147,12 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
         if (pdev->device == 0x6101)
                 ppi[1] = &ata_dummy_port_info;
 
+#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
+        if (!marvell_pata_active(pdev)) {
+                printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n");
+                return -ENODEV;
+        }
+#endif
         return ata_pci_sff_init_one(pdev, ppi, &marvell_sht, NULL);
 }
 
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 720b8645f58a..e970b227fbce 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -322,9 +322,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
         /* Try to acquire MMIO resources and fallback to PIO if
          * that fails
          */
-        rc = pcim_enable_device(pdev);
-        if (rc)
-                return rc;
         rc = pcim_iomap_regions(pdev, 1 << SIL680_MMIO_BAR, DRV_NAME);
         if (rc)
                 goto use_ioports;
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 13c1d2af18ac..c815f8ecf6e6 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -667,7 +667,8 @@ static const struct pci_device_id mv_pci_tbl[] = {
         { PCI_VDEVICE(MARVELL, 0x5041), chip_504x },
         { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 },
         { PCI_VDEVICE(MARVELL, 0x5081), chip_508x },
-        /* RocketRAID 1740/174x have different identifiers */
+        /* RocketRAID 1720/174x have different identifiers */
+        { PCI_VDEVICE(TTI, 0x1720), chip_6042 },
         { PCI_VDEVICE(TTI, 0x1740), chip_508x },
         { PCI_VDEVICE(TTI, 0x1742), chip_508x },
 
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 858f70610eda..1e1f3f3757ae 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -309,8 +309,6 @@ static void nv_nf2_freeze(struct ata_port *ap);
 static void nv_nf2_thaw(struct ata_port *ap);
 static void nv_ck804_freeze(struct ata_port *ap);
 static void nv_ck804_thaw(struct ata_port *ap);
-static int nv_hardreset(struct ata_link *link, unsigned int *class,
-                        unsigned long deadline);
 static int nv_adma_slave_config(struct scsi_device *sdev);
 static int nv_adma_check_atapi_dma(struct ata_queued_cmd *qc);
 static void nv_adma_qc_prep(struct ata_queued_cmd *qc);
@@ -407,7 +405,7 @@ static struct scsi_host_template nv_swncq_sht = {
 
 static struct ata_port_operations nv_generic_ops = {
         .inherits               = &ata_bmdma_port_ops,
-        .hardreset              = nv_hardreset,
+        .hardreset              = ATA_OP_NULL,
         .scr_read               = nv_scr_read,
         .scr_write              = nv_scr_write,
 };
@@ -1588,21 +1586,6 @@ static void nv_mcp55_thaw(struct ata_port *ap)
         ata_sff_thaw(ap);
 }
 
-static int nv_hardreset(struct ata_link *link, unsigned int *class,
-                        unsigned long deadline)
-{
-        int rc;
-
-        /* SATA hardreset fails to retrieve proper device signature on
-         * some controllers.  Request follow up SRST.  For more info,
-         * see http://bugzilla.kernel.org/show_bug.cgi?id=3352
-         */
-        rc = sata_sff_hardreset(link, class, deadline);
-        if (rc)
-                return rc;
-        return -EAGAIN;
-}
-
 static void nv_adma_error_handler(struct ata_port *ap)
 {
         struct nv_adma_port_priv *pp = ap->private_data;
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 5ca1d80de182..4eee533f3f4a 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -21,6 +21,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 #include <asm/io.h>
 
 /*
@@ -151,13 +152,13 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,
  */
 static int verify_pmtmr_rate(void)
 {
-        u32 value1, value2;
+        cycle_t value1, value2;
         unsigned long count, delta;
 
         mach_prepare_counter();
-        value1 = read_pmtmr();
+        value1 = clocksource_acpi_pm.read();
         mach_countup(&count);
-        value2 = read_pmtmr();
+        value2 = clocksource_acpi_pm.read();
         delta = (value2 - value1) & ACPI_PM_MASK;
 
         /* Check that the PMTMR delta is within 5% of what we expect */
@@ -175,10 +176,13 @@ static int verify_pmtmr_rate(void)
 #define verify_pmtmr_rate() (0)
 #endif
 
+/* Number of monotonicity checks to perform during initialization */
+#define ACPI_PM_MONOTONICITY_CHECKS 10
+
 static int __init init_acpi_pm_clocksource(void)
 {
-        u32 value1, value2;
-        unsigned int i;
+        cycle_t value1, value2;
+        unsigned int i, j, good = 0;
 
         if (!pmtmr_ioport)
                 return -ENODEV;
@@ -187,24 +191,32 @@ static int __init init_acpi_pm_clocksource(void)
                                                 clocksource_acpi_pm.shift);
 
         /* "verify" this timing source: */
-        value1 = read_pmtmr();
-        for (i = 0; i < 10000; i++) {
-                value2 = read_pmtmr();
-                if (value2 == value1)
-                        continue;
-                if (value2 > value1)
-                        goto pm_good;
-                if ((value2 < value1) && ((value2) < 0xFFF))
-                        goto pm_good;
-                printk(KERN_INFO "PM-Timer had inconsistent results:"
-                        " 0x%#x, 0x%#x - aborting.\n", value1, value2);
-                return -EINVAL;
+        for (j = 0; j < ACPI_PM_MONOTONICITY_CHECKS; j++) {
+                value1 = clocksource_acpi_pm.read();
+                for (i = 0; i < 10000; i++) {
+                        value2 = clocksource_acpi_pm.read();
+                        if (value2 == value1)
+                                continue;
+                        if (value2 > value1)
+                                good++;
+                                break;
+                        if ((value2 < value1) && ((value2) < 0xFFF))
+                                good++;
+                                break;
+                        printk(KERN_INFO "PM-Timer had inconsistent results:"
+                               " 0x%#llx, 0x%#llx - aborting.\n",
+                               value1, value2);
+                        return -EINVAL;
+                }
+                udelay(300 * i);
+        }
+
+        if (good != ACPI_PM_MONOTONICITY_CHECKS) {
+                printk(KERN_INFO "PM-Timer failed consistency check "
+                       " (0x%#llx) - aborting.\n", value1);
+                return -ENODEV;
         }
-        printk(KERN_INFO "PM-Timer had no reasonable result:"
-                        " 0x%#x - aborting.\n", value1);
-        return -ENODEV;
 
-pm_good:
         if (verify_pmtmr_rate() != 0)
                 return -ENODEV;
 
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 840e634fa31f..640cbb237328 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -31,13 +31,84 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
+/* Transmit operation:                                                      */
+/*                                                                          */
+/* 0 byte transmit                                                          */
+/* BUS:     S     A8     ACK   P                                            */
+/* IRQ:       DTE   WAIT                                                    */
+/* ICIC:                                                                    */
+/* ICCR: 0x94 0x90                                                          */
+/* ICDR:      A8                                                            */
+/*                                                                          */
+/* 1 byte transmit                                                          */
+/* BUS:     S     A8     ACK   D8(1)   ACK   P                              */
+/* IRQ:       DTE   WAIT         WAIT                                       */
+/* ICIC:      -DTE                                                          */
+/* ICCR: 0x94       0x90                                                    */
+/* ICDR:      A8    D8(1)                                                   */
+/*                                                                          */
+/* 2 byte transmit                                                          */
+/* BUS:     S     A8     ACK   D8(1)   ACK   D8(2)   ACK   P                */
+/* IRQ:       DTE   WAIT         WAIT          WAIT                         */
+/* ICIC:      -DTE                                                          */
+/* ICCR: 0x94                    0x90                                       */
+/* ICDR:      A8    D8(1)        D8(2)                                      */
+/*                                                                          */
+/* 3 bytes or more, +---------+ gets repeated                               */
+/*                                                                          */
+/*                                                                          */
+/* Receive operation:                                                       */
+/*                                                                          */
+/* 0 byte receive - not supported since slave may hold SDA low              */
+/*                                                                          */
+/* 1 byte receive       [TX] | [RX]                                         */
+/* BUS:     S     A8     ACK | D8(1)   ACK   P                              */
+/* IRQ:       DTE   WAIT     |   WAIT     DTE                               */
+/* ICIC:      -DTE           |   +DTE                                       */
+/* ICCR: 0x94       0x81     |   0xc0                                       */
+/* ICDR:      A8             |            D8(1)                             */
+/*                                                                          */
+/* 2 byte receive        [TX]| [RX]                                         */
+/* BUS:     S     A8     ACK | D8(1)   ACK   D8(2)   ACK   P                */
+/* IRQ:       DTE   WAIT     |   WAIT          WAIT     DTE                 */
+/* ICIC:      -DTE           |                 +DTE                         */
+/* ICCR: 0x94       0x81     |                 0xc0                         */
+/* ICDR:      A8             |                 D8(1)    D8(2)               */
+/*                                                                          */
+/* 3 byte receive       [TX] | [RX]                                         */
+/* BUS:     S     A8     ACK | D8(1)   ACK   D8(2)   ACK   D8(3)   ACK    P */
+/* IRQ:       DTE   WAIT     |   WAIT          WAIT         WAIT      DTE   */
+/* ICIC:      -DTE           |                              +DTE            */
+/* ICCR: 0x94       0x81     |                              0xc0            */
+/* ICDR:      A8             |                 D8(1)        D8(2)     D8(3) */
+/*                                                                          */
+/* 4 bytes or more, this part is repeated    +---------+                    */
+/*                                                                          */
+/*                                                                          */
+/* Interrupt order and BUSY flag                                            */
+/*     ___                                                 _                */
+/* SDA ___\___XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXAAAAAAAAA___/                 */
+/* SCL      \_/1\_/2\_/3\_/4\_/5\_/6\_/7\_/8\___/9\_____/                   */
+/*                                                                          */
+/*        S   D7  D6  D5  D4  D3  D2  D1  D0              P                 */
+/*                                           ___                            */
+/* WAIT IRQ ________________________________/   \___________                */
+/* TACK IRQ ____________________________________/   \_______                */
+/* DTE  IRQ __________________________________________/   \_                */
+/* AL   IRQ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX                */
+/*         _______________________________________________                  */
+/* BUSY __/                                               \_                */
+/*                                                                          */
+
 enum sh_mobile_i2c_op {
         OP_START = 0,
-        OP_TX_ONLY,
+        OP_TX_FIRST,
+        OP_TX,
         OP_TX_STOP,
         OP_TX_TO_RX,
-        OP_RX_ONLY,
+        OP_RX,
         OP_RX_STOP,
+        OP_RX_STOP_DATA,
 };
 
 struct sh_mobile_i2c_data {
@@ -127,25 +198,34 @@ static unsigned char i2c_op(struct sh_mobile_i2c_data *pd,
         spin_lock_irqsave(&pd->lock, flags);
 
         switch (op) {
-        case OP_START:
+        case OP_START: /* issue start and trigger DTE interrupt */
                 iowrite8(0x94, ICCR(pd));
                 break;
-        case OP_TX_ONLY:
+        case OP_TX_FIRST: /* disable DTE interrupt and write data */
+                iowrite8(ICIC_WAITE | ICIC_ALE | ICIC_TACKE, ICIC(pd));
                 iowrite8(data, ICDR(pd));
                 break;
-        case OP_TX_STOP:
+        case OP_TX: /* write data */
                 iowrite8(data, ICDR(pd));
-                iowrite8(0x90, ICCR(pd));
-                iowrite8(ICIC_ALE | ICIC_TACKE, ICIC(pd));
                 break;
-        case OP_TX_TO_RX:
+        case OP_TX_STOP: /* write data and issue a stop afterwards */
                 iowrite8(data, ICDR(pd));
+                iowrite8(0x90, ICCR(pd));
+                break;
+        case OP_TX_TO_RX: /* select read mode */
                 iowrite8(0x81, ICCR(pd));
                 break;
-        case OP_RX_ONLY:
+        case OP_RX: /* just read data */
                 ret = ioread8(ICDR(pd));
                 break;
-        case OP_RX_STOP:
+        case OP_RX_STOP: /* enable DTE interrupt, issue stop */
+                iowrite8(ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE,
+                         ICIC(pd));
+                iowrite8(0xc0, ICCR(pd));
+                break;
+        case OP_RX_STOP_DATA: /* enable DTE interrupt, read data, issue stop */
+                iowrite8(ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE,
+                         ICIC(pd));
                 ret = ioread8(ICDR(pd));
                 iowrite8(0xc0, ICCR(pd));
                 break;
@@ -157,58 +237,120 @@ static unsigned char i2c_op(struct sh_mobile_i2c_data *pd,
         return ret;
 }
 
+static int sh_mobile_i2c_is_first_byte(struct sh_mobile_i2c_data *pd)
+{
+        if (pd->pos == -1)
+                return 1;
+
+        return 0;
+}
+
+static int sh_mobile_i2c_is_last_byte(struct sh_mobile_i2c_data *pd)
+{
+        if (pd->pos == (pd->msg->len - 1))
+                return 1;
+
+        return 0;
+}
+
+static void sh_mobile_i2c_get_data(struct sh_mobile_i2c_data *pd,
+                                   unsigned char *buf)
+{
+        switch (pd->pos) {
+        case -1:
+                *buf = (pd->msg->addr & 0x7f) << 1;
+                *buf |= (pd->msg->flags & I2C_M_RD) ? 1 : 0;
+                break;
+        default:
+                *buf = pd->msg->buf[pd->pos];
+        }
+}
+
+static int sh_mobile_i2c_isr_tx(struct sh_mobile_i2c_data *pd)
+{
+        unsigned char data;
+
+        if (pd->pos == pd->msg->len)
+                return 1;
+
+        sh_mobile_i2c_get_data(pd, &data);
+
+        if (sh_mobile_i2c_is_last_byte(pd))
+                i2c_op(pd, OP_TX_STOP, data);
+        else if (sh_mobile_i2c_is_first_byte(pd))
+                i2c_op(pd, OP_TX_FIRST, data);
+        else
+                i2c_op(pd, OP_TX, data);
+
+        pd->pos++;
+        return 0;
+}
+
+static int sh_mobile_i2c_isr_rx(struct sh_mobile_i2c_data *pd)
+{
+        unsigned char data;
+        int real_pos;
+
+        do {
+                if (pd->pos <= -1) {
+                        sh_mobile_i2c_get_data(pd, &data);
+
+                        if (sh_mobile_i2c_is_first_byte(pd))
+                                i2c_op(pd, OP_TX_FIRST, data);
+                        else
+                                i2c_op(pd, OP_TX, data);
+                        break;
+                }
+
+                if (pd->pos == 0) {
+                        i2c_op(pd, OP_TX_TO_RX, 0);
+                        break;
+                }
+
+                real_pos = pd->pos - 2;
+
+                if (pd->pos == pd->msg->len) {
+                        if (real_pos < 0) {
+                                i2c_op(pd, OP_RX_STOP, 0);
+                                break;
+                        }
+                        data = i2c_op(pd, OP_RX_STOP_DATA, 0);
+                } else
+                        data = i2c_op(pd, OP_RX, 0);
+
+                pd->msg->buf[real_pos] = data;
+        } while (0);
+
+        pd->pos++;
+        return pd->pos == (pd->msg->len + 2);
+}
+
 static irqreturn_t sh_mobile_i2c_isr(int irq, void *dev_id)
 {
         struct platform_device *dev = dev_id;
         struct sh_mobile_i2c_data *pd = platform_get_drvdata(dev);
-        struct i2c_msg *msg = pd->msg;
-        unsigned char data, sr;
-        int wakeup = 0;
+        unsigned char sr;
+        int wakeup;
 
         sr = ioread8(ICSR(pd));
-        pd->sr |= sr;
+        pd->sr |= sr; /* remember state */
 
         dev_dbg(pd->dev, "i2c_isr 0x%02x 0x%02x %s %d %d!\n", sr, pd->sr,
-               (msg->flags & I2C_M_RD) ? "read" : "write",
-               pd->pos, msg->len);
+               (pd->msg->flags & I2C_M_RD) ? "read" : "write",
+               pd->pos, pd->msg->len);
 
         if (sr & (ICSR_AL | ICSR_TACK)) {
-                iowrite8(0, ICIC(pd)); /* disable interrupts */
-                wakeup = 1;
-                goto do_wakeup;
-        }
+                /* don't interrupt transaction - continue to issue stop */
+                iowrite8(sr & ~(ICSR_AL | ICSR_TACK), ICSR(pd));
+                wakeup = 0;
+        } else if (pd->msg->flags & I2C_M_RD)
+                wakeup = sh_mobile_i2c_isr_rx(pd);
+        else
+                wakeup = sh_mobile_i2c_isr_tx(pd);
 
-        if (pd->pos == msg->len) {
-                i2c_op(pd, OP_RX_ONLY, 0);
-                wakeup = 1;
-                goto do_wakeup;
-        }
+        if (sr & ICSR_WAIT) /* TODO: add delay here to support slow acks */
+                iowrite8(sr & ~ICSR_WAIT, ICSR(pd));
 
-        if (pd->pos == -1) {
-                data = (msg->addr & 0x7f) << 1;
-                data |= (msg->flags & I2C_M_RD) ? 1 : 0;
-        } else
-                data = msg->buf[pd->pos];
-
-        if ((pd->pos == -1) || !(msg->flags & I2C_M_RD)) {
-                if (msg->flags & I2C_M_RD)
-                        i2c_op(pd, OP_TX_TO_RX, data);
-                else if (pd->pos == (msg->len - 1)) {
-                        i2c_op(pd, OP_TX_STOP, data);
-                        wakeup = 1;
-                } else
-                        i2c_op(pd, OP_TX_ONLY, data);
-        } else {
-                if (pd->pos == (msg->len - 1))
-                        data = i2c_op(pd, OP_RX_STOP, 0);
-                else
-                        data = i2c_op(pd, OP_RX_ONLY, 0);
-
-                msg->buf[pd->pos] = data;
-        }
-        pd->pos++;
-
- do_wakeup:
         if (wakeup) {
                 pd->sr |= SW_DONE;
                 wake_up(&pd->wait);
@@ -219,6 +361,11 @@ static irqreturn_t sh_mobile_i2c_isr(int irq, void *dev_id)
 
 static int start_ch(struct sh_mobile_i2c_data *pd, struct i2c_msg *usr_msg)
 {
+        if (usr_msg->len == 0 && (usr_msg->flags & I2C_M_RD)) {
+                dev_err(pd->dev, "Unsupported zero length i2c read\n");
+                return -EIO;
+        }
+
         /* Initialize channel registers */
         iowrite8(ioread8(ICCR(pd)) & ~ICCR_ICE, ICCR(pd));
 
@@ -233,9 +380,8 @@ static int start_ch(struct sh_mobile_i2c_data *pd, struct i2c_msg *usr_msg)
         pd->pos = -1;
         pd->sr = 0;
 
-        /* Enable all interrupts except wait */
-        iowrite8(ioread8(ICIC(pd)) | ICIC_ALE | ICIC_TACKE | ICIC_DTEE,
-                 ICIC(pd));
+        /* Enable all interrupts to begin with */
+        iowrite8(ICIC_WAITE | ICIC_ALE | ICIC_TACKE | ICIC_DTEE, ICIC(pd));
         return 0;
 }
 
@@ -268,25 +414,18 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter,
                 if (!k)
                         dev_err(pd->dev, "Transfer request timed out\n");
 
-                retry_count = 10;
+                retry_count = 1000;
 again:
                 val = ioread8(ICSR(pd));
 
                 dev_dbg(pd->dev, "val 0x%02x pd->sr 0x%02x\n", val, pd->sr);
 
-                if ((val | pd->sr) & (ICSR_TACK | ICSR_AL)) {
-                        err = -EIO;
-                        break;
-                }
-
                 /* the interrupt handler may wake us up before the
                  * transfer is finished, so poll the hardware
                  * until we're done.
                  */
-
-                if (!(!(val & ICSR_BUSY) && (val & ICSR_SCLM) &&
-                      (val & ICSR_SDAM))) {
-                        msleep(1);
+                if (val & ICSR_BUSY) {
+                        udelay(10);
                         if (retry_count--)
                                 goto again;
 
@@ -294,6 +433,12 @@ again:
                         dev_err(pd->dev, "Polling timed out\n");
                         break;
                 }
+
+                /* handle missing acknowledge and arbitration lost */
+                if ((val | pd->sr) & (ICSR_TACK | ICSR_AL)) {
+                        err = -EIO;
+                        break;
+                }
         }
 
         deactivate_ch(pd);
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 2ec921bf3c60..18f4d7f6ce6d 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -63,7 +63,7 @@
 }
 
 /* table of devices that work with this driver */
-static const struct usb_device_id bcm5974_table [] = {
+static const struct usb_device_id bcm5974_table[] = {
         /* MacbookAir1.1 */
         BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
         BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
@@ -105,7 +105,7 @@ struct tp_header {
 
 /* trackpad finger structure */
 struct tp_finger {
-        __le16 origin;          /* left/right origin? */
+        __le16 origin;          /* zero when switching track finger */
         __le16 abs_x;           /* absolute x coodinate */
         __le16 abs_y;           /* absolute y coodinate */
         __le16 rel_x;           /* relative x coodinate */
@@ -159,6 +159,7 @@ struct bcm5974 {
         struct bt_data *bt_data;        /* button transferred data */
         struct urb *tp_urb;             /* trackpad usb request block */
         struct tp_data *tp_data;        /* trackpad transferred data */
+        int fingers;                    /* number of fingers on trackpad */
 };
 
 /* logical dimensions */
@@ -172,6 +173,10 @@ struct bcm5974 {
 #define SN_WIDTH        100             /* width signal-to-noise ratio */
 #define SN_COORD        250             /* coordinate signal-to-noise ratio */
 
+/* pressure thresholds */
+#define PRESSURE_LOW    (2 * DIM_PRESSURE / SN_PRESSURE)
+#define PRESSURE_HIGH   (3 * PRESSURE_LOW)
+
 /* device constants */
 static const struct bcm5974_config bcm5974_config_table[] = {
         {
@@ -248,6 +253,7 @@ static void setup_events_to_report(struct input_dev *input_dev,
                                 0, cfg->y.dim, cfg->y.fuzz, 0);
 
         __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
         __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
         __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
         __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
@@ -273,32 +279,66 @@ static int report_tp_state(struct bcm5974 *dev, int size)
         const struct tp_finger *f = dev->tp_data->finger;
         struct input_dev *input = dev->input;
         const int fingers = (size - 26) / 28;
-        int p = 0, w, x, y, n = 0;
+        int raw_p, raw_w, raw_x, raw_y;
+        int ptest = 0, origin = 0, nmin = 0, nmax = 0;
+        int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0;
 
         if (size < 26 || (size - 26) % 28 != 0)
                 return -EIO;
 
+        /* always track the first finger; when detached, start over */
         if (fingers) {
-                p = raw2int(f->force_major);
-                w = raw2int(f->size_major);
-                x = raw2int(f->abs_x);
-                y = raw2int(f->abs_y);
-                n = p > 0 ? fingers : 0;
+                raw_p = raw2int(f->force_major);
+                raw_w = raw2int(f->size_major);
+                raw_x = raw2int(f->abs_x);
+                raw_y = raw2int(f->abs_y);
 
                 dprintk(9,
-                        "bcm5974: p: %+05d w: %+05d x: %+05d y: %+05d n: %d\n",
-                        p, w, x, y, n);
+                        "bcm5974: raw: p: %+05d w: %+05d x: %+05d y: %+05d\n",
+                        raw_p, raw_w, raw_x, raw_y);
+
+                ptest = int2bound(&c->p, raw_p);
+                origin = raw2int(f->origin);
+        }
 
-                input_report_abs(input, ABS_TOOL_WIDTH, int2bound(&c->w, w));
-                input_report_abs(input, ABS_X, int2bound(&c->x, x - c->x.devmin));
-                input_report_abs(input, ABS_Y, int2bound(&c->y, c->y.devmax - y));
+        /* while tracking finger still valid, count all fingers */
+        if (ptest > PRESSURE_LOW && origin) {
+                abs_p = ptest;
+                abs_w = int2bound(&c->w, raw_w);
+                abs_x = int2bound(&c->x, raw_x - c->x.devmin);
+                abs_y = int2bound(&c->y, c->y.devmax - raw_y);
+                for (; f != dev->tp_data->finger + fingers; f++) {
+                        ptest = int2bound(&c->p, raw2int(f->force_major));
+                        if (ptest > PRESSURE_LOW)
+                                nmax++;
+                        if (ptest > PRESSURE_HIGH)
+                                nmin++;
+                }
         }
 
-        input_report_abs(input, ABS_PRESSURE, int2bound(&c->p, p));
+        if (dev->fingers < nmin)
+                dev->fingers = nmin;
+        if (dev->fingers > nmax)
+                dev->fingers = nmax;
+
+        input_report_key(input, BTN_TOUCH, dev->fingers > 0);
+        input_report_key(input, BTN_TOOL_FINGER, dev->fingers == 1);
+        input_report_key(input, BTN_TOOL_DOUBLETAP, dev->fingers == 2);
+        input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers > 2);
 
-        input_report_key(input, BTN_TOOL_FINGER, n == 1);
-        input_report_key(input, BTN_TOOL_DOUBLETAP, n == 2);
-        input_report_key(input, BTN_TOOL_TRIPLETAP, n > 2);
+        input_report_abs(input, ABS_PRESSURE, abs_p);
+        input_report_abs(input, ABS_TOOL_WIDTH, abs_w);
+
+        if (abs_p) {
+                input_report_abs(input, ABS_X, abs_x);
+                input_report_abs(input, ABS_Y, abs_y);
+
+                dprintk(8,
+                        "bcm5974: abs: p: %+05d w: %+05d x: %+05d y: %+05d "
+                        "nmin: %d nmax: %d n: %d\n",
+                        abs_p, abs_w, abs_x, abs_y, nmin, nmax, dev->fingers);
+
+        }
 
         input_sync(input);
 
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 3282b741e246..5aafe24984c5 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -305,7 +305,7 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                 .ident = "Lenovo 3000 n100",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                        DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "076804U"),
                 },
         },
         {
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index e8bc7abf2409..99be9e5c85f7 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1068,7 +1068,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
         {
                 v4l2_std_id *id = arg;
                 int found = 0;
-                int i, err;
+                int i;
 
                 DEB_EE(("VIDIOC_S_STD\n"));
 
@@ -1116,7 +1116,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
         case VIDIOC_OVERLAY:
         {
                 int on = *(int *)arg;
-                int err = 0;
 
                 DEB_D(("VIDIOC_OVERLAY on:%d\n",on));
                 if (on != 0) {
@@ -1192,7 +1191,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
         case VIDIOCGMBUF:
         {
                 struct video_mbuf *mbuf = arg;
-                struct videobuf_queue *q;
                 int i;
 
                 /* fixme: number of capture buffers and sizes for v4l apps */
diff --git a/drivers/media/common/tuners/mt2131.c b/drivers/media/common/tuners/mt2131.c
index e254bcfc2efb..e8d3c48f8605 100644
--- a/drivers/media/common/tuners/mt2131.c
+++ b/drivers/media/common/tuners/mt2131.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for Microtune MT2131 "QAM/8VSB single chip tuner"
  *
- *  Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/common/tuners/mt2131.h b/drivers/media/common/tuners/mt2131.h
index cd8376f6f7b4..6632de640df0 100644
--- a/drivers/media/common/tuners/mt2131.h
+++ b/drivers/media/common/tuners/mt2131.h
@@ -1,7 +1,7 @@
 /*
  *  Driver for Microtune MT2131 "QAM/8VSB single chip tuner"
  *
- *  Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/common/tuners/mt2131_priv.h b/drivers/media/common/tuners/mt2131_priv.h
index e930759c2c00..4e05a67e88c1 100644
--- a/drivers/media/common/tuners/mt2131_priv.h
+++ b/drivers/media/common/tuners/mt2131_priv.h
@@ -1,7 +1,7 @@
 /*
  *  Driver for Microtune MT2131 "QAM/8VSB single chip tuner"
  *
- *  Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c
index 0dc2bef9f6a3..227642b044ae 100644
--- a/drivers/media/common/tuners/mxl5005s.c
+++ b/drivers/media/common/tuners/mxl5005s.c
@@ -2,7 +2,7 @@
     MaxLinear MXL5005S VSB/QAM/DVBT tuner driver
 
     Copyright (C) 2008 MaxLinear
-    Copyright (C) 2006 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2006 Steven Toth <stoth@linuxtv.org>
       Functions:
         mxl5005s_reset()
         mxl5005s_writereg()
@@ -3837,7 +3837,7 @@ static u16 MXL_Hystersis_Test(struct dvb_frontend *fe, int Hystersis)
 /* ----------------------------------------------------------------
  * Begin: Everything after here is new code to adapt the
  * proprietary Realtek driver into a Linux API tuner.
- * Copyright (C) 2008 Steven Toth <stoth@hauppauge.com>
+ * Copyright (C) 2008 Steven Toth <stoth@linuxtv.org>
  */
 static int mxl5005s_reset(struct dvb_frontend *fe)
 {
diff --git a/drivers/media/common/tuners/mxl5005s.h b/drivers/media/common/tuners/mxl5005s.h
index 396db150bf0c..7ac6815b30aa 100644
--- a/drivers/media/common/tuners/mxl5005s.h
+++ b/drivers/media/common/tuners/mxl5005s.h
@@ -2,7 +2,7 @@
     MaxLinear MXL5005S VSB/QAM/DVBT tuner driver
 
     Copyright (C) 2008 MaxLinear
-    Copyright (C) 2008 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2008 Steven Toth <stoth@linuxtv.org>
 
     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
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index 597e47f5d69c..aa773a658a2a 100644
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -253,7 +253,7 @@ static struct tuner_params *simple_tuner_params(struct dvb_frontend *fe,
 
 static int simple_config_lookup(struct dvb_frontend *fe,
                                 struct tuner_params *t_params,
-                                int *frequency, u8 *config, u8 *cb)
+                                unsigned *frequency, u8 *config, u8 *cb)
 {
         struct tuner_simple_priv *priv = fe->tuner_priv;
         int i;
@@ -587,45 +587,45 @@ static int simple_set_tv_freq(struct dvb_frontend *fe,
         priv->last_div = div;
         if (t_params->has_tda9887) {
                 struct v4l2_priv_tun_config tda9887_cfg;
-                int config = 0;
+                int tda_config = 0;
                 int is_secam_l = (params->std & (V4L2_STD_SECAM_L |
                                                  V4L2_STD_SECAM_LC)) &&
                         !(params->std & ~(V4L2_STD_SECAM_L |
                                           V4L2_STD_SECAM_LC));
 
                 tda9887_cfg.tuner = TUNER_TDA9887;
-                tda9887_cfg.priv  = &config;
+                tda9887_cfg.priv  = &tda_config;
 
                 if (params->std == V4L2_STD_SECAM_LC) {
                         if (t_params->port1_active ^ t_params->port1_invert_for_secam_lc)
-                                config |= TDA9887_PORT1_ACTIVE;
+                                tda_config |= TDA9887_PORT1_ACTIVE;
                         if (t_params->port2_active ^ t_params->port2_invert_for_secam_lc)
-                                config |= TDA9887_PORT2_ACTIVE;
+                                tda_config |= TDA9887_PORT2_ACTIVE;
                 } else {
                         if (t_params->port1_active)
-                                config |= TDA9887_PORT1_ACTIVE;
+                                tda_config |= TDA9887_PORT1_ACTIVE;
                         if (t_params->port2_active)
-                                config |= TDA9887_PORT2_ACTIVE;
+                                tda_config |= TDA9887_PORT2_ACTIVE;
                 }
                 if (t_params->intercarrier_mode)
-                        config |= TDA9887_INTERCARRIER;
+                        tda_config |= TDA9887_INTERCARRIER;
                 if (is_secam_l) {
                         if (i == 0 && t_params->default_top_secam_low)
-                                config |= TDA9887_TOP(t_params->default_top_secam_low);
+                                tda_config |= TDA9887_TOP(t_params->default_top_secam_low);
                         else if (i == 1 && t_params->default_top_secam_mid)
-                                config |= TDA9887_TOP(t_params->default_top_secam_mid);
+                                tda_config |= TDA9887_TOP(t_params->default_top_secam_mid);
                         else if (t_params->default_top_secam_high)
-                                config |= TDA9887_TOP(t_params->default_top_secam_high);
+                                tda_config |= TDA9887_TOP(t_params->default_top_secam_high);
                 } else {
                         if (i == 0 && t_params->default_top_low)
-                                config |= TDA9887_TOP(t_params->default_top_low);
+                                tda_config |= TDA9887_TOP(t_params->default_top_low);
                         else if (i == 1 && t_params->default_top_mid)
-                                config |= TDA9887_TOP(t_params->default_top_mid);
+                                tda_config |= TDA9887_TOP(t_params->default_top_mid);
                         else if (t_params->default_top_high)
-                                config |= TDA9887_TOP(t_params->default_top_high);
+                                tda_config |= TDA9887_TOP(t_params->default_top_high);
                 }
                 if (t_params->default_pll_gating_18)
-                        config |= TDA9887_GATING_18;
+                        tda_config |= TDA9887_GATING_18;
                 i2c_clients_command(priv->i2c_props.adap, TUNER_SET_CONFIG,
                                     &tda9887_cfg);
         }
@@ -813,7 +813,8 @@ static u32 simple_dvb_configure(struct dvb_frontend *fe, u8 *buf,
         static struct tuner_params *t_params;
         u8 config, cb;
         u32 div;
-        int ret, frequency = params->frequency / 62500;
+        int ret;
+        unsigned frequency = params->frequency / 62500;
 
         t_params = simple_tuner_params(fe, TUNER_PARAM_TYPE_DIGITAL);
         ret = simple_config_lookup(fe, t_params, &frequency, &config, &cb);
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index 5f99de0ad612..dcddfa803a75 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -2,7 +2,7 @@
  *  Driver for Xceive XC5000 "QAM/8VSB single chip tuner"
  *
  *  Copyright (c) 2007 Xceive Corporation
- *  Copyright (c) 2007 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2007 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h
index c910715addc9..5389f740945a 100644
--- a/drivers/media/common/tuners/xc5000.h
+++ b/drivers/media/common/tuners/xc5000.h
@@ -1,7 +1,7 @@
 /*
  *  Driver for Xceive XC5000 "QAM/8VSB single chip tuner"
  *
- *  Copyright (c) 2007 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2007 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/common/tuners/xc5000_priv.h b/drivers/media/common/tuners/xc5000_priv.h
index a72a9887fe7f..b2a0074c99c9 100644
--- a/drivers/media/common/tuners/xc5000_priv.h
+++ b/drivers/media/common/tuners/xc5000_priv.h
@@ -1,7 +1,7 @@
 /*
  *  Driver for Xceive XC5000 "QAM/8VSB single chip tuner"
  *
- *  Copyright (c) 2007 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2007 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index f9d087669d5d..4eed783f4bce 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -137,7 +137,8 @@ static int flexcop_send_diseqc_msg(struct dvb_frontend* fe, int len, u8 *msg, un
                         flexcop_diseqc_send_byte(fe, 0xff);
                 else {
                         flexcop_set_tone(fe, SEC_TONE_ON);
-                        udelay(12500);
+                        mdelay(12);
+                        udelay(500);
                         flexcop_set_tone(fe, SEC_TONE_OFF);
                 }
                 msleep(20);
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
index 55973eaf3711..43a112ec6d44 100644
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -221,12 +221,12 @@ int flexcop_i2c_init(struct flexcop_device *fc)
         fc->fc_i2c_adap[1].port = FC_I2C_PORT_EEPROM;
         fc->fc_i2c_adap[2].port = FC_I2C_PORT_TUNER;
 
-        strncpy(fc->fc_i2c_adap[0].i2c_adap.name,
-                "B2C2 FlexCop I2C to demod", I2C_NAME_SIZE);
-        strncpy(fc->fc_i2c_adap[1].i2c_adap.name,
-                "B2C2 FlexCop I2C to eeprom", I2C_NAME_SIZE);
-        strncpy(fc->fc_i2c_adap[2].i2c_adap.name,
-                "B2C2 FlexCop I2C to tuner", I2C_NAME_SIZE);
+        strlcpy(fc->fc_i2c_adap[0].i2c_adap.name, "B2C2 FlexCop I2C to demod",
+                sizeof(fc->fc_i2c_adap[0].i2c_adap.name));
+        strlcpy(fc->fc_i2c_adap[1].i2c_adap.name, "B2C2 FlexCop I2C to eeprom",
+                sizeof(fc->fc_i2c_adap[1].i2c_adap.name));
+        strlcpy(fc->fc_i2c_adap[2].i2c_adap.name, "B2C2 FlexCop I2C to tuner",
+                sizeof(fc->fc_i2c_adap[2].i2c_adap.name));
 
         i2c_set_adapdata(&fc->fc_i2c_adap[0].i2c_adap, &fc->fc_i2c_adap[0]);
         i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]);
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index a7637562e742..aa3db57d32d9 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1244,7 +1244,7 @@ static int dst_command(struct dst_state *state, u8 *data, u8 len)
                 goto error;
         }
         if (state->type_flags & DST_TYPE_HAS_FW_1)
-                udelay(3000);
+                mdelay(3);
         if (read_dst(state, &reply, GET_ACK)) {
                 dprintk(verbose, DST_DEBUG, 1, "Trying to recover.. ");
                 if ((dst_error_recovery(state)) < 0) {
@@ -1260,7 +1260,7 @@ static int dst_command(struct dst_state *state, u8 *data, u8 len)
         if (len >= 2 && data[0] == 0 && (data[1] == 1 || data[1] == 3))
                 goto error;
         if (state->type_flags & DST_TYPE_HAS_FW_1)
-                udelay(3000);
+                mdelay(3);
         else
                 udelay(2000);
         if (!dst_wait_dst_ready(state, NO_DELAY))
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 1cf9fcb6f514..069d847ba887 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -641,7 +641,6 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
                 struct timespec timeout = { 0 };
                 struct dmx_pes_filter_params *para = &filter->params.pes;
                 dmx_output_t otype;
-                int ret;
                 int ts_type;
                 enum dmx_ts_pes ts_pes;
                 struct dmx_ts_feed **tsfeed = &filter->feed.ts;
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 8e5dd7b1f034..98ee16773ff2 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -1032,7 +1032,7 @@ static int dvb_ca_en50221_thread(void *data)
                                         /* we need this extra check for annoying interfaces like the budget-av */
                                         if ((!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) &&
                                             (ca->pub->poll_slot_status)) {
-                                                int status = ca->pub->poll_slot_status(ca->pub, slot, 0);
+                                                status = ca->pub->poll_slot_status(ca->pub, slot, 0);
                                                 if (!(status & DVB_CA_EN50221_POLL_CAM_PRESENT)) {
                                                         ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;
                                                         dvb_ca_en50221_thread_update_delay(ca);
@@ -1089,7 +1089,7 @@ static int dvb_ca_en50221_thread(void *data)
                                         /* we need this extra check for annoying interfaces like the budget-av */
                                         if ((!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) &&
                                             (ca->pub->poll_slot_status)) {
-                                                int status = ca->pub->poll_slot_status(ca->pub, slot, 0);
+                                                status = ca->pub->poll_slot_status(ca->pub, slot, 0);
                                                 if (!(status & DVB_CA_EN50221_POLL_CAM_PRESENT)) {
                                                         ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;
                                                         dvb_ca_en50221_thread_update_delay(ca);
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 8cbdb218952f..3526e3ee9487 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -889,13 +889,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                          * initialization, so parg is 8 bits and does not
                          * include the initialization or start bit
                          */
-                        unsigned long cmd = ((unsigned long) parg) << 1;
+                        unsigned long swcmd = ((unsigned long) parg) << 1;
                         struct timeval nexttime;
                         struct timeval tv[10];
                         int i;
                         u8 last = 1;
                         if (dvb_frontend_debug)
-                                printk("%s switch command: 0x%04lx\n", __func__, cmd);
+                                printk("%s switch command: 0x%04lx\n", __func__, swcmd);
                         do_gettimeofday(&nexttime);
                         if (dvb_frontend_debug)
                                 memcpy(&tv[0], &nexttime, sizeof(struct timeval));
@@ -908,12 +908,12 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                         for (i = 0; i < 9; i++) {
                                 if (dvb_frontend_debug)
                                         do_gettimeofday(&tv[i + 1]);
-                                if ((cmd & 0x01) != last) {
+                                if ((swcmd & 0x01) != last) {
                                         /* set voltage to (last ? 13V : 18V) */
                                         fe->ops.set_voltage(fe, (last) ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);
                                         last = (last) ? 0 : 1;
                                 }
-                                cmd = cmd >> 1;
+                                swcmd = swcmd >> 1;
                                 if (i != 8)
                                         dvb_frontend_sleep_until(&nexttime, 8000);
                         }
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index aaa0b6f0b521..563400277a42 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -210,7 +210,7 @@ static int cxusb_aver_power_ctrl(struct dvb_usb_device *d, int onoff)
         if (d->state == DVB_USB_STATE_INIT &&
             usb_set_interface(d->udev, 0, 0) < 0)
                 err("set interface failed");
-        do; while (!(ret = cxusb_ctrl_msg(d, CMD_POWER_ON, NULL, 0, NULL, 0)) &&
+        do {} while (!(ret = cxusb_ctrl_msg(d, CMD_POWER_ON, NULL, 0, NULL, 0)) &&
                    !(ret = cxusb_ctrl_msg(d, 0x15, NULL, 0, NULL, 0)) &&
                    !(ret = cxusb_ctrl_msg(d, 0x17, NULL, 0, NULL, 0)) && 0);
         if (!ret) {
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 3dd20bfbed32..6c0e5c5f4362 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1117,7 +1117,8 @@ struct usb_device_id dib0700_usb_id_table[] = {
         { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_HT_EXPRESS) },
         { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_T_XXS) },
         { USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV_DONGLE_STK7700P_2) },
-        { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009) },
+/* 35 */{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009) },
+        { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_3) },
         { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1373,7 +1374,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         }
                 },
 
-                .num_device_descs = 3,
+                .num_device_descs = 4,
                 .devices = {
                         {   "DiBcom STK7070PD reference design",
                                 { &dib0700_usb_id_table[17], NULL },
@@ -1386,6 +1387,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         {   "Hauppauge Nova-TD Stick (52009)",
                                 { &dib0700_usb_id_table[35], NULL },
                                 { NULL },
+                        },
+                        {   "Hauppauge Nova-TD-500 (84xxx)",
+                                { &dib0700_usb_id_table[36], NULL },
+                                { NULL },
                         }
                 }
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 029b437caf9a..03dfb9f2fe30 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -129,6 +129,7 @@
 #define USB_PID_WINTV_NOVA_T_USB2_WARM                  0x9301
 #define USB_PID_HAUPPAUGE_NOVA_T_500                    0x9941
 #define USB_PID_HAUPPAUGE_NOVA_T_500_2                  0x9950
+#define USB_PID_HAUPPAUGE_NOVA_T_500_3                  0x8400
 #define USB_PID_HAUPPAUGE_NOVA_T_STICK                  0x7050
 #define USB_PID_HAUPPAUGE_NOVA_T_STICK_2                0x7060
 #define USB_PID_HAUPPAUGE_NOVA_T_STICK_3                0x7070
diff --git a/drivers/media/dvb/frontends/au8522.c b/drivers/media/dvb/frontends/au8522.c
index f7b71657f0f6..0b82cc2a1e16 100644
--- a/drivers/media/dvb/frontends/au8522.c
+++ b/drivers/media/dvb/frontends/au8522.c
@@ -1,7 +1,7 @@
 /*
     Auvitek AU8522 QAM/8VSB demodulator driver
 
-    Copyright (C) 2008 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2008 Steven Toth <stoth@linuxtv.org>
 
     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
@@ -304,6 +304,43 @@ static int au8522_mse2snr_lookup(struct mse2snr_tab *tab, int sz, int mse,
         return ret;
 }
 
+static int au8522_set_if(struct dvb_frontend *fe, enum au8522_if_freq if_freq)
+{
+        struct au8522_state *state = fe->demodulator_priv;
+        u8 r0b5, r0b6, r0b7;
+        char *ifmhz;
+
+        switch (if_freq) {
+        case AU8522_IF_3_25MHZ:
+                ifmhz = "3.25";
+                r0b5 = 0x00;
+                r0b6 = 0x3d;
+                r0b7 = 0xa0;
+                break;
+        case AU8522_IF_4MHZ:
+                ifmhz = "4.00";
+                r0b5 = 0x00;
+                r0b6 = 0x4b;
+                r0b7 = 0xd9;
+                break;
+        case AU8522_IF_6MHZ:
+                ifmhz = "6.00";
+                r0b5 = 0xfb;
+                r0b6 = 0x8e;
+                r0b7 = 0x39;
+                break;
+        default:
+                dprintk("%s() IF Frequency not supported\n", __func__);
+                return -EINVAL;
+        }
+        dprintk("%s() %s MHz\n", __func__, ifmhz);
+        au8522_writereg(state, 0x80b5, r0b5);
+        au8522_writereg(state, 0x80b6, r0b6);
+        au8522_writereg(state, 0x80b7, r0b7);
+
+        return 0;
+}
+
 /* VSB Modulation table */
 static struct {
         u16 reg;
@@ -334,9 +371,6 @@ static struct {
         { 0x80af, 0x66 },
         { 0x821b, 0xcc },
         { 0x821d, 0x80 },
-        { 0x80b5, 0xfb },
-        { 0x80b6, 0x8e },
-        { 0x80b7, 0x39 },
         { 0x80a4, 0xe8 },
         { 0x8231, 0x13 },
 };
@@ -350,9 +384,6 @@ static struct {
         { 0x80a4, 0x00 },
         { 0x8081, 0xc4 },
         { 0x80a5, 0x40 },
-        { 0x80b5, 0xfb },
-        { 0x80b6, 0x8e },
-        { 0x80b7, 0x39 },
         { 0x80aa, 0x77 },
         { 0x80ad, 0x77 },
         { 0x80a6, 0x67 },
@@ -438,6 +469,7 @@ static int au8522_enable_modulation(struct dvb_frontend *fe,
                         au8522_writereg(state,
                                 VSB_mod_tab[i].reg,
                                 VSB_mod_tab[i].data);
+                au8522_set_if(fe, state->config->vsb_if);
                 break;
         case QAM_64:
         case QAM_256:
@@ -446,6 +478,7 @@ static int au8522_enable_modulation(struct dvb_frontend *fe,
                         au8522_writereg(state,
                                 QAM_mod_tab[i].reg,
                                 QAM_mod_tab[i].data);
+                au8522_set_if(fe, state->config->qam_if);
                 break;
         default:
                 dprintk("%s() Invalid modulation\n", __func__);
diff --git a/drivers/media/dvb/frontends/au8522.h b/drivers/media/dvb/frontends/au8522.h
index d7affa3cdb27..595915ade8c3 100644
--- a/drivers/media/dvb/frontends/au8522.h
+++ b/drivers/media/dvb/frontends/au8522.h
@@ -1,7 +1,7 @@
 /*
     Auvitek AU8522 QAM/8VSB demodulator driver
 
-    Copyright (C) 2008 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2008 Steven Toth <stoth@linuxtv.org>
 
     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
@@ -24,6 +24,12 @@
 
 #include <linux/dvb/frontend.h>
 
+enum au8522_if_freq {
+        AU8522_IF_6MHZ = 0,
+        AU8522_IF_4MHZ,
+        AU8522_IF_3_25MHZ,
+};
+
 struct au8522_config {
         /* the demodulator's i2c address */
         u8 demod_address;
@@ -32,6 +38,9 @@ struct au8522_config {
 #define AU8522_TUNERLOCKING 0
 #define AU8522_DEMODLOCKING 1
         u8 status_mode;
+
+        enum au8522_if_freq vsb_if;
+        enum au8522_if_freq qam_if;
 };
 
 #if defined(CONFIG_DVB_AU8522) ||                               \
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index cc1db4e371c3..9430e03dba6c 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -7,7 +7,7 @@
     Copyright (C) 2001-2002 Convergence Integrated Media GmbH
           Holger Waechtler <holger@convergence.de>
 
-    Copyright (C) 2004 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2004 Steven Toth <stoth@linuxtv.org>
 
     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
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h
index 8af766a31552..b1e465c6c2ce 100644
--- a/drivers/media/dvb/frontends/cx22702.h
+++ b/drivers/media/dvb/frontends/cx22702.h
@@ -7,7 +7,7 @@
     Copyright (C) 2001-2002 Convergence Integrated Media GmbH
           Holger Waechtler <holger@convergence.de>
 
-    Copyright (C) 2004 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2004 Steven Toth <stoth@linuxtv.org>
 
     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
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index 7f68d78c6558..7156157cb34b 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -1,7 +1,7 @@
 /*
  *   Conexant cx24123/cx24109 - DVB QPSK Satellite demod/tuner driver
  *
- *   Copyright (C) 2005 Steven Toth <stoth@hauppauge.com>
+ *   Copyright (C) 2005 Steven Toth <stoth@linuxtv.org>
  *
  *   Support for KWorld DVB-S 100 by Vadim Catana <skystar@moldova.cc>
  *
@@ -1072,8 +1072,8 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,
     if (config->dont_use_pll)
         cx24123_repeater_mode(state, 1, 0);
 
-        strncpy(state->tuner_i2c_adapter.name,
-                "CX24123 tuner I2C bus", I2C_NAME_SIZE);
+        strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus",
+                sizeof(state->tuner_i2c_adapter.name));
         state->tuner_i2c_adapter.class     = I2C_CLASS_TV_DIGITAL,
         state->tuner_i2c_adapter.algo      = &cx24123_tuner_i2c_algo;
         state->tuner_i2c_adapter.algo_data = NULL;
diff --git a/drivers/media/dvb/frontends/cx24123.h b/drivers/media/dvb/frontends/cx24123.h
index 81ebc3d2f19f..cc6b411d6d20 100644
--- a/drivers/media/dvb/frontends/cx24123.h
+++ b/drivers/media/dvb/frontends/cx24123.h
@@ -1,7 +1,7 @@
 /*
     Conexant cx24123/cx24109 - DVB QPSK Satellite demod/tuner driver
 
-    Copyright (C) 2005 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2005 Steven Toth <stoth@linuxtv.org>
 
     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
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
index 5ddb2dca305c..7500a1c53e68 100644
--- a/drivers/media/dvb/frontends/s5h1409.c
+++ b/drivers/media/dvb/frontends/s5h1409.c
@@ -1,7 +1,7 @@
 /*
     Samsung S5H1409 VSB/QAM demodulator driver
 
-    Copyright (C) 2006 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2006 Steven Toth <stoth@linuxtv.org>
 
     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
@@ -404,6 +404,7 @@ static int s5h1409_enable_modulation(struct dvb_frontend* fe,
                 break;
         case QAM_64:
         case QAM_256:
+        case QAM_AUTO:
                 dprintk("%s() QAM_AUTO (64/256)\n", __func__);
                 if (state->if_freq != S5H1409_QAM_IF_FREQ)
                         s5h1409_set_if_freq(fe, S5H1409_QAM_IF_FREQ);
diff --git a/drivers/media/dvb/frontends/s5h1409.h b/drivers/media/dvb/frontends/s5h1409.h
index 59f4335964c6..d1a1d2eb8e11 100644
--- a/drivers/media/dvb/frontends/s5h1409.h
+++ b/drivers/media/dvb/frontends/s5h1409.h
@@ -1,7 +1,7 @@
 /*
     Samsung S5H1409 VSB/QAM demodulator driver
 
-    Copyright (C) 2006 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2006 Steven Toth <stoth@linuxtv.org>
 
     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
diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c
index cff360ce1ba3..2da1a3763de9 100644
--- a/drivers/media/dvb/frontends/s5h1411.c
+++ b/drivers/media/dvb/frontends/s5h1411.c
@@ -1,7 +1,7 @@
 /*
     Samsung S5H1411 VSB/QAM demodulator driver
 
-    Copyright (C) 2008 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2008 Steven Toth <stoth@linuxtv.org>
 
     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
@@ -488,6 +488,7 @@ static int s5h1411_enable_modulation(struct dvb_frontend *fe,
                 break;
         case QAM_64:
         case QAM_256:
+        case QAM_AUTO:
                 dprintk("%s() QAM_AUTO (64/256)\n", __func__);
                 s5h1411_set_if_freq(fe, state->config->qam_if);
                 s5h1411_writereg(state, S5H1411_I2C_TOP_ADDR, 0x00, 0x0171);
diff --git a/drivers/media/dvb/frontends/s5h1411.h b/drivers/media/dvb/frontends/s5h1411.h
index 1855f64ed4d8..7d542bc00c48 100644
--- a/drivers/media/dvb/frontends/s5h1411.h
+++ b/drivers/media/dvb/frontends/s5h1411.h
@@ -1,7 +1,7 @@
 /*
     Samsung S5H1411 VSB/QAM demodulator driver
 
-    Copyright (C) 2008 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2008 Steven Toth <stoth@linuxtv.org>
 
     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
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index 720ed9ff7c5f..747d3fa2e5e5 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -915,7 +915,8 @@ struct dvb_frontend *s5h1420_attach(const struct s5h1420_config *config,
         state->frontend.demodulator_priv = state;
 
         /* create tuner i2c adapter */
-        strncpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus", I2C_NAME_SIZE);
+        strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus",
+                sizeof(state->tuner_i2c_adapter.name));
         state->tuner_i2c_adapter.class     = I2C_CLASS_TV_DIGITAL,
         state->tuner_i2c_adapter.algo      = &s5h1420_tuner_i2c_algo;
         state->tuner_i2c_adapter.algo_data = NULL;
diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c
index 0ab8d86b3ae3..04e7f1cc1403 100644
--- a/drivers/media/dvb/frontends/tda10048.c
+++ b/drivers/media/dvb/frontends/tda10048.c
@@ -1,7 +1,7 @@
 /*
     NXP TDA10048HN DVB OFDM demodulator driver
 
-    Copyright (C) 2008 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2008 Steven Toth <stoth@linuxtv.org>
 
     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
@@ -303,7 +303,7 @@ static int tda10048_firmware_upload(struct dvb_frontend *fe)
 
         if (fw->size != TDA10048_DEFAULT_FIRMWARE_SIZE) {
                 printk(KERN_ERR "%s: firmware incorrect size\n", __func__);
-                return -EIO;
+                ret = -EIO;
         } else {
                 printk(KERN_INFO "%s: firmware uploading\n", __func__);
 
diff --git a/drivers/media/dvb/frontends/tda10048.h b/drivers/media/dvb/frontends/tda10048.h
index 2b5c78e62c86..0457b24601fa 100644
--- a/drivers/media/dvb/frontends/tda10048.h
+++ b/drivers/media/dvb/frontends/tda10048.h
@@ -1,7 +1,7 @@
 /*
     NXP TDA10048HN DVB OFDM demodulator driver
 
-    Copyright (C) 2008 Steven Toth <stoth@hauppauge.com>
+    Copyright (C) 2008 Steven Toth <stoth@linuxtv.org>
 
     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
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index e7a8ac0c4049..cc5efb643f33 100644
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -4,7 +4,7 @@
  *  Copyright (c) 2008 Michael Krufky <mkrufky@linuxtv.org>
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
+ *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation;
  *
  *  Software distributed under the License is distributed on an "AS IS"
diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/dvb/siano/sms-cards.h
index 83b39bc203fe..c8f3da6f9bc1 100644
--- a/drivers/media/dvb/siano/sms-cards.h
+++ b/drivers/media/dvb/siano/sms-cards.h
@@ -4,7 +4,7 @@
  *  Copyright (c) 2008 Michael Krufky <mkrufky@linuxtv.org>
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
+ *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation;
  *
  *  Software distributed under the License is distributed on an "AS IS"
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index c5f45fed69dc..6576fbb40fc6 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -8,7 +8,7 @@
  *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
+ *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation;
  *
  *  Software distributed under the License is distributed on an "AS IS"
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h
index c1f8f1dccb11..8d973f726fb8 100644
--- a/drivers/media/dvb/siano/smscoreapi.h
+++ b/drivers/media/dvb/siano/smscoreapi.h
@@ -6,7 +6,7 @@
  *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
+ *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation;
  *
  *  Software distributed under the License is distributed on an "AS IS"
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index 229274a14110..8d490e133f35 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -6,7 +6,7 @@
  *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
+ *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation;
  *
  *  Software distributed under the License is distributed on an "AS IS"
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index c10b1849c6a3..87a3c24454b9 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -6,7 +6,7 @@
  *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
+ *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation;
  *
  *  Software distributed under the License is distributed on an "AS IS"
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 39bd0a20f53a..aa5ed4ef19f2 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -116,7 +116,8 @@ static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long
                         DiseqcSendByte(budget, 0xff);
                 else {
                         saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);
-                        udelay(12500);
+                        mdelay(12);
+                        udelay(500);
                         saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
                 }
                 msleep(20);
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 2293d80c6e51..f0068996ac07 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -108,7 +108,8 @@ static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long
                         DiseqcSendByte(budget, 0xff);
                 else {
                         saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);
-                        udelay(12500);
+                        mdelay(12);
+                        udelay(500);
                         saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
                 }
                 msleep(20);
diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile
index a30159f6fa42..7ca71ab96b43 100644
--- a/drivers/media/radio/Makefile
+++ b/drivers/media/radio/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the kernel character device drivers.
 #
 
-miropcm20-objs  := miropcm20-rds-core.o miropcm20-radio.o
-
 obj-$(CONFIG_RADIO_AZTECH) += radio-aztech.o
 obj-$(CONFIG_RADIO_RTRACK2) += radio-rtrack2.o
 obj-$(CONFIG_RADIO_SF16FMI) += radio-sf16fmi.o
@@ -14,8 +12,6 @@ obj-$(CONFIG_RADIO_TERRATEC) += radio-terratec.o
 obj-$(CONFIG_RADIO_MAXIRADIO) += radio-maxiradio.o
 obj-$(CONFIG_RADIO_RTRACK) += radio-aimslab.o
 obj-$(CONFIG_RADIO_ZOLTRIX) += radio-zoltrix.o
-obj-$(CONFIG_RADIO_MIROPCM20) += miropcm20.o
-obj-$(CONFIG_RADIO_MIROPCM20_RDS) += miropcm20-rds.o
 obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o
 obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o
 obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 1ed88f3abe61..70c65a745923 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -493,7 +493,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
         radio->usbdev = interface_to_usbdev(intf);
         radio->curfreq = FREQ_MIN*FREQ_MUL;
         video_set_drvdata(radio->videodev, radio);
-        if (video_register_device(radio->videodev, VFL_TYPE_RADIO,radio_nr)) {
+        if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr) < 0) {
                 warn("Could not register video device");
                 video_device_release(radio->videodev);
                 kfree(radio->transfer_buffer);
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
deleted file mode 100644
index 7fd7ee2d32c1..000000000000
--- a/drivers/media/radio/miropcm20-radio.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* Miro PCM20 radio driver for Linux radio support
- * (c) 1998 Ruurd Reitsma <R.A.Reitsma@wbmt.tudelft.nl>
- * Thanks to Norberto Pellici for the ACI device interface specification
- * The API part is based on the radiotrack driver by M. Kirkwood
- * This driver relies on the aci mixer (drivers/sound/aci.c)
- * Look there for further info...
- */
-
-/* Revision history:
- *
- *   1998        Ruurd Reitsma <R.A.Reitsma@wbmt.tudelft.nl>
- *   2000-09-05  Robert Siemer <Robert.Siemer@gmx.de>
- *        removed unfinished volume control (maybe adding it later again)
- *        use OSS-mixer; added stereo control
- */
-
-/* What ever you think about the ACI, version 0x07 is not very well!
- * I can't get frequency, 'tuner status', 'tuner flags' or mute/mono
- * conditions...                Robert
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/videodev.h>
-#include <media/v4l2-common.h>
-#include <media/v4l2-ioctl.h>
-#include "oss/aci.h"
-#include "miropcm20-rds-core.h"
-
-static int radio_nr = -1;
-module_param(radio_nr, int, 0);
-
-struct pcm20_device {
-        unsigned long freq;
-        int muted;
-        int stereo;
-};
-
-
-static int pcm20_mute(struct pcm20_device *dev, unsigned char mute)
-{
-        dev->muted = mute;
-        return aci_write_cmd(ACI_SET_TUNERMUTE, mute);
-}
-
-static int pcm20_stereo(struct pcm20_device *dev, unsigned char stereo)
-{
-        dev->stereo = stereo;
-        return aci_write_cmd(ACI_SET_TUNERMONO, !stereo);
-}
-
-static int pcm20_setfreq(struct pcm20_device *dev, unsigned long freq)
-{
-        unsigned char freql;
-        unsigned char freqh;
-
-        dev->freq=freq;
-
-        freq /= 160;
-        if (!(aci_version==0x07 || aci_version>=0xb0))
-                freq /= 10;  /* I don't know exactly which version
-                              * needs this hack */
-        freql = freq & 0xff;
-        freqh = freq >> 8;
-
-        aci_rds_cmd(RDS_RESET, NULL, 0);
-        pcm20_stereo(dev, 1);
-
-        return aci_rw_cmd(ACI_WRITE_TUNE, freql, freqh);
-}
-
-static int pcm20_getflags(struct pcm20_device *dev, __u32 *flags, __u16 *signal)
-{
-        /* okay, check for signal, stereo and rds here... */
-        int i;
-        unsigned char buf;
-
-        if ((i=aci_rw_cmd(ACI_READ_TUNERSTATION, -1, -1))<0)
-                return i;
-        pr_debug("check_sig: 0x%x\n", i);
-        if (i & 0x80) {
-                /* no signal from tuner */
-                *flags=0;
-                *signal=0;
-                return 0;
-        } else
-                *signal=0xffff;
-
-        if ((i=aci_rw_cmd(ACI_READ_TUNERSTEREO, -1, -1))<0)
-                return i;
-        if (i & 0x40) {
-                *flags=0;
-        } else {
-                /* stereo */
-                *flags=VIDEO_TUNER_STEREO_ON;
-                /* I can't see stereo, when forced to mono */
-                dev->stereo=1;
-        }
-
-        if ((i=aci_rds_cmd(RDS_STATUS, &buf, 1))<0)
-                return i;
-        if (buf & 1)
-                /* RDS available */
-                *flags|=VIDEO_TUNER_RDS_ON;
-        else
-                return 0;
-
-        if ((i=aci_rds_cmd(RDS_RXVALUE, &buf, 1))<0)
-                return i;
-        pr_debug("rds-signal: %d\n", buf);
-        if (buf > 15) {
-                printk("miropcm20-radio: RX strengths unexpected high...\n");
-                buf=15;
-        }
-        /* refine signal */
-        if ((*signal=SCALE(15, 0xffff, buf))==0)
-                *signal = 1;
-
-        return 0;
-}
-
-static int pcm20_do_ioctl(struct inode *inode, struct file *file,
-                          unsigned int cmd, void *arg)
-{
-        struct video_device *dev = video_devdata(file);
-        struct pcm20_device *pcm20 = dev->priv;
-        int i;
-
-        switch(cmd)
-        {
-                case VIDIOCGCAP:
-                {
-                        struct video_capability *v = arg;
-                        memset(v,0,sizeof(*v));
-                        v->type=VID_TYPE_TUNER;
-                        strcpy(v->name, "Miro PCM20");
-                        v->channels=1;
-                        v->audios=1;
-                        return 0;
-                }
-                case VIDIOCGTUNER:
-                {
-                        struct video_tuner *v = arg;
-                        if(v->tuner)    /* Only 1 tuner */
-                                return -EINVAL;
-                        v->rangelow=87*16000;
-                        v->rangehigh=108*16000;
-                        pcm20_getflags(pcm20, &v->flags, &v->signal);
-                        v->flags|=VIDEO_TUNER_LOW;
-                        v->mode=VIDEO_MODE_AUTO;
-                        strcpy(v->name, "FM");
-                        return 0;
-                }
-                case VIDIOCSTUNER:
-                {
-                        struct video_tuner *v = arg;
-                        if(v->tuner!=0)
-                                return -EINVAL;
-                        /* Only 1 tuner so no setting needed ! */
-                        return 0;
-                }
-                case VIDIOCGFREQ:
-                {
-                        unsigned long *freq = arg;
-                        *freq = pcm20->freq;
-                        return 0;
-                }
-                case VIDIOCSFREQ:
-                {
-                        unsigned long *freq = arg;
-                        pcm20->freq = *freq;
-                        i=pcm20_setfreq(pcm20, pcm20->freq);
-                        pr_debug("First view (setfreq): 0x%x\n", i);
-                        return i;
-                }
-                case VIDIOCGAUDIO:
-                {
-                        struct video_audio *v = arg;
-                        memset(v,0, sizeof(*v));
-                        v->flags=VIDEO_AUDIO_MUTABLE;
-                        if (pcm20->muted)
-                                v->flags|=VIDEO_AUDIO_MUTE;
-                        v->mode=VIDEO_SOUND_STEREO;
-                        if (pcm20->stereo)
-                                v->mode|=VIDEO_SOUND_MONO;
-                        /* v->step=2048; */
-                        strcpy(v->name, "Radio");
-                        return 0;
-                }
-                case VIDIOCSAUDIO:
-                {
-                        struct video_audio *v = arg;
-                        if(v->audio)
-                                return -EINVAL;
-
-                        pcm20_mute(pcm20, !!(v->flags&VIDEO_AUDIO_MUTE));
-                        if(v->flags&VIDEO_SOUND_MONO)
-                                pcm20_stereo(pcm20, 0);
-                        if(v->flags&VIDEO_SOUND_STEREO)
-                                pcm20_stereo(pcm20, 1);
-
-                        return 0;
-                }
-                default:
-                        return -ENOIOCTLCMD;
-        }
-}
-
-static int pcm20_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg)
-{
-        return video_usercopy(inode, file, cmd, arg, pcm20_do_ioctl);
-}
-
-static struct pcm20_device pcm20_unit = {
-        .freq   = 87*16000,
-        .muted  = 1,
-};
-
-static const struct file_operations pcm20_fops = {
-        .owner          = THIS_MODULE,
-        .open           = video_exclusive_open,
-        .release        = video_exclusive_release,
-        .ioctl          = pcm20_ioctl,
-#ifdef CONFIG_COMPAT
-        .compat_ioctl   = v4l_compat_ioctl32,
-#endif
-        .llseek         = no_llseek,
-};
-
-static struct video_device pcm20_radio = {
-        .name           = "Miro PCM 20 radio",
-        .fops           = &pcm20_fops,
-        .priv           = &pcm20_unit
-};
-
-static int __init pcm20_init(void)
-{
-        if(video_register_device(&pcm20_radio, VFL_TYPE_RADIO, radio_nr)==-1)
-                goto video_register_device;
-
-        if(attach_aci_rds()<0)
-                goto attach_aci_rds;
-
-        printk(KERN_INFO "Miro PCM20 radio card driver.\n");
-
-        return 0;
-
- attach_aci_rds:
-        video_unregister_device(&pcm20_radio);
- video_register_device:
-        return -EINVAL;
-}
-
-MODULE_AUTHOR("Ruurd Reitsma");
-MODULE_DESCRIPTION("A driver for the Miro PCM20 radio card.");
-MODULE_LICENSE("GPL");
-
-static void __exit pcm20_cleanup(void)
-{
-        unload_aci_rds();
-        video_unregister_device(&pcm20_radio);
-}
-
-module_init(pcm20_init);
-module_exit(pcm20_cleanup);
diff --git a/drivers/media/radio/miropcm20-rds-core.c b/drivers/media/radio/miropcm20-rds-core.c
deleted file mode 100644
index 9428d8b2642c..000000000000
--- a/drivers/media/radio/miropcm20-rds-core.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- *  Many thanks to Fred Seidel <seidel@metabox.de>, the
- *  designer of the RDS decoder hardware. With his help
- *  I was able to code this driver.
- *  Thanks also to Norberto Pellicci, Dominic Mounteney
- *  <DMounteney@pinnaclesys.com> and www.teleauskunft.de
- *  for good hints on finding Fred. It was somewhat hard
- *  to locate him here in Germany... [:
- *
- * Revision history:
- *
- *   2000-08-09  Robert Siemer <Robert.Siemer@gmx.de>
- *        RDS support for MiroSound PCM20 radio
- */
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/mutex.h>
-
-#include <asm/io.h>
-#include "oss/aci.h"
-#include "miropcm20-rds-core.h"
-
-#define DEBUG 0
-
-static struct mutex aci_rds_mutex;
-
-#define RDS_DATASHIFT          2   /* Bit 2 */
-#define RDS_DATAMASK        (1 << RDS_DATASHIFT)
-#define RDS_BUSYMASK        0x10   /* Bit 4 */
-#define RDS_CLOCKMASK       0x08   /* Bit 3 */
-
-#define RDS_DATA(x)         (((x) >> RDS_DATASHIFT) & 1)
-
-
-#if DEBUG
-static void print_matrix(char array[], unsigned int length)
-{
-        int i, j;
-
-        for (i=0; i<length; i++) {
-                printk(KERN_DEBUG "aci-rds: ");
-                for (j=7; j>=0; j--) {
-                        printk("%d", (array[i] >> j) & 0x1);
-                }
-                if (i%8 == 0)
-                        printk(" byte-border\n");
-                else
-                        printk("\n");
-        }
-}
-#endif /* DEBUG */
-
-static int byte2trans(unsigned char byte, unsigned char sendbuffer[], int size)
-{
-        int i;
-
-        if (size != 8)
-                return -1;
-        for (i = 7; i >= 0; i--)
-                sendbuffer[7-i] = (byte & (1 << i)) ? RDS_DATAMASK : 0;
-        sendbuffer[0] |= RDS_CLOCKMASK;
-
-        return 0;
-}
-
-static int rds_waitread(void)
-{
-        unsigned char byte;
-        int i=2000;
-
-        do {
-                byte=inb(RDS_REGISTER);
-                i--;
-        }
-        while ((byte & RDS_BUSYMASK) && i);
-
-        if (i) {
-                #if DEBUG
-                printk(KERN_DEBUG "rds_waitread()");
-                print_matrix(&byte, 1);
-                #endif
-                return (byte);
-        } else {
-                printk(KERN_WARNING "aci-rds: rds_waitread() timeout...\n");
-                return -1;
-        }
-}
-
-/* don't use any ..._nowait() function if you are not sure what you do... */
-
-static inline void rds_rawwrite_nowait(unsigned char byte)
-{
-        #if DEBUG
-        printk(KERN_DEBUG "rds_rawwrite()");
-        print_matrix(&byte, 1);
-        #endif
-        outb(byte, RDS_REGISTER);
-}
-
-static int rds_rawwrite(unsigned char byte)
-{
-        if (rds_waitread() >= 0) {
-                rds_rawwrite_nowait(byte);
-                return 0;
-        } else
-                return -1;
-}
-
-static int rds_write(unsigned char cmd)
-{
-        unsigned char sendbuffer[8];
-        int i;
-
-        if (byte2trans(cmd, sendbuffer, 8) != 0){
-                return -1;
-        } else {
-                for (i=0; i<8; i++) {
-                        rds_rawwrite(sendbuffer[i]);
-                }
-        }
-        return 0;
-}
-
-static int rds_readcycle_nowait(void)
-{
-        rds_rawwrite_nowait(0);
-        return rds_waitread();
-}
-
-static int rds_readcycle(void)
-{
-        if (rds_rawwrite(0) < 0)
-                return -1;
-        return rds_waitread();
-}
-
-static int rds_read(unsigned char databuffer[], int datasize)
-{
-        #define READSIZE (8*datasize)
-
-        int i,j;
-
-        if (datasize < 1)  /* nothing to read */
-                return 0;
-
-        /* to be able to use rds_readcycle_nowait()
-           I have to waitread() here */
-        if (rds_waitread() < 0)
-                return -1;
-
-        memset(databuffer, 0, datasize);
-
-        for (i=0; i< READSIZE; i++)
-                if((j=rds_readcycle_nowait()) < 0) {
-                        return -1;
-                } else {
-                        databuffer[i/8]|=(RDS_DATA(j) << (7-(i%8)));
-                }
-
-        return 0;
-}
-
-static int rds_ack(void)
-{
-        int i=rds_readcycle();
-
-        if (i < 0)
-                return -1;
-        if (i & RDS_DATAMASK) {
-                return 0;  /* ACK  */
-        } else {
-                printk(KERN_DEBUG "aci-rds: NACK\n");
-                return 1;  /* NACK */
-        }
-}
-
-int aci_rds_cmd(unsigned char cmd, unsigned char databuffer[], int datasize)
-{
-        int ret;
-
-        if (mutex_lock_interruptible(&aci_rds_mutex))
-                return -EINTR;
-
-        rds_write(cmd);
-
-        /* RDS_RESET doesn't need further processing */
-        if (cmd!=RDS_RESET && (rds_ack() || rds_read(databuffer, datasize)))
-                ret = -1;
-        else
-                ret = 0;
-
-        mutex_unlock(&aci_rds_mutex);
-
-        return ret;
-}
-EXPORT_SYMBOL(aci_rds_cmd);
-
-int __init attach_aci_rds(void)
-{
-        mutex_init(&aci_rds_mutex);
-        return 0;
-}
-
-void __exit unload_aci_rds(void)
-{
-}
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/radio/miropcm20-rds-core.h b/drivers/media/radio/miropcm20-rds-core.h
deleted file mode 100644
index aeb5761f0469..000000000000
--- a/drivers/media/radio/miropcm20-rds-core.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _MIROPCM20_RDS_CORE_H_
-#define _MIROPCM20_RDS_CORE_H_
-
-extern int aci_rds_cmd(unsigned char cmd, unsigned char databuffer[], int datasize);
-
-#define RDS_STATUS      0x01
-#define RDS_STATIONNAME 0x02
-#define RDS_TEXT        0x03
-#define RDS_ALTFREQ     0x04
-#define RDS_TIMEDATE    0x05
-#define RDS_PI_CODE     0x06
-#define RDS_PTYTATP     0x07
-#define RDS_RESET       0x08
-#define RDS_RXVALUE     0x09
-
-extern void __exit unload_aci_rds(void);
-extern int __init attach_aci_rds(void);
-
-#endif /* _MIROPCM20_RDS_CORE_H_ */
diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
deleted file mode 100644
index 3e840f74d45c..000000000000
--- a/drivers/media/radio/miropcm20-rds.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* MiroSOUND PCM20 radio rds interface driver
- * (c) 2001 Robert Siemer <Robert.Siemer@gmx.de>
- * Thanks to Fred Seidel. See miropcm20-rds-core.c for further information.
- */
-
-/* Revision history:
- *
- *   2001-04-18  Robert Siemer <Robert.Siemer@gmx.de>
- *        separate file for user interface driver
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/smp_lock.h>
-#include <linux/fs.h>
-#include <linux/miscdevice.h>
-#include <linux/delay.h>
-#include <asm/uaccess.h>
-#include "miropcm20-rds-core.h"
-
-static char * text_buffer;
-static int rds_users;
-
-
-static int rds_f_open(struct inode *in, struct file *fi)
-{
-        if (rds_users)
-                return -EBUSY;
-
-        lock_kernel();
-        rds_users++;
-        if ((text_buffer=kmalloc(66, GFP_KERNEL)) == 0) {
-                rds_users--;
-                printk(KERN_NOTICE "aci-rds: Out of memory by open()...\n");
-                unlock_kernel();
-                return -ENOMEM;
-        }
-
-        unlock_kernel();
-        return 0;
-}
-
-static int rds_f_release(struct inode *in, struct file *fi)
-{
-        kfree(text_buffer);
-
-        rds_users--;
-        return 0;
-}
-
-static void print_matrix(char *ch, char out[])
-{
-        int j;
-
-        for (j=7; j>=0; j--) {
-                 out[7-j] = ((*ch >> j) & 0x1) + '0';
-        }
-}
-
-static ssize_t rds_f_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
-{
-//      i = sprintf(text_buffer, "length: %d, offset: %d\n", length, *offset);
-
-        char c;
-        char bits[8];
-
-        msleep(2000);
-        aci_rds_cmd(RDS_STATUS, &c, 1);
-        print_matrix(&c, bits);
-        if (copy_to_user(buffer, bits, 8))
-                return -EFAULT;
-
-/*      if ((c >> 3) & 1) {
-                aci_rds_cmd(RDS_STATIONNAME, text_buffer+1, 8);
-                text_buffer[0]  = ' ' ;
-                text_buffer[9]  = '\n';
-                return copy_to_user(buffer+8, text_buffer, 10) ? -EFAULT: 18;
-        }
-*/
-/*      if ((c >> 6) & 1) {
-                aci_rds_cmd(RDS_PTYTATP, &c, 1);
-                if ( c & 1)
-                        sprintf(text_buffer, " M");
-                else
-                        sprintf(text_buffer, " S");
-                if ((c >> 1) & 1)
-                        sprintf(text_buffer+2, " TA");
-                else
-                        sprintf(text_buffer+2, " --");
-                if ((c >> 7) & 1)
-                        sprintf(text_buffer+5, " TP");
-                else
-                        sprintf(text_buffer+5, " --");
-                sprintf(text_buffer+8, " %2d\n", (c >> 2) & 0x1f);
-                return copy_to_user(buffer+8, text_buffer, 12) ? -EFAULT: 20;
-        }
-*/
-
-        if ((c >> 4) & 1) {
-                aci_rds_cmd(RDS_TEXT, text_buffer, 65);
-                text_buffer[0]  = ' ' ;
-                text_buffer[65] = '\n';
-                return copy_to_user(buffer+8, text_buffer,66) ? -EFAULT : 66+8;
-        } else {
-                put_user('\n', buffer+8);
-                return 9;
-        }
-}
-
-static const struct file_operations rds_fops = {
-        .owner          = THIS_MODULE,
-        .read           = rds_f_read,
-        .open           = rds_f_open,
-        .release        = rds_f_release
-};
-
-static struct miscdevice rds_miscdev = {
-        .minor          = MISC_DYNAMIC_MINOR,
-        .name           = "radiotext",
-        .fops           = &rds_fops,
-};
-
-static int __init miropcm20_rds_init(void)
-{
-        return misc_register(&rds_miscdev);
-}
-
-static void __exit miropcm20_rds_cleanup(void)
-{
-        misc_deregister(&rds_miscdev);
-}
-
-module_init(miropcm20_rds_init);
-module_exit(miropcm20_rds_cleanup);
-MODULE_LICENSE("GPL");
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index eba9209b3024..1f064f4b32df 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -426,8 +426,7 @@ static int __init rtrack_init(void)
 
         rtrack_radio.priv=&rtrack_unit;
 
-        if(video_register_device(&rtrack_radio, VFL_TYPE_RADIO, radio_nr)==-1)
-        {
+        if (video_register_device(&rtrack_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 2);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 3fe5504428c5..628c689e3ffe 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -394,8 +394,7 @@ static int __init aztech_init(void)
         mutex_init(&lock);
         aztech_radio.priv=&aztech_unit;
 
-        if(video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr)==-1)
-        {
+        if (video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io,2);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 6166e726ed72..04c3698d32e4 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -682,7 +682,7 @@ static int __init cadet_init(void)
         }
         if (!request_region(io,2,"cadet"))
                 goto fail;
-        if(video_register_device(&cadet_radio,VFL_TYPE_RADIO,radio_nr)==-1) {
+        if (video_register_device(&cadet_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io,2);
                 goto fail;
         }
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 36e754e3ffb2..5cd7f032298d 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -425,7 +425,7 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci
         }
         *devradio = vdev_template;
 
-        if ( video_register_device( devradio, VFL_TYPE_RADIO , nr_radio) == -1 ) {
+        if (video_register_device(devradio, VFL_TYPE_RADIO, nr_radio) < 0) {
                 kfree( devradio );
                 goto err_video;
         }
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 2b1a6221de6d..0a0f956bb308 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -612,8 +612,7 @@ static int __init gemtek_init(void)
 
         gemtek_radio.priv = &gemtek_unit;
 
-        if (video_register_device(&gemtek_radio, VFL_TYPE_RADIO,
-                radio_nr) == -1) {
+        if (video_register_device(&gemtek_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 1);
                 return -EBUSY;
         }
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 0ada1c697e8a..9ef0a763eeb7 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -409,8 +409,7 @@ static int __devinit maestro_probe(struct pci_dev *pdev,
         video_set_drvdata(maestro_radio_inst, radio_unit);
         pci_set_drvdata(pdev, maestro_radio_inst);
 
-        retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO,
-                radio_nr);
+        retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO, radio_nr);
         if (retval) {
                 printk(KERN_ERR "can't register video device!\n");
                 goto errfr1;
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 43c75497dc49..0cc6fcb041fd 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -156,28 +156,28 @@ static void set_freq(__u16 io, __u32 freq)
 {
         unsigned long int si;
         int bl;
-        int data = FREQ2BITS(freq);
+        int val = FREQ2BITS(freq);
 
         /* TEA5757 shift register bits (see pdf) */
 
-        outbit(0,io); // 24  search
-        outbit(1,io); // 23  search up/down
+        outbit(0, io); /* 24  search */
+        outbit(1, io); /* 23  search up/down */
 
-        outbit(0,io); // 22  stereo/mono
+        outbit(0, io); /* 22  stereo/mono */
 
-        outbit(0,io); // 21  band
-        outbit(0,io); // 20  band (only 00=FM works I think)
+        outbit(0, io); /* 21  band */
+        outbit(0, io); /* 20  band (only 00=FM works I think) */
 
-        outbit(0,io); // 19  port ?
-        outbit(0,io); // 18  port ?
+        outbit(0, io); /* 19  port ? */
+        outbit(0, io); /* 18  port ? */
 
-        outbit(0,io); // 17  search level
-        outbit(0,io); // 16  search level
+        outbit(0, io); /* 17  search level */
+        outbit(0, io); /* 16  search level */
 
         si = 0x8000;
-        for (bl = 1; bl <= 16 ; bl++) {
-                outbit(data & si,io);
-                si >>=1;
+        for (bl = 1; bl <= 16; bl++) {
+                outbit(val & si, io);
+                si >>= 1;
         }
 
         dprintk(1, "Radio freq set to %d.%02d MHz\n",
@@ -410,7 +410,7 @@ static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_d
         mutex_init(&radio_unit.lock);
         maxiradio_radio.priv = &radio_unit;
 
-        if (video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr)==-1) {
+        if (video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 printk("radio-maxiradio: can't register device!");
                 goto err_out_free_region;
         }
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index e2dde0807268..6d820e2481e7 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -332,8 +332,7 @@ static int __init rtrack2_init(void)
         rtrack2_radio.priv=&rtrack2_unit;
 
         spin_lock_init(&lock);
-        if(video_register_device(&rtrack2_radio, VFL_TYPE_RADIO, radio_nr)==-1)
-        {
+        if (video_register_device(&rtrack2_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 4);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index bb5d92f104af..0d478f54a907 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -377,7 +377,7 @@ static int __init fmi_init(void)
 
         mutex_init(&lock);
 
-        if (video_register_device(&fmi_radio, VFL_TYPE_RADIO, radio_nr) == -1) {
+        if (video_register_device(&fmi_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 2);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index a4984ff87c9c..16c7ef20265c 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -1694,8 +1694,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
         INIT_DELAYED_WORK(&radio->work, si470x_work);
 
         /* register video device */
-        if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr)) {
-                retval = -EIO;
+        retval = video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr);
+        if (retval) {
                 printk(KERN_WARNING DRIVER_NAME
                                 ": Could not register video device\n");
                 goto err_all;
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index cefa44fc5aed..0876fecc5f27 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -405,8 +405,7 @@ static int __init terratec_init(void)
 
         spin_lock_init(&lock);
 
-        if(video_register_device(&terratec_radio, VFL_TYPE_RADIO, radio_nr)==-1)
-        {
+        if (video_register_device(&terratec_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io,2);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index d70172d23edb..193161956253 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -378,8 +378,7 @@ static int __init trust_init(void)
                 printk(KERN_ERR "trust: port 0x%x already in use\n", io);
                 return -EBUSY;
         }
-        if(video_register_device(&trust_radio, VFL_TYPE_RADIO, radio_nr)==-1)
-        {
+        if (video_register_device(&trust_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 2);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 9f17a332fa11..51d57ed3b3e1 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -446,8 +446,7 @@ static int __init zoltrix_init(void)
                 return -EBUSY;
         }
 
-        if (video_register_device(&zoltrix_radio, VFL_TYPE_RADIO, radio_nr) == -1)
-        {
+        if (video_register_device(&zoltrix_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 2);
                 return -EINVAL;
         }
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index bbc6f8b82297..ef7c8d3ffb18 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -20,6 +20,8 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
   obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
 endif
 
+obj-$(CONFIG_VIDEO_TUNER) += tuner.o
+
 obj-$(CONFIG_VIDEO_BT848) += bt8xx/
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
 obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
@@ -85,8 +87,6 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
 obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
 obj-$(CONFIG_TUNER_3036) += tuner-3036.o
 
-obj-$(CONFIG_VIDEO_TUNER) += tuner.o
-
 obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
 obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
 obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o
diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig
index ed9a50f189fc..018f72b8e3e2 100644
--- a/drivers/media/video/au0828/Kconfig
+++ b/drivers/media/video/au0828/Kconfig
@@ -7,6 +7,7 @@ config VIDEO_AU0828
         select DVB_AU8522 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMIZE
+        select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
         ---help---
           This is a video4linux driver for Auvitek's USB device.
 
diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c
index 443e59009762..ed48908a9034 100644
--- a/drivers/media/video/au0828/au0828-cards.c
+++ b/drivers/media/video/au0828/au0828-cards.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Auvitek USB bridge
  *
- *  Copyright (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
  *
  *  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
@@ -38,6 +38,9 @@ struct au0828_board au0828_boards[] = {
         [AU0828_BOARD_DVICO_FUSIONHDTV7] = {
                 .name   = "DViCO FusionHDTV USB",
         },
+        [AU0828_BOARD_HAUPPAUGE_WOODBURY] = {
+                .name = "Hauppauge Woodbury",
+        },
 };
 
 /* Tuner callback function for au0828 boards. Currently only needed
@@ -115,6 +118,7 @@ void au0828_card_setup(struct au0828_dev *dev)
         case AU0828_BOARD_HAUPPAUGE_HVR850:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
+        case AU0828_BOARD_HAUPPAUGE_WOODBURY:
                 if (dev->i2c_rc == 0)
                         hauppauge_eeprom(dev, eeprom+0xa0);
                 break;
@@ -134,6 +138,7 @@ void au0828_gpio_setup(struct au0828_dev *dev)
         case AU0828_BOARD_HAUPPAUGE_HVR850:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q:
         case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
+        case AU0828_BOARD_HAUPPAUGE_WOODBURY:
                 /* GPIO's
                  * 4 - CS5340
                  * 5 - AU8522 Demodulator
@@ -205,6 +210,8 @@ struct usb_device_id au0828_usb_id_table [] = {
                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
         { USB_DEVICE(0x2040, 0x7281),
                 .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
+        { USB_DEVICE(0x2040, 0x8200),
+                .driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
         { },
 };
 
diff --git a/drivers/media/video/au0828/au0828-cards.h b/drivers/media/video/au0828/au0828-cards.h
index c37f5fd0fa80..48a1882c2b6b 100644
--- a/drivers/media/video/au0828/au0828-cards.h
+++ b/drivers/media/video/au0828/au0828-cards.h
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Auvitek USB bridge
  *
- *  Copyright (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
  *
  *  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
@@ -24,3 +24,4 @@
 #define AU0828_BOARD_HAUPPAUGE_HVR850   2
 #define AU0828_BOARD_DVICO_FUSIONHDTV7  3
 #define AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL      4
+#define AU0828_BOARD_HAUPPAUGE_WOODBURY 5
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c
index 54bfc0f05295..d856de9f742f 100644
--- a/drivers/media/video/au0828/au0828-core.c
+++ b/drivers/media/video/au0828/au0828-core.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Auvitek USB bridge
  *
- *  Copyright (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
  *
  *  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
@@ -252,5 +252,5 @@ module_init(au0828_init);
 module_exit(au0828_exit);
 
 MODULE_DESCRIPTION("Driver for Auvitek AU0828 based products");
-MODULE_AUTHOR("Steven Toth <stoth@hauppauge.com>");
+MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index 584a83a94a2a..ba94be7e0ac1 100644
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Auvitek USB bridge
  *
- *  Copyright (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
  *
  *  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
@@ -29,6 +29,7 @@
 #include "au8522.h"
 #include "xc5000.h"
 #include "mxl5007t.h"
+#include "tda18271.h"
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
@@ -38,6 +39,15 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 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,
+};
+
+static struct au8522_config hauppauge_woodbury_config = {
+        .demod_address = 0x8e >> 1,
+        .status_mode   = AU8522_DEMODLOCKING,
+        .qam_if        = AU8522_IF_4MHZ,
+        .vsb_if        = AU8522_IF_3_25MHZ,
 };
 
 static struct xc5000_config hauppauge_hvr950q_tunerconfig = {
@@ -51,6 +61,10 @@ static struct mxl5007t_config mxl5007t_hvr950q_config = {
         .if_freq_hz = MxL_IF_6_MHZ,
 };
 
+static struct tda18271_config hauppauge_woodbury_tunerconfig = {
+        .gate    = TDA18271_GATE_DIGITAL,
+};
+
 /*-------------------------------------------------------------------*/
 static void urb_completion(struct urb *purb)
 {
@@ -357,6 +371,15 @@ int au0828_dvb_register(struct au0828_dev *dev)
                                    &dev->i2c_adap, 0x60,
                                    &mxl5007t_hvr950q_config);
                 break;
+        case AU0828_BOARD_HAUPPAUGE_WOODBURY:
+                dvb->frontend = dvb_attach(au8522_attach,
+                                &hauppauge_woodbury_config,
+                                &dev->i2c_adap);
+                if (dvb->frontend != NULL)
+                        dvb_attach(tda18271_attach, dvb->frontend,
+                                   0x60, &dev->i2c_adap,
+                                   &hauppauge_woodbury_tunerconfig);
+                break;
         default:
                 printk(KERN_WARNING "The frontend of your DVB/ATSC card "
                        "isn't supported yet\n");
diff --git a/drivers/media/video/au0828/au0828-i2c.c b/drivers/media/video/au0828/au0828-i2c.c
index 741a4937b050..d618fbaade1b 100644
--- a/drivers/media/video/au0828/au0828-i2c.c
+++ b/drivers/media/video/au0828/au0828-i2c.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Auvitek AU0828 USB bridge
  *
- *  Copyright (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/au0828/au0828-reg.h b/drivers/media/video/au0828/au0828-reg.h
index 39827550891c..1e87fa0c6842 100644
--- a/drivers/media/video/au0828/au0828-reg.h
+++ b/drivers/media/video/au0828/au0828-reg.h
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Auvitek USB bridge
  *
- *  Copyright (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
index 7beb571798e5..4f10ff300135 100644
--- a/drivers/media/video/au0828/au0828.h
+++ b/drivers/media/video/au0828/au0828.h
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Auvitek AU0828 USB bridge
  *
- *  Copyright (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 1c56ae92ce74..6081edc362df 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -3144,8 +3144,9 @@ static void identify_by_eeprom(struct bttv *btv, unsigned char eeprom_data[256])
 
 static void flyvideo_gpio(struct bttv *btv)
 {
-        int gpio,has_remote,has_radio,is_capture_only,is_lr90,has_tda9820_tda9821;
-        int tuner=UNSET,ttype;
+        int gpio, has_remote, has_radio, is_capture_only;
+        int is_lr90, has_tda9820_tda9821;
+        int tuner_type = UNSET, ttype;
 
         gpio_inout(0xffffff, 0);
         udelay(8);  /* without this we would see the 0x1800 mask */
@@ -3163,20 +3164,26 @@ static void flyvideo_gpio(struct bttv *btv)
          * xxxF00(LR26/LR50), xxxFE0(LR90): Remote control chip (LVA001 or CF45) soldered
          * Note: Some bits are Audio_Mask !
          */
-        ttype=(gpio&0x0f0000)>>16;
-        switch(ttype) {
-        case 0x0: tuner=2; /* NTSC, e.g. TPI8NSR11P */
+        ttype = (gpio & 0x0f0000) >> 16;
+        switch (ttype) {
+        case 0x0:
+                tuner_type = 2;  /* NTSC, e.g. TPI8NSR11P */
                 break;
-        case 0x2: tuner=39;/* LG NTSC (newer TAPC series) TAPC-H701P */
+        case 0x2:
+                tuner_type = 39; /* LG NTSC (newer TAPC series) TAPC-H701P */
                 break;
-        case 0x4: tuner=5; /* Philips PAL TPI8PSB02P, TPI8PSB12P, TPI8PSB12D or FI1216, FM1216 */
+        case 0x4:
+                tuner_type = 5;  /* Philips PAL TPI8PSB02P, TPI8PSB12P, TPI8PSB12D or FI1216, FM1216 */
                 break;
-        case 0x6: tuner=37;/* LG PAL (newer TAPC series) TAPC-G702P */
+        case 0x6:
+                tuner_type = 37; /* LG PAL (newer TAPC series) TAPC-G702P */
                 break;
-                case 0xC: tuner=3; /* Philips SECAM(+PAL) FQ1216ME or FI1216MF */
+        case 0xC:
+                tuner_type = 3;  /* Philips SECAM(+PAL) FQ1216ME or FI1216MF */
                 break;
         default:
                 printk(KERN_INFO "bttv%d: FlyVideo_gpio: unknown tuner type.\n", btv->c.nr);
+                break;
         }
 
         has_remote          =   gpio & 0x800000;
@@ -3189,23 +3196,26 @@ static void flyvideo_gpio(struct bttv *btv)
         /*
          * gpio & 0x001000    output bit for audio routing */
 
-        if(is_capture_only)
-                tuner = TUNER_ABSENT; /* No tuner present */
+        if (is_capture_only)
+                tuner_type = TUNER_ABSENT; /* No tuner present */
 
         printk(KERN_INFO "bttv%d: FlyVideo Radio=%s RemoteControl=%s Tuner=%d gpio=0x%06x\n",
-               btv->c.nr, has_radio? "yes":"no ", has_remote? "yes":"no ", tuner, gpio);
+                btv->c.nr, has_radio ? "yes" : "no ",
+                has_remote ? "yes" : "no ", tuner_type, gpio);
         printk(KERN_INFO "bttv%d: FlyVideo  LR90=%s tda9821/tda9820=%s capture_only=%s\n",
-                btv->c.nr, is_lr90?"yes":"no ", has_tda9820_tda9821?"yes":"no ",
-                is_capture_only?"yes":"no ");
+                btv->c.nr, is_lr90 ? "yes" : "no ",
+                has_tda9820_tda9821 ? "yes" : "no ",
+                is_capture_only ? "yes" : "no ");
 
-        if (tuner != UNSET) /* only set if known tuner autodetected, else let insmod option through */
-                btv->tuner_type = tuner;
+        if (tuner_type != UNSET) /* only set if known tuner autodetected, else let insmod option through */
+                btv->tuner_type = tuner_type;
         btv->has_radio = has_radio;
 
         /* LR90 Audio Routing is done by 2 hef4052, so Audio_Mask has 4 bits: 0x001c80
          * LR26/LR50 only has 1 hef4052, Audio_Mask 0x000c00
          * Audio options: from tuner, from tda9821/tda9821(mono,stereo,sap), from tda9874, ext., mute */
-        if(has_tda9820_tda9821) btv->audio_mode_gpio = lt9415_audio;
+        if (has_tda9820_tda9821)
+                btv->audio_mode_gpio = lt9415_audio;
         /* todo: if(has_tda9874) btv->audio_mode_gpio = fv2000s_audio; */
 }
 
@@ -3962,7 +3972,7 @@ static int tuner_1_table[] = {
 
 static void __devinit avermedia_eeprom(struct bttv *btv)
 {
-        int tuner_make,tuner_tv_fm,tuner_format,tuner=0;
+        int tuner_make, tuner_tv_fm, tuner_format, tuner_type = 0;
 
         tuner_make      = (eeprom_data[0x41] & 0x7);
         tuner_tv_fm     = (eeprom_data[0x41] & 0x18) >> 3;
@@ -3970,24 +3980,24 @@ static void __devinit avermedia_eeprom(struct bttv *btv)
         btv->has_remote = (eeprom_data[0x42] & 0x01);
 
         if (tuner_make == 0 || tuner_make == 2)
-                if(tuner_format <=0x0a)
-                        tuner = tuner_0_table[tuner_format];
+                if (tuner_format <= 0x0a)
+                        tuner_type = tuner_0_table[tuner_format];
         if (tuner_make == 1)
-                if(tuner_format <=9)
-                        tuner = tuner_1_table[tuner_format];
+                if (tuner_format <= 9)
+                        tuner_type = tuner_1_table[tuner_format];
 
         if (tuner_make == 4)
-                if(tuner_format == 0x09)
-                        tuner = TUNER_LG_NTSC_NEW_TAPC; /* TAPC-G702P */
+                if (tuner_format == 0x09)
+                        tuner_type = TUNER_LG_NTSC_NEW_TAPC; /* TAPC-G702P */
 
         printk(KERN_INFO "bttv%d: Avermedia eeprom[0x%02x%02x]: tuner=",
-                btv->c.nr,eeprom_data[0x41],eeprom_data[0x42]);
-        if(tuner) {
-                btv->tuner_type=tuner;
-                printk("%d",tuner);
+                btv->c.nr, eeprom_data[0x41], eeprom_data[0x42]);
+        if (tuner_type) {
+                btv->tuner_type = tuner_type;
+                printk(KERN_CONT "%d", tuner_type);
         } else
-                printk("Unknown type");
-        printk(" radio:%s remote control:%s\n",
+                printk(KERN_CONT "Unknown type");
+        printk(KERN_CONT " radio:%s remote control:%s\n",
                tuner_tv_fm     ? "yes" : "no",
                btv->has_remote ? "yes" : "no");
 }
@@ -4029,7 +4039,8 @@ static void __devinit boot_msp34xx(struct bttv *btv, int pin)
 
         gpio_inout(mask,mask);
         gpio_bits(mask,0);
-        udelay(2500);
+        mdelay(2);
+        udelay(500);
         gpio_bits(mask,mask);
 
         if (bttv_gpio)
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 85bf31ab8789..6ae4cc860efe 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -96,7 +96,6 @@ static unsigned int irq_iswitch;
 static unsigned int uv_ratio    = 50;
 static unsigned int full_luma_range;
 static unsigned int coring;
-extern int no_overlay;
 
 /* API features (turn on/off stuff for testing) */
 static unsigned int v4l2        = 1;
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c
index 649682aac1ac..5b1b8e4c78ba 100644
--- a/drivers/media/video/bt8xx/bttv-risc.c
+++ b/drivers/media/video/bt8xx/bttv-risc.c
@@ -244,7 +244,8 @@ bttv_risc_overlay(struct bttv *btv, struct btcx_riscmem *risc,
                   const struct bttv_format *fmt, struct bttv_overlay *ov,
                   int skip_even, int skip_odd)
 {
-        int dwords,rc,line,maxy,start,end,skip,nskips;
+        int dwords, rc, line, maxy, start, end;
+        unsigned skip, nskips;
         struct btcx_skiplist *skips;
         __le32 *rp;
         u32 ri,ra;
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 08ef54a22c9e..b4d940b2e447 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -267,6 +267,11 @@ int bttv_sub_add_device(struct bttv_core *core, char *name);
 int bttv_sub_del_devices(struct bttv_core *core);
 
 /* ---------------------------------------------------------- */
+/* bttv-cards.c                                               */
+
+extern int no_overlay;
+
+/* ---------------------------------------------------------- */
 /* bttv-driver.c                                              */
 
 /* insmod options */
diff --git a/drivers/media/video/btcx-risc.c b/drivers/media/video/btcx-risc.c
index f42701f82e7f..3324ab38f58c 100644
--- a/drivers/media/video/btcx-risc.c
+++ b/drivers/media/video/btcx-risc.c
@@ -184,12 +184,12 @@ btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips)
 }
 
 void
-btcx_calc_skips(int line, int width, unsigned int *maxy,
+btcx_calc_skips(int line, int width, int *maxy,
                 struct btcx_skiplist *skips, unsigned int *nskips,
                 const struct v4l2_clip *clips, unsigned int nclips)
 {
         unsigned int clip,skip;
-        int end,maxline;
+        int end, maxline;
 
         skip=0;
         maxline = 9999;
diff --git a/drivers/media/video/btcx-risc.h b/drivers/media/video/btcx-risc.h
index 861bc8112824..f8bc6e8e7b51 100644
--- a/drivers/media/video/btcx-risc.h
+++ b/drivers/media/video/btcx-risc.h
@@ -23,7 +23,7 @@ int btcx_screen_clips(int swidth, int sheight, struct v4l2_rect *win,
 int btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips,
                unsigned int n, int mask);
 void btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips);
-void btcx_calc_skips(int line, int width, unsigned int *maxy,
+void btcx_calc_skips(int line, int width, int *maxy,
                      struct btcx_skiplist *skips, unsigned int *nskips,
                      const struct v4l2_clip *clips, unsigned int nclips);
 
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index d3b3268bace8..6e39e253ce53 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -946,8 +946,7 @@ static int init_bwqcam(struct parport *port)
 
         printk(KERN_INFO "Connectix Quickcam on %s\n", qcam->pport->name);
 
-        if(video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr)==-1)
-        {
+        if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
                 parport_unregister_device(qcam->pdev);
                 kfree(qcam);
                 return -ENODEV;
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index fe9379b282d3..7f6c6b4bec10 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -787,8 +787,7 @@ static int init_cqcam(struct parport *port)
 
         parport_release(qcam->pdev);
 
-        if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr)==-1)
-        {
+        if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
                 printk(KERN_ERR "Unable to register Colour QuickCam on %s\n",
                        qcam->pport->name);
                 parport_unregister_device(qcam->pdev);
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index dc8cc6115e2f..a661800b0e69 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -3955,7 +3955,7 @@ struct cam_data *cpia_register_camera(struct cpia_camera_ops *ops, void *lowleve
         camera->lowlevel_data = lowlevel;
 
         /* register v4l device */
-        if (video_register_device(&camera->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
+        if (video_register_device(&camera->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
                 kfree(camera);
                 printk(KERN_DEBUG "video_register_device failed\n");
                 return NULL;
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 515c8b57a60d..eb9f15cd4c45 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -1024,7 +1024,6 @@ static int ioctl_queryctrl(void *arg,struct camera_data *cam)
                 if(cam->params.pnp_id.device_type == DEVICE_STV_672 &&
                    cam->params.version.sensor_flags==CPIA2_VP_SENSOR_FLAGS_500){
                         // Maximum 15fps
-                        int i;
                         for(i=0; i<c->maximum; ++i) {
                                 if(framerate_controls[i].value ==
                                    CPIA2_VP_FRAMERATE_15) {
@@ -1959,8 +1958,7 @@ int cpia2_register_camera(struct camera_data *cam)
         reset_camera_struct_v4l(cam);
 
         /* register v4l device */
-        if (video_register_device
-            (cam->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
+        if (video_register_device(cam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
                 ERR("video_register_device failed\n");
                 video_device_release(cam->vdev);
                 return -ENODEV;
diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c
index 834b9248242e..e996a4e3123a 100644
--- a/drivers/media/video/cx18/cx18-av-firmware.c
+++ b/drivers/media/video/cx18/cx18-av-firmware.c
@@ -32,7 +32,7 @@ int cx18_av_loadfw(struct cx18 *cx)
         u32 v;
         const u8 *ptr;
         int i;
-        int retries = 0;
+        int retries1 = 0;
 
         if (request_firmware(&fw, FWFILE, &cx->dev->dev) != 0) {
                 CX18_ERR("unable to open firmware %s\n", FWFILE);
@@ -41,7 +41,7 @@ int cx18_av_loadfw(struct cx18 *cx)
 
         /* The firmware load often has byte errors, so allow for several
            retries, both at byte level and at the firmware load level. */
-        while (retries < 5) {
+        while (retries1 < 5) {
                 cx18_av_write4(cx, CXADEC_CHIP_CTRL, 0x00010000);
                 cx18_av_write(cx, CXADEC_STD_DET_CTL, 0xf6);
 
@@ -57,9 +57,9 @@ int cx18_av_loadfw(struct cx18 *cx)
                 for (i = 0; i < size; i++) {
                         u32 dl_control = 0x0F000000 | i | ((u32)ptr[i] << 16);
                         u32 value = 0;
-                        int retries;
+                        int retries2;
 
-                        for (retries = 0; retries < 5; retries++) {
+                        for (retries2 = 0; retries2 < 5; retries2++) {
                                 cx18_av_write4(cx, CXADEC_DL_CTL, dl_control);
                                 udelay(10);
                                 value = cx18_av_read4(cx, CXADEC_DL_CTL);
@@ -69,18 +69,18 @@ int cx18_av_loadfw(struct cx18 *cx)
                                    the address.  We can only write the lower
                                    address byte of the address. */
                                 if ((value & 0x3F00) != (dl_control & 0x3F00)) {
-                                        retries = 5;
+                                        retries2 = 5;
                                         break;
                                 }
                         }
-                        if (retries >= 5)
+                        if (retries2 >= 5)
                                 break;
                 }
                 if (i == size)
                         break;
-                retries++;
+                retries1++;
         }
-        if (retries >= 5) {
+        if (retries1 >= 5) {
                 CX18_ERR("unable to load firmware %s\n", FWFILE);
                 release_firmware(fw);
                 return -EIO;
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 22434aadde31..bd18afebbf86 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -74,9 +74,9 @@ 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 };
 
-static int cardtype_c = 1;
-static int tuner_c = 1;
-static int radio_c = 1;
+static unsigned cardtype_c = 1;
+static unsigned tuner_c = 1;
+static unsigned radio_c = 1;
 static char pal[] = "--";
 static char secam[] = "--";
 static char ntsc[] = "-";
diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c
index cae38985b131..1e420a804fc9 100644
--- a/drivers/media/video/cx18/cx18-dvb.c
+++ b/drivers/media/video/cx18/cx18-dvb.c
@@ -1,7 +1,7 @@
 /*
  *  cx18 functions for DVB support
  *
- *  Copyright (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/cx18/cx18-dvb.h b/drivers/media/video/cx18/cx18-dvb.h
index d6a6ccda79a9..bf8d8f6f5455 100644
--- a/drivers/media/video/cx18/cx18-dvb.h
+++ b/drivers/media/video/cx18/cx18-dvb.h
@@ -1,7 +1,7 @@
 /*
  *  cx18 functions for DVB support
  *
- *  Copyright (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/cx18/cx18-irq.c b/drivers/media/video/cx18/cx18-irq.c
index 25114a5cbd57..ab218315c84b 100644
--- a/drivers/media/video/cx18/cx18-irq.c
+++ b/drivers/media/video/cx18/cx18-irq.c
@@ -61,7 +61,7 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
                 CX18_WARN("Ack struct = %d for %s\n",
                         mb->args[2], s->name);
         id = read_enc(off);
-        buf = cx18_queue_find_buf(s, id, read_enc(off + 4));
+        buf = cx18_queue_get_buf_irq(s, id, read_enc(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);
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index 6990b77c6200..dbe792ac3001 100644
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -78,12 +78,13 @@ struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q)
         return buf;
 }
 
-struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id,
+struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id,
         u32 bytesused)
 {
         struct cx18 *cx = s->cx;
         struct list_head *p;
 
+        spin_lock(&s->qlock);
         list_for_each(p, &s->q_free.list) {
                 struct cx18_buffer *buf =
                         list_entry(p, struct cx18_buffer, list);
@@ -92,114 +93,48 @@ struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id,
                         continue;
                 buf->bytesused = bytesused;
                 /* the transport buffers are handled differently,
-                   so there is no need to move them to the full queue */
-                if (s->type == CX18_ENC_STREAM_TYPE_TS)
-                        return buf;
-                s->q_free.buffers--;
-                s->q_free.length -= s->buf_size;
-                s->q_full.buffers++;
-                s->q_full.length += s->buf_size;
-                s->q_full.bytesused += buf->bytesused;
-                list_move_tail(&buf->list, &s->q_full.list);
+                   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;
+                        s->q_full.bytesused += buf->bytesused;
+                        list_move_tail(&buf->list, &s->q_full.list);
+                }
+                spin_unlock(&s->qlock);
                 return buf;
         }
+        spin_unlock(&s->qlock);
         CX18_ERR("Cannot find buffer %d for stream %s\n", id, s->name);
         return NULL;
 }
 
-static void cx18_queue_move_buf(struct cx18_stream *s, struct cx18_queue *from,
-                struct cx18_queue *to, int clear, int full)
-{
-        struct cx18_buffer *buf =
-                list_entry(from->list.next, struct cx18_buffer, list);
-
-        list_move_tail(from->list.next, &to->list);
-        from->buffers--;
-        from->length -= s->buf_size;
-        from->bytesused -= buf->bytesused - buf->readpos;
-        /* special handling for q_free */
-        if (clear)
-                buf->bytesused = buf->readpos = buf->b_flags = 0;
-        else if (full) {
-                /* special handling for stolen buffers, assume
-                   all bytes are used. */
-                buf->bytesused = s->buf_size;
-                buf->readpos = buf->b_flags = 0;
-        }
-        to->buffers++;
-        to->length += s->buf_size;
-        to->bytesused += buf->bytesused - buf->readpos;
-}
-
-/* Move 'needed_bytes' worth of buffers from queue 'from' into queue 'to'.
-   If 'needed_bytes' == 0, then move all buffers from 'from' into 'to'.
-   If 'steal' != NULL, then buffers may also taken from that queue if
-   needed.
-
-   The buffer is automatically cleared if it goes to the free queue. It is
-   also cleared if buffers need to be taken from the 'steal' queue and
-   the 'from' queue is the free queue.
-
-   When 'from' is q_free, then needed_bytes is compared to the total
-   available buffer length, otherwise needed_bytes is compared to the
-   bytesused value. For the 'steal' queue the total available buffer
-   length is always used.
-
-   -ENOMEM is returned if the buffers could not be obtained, 0 if all
-   buffers where obtained from the 'from' list and if non-zero then
-   the number of stolen buffers is returned. */
-static int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,
-                           struct cx18_queue *steal, struct cx18_queue *to,
-                           int needed_bytes)
+/* Move all buffers of a queue to q_free, while flushing the buffers */
+static void cx18_queue_flush(struct cx18_stream *s, struct cx18_queue *q)
 {
         unsigned long flags;
-        int rc = 0;
-        int from_free = from == &s->q_free;
-        int to_free = to == &s->q_free;
-        int bytes_available;
-
-        spin_lock_irqsave(&s->qlock, flags);
-        if (needed_bytes == 0) {
-                from_free = 1;
-                needed_bytes = from->length;
-        }
-
-        bytes_available = from_free ? from->length : from->bytesused;
-        bytes_available += steal ? steal->length : 0;
+        struct cx18_buffer *buf;
 
-        if (bytes_available < needed_bytes) {
-                spin_unlock_irqrestore(&s->qlock, flags);
-                return -ENOMEM;
-        }
-        if (from_free) {
-                u32 old_length = to->length;
+        if (q == &s->q_free)
+                return;
 
-                while (to->length - old_length < needed_bytes) {
-                        if (list_empty(&from->list))
-                                from = steal;
-                        if (from == steal)
-                                rc++;   /* keep track of 'stolen' buffers */
-                        cx18_queue_move_buf(s, from, to, 1, 0);
-                }
-        } else {
-                u32 old_bytesused = to->bytesused;
-
-                while (to->bytesused - old_bytesused < needed_bytes) {
-                        if (list_empty(&from->list))
-                                from = steal;
-                        if (from == steal)
-                                rc++;   /* keep track of 'stolen' buffers */
-                        cx18_queue_move_buf(s, from, to, to_free, rc);
-                }
+        spin_lock_irqsave(&s->qlock, flags);
+        while (!list_empty(&q->list)) {
+                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;
         }
+        cx18_queue_init(q);
         spin_unlock_irqrestore(&s->qlock, flags);
-        return rc;
 }
 
 void cx18_flush_queues(struct cx18_stream *s)
 {
-        cx18_queue_move(s, &s->q_io, NULL, &s->q_free, 0);
-        cx18_queue_move(s, &s->q_full, NULL, &s->q_free, 0);
+        cx18_queue_flush(s, &s->q_io);
+        cx18_queue_flush(s, &s->q_full);
 }
 
 int cx18_stream_alloc(struct cx18_stream *s)
@@ -214,10 +149,10 @@ int cx18_stream_alloc(struct cx18_stream *s)
                 s->name, s->buffers, s->buf_size,
                 s->buffers * s->buf_size / 1024);
 
-        if (((char *)&cx->scb->cpu_mdl[cx->mdl_offset + s->buffers] -
-                                (char *)cx->scb) > SCB_RESERVED_SIZE) {
-                unsigned bufsz = (((char *)cx->scb) + SCB_RESERVED_SIZE -
-                                        ((char *)cx->scb->cpu_mdl));
+        if (((char __iomem *)&cx->scb->cpu_mdl[cx->mdl_offset + s->buffers] -
+                                (char __iomem *)cx->scb) > SCB_RESERVED_SIZE) {
+                unsigned bufsz = (((char __iomem *)cx->scb) + SCB_RESERVED_SIZE -
+                                        ((char __iomem *)cx->scb->cpu_mdl));
 
                 CX18_ERR("Too many buffers, cannot fit in SCB area\n");
                 CX18_ERR("Max buffers = %zd\n",
diff --git a/drivers/media/video/cx18/cx18-queue.h b/drivers/media/video/cx18/cx18-queue.h
index 91423b9863a4..7f93bb13c09f 100644
--- a/drivers/media/video/cx18/cx18-queue.h
+++ b/drivers/media/video/cx18/cx18-queue.h
@@ -46,7 +46,7 @@ void cx18_queue_init(struct cx18_queue *q);
 void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf,
         struct cx18_queue *q);
 struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q);
-struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id,
+struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id,
         u32 bytesused);
 void cx18_flush_queues(struct cx18_stream *s);
 
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 8118091568fc..7b0e8c01692e 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -4,7 +4,7 @@
  *
  *    (c) 2004 Jelle Foks <jelle@foks.8m.com>
  *    (c) 2004 Gerd Knorr <kraxel@bytesex.org>
- *    (c) 2008 Steven Toth <stoth@hauppauge.com>
+ *    (c) 2008 Steven Toth <stoth@linuxtv.org>
  *      - CX23885/7/8 support
  *
  *  Includes parts from the ivtv driver( http://ivtv.sourceforge.net/),
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index a19de850955d..c36d3f632104 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Conexant CX23885 PCIe bridge
  *
- *  Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 6286a9cf957e..25fb09938744 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Conexant CX23885 PCIe bridge
  *
- *  Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
  *
  *  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
@@ -33,7 +33,7 @@
 #include "cx23885.h"
 
 MODULE_DESCRIPTION("Driver for cx23885 based TV cards");
-MODULE_AUTHOR("Steven Toth <stoth@hauppauge.com>");
+MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
 MODULE_LICENSE("GPL");
 
 static unsigned int debug;
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 0a2e6558cd66..291b9d008da8 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Conexant CX23885 PCIe bridge
  *
- *  Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index c6bb0a05bc1c..f98e476e9617 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Conexant CX23885 PCIe bridge
  *
- *  Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h
index bdd11bc513ad..20b68a236260 100644
--- a/drivers/media/video/cx23885/cx23885-reg.h
+++ b/drivers/media/video/cx23885/cx23885-reg.h
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Conexant CX23885 PCIe bridge
  *
- *  Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c
index e36e3fcae2fb..35e61cd112fc 100644
--- a/drivers/media/video/cx23885/cx23885-vbi.c
+++ b/drivers/media/video/cx23885/cx23885-vbi.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Conexant CX23885 PCIe bridge
  *
- *  Copyright (c) 2007 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2007 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index ad2235dab5b1..6047c78d84bf 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Conexant CX23885 PCIe bridge
  *
- *  Copyright (c) 2007 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2007 Steven Toth <stoth@linuxtv.org>
  *
  *  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
@@ -41,7 +41,7 @@
 #endif
 
 MODULE_DESCRIPTION("v4l2 driver module for cx23885 based TV cards");
-MODULE_AUTHOR("Steven Toth <stoth@hauppauge.com>");
+MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
 MODULE_LICENSE("GPL");
 
 /* ------------------------------------------------------------------ */
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 00dfdc89d641..e23d97c071e0 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Conexant CX23885 PCIe bridge
  *
- *  Copyright (c) 2006 Steven Toth <stoth@hauppauge.com>
+ *  Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
  *
  *  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
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 209d3bcb5dbb..4da8cd74f00e 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -13,7 +13,7 @@
  * NTSC sliced VBI support by Christopher Neufeld <television@cneufeld.ca>
  * with additional fixes by Hans Verkuil <hverkuil@xs4all.nl>.
  *
- * CX23885 support by Steven Toth <stoth@hauppauge.com>.
+ * CX23885 support by Steven Toth <stoth@linuxtv.org>.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 2d170d101c21..8db2a05bf9c5 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -2588,6 +2588,7 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         cam->v4ldev->fops = &et61x251_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
+        cam->v4ldev->parent = &udev->dev;
         video_set_drvdata(cam->v4ldev, cam);
 
         init_completion(&cam->probe);
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index cd3a3f5829b2..4d9f4cc255a9 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -124,7 +124,7 @@ static void reg_r(struct gspca_dev *gspca_dev,
         struct usb_device *dev = gspca_dev->dev;
 
 #ifdef GSPCA_DEBUG
-        if (len > sizeof gspca_dev->usb_buf) {
+        if (len > USB_BUF_SZ) {
                 err("reg_r: buffer overflow");
                 return;
         }
@@ -164,7 +164,7 @@ static void reg_w(struct gspca_dev *gspca_dev,
         struct usb_device *dev = gspca_dev->dev;
 
 #ifdef GSPCA_DEBUG
-        if (len > sizeof gspca_dev->usb_buf) {
+        if (len > USB_BUF_SZ) {
                 err("reg_w: buffer overflow");
                 return;
         }
@@ -731,13 +731,13 @@ static void cx11646_jpeg(struct gspca_dev*gspca_dev)
         reg_w_val(gspca_dev, 0x0000, 0x00);
         /* wait for completion */
         retry = 50;
-        while (retry--) {
+        do {
                 reg_r(gspca_dev, 0x0002, 1);
                                                         /* 0x07 until 0x00 */
                 if (gspca_dev->usb_buf[0] == 0x00)
                         break;
                 reg_w_val(gspca_dev, 0x0053, 0x00);
-        }
+        } while (--retry);
         if (retry == 0)
                 PDEBUG(D_ERR, "Damned Errors sending jpeg Table");
         /* send the qtable now */
@@ -826,8 +826,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         cx11646_init1(gspca_dev);
         cx11646_initsize(gspca_dev);
@@ -845,10 +845,6 @@ static void sd_start(struct gspca_dev *gspca_dev)
         cx11646_jpeg(gspca_dev);
 }
 
-static void sd_stopN(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
         int retry = 50;
@@ -871,10 +867,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
         reg_w_val(gspca_dev, 0x00fc, 0xe0);
 }
 
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
@@ -998,11 +990,9 @@ static struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
-        .stopN = sd_stopN,
         .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
 };
 
@@ -1026,6 +1016,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index 1dbe92d01e6a..4ff0e386914b 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -81,6 +81,7 @@ static struct ctrl sd_ctrls[] = {
          .set = sd_setcontrast,
          .get = sd_getcontrast,
          },
+#define COLOR_IDX 2
         {
          {
           .id = V4L2_CID_SATURATION,
@@ -234,7 +235,7 @@ static void reg_r(struct gspca_dev *gspca_dev,
         struct usb_device *dev = gspca_dev->dev;
 
 #ifdef GSPCA_DEBUG
-        if (len > sizeof gspca_dev->usb_buf) {
+        if (len > USB_BUF_SZ) {
                 err("reg_r: buffer overflow");
                 return;
         }
@@ -272,7 +273,7 @@ static void reg_w(struct gspca_dev *gspca_dev,
         struct usb_device *dev = gspca_dev->dev;
 
 #ifdef GSPCA_DEBUG
-        if (len > sizeof gspca_dev->usb_buf) {
+        if (len > USB_BUF_SZ) {
                 err("reg_w: buffer overflow");
                 return;
         }
@@ -665,6 +666,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
         } else {
                 cam->cam_mode = vga_mode;
                 cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
+                gspca_dev->ctrl_dis = (1 << COLOR_IDX);
         }
         sd->brightness = BRIGHTNESS_DEF;
         sd->contrast = CONTRAST_DEF;
@@ -674,8 +676,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -709,14 +711,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         et_video(gspca_dev, 0);         /* video off */
 }
 
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static __u8 Et_getgainG(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -893,21 +887,19 @@ static struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
         .dq_callback = do_autogain,
 };
 
 /* -- module initialisation -- */
 static __devinitdata struct usb_device_id device_table[] = {
-#ifndef CONFIG_USB_ET61X251
         {USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106},
-#endif
+#if !defined CONFIG_USB_ET61X251 && !defined CONFIG_USB_ET61X251_MODULE
         {USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX},
+#endif
         {}
 };
 
@@ -926,6 +918,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 15d302b28b79..7be69284da03 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -114,7 +114,10 @@ static void fill_frame(struct gspca_dev *gspca_dev,
         cam_pkt_op pkt_scan;
 
         if (urb->status != 0) {
-                PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
+#ifdef CONFIG_PM
+                if (!gspca_dev->frozen)
+#endif
+                        PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
                 return;         /* disconnection ? */
         }
         pkt_scan = gspca_dev->sd_desc->pkt_scan;
@@ -555,10 +558,12 @@ static void gspca_stream_off(struct gspca_dev *gspca_dev)
         gspca_dev->streaming = 0;
         atomic_set(&gspca_dev->nevent, 0);
         if (gspca_dev->present) {
-                gspca_dev->sd_desc->stopN(gspca_dev);
+                if (gspca_dev->sd_desc->stopN)
+                        gspca_dev->sd_desc->stopN(gspca_dev);
                 destroy_urbs(gspca_dev);
                 gspca_set_alt0(gspca_dev);
-                gspca_dev->sd_desc->stop0(gspca_dev);
+                if (gspca_dev->sd_desc->stop0)
+                        gspca_dev->sd_desc->stop0(gspca_dev);
                 PDEBUG(D_STREAM, "stream off OK");
         }
 }
@@ -767,19 +772,7 @@ static int dev_open(struct inode *inode, struct file *file)
                 goto out;
         }
 
-        /* if not done yet, initialize the sensor */
-        if (gspca_dev->users == 0) {
-                if (mutex_lock_interruptible(&gspca_dev->usb_lock)) {
-                        ret = -ERESTARTSYS;
-                        goto out;
-                }
-                ret = gspca_dev->sd_desc->open(gspca_dev);
-                mutex_unlock(&gspca_dev->usb_lock);
-                if (ret != 0) {
-                        PDEBUG(D_ERR|D_CONF, "init device failed %d", ret);
-                        goto out;
-                }
-        } else if (gspca_dev->users > 4) {      /* (arbitrary value) */
+        if (gspca_dev->users > 4) {     /* (arbitrary value) */
                 ret = -EBUSY;
                 goto out;
         }
@@ -792,6 +785,7 @@ static int dev_open(struct inode *inode, struct file *file)
         else
                 gspca_dev->vdev.debug &= ~3;
 #endif
+        ret = 0;
 out:
         mutex_unlock(&gspca_dev->queue_lock);
         if (ret != 0)
@@ -812,11 +806,11 @@ static int dev_close(struct inode *inode, struct file *file)
 
         /* if the file did the capture, free the streaming resources */
         if (gspca_dev->capt_file == file) {
-                mutex_lock(&gspca_dev->usb_lock);
-                if (gspca_dev->streaming)
+                if (gspca_dev->streaming) {
+                        mutex_lock(&gspca_dev->usb_lock);
                         gspca_stream_off(gspca_dev);
-                gspca_dev->sd_desc->close(gspca_dev);
-                mutex_unlock(&gspca_dev->usb_lock);
+                        mutex_unlock(&gspca_dev->usb_lock);
+                }
                 frame_free(gspca_dev);
                 gspca_dev->capt_file = NULL;
                 gspca_dev->memory = GSPCA_MEMORY_NO;
@@ -853,42 +847,44 @@ static int vidioc_querycap(struct file *file, void  *priv,
         return 0;
 }
 
-/* the use of V4L2_CTRL_FLAG_NEXT_CTRL asks for the controls to be sorted */
 static int vidioc_queryctrl(struct file *file, void *priv,
                            struct v4l2_queryctrl *q_ctrl)
 {
         struct gspca_dev *gspca_dev = priv;
-        int i;
+        int i, ix;
         u32 id;
 
+        ix = -1;
         id = q_ctrl->id;
         if (id & V4L2_CTRL_FLAG_NEXT_CTRL) {
                 id &= V4L2_CTRL_ID_MASK;
                 id++;
                 for (i = 0; i < gspca_dev->sd_desc->nctrls; i++) {
-                        if (id >= gspca_dev->sd_desc->ctrls[i].qctrl.id) {
-                                memcpy(q_ctrl,
-                                        &gspca_dev->sd_desc->ctrls[i].qctrl,
-                                        sizeof *q_ctrl);
-                                return 0;
+                        if (gspca_dev->sd_desc->ctrls[i].qctrl.id < id)
+                                continue;
+                        if (ix < 0) {
+                                ix = i;
+                                continue;
                         }
+                        if (gspca_dev->sd_desc->ctrls[i].qctrl.id
+                                    > gspca_dev->sd_desc->ctrls[ix].qctrl.id)
+                                continue;
+                        ix = i;
                 }
-                return -EINVAL;
         }
         for (i = 0; i < gspca_dev->sd_desc->nctrls; i++) {
                 if (id == gspca_dev->sd_desc->ctrls[i].qctrl.id) {
-                        memcpy(q_ctrl,
-                                &gspca_dev->sd_desc->ctrls[i].qctrl,
-                                sizeof *q_ctrl);
-                        return 0;
+                        ix = i;
+                        break;
                 }
         }
-        if (id >= V4L2_CID_BASE
-            && id <= V4L2_CID_LASTP1) {
+        if (ix < 0)
+                return -EINVAL;
+        memcpy(q_ctrl, &gspca_dev->sd_desc->ctrls[ix].qctrl,
+                sizeof *q_ctrl);
+        if (gspca_dev->ctrl_dis & (1 << ix))
                 q_ctrl->flags |= V4L2_CTRL_FLAG_DISABLED;
-                return 0;
-        }
-        return -EINVAL;
+        return 0;
 }
 
 static int vidioc_s_ctrl(struct file *file, void *priv,
@@ -903,6 +899,8 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
              i++, ctrls++) {
                 if (ctrl->id != ctrls->qctrl.id)
                         continue;
+                if (gspca_dev->ctrl_dis & (1 << i))
+                        return -EINVAL;
                 if (ctrl->value < ctrls->qctrl.minimum
                     || ctrl->value > ctrls->qctrl.maximum)
                         return -ERANGE;
@@ -929,6 +927,8 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
              i++, ctrls++) {
                 if (ctrl->id != ctrls->qctrl.id)
                         continue;
+                if (gspca_dev->ctrl_dis & (1 << i))
+                        return -EINVAL;
                 if (mutex_lock_interruptible(&gspca_dev->usb_lock))
                         return -ERESTARTSYS;
                 ret = ctrls->get(gspca_dev, &ctrl->value);
@@ -1403,7 +1403,7 @@ static int vidioc_dqbuf(struct file *file, void *priv,
         i = ret;                                /* frame index */
         frame = &gspca_dev->frame[i];
         if (gspca_dev->memory == V4L2_MEMORY_USERPTR) {
-                if (copy_to_user((__u8 *) frame->v4l2_buf.m.userptr,
+                if (copy_to_user((__u8 __user *) frame->v4l2_buf.m.userptr,
                                  frame->data,
                                  frame->v4l2_buf.bytesused)) {
                         PDEBUG(D_ERR|D_STREAM,
@@ -1731,6 +1731,12 @@ int gspca_dev_probe(struct usb_interface *intf,
                 err("couldn't kzalloc gspca struct");
                 return -EIO;
         }
+        gspca_dev->usb_buf = kmalloc(USB_BUF_SZ, GFP_KERNEL);
+        if (!gspca_dev->usb_buf) {
+                err("out of memory");
+                ret = -EIO;
+                goto out;
+        }
         gspca_dev->dev = dev;
         gspca_dev->iface = interface->bInterfaceNumber;
         gspca_dev->nbalt = intf->num_altsetting;
@@ -1738,10 +1744,13 @@ int gspca_dev_probe(struct usb_interface *intf,
 /*      gspca_dev->users = 0;                   (done by kzalloc) */
         gspca_dev->nbufread = 2;
 
-        /* configure the subdriver */
+        /* configure the subdriver and initialize the USB device */
         ret = gspca_dev->sd_desc->config(gspca_dev, id);
         if (ret < 0)
                 goto out;
+        ret = gspca_dev->sd_desc->init(gspca_dev);
+        if (ret < 0)
+                goto out;
         ret = gspca_set_alt0(gspca_dev);
         if (ret < 0)
                 goto out;
@@ -1771,6 +1780,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);
         return ret;
 }
@@ -1803,11 +1813,42 @@ void gspca_disconnect(struct usb_interface *intf)
 /* 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);
         PDEBUG(D_PROBE, "disconnect complete");
 }
 EXPORT_SYMBOL(gspca_disconnect);
 
+#ifdef CONFIG_PM
+int gspca_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
+
+        if (!gspca_dev->streaming)
+                return 0;
+        gspca_dev->frozen = 1;          /* avoid urb error messages */
+        if (gspca_dev->sd_desc->stopN)
+                gspca_dev->sd_desc->stopN(gspca_dev);
+        destroy_urbs(gspca_dev);
+        gspca_set_alt0(gspca_dev);
+        if (gspca_dev->sd_desc->stop0)
+                gspca_dev->sd_desc->stop0(gspca_dev);
+        return 0;
+}
+EXPORT_SYMBOL(gspca_suspend);
+
+int gspca_resume(struct usb_interface *intf)
+{
+        struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
+
+        gspca_dev->frozen = 0;
+        gspca_dev->sd_desc->init(gspca_dev);
+        if (gspca_dev->streaming)
+                return gspca_init_transfer(gspca_dev);
+        return 0;
+}
+EXPORT_SYMBOL(gspca_resume);
+#endif
 /* -- cam driver utility functions -- */
 
 /* auto gain and exposure algorithm based on the knee algorithm described here:
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 67e448940eaa..c17625cff9ba 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -56,7 +56,6 @@ extern int gspca_debug;
 
 /* device information - set at probe time */
 struct cam {
-        char *dev_name;
         struct v4l2_pix_format *cam_mode;       /* size nmodes */
         char nmodes;
         __u8 epaddr;
@@ -91,15 +90,14 @@ struct sd_desc {
 /* controls */
         const struct ctrl *ctrls;
         int nctrls;
-/* operations */
+/* mandatory operations */
         cam_cf_op config;       /* called on probe */
-        cam_op open;            /* called on open */
+        cam_op init;            /* called on probe and resume */
         cam_v_op start;         /* called on stream on */
-        cam_v_op stopN;         /* called on stream off - main alt */
-        cam_v_op stop0;         /* called on stream off - alt 0 */
-        cam_v_op close;         /* called on close */
         cam_pkt_op pkt_scan;
 /* optional operations */
+        cam_v_op stopN;         /* called on stream off - main alt */
+        cam_v_op stop0;         /* called on stream off - alt 0 */
         cam_v_op dq_callback;   /* called when a frame has been dequeued */
         cam_jpg_op get_jcomp;
         cam_jpg_op set_jcomp;
@@ -127,8 +125,10 @@ struct gspca_dev {
 
         struct cam cam;                         /* device information */
         const struct sd_desc *sd_desc;          /* subdriver description */
+        unsigned ctrl_dis;              /* disabled controls (bit map) */
 
-        __u8 usb_buf[8];                        /* buffer for USB exchanges */
+#define USB_BUF_SZ 64
+        __u8 *usb_buf;                          /* buffer for USB exchanges */
         struct urb *urb[MAX_NURBS];
 
         __u8 *frbuf;                            /* buffer for nframes */
@@ -155,6 +155,9 @@ struct gspca_dev {
         struct mutex queue_lock;        /* ISOC queue protection */
         __u32 sequence;                 /* frame sequence number */
         char streaming;
+#ifdef CONFIG_PM
+        char frozen;                    /* suspend - resume */
+#endif
         char users;                     /* number of opens */
         char present;                   /* device connected */
         char nbufread;                  /* number of buffers for read() */
@@ -174,6 +177,10 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
                                     struct gspca_frame *frame,
                                     const __u8 *data,
                                     int len);
+#ifdef CONFIG_PM
+int gspca_suspend(struct usb_interface *intf, pm_message_t message);
+int gspca_resume(struct usb_interface *intf);
+#endif
 int gspca_auto_gain_n_exposure(struct gspca_dev *gspca_dev, int avg_lum,
         int desired_avg_lum, int deadzone, int gain_knee, int exposure_knee);
 #endif /* GSPCAV2_H */
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index 21c4ee56a10a..4d5db47ba8cb 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -100,22 +100,6 @@ static int reg_w(struct gspca_dev *gspca_dev,
         return rc;
 }
 
-static int reg_w_buf(struct gspca_dev *gspca_dev,
-                        __u16 index, __u8 *buf, int len)
-{
-        int rc;
-
-        rc = usb_control_msg(gspca_dev->dev,
-                         usb_sndbulkpipe(gspca_dev->dev, 4),
-                         0x12,
-                         0xc8,          /* ?? */
-                         0,             /* value */
-                         index, buf, len, 500);
-        if (rc < 0)
-                PDEBUG(D_ERR, "reg write [%02x] error %d", index, rc);
-        return rc;
-}
-
 static void bulk_w(struct gspca_dev *gspca_dev,
                    __u16 *pch,
                    __u16 Address)
@@ -144,8 +128,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         return 0;
 }
@@ -175,7 +159,6 @@ static void sd_start(struct gspca_dev *gspca_dev)
         /*
            Initialize the MR97113 chip register
          */
-        data = kmalloc(16, GFP_KERNEL);
         data[0] = 0x00;         /* address */
         data[1] = 0x0c | 0x01;  /* reg 0 */
         data[2] = 0x01;         /* reg 1 */
@@ -195,12 +178,10 @@ static void sd_start(struct gspca_dev *gspca_dev)
         data[10] = 0x5d;        /* reg 9, I2C device address
                                  *      [for PAS5101 (0x40)] [for MI (0x5d)] */
 
-        err_code = reg_w_buf(gspca_dev, data[0], data, 11);
-        kfree(data);
+        err_code = reg_w(gspca_dev, data[0], 11);
         if (err_code < 0)
                 return;
 
-        data = gspca_dev->usb_buf;
         data[0] = 0x23;         /* address */
         data[1] = 0x09;         /* reg 35, append frame header */
 
@@ -358,14 +339,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
                 PDEBUG(D_ERR, "Camera Stop failed");
 }
 
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
@@ -411,11 +384,9 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
 };
 
@@ -439,6 +410,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index b4f00ec0885c..4df4eec9f7e7 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -63,11 +63,10 @@ struct sd {
 #define SEN_OV6630 2
 #define SEN_OV7610 3
 #define SEN_OV7620 4
-#define SEN_OV7630 5
-#define SEN_OV7640 6
-#define SEN_OV7670 7
-#define SEN_OV76BE 8
-#define SEN_OV8610 9
+#define SEN_OV7640 5
+#define SEN_OV7670 6
+#define SEN_OV76BE 7
+#define SEN_OV8610 8
 
 };
 
@@ -127,6 +126,7 @@ static struct ctrl sd_ctrls[] = {
             .get = sd_getcolors,
         },
 /* next controls work with ov7670 only */
+#define HFLIP_IDX 3
         {
             {
                 .id      = V4L2_CID_HFLIP,
@@ -141,6 +141,7 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_sethflip,
             .get = sd_gethflip,
         },
+#define VFLIP_IDX 4
         {
             {
                 .id      = V4L2_CID_VFLIP,
@@ -293,6 +294,541 @@ static struct v4l2_pix_format sif_mode[] = {
 #define OV7670_REG_HAECC7      0xaa    /* Hist AEC/AGC control 7 */
 #define OV7670_REG_BD60MAX     0xab    /* 60hz banding step limit */
 
+struct ov_regvals {
+        __u8 reg;
+        __u8 val;
+};
+struct ov_i2c_regvals {
+        __u8 reg;
+        __u8 val;
+};
+
+static const struct ov_i2c_regvals norm_6x20[] = {
+        { 0x12, 0x80 }, /* reset */
+        { 0x11, 0x01 },
+        { 0x03, 0x60 },
+        { 0x05, 0x7f }, /* For when autoadjust is off */
+        { 0x07, 0xa8 },
+        /* The ratio of 0x0c and 0x0d  controls the white point */
+        { 0x0c, 0x24 },
+        { 0x0d, 0x24 },
+        { 0x0f, 0x15 }, /* COMS */
+        { 0x10, 0x75 }, /* AEC Exposure time */
+        { 0x12, 0x24 }, /* Enable AGC */
+        { 0x14, 0x04 },
+        /* 0x16: 0x06 helps frame stability with moving objects */
+        { 0x16, 0x06 },
+/*      { 0x20, 0x30 },  * Aperture correction enable */
+        { 0x26, 0xb2 }, /* BLC enable */
+        /* 0x28: 0x05 Selects RGB format if RGB on */
+        { 0x28, 0x05 },
+        { 0x2a, 0x04 }, /* Disable framerate adjust */
+/*      { 0x2b, 0xac },  * Framerate; Set 2a[7] first */
+        { 0x2d, 0x99 },
+        { 0x33, 0xa0 }, /* Color Processing Parameter */
+        { 0x34, 0xd2 }, /* Max A/D range */
+        { 0x38, 0x8b },
+        { 0x39, 0x40 },
+
+        { 0x3c, 0x39 }, /* Enable AEC mode changing */
+        { 0x3c, 0x3c }, /* Change AEC mode */
+        { 0x3c, 0x24 }, /* Disable AEC mode changing */
+
+        { 0x3d, 0x80 },
+        /* These next two registers (0x4a, 0x4b) are undocumented.
+         * They control the color balance */
+        { 0x4a, 0x80 },
+        { 0x4b, 0x80 },
+        { 0x4d, 0xd2 }, /* This reduces noise a bit */
+        { 0x4e, 0xc1 },
+        { 0x4f, 0x04 },
+/* Do 50-53 have any effect? */
+/* Toggle 0x12[2] off and on here? */
+};
+
+static const struct ov_i2c_regvals norm_6x30[] = {
+        { 0x12, 0x80 }, /* Reset */
+        { 0x00, 0x1f }, /* Gain */
+        { 0x01, 0x99 }, /* Blue gain */
+        { 0x02, 0x7c }, /* Red gain */
+        { 0x03, 0xc0 }, /* Saturation */
+        { 0x05, 0x0a }, /* Contrast */
+        { 0x06, 0x95 }, /* Brightness */
+        { 0x07, 0x2d }, /* Sharpness */
+        { 0x0c, 0x20 },
+        { 0x0d, 0x20 },
+        { 0x0e, 0x20 },
+        { 0x0f, 0x05 },
+        { 0x10, 0x9a },
+        { 0x11, 0x00 }, /* Pixel clock = fastest */
+        { 0x12, 0x24 }, /* Enable AGC and AWB */
+        { 0x13, 0x21 },
+        { 0x14, 0x80 },
+        { 0x15, 0x01 },
+        { 0x16, 0x03 },
+        { 0x17, 0x38 },
+        { 0x18, 0xea },
+        { 0x19, 0x04 },
+        { 0x1a, 0x93 },
+        { 0x1b, 0x00 },
+        { 0x1e, 0xc4 },
+        { 0x1f, 0x04 },
+        { 0x20, 0x20 },
+        { 0x21, 0x10 },
+        { 0x22, 0x88 },
+        { 0x23, 0xc0 }, /* Crystal circuit power level */
+        { 0x25, 0x9a }, /* Increase AEC black ratio */
+        { 0x26, 0xb2 }, /* BLC enable */
+        { 0x27, 0xa2 },
+        { 0x28, 0x00 },
+        { 0x29, 0x00 },
+        { 0x2a, 0x84 }, /* 60 Hz power */
+        { 0x2b, 0xa8 }, /* 60 Hz power */
+        { 0x2c, 0xa0 },
+        { 0x2d, 0x95 }, /* Enable auto-brightness */
+        { 0x2e, 0x88 },
+        { 0x33, 0x26 },
+        { 0x34, 0x03 },
+        { 0x36, 0x8f },
+        { 0x37, 0x80 },
+        { 0x38, 0x83 },
+        { 0x39, 0x80 },
+        { 0x3a, 0x0f },
+        { 0x3b, 0x3c },
+        { 0x3c, 0x1a },
+        { 0x3d, 0x80 },
+        { 0x3e, 0x80 },
+        { 0x3f, 0x0e },
+        { 0x40, 0x00 }, /* White bal */
+        { 0x41, 0x00 }, /* White bal */
+        { 0x42, 0x80 },
+        { 0x43, 0x3f }, /* White bal */
+        { 0x44, 0x80 },
+        { 0x45, 0x20 },
+        { 0x46, 0x20 },
+        { 0x47, 0x80 },
+        { 0x48, 0x7f },
+        { 0x49, 0x00 },
+        { 0x4a, 0x00 },
+        { 0x4b, 0x80 },
+        { 0x4c, 0xd0 },
+        { 0x4d, 0x10 }, /* U = 0.563u, V = 0.714v */
+        { 0x4e, 0x40 },
+        { 0x4f, 0x07 }, /* UV avg., col. killer: max */
+        { 0x50, 0xff },
+        { 0x54, 0x23 }, /* Max AGC gain: 18dB */
+        { 0x55, 0xff },
+        { 0x56, 0x12 },
+        { 0x57, 0x81 },
+        { 0x58, 0x75 },
+        { 0x59, 0x01 }, /* AGC dark current comp.: +1 */
+        { 0x5a, 0x2c },
+        { 0x5b, 0x0f }, /* AWB chrominance levels */
+        { 0x5c, 0x10 },
+        { 0x3d, 0x80 },
+        { 0x27, 0xa6 },
+        { 0x12, 0x20 }, /* Toggle AWB */
+        { 0x12, 0x24 },
+};
+
+/* Lawrence Glaister <lg@jfm.bc.ca> reports:
+ *
+ * Register 0x0f in the 7610 has the following effects:
+ *
+ * 0x85 (AEC method 1): Best overall, good contrast range
+ * 0x45 (AEC method 2): Very overexposed
+ * 0xa5 (spec sheet default): Ok, but the black level is
+ *      shifted resulting in loss of contrast
+ * 0x05 (old driver setting): very overexposed, too much
+ *      contrast
+ */
+static const struct ov_i2c_regvals norm_7610[] = {
+        { 0x10, 0xff },
+        { 0x16, 0x06 },
+        { 0x28, 0x24 },
+        { 0x2b, 0xac },
+        { 0x12, 0x00 },
+        { 0x38, 0x81 },
+        { 0x28, 0x24 }, /* 0c */
+        { 0x0f, 0x85 }, /* lg's setting */
+        { 0x15, 0x01 },
+        { 0x20, 0x1c },
+        { 0x23, 0x2a },
+        { 0x24, 0x10 },
+        { 0x25, 0x8a },
+        { 0x26, 0xa2 },
+        { 0x27, 0xc2 },
+        { 0x2a, 0x04 },
+        { 0x2c, 0xfe },
+        { 0x2d, 0x93 },
+        { 0x30, 0x71 },
+        { 0x31, 0x60 },
+        { 0x32, 0x26 },
+        { 0x33, 0x20 },
+        { 0x34, 0x48 },
+        { 0x12, 0x24 },
+        { 0x11, 0x01 },
+        { 0x0c, 0x24 },
+        { 0x0d, 0x24 },
+};
+
+static const struct ov_i2c_regvals norm_7620[] = {
+        { 0x00, 0x00 },         /* gain */
+        { 0x01, 0x80 },         /* blue gain */
+        { 0x02, 0x80 },         /* red gain */
+        { 0x03, 0xc0 },         /* OV7670_REG_VREF */
+        { 0x06, 0x60 },
+        { 0x07, 0x00 },
+        { 0x0c, 0x24 },
+        { 0x0c, 0x24 },
+        { 0x0d, 0x24 },
+        { 0x11, 0x01 },
+        { 0x12, 0x24 },
+        { 0x13, 0x01 },
+        { 0x14, 0x84 },
+        { 0x15, 0x01 },
+        { 0x16, 0x03 },
+        { 0x17, 0x2f },
+        { 0x18, 0xcf },
+        { 0x19, 0x06 },
+        { 0x1a, 0xf5 },
+        { 0x1b, 0x00 },
+        { 0x20, 0x18 },
+        { 0x21, 0x80 },
+        { 0x22, 0x80 },
+        { 0x23, 0x00 },
+        { 0x26, 0xa2 },
+        { 0x27, 0xea },
+        { 0x28, 0x20 },
+        { 0x29, 0x00 },
+        { 0x2a, 0x10 },
+        { 0x2b, 0x00 },
+        { 0x2c, 0x88 },
+        { 0x2d, 0x91 },
+        { 0x2e, 0x80 },
+        { 0x2f, 0x44 },
+        { 0x60, 0x27 },
+        { 0x61, 0x02 },
+        { 0x62, 0x5f },
+        { 0x63, 0xd5 },
+        { 0x64, 0x57 },
+        { 0x65, 0x83 },
+        { 0x66, 0x55 },
+        { 0x67, 0x92 },
+        { 0x68, 0xcf },
+        { 0x69, 0x76 },
+        { 0x6a, 0x22 },
+        { 0x6b, 0x00 },
+        { 0x6c, 0x02 },
+        { 0x6d, 0x44 },
+        { 0x6e, 0x80 },
+        { 0x6f, 0x1d },
+        { 0x70, 0x8b },
+        { 0x71, 0x00 },
+        { 0x72, 0x14 },
+        { 0x73, 0x54 },
+        { 0x74, 0x00 },
+        { 0x75, 0x8e },
+        { 0x76, 0x00 },
+        { 0x77, 0xff },
+        { 0x78, 0x80 },
+        { 0x79, 0x80 },
+        { 0x7a, 0x80 },
+        { 0x7b, 0xe2 },
+        { 0x7c, 0x00 },
+};
+
+/* 7640 and 7648. The defaults should be OK for most registers. */
+static const struct ov_i2c_regvals norm_7640[] = {
+        { 0x12, 0x80 },
+        { 0x12, 0x14 },
+};
+
+/* 7670. Defaults taken from OmniVision provided data,
+*  as provided by Jonathan Corbet of OLPC               */
+static const struct ov_i2c_regvals norm_7670[] = {
+        { OV7670_REG_COM7, OV7670_COM7_RESET },
+        { OV7670_REG_TSLB, 0x04 },              /* OV */
+        { OV7670_REG_COM7, OV7670_COM7_FMT_VGA }, /* VGA */
+        { OV7670_REG_CLKRC, 0x01 },
+/*
+ * Set the hardware window.  These values from OV don't entirely
+ * make sense - hstop is less than hstart.  But they work...
+ */
+        { OV7670_REG_HSTART, 0x13 },
+        { OV7670_REG_HSTOP, 0x01 },
+        { OV7670_REG_HREF, 0xb6 },
+        { OV7670_REG_VSTART, 0x02 },
+        { OV7670_REG_VSTOP, 0x7a },
+        { OV7670_REG_VREF, 0x0a },
+
+        { OV7670_REG_COM3, 0 },
+        { OV7670_REG_COM14, 0 },
+/* Mystery scaling numbers */
+        { 0x70, 0x3a },
+        { 0x71, 0x35 },
+        { 0x72, 0x11 },
+        { 0x73, 0xf0 },
+        { 0xa2, 0x02 },
+/*      { OV7670_REG_COM10, 0x0 }, */
+
+/* Gamma curve values */
+        { 0x7a, 0x20 },
+        { 0x7b, 0x10 },
+        { 0x7c, 0x1e },
+        { 0x7d, 0x35 },
+        { 0x7e, 0x5a },
+        { 0x7f, 0x69 },
+        { 0x80, 0x76 },
+        { 0x81, 0x80 },
+        { 0x82, 0x88 },
+        { 0x83, 0x8f },
+        { 0x84, 0x96 },
+        { 0x85, 0xa3 },
+        { 0x86, 0xaf },
+        { 0x87, 0xc4 },
+        { 0x88, 0xd7 },
+        { 0x89, 0xe8 },
+
+/* AGC and AEC parameters.  Note we start by disabling those features,
+   then turn them only after tweaking the values. */
+        { OV7670_REG_COM8, OV7670_COM8_FASTAEC
+                         | OV7670_COM8_AECSTEP
+                         | OV7670_COM8_BFILT },
+        { OV7670_REG_GAIN, 0 },
+        { OV7670_REG_AECH, 0 },
+        { OV7670_REG_COM4, 0x40 }, /* magic reserved bit */
+        { OV7670_REG_COM9, 0x18 }, /* 4x gain + magic rsvd bit */
+        { OV7670_REG_BD50MAX, 0x05 },
+        { OV7670_REG_BD60MAX, 0x07 },
+        { OV7670_REG_AEW, 0x95 },
+        { OV7670_REG_AEB, 0x33 },
+        { OV7670_REG_VPT, 0xe3 },
+        { OV7670_REG_HAECC1, 0x78 },
+        { OV7670_REG_HAECC2, 0x68 },
+        { 0xa1, 0x03 }, /* magic */
+        { OV7670_REG_HAECC3, 0xd8 },
+        { OV7670_REG_HAECC4, 0xd8 },
+        { OV7670_REG_HAECC5, 0xf0 },
+        { OV7670_REG_HAECC6, 0x90 },
+        { OV7670_REG_HAECC7, 0x94 },
+        { OV7670_REG_COM8, OV7670_COM8_FASTAEC
+                        | OV7670_COM8_AECSTEP
+                        | OV7670_COM8_BFILT
+                        | OV7670_COM8_AGC
+                        | OV7670_COM8_AEC },
+
+/* Almost all of these are magic "reserved" values.  */
+        { OV7670_REG_COM5, 0x61 },
+        { OV7670_REG_COM6, 0x4b },
+        { 0x16, 0x02 },
+        { OV7670_REG_MVFP, 0x07 },
+        { 0x21, 0x02 },
+        { 0x22, 0x91 },
+        { 0x29, 0x07 },
+        { 0x33, 0x0b },
+        { 0x35, 0x0b },
+        { 0x37, 0x1d },
+        { 0x38, 0x71 },
+        { 0x39, 0x2a },
+        { OV7670_REG_COM12, 0x78 },
+        { 0x4d, 0x40 },
+        { 0x4e, 0x20 },
+        { OV7670_REG_GFIX, 0 },
+        { 0x6b, 0x4a },
+        { 0x74, 0x10 },
+        { 0x8d, 0x4f },
+        { 0x8e, 0 },
+        { 0x8f, 0 },
+        { 0x90, 0 },
+        { 0x91, 0 },
+        { 0x96, 0 },
+        { 0x9a, 0 },
+        { 0xb0, 0x84 },
+        { 0xb1, 0x0c },
+        { 0xb2, 0x0e },
+        { 0xb3, 0x82 },
+        { 0xb8, 0x0a },
+
+/* More reserved magic, some of which tweaks white balance */
+        { 0x43, 0x0a },
+        { 0x44, 0xf0 },
+        { 0x45, 0x34 },
+        { 0x46, 0x58 },
+        { 0x47, 0x28 },
+        { 0x48, 0x3a },
+        { 0x59, 0x88 },
+        { 0x5a, 0x88 },
+        { 0x5b, 0x44 },
+        { 0x5c, 0x67 },
+        { 0x5d, 0x49 },
+        { 0x5e, 0x0e },
+        { 0x6c, 0x0a },
+        { 0x6d, 0x55 },
+        { 0x6e, 0x11 },
+        { 0x6f, 0x9f },
+                                        /* "9e for advance AWB" */
+        { 0x6a, 0x40 },
+        { OV7670_REG_BLUE, 0x40 },
+        { OV7670_REG_RED, 0x60 },
+        { OV7670_REG_COM8, OV7670_COM8_FASTAEC
+                        | OV7670_COM8_AECSTEP
+                        | OV7670_COM8_BFILT
+                        | OV7670_COM8_AGC
+                        | OV7670_COM8_AEC
+                        | OV7670_COM8_AWB },
+
+/* Matrix coefficients */
+        { 0x4f, 0x80 },
+        { 0x50, 0x80 },
+        { 0x51, 0 },
+        { 0x52, 0x22 },
+        { 0x53, 0x5e },
+        { 0x54, 0x80 },
+        { 0x58, 0x9e },
+
+        { OV7670_REG_COM16, OV7670_COM16_AWBGAIN },
+        { OV7670_REG_EDGE, 0 },
+        { 0x75, 0x05 },
+        { 0x76, 0xe1 },
+        { 0x4c, 0 },
+        { 0x77, 0x01 },
+        { OV7670_REG_COM13, OV7670_COM13_GAMMA
+                          | OV7670_COM13_UVSAT
+                          | 2},         /* was 3 */
+        { 0x4b, 0x09 },
+        { 0xc9, 0x60 },
+        { OV7670_REG_COM16, 0x38 },
+        { 0x56, 0x40 },
+
+        { 0x34, 0x11 },
+        { OV7670_REG_COM11, OV7670_COM11_EXP|OV7670_COM11_HZAUTO },
+        { 0xa4, 0x88 },
+        { 0x96, 0 },
+        { 0x97, 0x30 },
+        { 0x98, 0x20 },
+        { 0x99, 0x30 },
+        { 0x9a, 0x84 },
+        { 0x9b, 0x29 },
+        { 0x9c, 0x03 },
+        { 0x9d, 0x4c },
+        { 0x9e, 0x3f },
+        { 0x78, 0x04 },
+
+/* Extra-weird stuff.  Some sort of multiplexor register */
+        { 0x79, 0x01 },
+        { 0xc8, 0xf0 },
+        { 0x79, 0x0f },
+        { 0xc8, 0x00 },
+        { 0x79, 0x10 },
+        { 0xc8, 0x7e },
+        { 0x79, 0x0a },
+        { 0xc8, 0x80 },
+        { 0x79, 0x0b },
+        { 0xc8, 0x01 },
+        { 0x79, 0x0c },
+        { 0xc8, 0x0f },
+        { 0x79, 0x0d },
+        { 0xc8, 0x20 },
+        { 0x79, 0x09 },
+        { 0xc8, 0x80 },
+        { 0x79, 0x02 },
+        { 0xc8, 0xc0 },
+        { 0x79, 0x03 },
+        { 0xc8, 0x40 },
+        { 0x79, 0x05 },
+        { 0xc8, 0x30 },
+        { 0x79, 0x26 },
+};
+
+static const struct ov_i2c_regvals norm_8610[] = {
+        { 0x12, 0x80 },
+        { 0x00, 0x00 },
+        { 0x01, 0x80 },
+        { 0x02, 0x80 },
+        { 0x03, 0xc0 },
+        { 0x04, 0x30 },
+        { 0x05, 0x30 }, /* was 0x10, new from windrv 090403 */
+        { 0x06, 0x70 }, /* was 0x80, new from windrv 090403 */
+        { 0x0a, 0x86 },
+        { 0x0b, 0xb0 },
+        { 0x0c, 0x20 },
+        { 0x0d, 0x20 },
+        { 0x11, 0x01 },
+        { 0x12, 0x25 },
+        { 0x13, 0x01 },
+        { 0x14, 0x04 },
+        { 0x15, 0x01 }, /* Lin and Win think different about UV order */
+        { 0x16, 0x03 },
+        { 0x17, 0x38 }, /* was 0x2f, new from windrv 090403 */
+        { 0x18, 0xea }, /* was 0xcf, new from windrv 090403 */
+        { 0x19, 0x02 }, /* was 0x06, new from windrv 090403 */
+        { 0x1a, 0xf5 },
+        { 0x1b, 0x00 },
+        { 0x20, 0xd0 }, /* was 0x90, new from windrv 090403 */
+        { 0x23, 0xc0 }, /* was 0x00, new from windrv 090403 */
+        { 0x24, 0x30 }, /* was 0x1d, new from windrv 090403 */
+        { 0x25, 0x50 }, /* was 0x57, new from windrv 090403 */
+        { 0x26, 0xa2 },
+        { 0x27, 0xea },
+        { 0x28, 0x00 },
+        { 0x29, 0x00 },
+        { 0x2a, 0x80 },
+        { 0x2b, 0xc8 }, /* was 0xcc, new from windrv 090403 */
+        { 0x2c, 0xac },
+        { 0x2d, 0x45 }, /* was 0xd5, new from windrv 090403 */
+        { 0x2e, 0x80 },
+        { 0x2f, 0x14 }, /* was 0x01, new from windrv 090403 */
+        { 0x4c, 0x00 },
+        { 0x4d, 0x30 }, /* was 0x10, new from windrv 090403 */
+        { 0x60, 0x02 }, /* was 0x01, new from windrv 090403 */
+        { 0x61, 0x00 }, /* was 0x09, new from windrv 090403 */
+        { 0x62, 0x5f }, /* was 0xd7, new from windrv 090403 */
+        { 0x63, 0xff },
+        { 0x64, 0x53 }, /* new windrv 090403 says 0x57,
+                         * maybe thats wrong */
+        { 0x65, 0x00 },
+        { 0x66, 0x55 },
+        { 0x67, 0xb0 },
+        { 0x68, 0xc0 }, /* was 0xaf, new from windrv 090403 */
+        { 0x69, 0x02 },
+        { 0x6a, 0x22 },
+        { 0x6b, 0x00 },
+        { 0x6c, 0x99 }, /* was 0x80, old windrv says 0x00, but
+                         * deleting bit7 colors the first images red */
+        { 0x6d, 0x11 }, /* was 0x00, new from windrv 090403 */
+        { 0x6e, 0x11 }, /* was 0x00, new from windrv 090403 */
+        { 0x6f, 0x01 },
+        { 0x70, 0x8b },
+        { 0x71, 0x00 },
+        { 0x72, 0x14 },
+        { 0x73, 0x54 },
+        { 0x74, 0x00 },/* 0x60? - was 0x00, new from windrv 090403 */
+        { 0x75, 0x0e },
+        { 0x76, 0x02 }, /* was 0x02, new from windrv 090403 */
+        { 0x77, 0xff },
+        { 0x78, 0x80 },
+        { 0x79, 0x80 },
+        { 0x7a, 0x80 },
+        { 0x7b, 0x10 }, /* was 0x13, new from windrv 090403 */
+        { 0x7c, 0x00 },
+        { 0x7d, 0x08 }, /* was 0x09, new from windrv 090403 */
+        { 0x7e, 0x08 }, /* was 0xc0, new from windrv 090403 */
+        { 0x7f, 0xfb },
+        { 0x80, 0x28 },
+        { 0x81, 0x00 },
+        { 0x82, 0x23 },
+        { 0x83, 0x0b },
+        { 0x84, 0x00 },
+        { 0x85, 0x62 }, /* was 0x61, new from windrv 090403 */
+        { 0x86, 0xc9 },
+        { 0x87, 0x00 },
+        { 0x88, 0x00 },
+        { 0x89, 0x01 },
+        { 0x12, 0x20 },
+        { 0x12, 0x25 }, /* was 0x24, new from windrv 090403 */
+};
+
 static unsigned char ov7670_abs_to_sm(unsigned char v)
 {
         if (v > 127)
@@ -537,18 +1073,10 @@ static int ov51x_set_slave_ids(struct sd *sd,
         rc = reg_w(sd, R51x_I2C_W_SID, slave);
         if (rc < 0)
                 return rc;
+        sd->primary_i2c_slave = slave;
         return reg_w(sd, R51x_I2C_R_SID, slave + 1);
 }
 
-struct ov_regvals {
-        __u8 reg;
-        __u8 val;
-};
-struct ov_i2c_regvals {
-        __u8 reg;
-        __u8 val;
-};
-
 static int write_regvals(struct sd *sd,
                          const struct ov_regvals *regvals,
                          int n)
@@ -591,101 +1119,9 @@ static int write_i2c_regvals(struct sd *sd,
 static int ov8xx0_configure(struct sd *sd)
 {
         int rc;
-        static const struct ov_i2c_regvals norm_8610[] = {
-                { 0x12, 0x80 },
-                { 0x00, 0x00 },
-                { 0x01, 0x80 },
-                { 0x02, 0x80 },
-                { 0x03, 0xc0 },
-                { 0x04, 0x30 },
-                { 0x05, 0x30 }, /* was 0x10, new from windrv 090403 */
-                { 0x06, 0x70 }, /* was 0x80, new from windrv 090403 */
-                { 0x0a, 0x86 },
-                { 0x0b, 0xb0 },
-                { 0x0c, 0x20 },
-                { 0x0d, 0x20 },
-                { 0x11, 0x01 },
-                { 0x12, 0x25 },
-                { 0x13, 0x01 },
-                { 0x14, 0x04 },
-                { 0x15, 0x01 }, /* Lin and Win think different about UV order */
-                { 0x16, 0x03 },
-                { 0x17, 0x38 }, /* was 0x2f, new from windrv 090403 */
-                { 0x18, 0xea }, /* was 0xcf, new from windrv 090403 */
-                { 0x19, 0x02 }, /* was 0x06, new from windrv 090403 */
-                { 0x1a, 0xf5 },
-                { 0x1b, 0x00 },
-                { 0x20, 0xd0 }, /* was 0x90, new from windrv 090403 */
-                { 0x23, 0xc0 }, /* was 0x00, new from windrv 090403 */
-                { 0x24, 0x30 }, /* was 0x1d, new from windrv 090403 */
-                { 0x25, 0x50 }, /* was 0x57, new from windrv 090403 */
-                { 0x26, 0xa2 },
-                { 0x27, 0xea },
-                { 0x28, 0x00 },
-                { 0x29, 0x00 },
-                { 0x2a, 0x80 },
-                { 0x2b, 0xc8 }, /* was 0xcc, new from windrv 090403 */
-                { 0x2c, 0xac },
-                { 0x2d, 0x45 }, /* was 0xd5, new from windrv 090403 */
-                { 0x2e, 0x80 },
-                { 0x2f, 0x14 }, /* was 0x01, new from windrv 090403 */
-                { 0x4c, 0x00 },
-                { 0x4d, 0x30 }, /* was 0x10, new from windrv 090403 */
-                { 0x60, 0x02 }, /* was 0x01, new from windrv 090403 */
-                { 0x61, 0x00 }, /* was 0x09, new from windrv 090403 */
-                { 0x62, 0x5f }, /* was 0xd7, new from windrv 090403 */
-                { 0x63, 0xff },
-                { 0x64, 0x53 }, /* new windrv 090403 says 0x57,
-                                 * maybe thats wrong */
-                { 0x65, 0x00 },
-                { 0x66, 0x55 },
-                { 0x67, 0xb0 },
-                { 0x68, 0xc0 }, /* was 0xaf, new from windrv 090403 */
-                { 0x69, 0x02 },
-                { 0x6a, 0x22 },
-                { 0x6b, 0x00 },
-                { 0x6c, 0x99 }, /* was 0x80, old windrv says 0x00, but
-                                   deleting bit7 colors the first images red */
-                { 0x6d, 0x11 }, /* was 0x00, new from windrv 090403 */
-                { 0x6e, 0x11 }, /* was 0x00, new from windrv 090403 */
-                { 0x6f, 0x01 },
-                { 0x70, 0x8b },
-                { 0x71, 0x00 },
-                { 0x72, 0x14 },
-                { 0x73, 0x54 },
-                { 0x74, 0x00 },/* 0x60? - was 0x00, new from windrv 090403 */
-                { 0x75, 0x0e },
-                { 0x76, 0x02 }, /* was 0x02, new from windrv 090403 */
-                { 0x77, 0xff },
-                { 0x78, 0x80 },
-                { 0x79, 0x80 },
-                { 0x7a, 0x80 },
-                { 0x7b, 0x10 }, /* was 0x13, new from windrv 090403 */
-                { 0x7c, 0x00 },
-                { 0x7d, 0x08 }, /* was 0x09, new from windrv 090403 */
-                { 0x7e, 0x08 }, /* was 0xc0, new from windrv 090403 */
-                { 0x7f, 0xfb },
-                { 0x80, 0x28 },
-                { 0x81, 0x00 },
-                { 0x82, 0x23 },
-                { 0x83, 0x0b },
-                { 0x84, 0x00 },
-                { 0x85, 0x62 }, /* was 0x61, new from windrv 090403 */
-                { 0x86, 0xc9 },
-                { 0x87, 0x00 },
-                { 0x88, 0x00 },
-                { 0x89, 0x01 },
-                { 0x12, 0x20 },
-                { 0x12, 0x25 }, /* was 0x24, new from windrv 090403 */
-        };
 
         PDEBUG(D_PROBE, "starting ov8xx0 configuration");
 
-        if (init_ov_sensor(sd) < 0)
-                PDEBUG(D_ERR|D_PROBE, "Failed to read sensor ID");
-        else
-                PDEBUG(D_PROBE, "OV86x0 initialized");
-
         /* Detect sensor (sub)type */
         rc = i2c_r(sd, OV7610_REG_COM_I);
         if (rc < 0) {
@@ -698,9 +1134,6 @@ static int ov8xx0_configure(struct sd *sd)
                 PDEBUG(D_ERR, "Unknown image sensor version: %d", rc & 3);
                 return -1;
         }
-        PDEBUG(D_PROBE, "Writing 8610 registers");
-        if (write_i2c_regvals(sd, norm_8610, ARRAY_SIZE(norm_8610)))
-                return -1;
 
         /* Set sensor-specific vars */
 /*      sd->sif = 0;            already done */
@@ -714,252 +1147,6 @@ static int ov7xx0_configure(struct sd *sd)
 {
         int rc, high, low;
 
-        /* Lawrence Glaister <lg@jfm.bc.ca> reports:
-         *
-         * Register 0x0f in the 7610 has the following effects:
-         *
-         * 0x85 (AEC method 1): Best overall, good contrast range
-         * 0x45 (AEC method 2): Very overexposed
-         * 0xa5 (spec sheet default): Ok, but the black level is
-         *      shifted resulting in loss of contrast
-         * 0x05 (old driver setting): very overexposed, too much
-         *      contrast
-         */
-        static const struct ov_i2c_regvals norm_7610[] = {
-                { 0x10, 0xff },
-                { 0x16, 0x06 },
-                { 0x28, 0x24 },
-                { 0x2b, 0xac },
-                { 0x12, 0x00 },
-                { 0x38, 0x81 },
-                { 0x28, 0x24 }, /* 0c */
-                { 0x0f, 0x85 }, /* lg's setting */
-                { 0x15, 0x01 },
-                { 0x20, 0x1c },
-                { 0x23, 0x2a },
-                { 0x24, 0x10 },
-                { 0x25, 0x8a },
-                { 0x26, 0xa2 },
-                { 0x27, 0xc2 },
-                { 0x2a, 0x04 },
-                { 0x2c, 0xfe },
-                { 0x2d, 0x93 },
-                { 0x30, 0x71 },
-                { 0x31, 0x60 },
-                { 0x32, 0x26 },
-                { 0x33, 0x20 },
-                { 0x34, 0x48 },
-                { 0x12, 0x24 },
-                { 0x11, 0x01 },
-                { 0x0c, 0x24 },
-                { 0x0d, 0x24 },
-        };
-
-        static const struct ov_i2c_regvals norm_7620[] = {
-                { 0x00, 0x00 },         /* gain */
-                { 0x01, 0x80 },         /* blue gain */
-                { 0x02, 0x80 },         /* red gain */
-                { 0x03, 0xc0 },         /* OV7670_REG_VREF */
-                { 0x06, 0x60 },
-                { 0x07, 0x00 },
-                { 0x0c, 0x24 },
-                { 0x0c, 0x24 },
-                { 0x0d, 0x24 },
-                { 0x11, 0x01 },
-                { 0x12, 0x24 },
-                { 0x13, 0x01 },
-                { 0x14, 0x84 },
-                { 0x15, 0x01 },
-                { 0x16, 0x03 },
-                { 0x17, 0x2f },
-                { 0x18, 0xcf },
-                { 0x19, 0x06 },
-                { 0x1a, 0xf5 },
-                { 0x1b, 0x00 },
-                { 0x20, 0x18 },
-                { 0x21, 0x80 },
-                { 0x22, 0x80 },
-                { 0x23, 0x00 },
-                { 0x26, 0xa2 },
-                { 0x27, 0xea },
-                { 0x28, 0x20 },
-                { 0x29, 0x00 },
-                { 0x2a, 0x10 },
-                { 0x2b, 0x00 },
-                { 0x2c, 0x88 },
-                { 0x2d, 0x91 },
-                { 0x2e, 0x80 },
-                { 0x2f, 0x44 },
-                { 0x60, 0x27 },
-                { 0x61, 0x02 },
-                { 0x62, 0x5f },
-                { 0x63, 0xd5 },
-                { 0x64, 0x57 },
-                { 0x65, 0x83 },
-                { 0x66, 0x55 },
-                { 0x67, 0x92 },
-                { 0x68, 0xcf },
-                { 0x69, 0x76 },
-                { 0x6a, 0x22 },
-                { 0x6b, 0x00 },
-                { 0x6c, 0x02 },
-                { 0x6d, 0x44 },
-                { 0x6e, 0x80 },
-                { 0x6f, 0x1d },
-                { 0x70, 0x8b },
-                { 0x71, 0x00 },
-                { 0x72, 0x14 },
-                { 0x73, 0x54 },
-                { 0x74, 0x00 },
-                { 0x75, 0x8e },
-                { 0x76, 0x00 },
-                { 0x77, 0xff },
-                { 0x78, 0x80 },
-                { 0x79, 0x80 },
-                { 0x7a, 0x80 },
-                { 0x7b, 0xe2 },
-                { 0x7c, 0x00 },
-        };
-
-        /* 7640 and 7648. The defaults should be OK for most registers. */
-        static const struct ov_i2c_regvals norm_7640[] = {
-                { 0x12, 0x80 },
-                { 0x12, 0x14 },
-        };
-
-        /* 7670. Defaults taken from OmniVision provided data,
-        *  as provided by Jonathan Corbet of OLPC               */
-        static const struct ov_i2c_regvals norm_7670[] = {
-                { OV7670_REG_COM7, OV7670_COM7_RESET },
-                { OV7670_REG_TSLB, 0x04 },              /* OV */
-                { OV7670_REG_COM7, OV7670_COM7_FMT_VGA }, /* VGA */
-                { OV7670_REG_CLKRC, 0x01 },
-        /*
-         * Set the hardware window.  These values from OV don't entirely
-         * make sense - hstop is less than hstart.  But they work...
-         */
-                { OV7670_REG_HSTART, 0x13 },    { OV7670_REG_HSTOP, 0x01 },
-                { OV7670_REG_HREF, 0xb6 },      { OV7670_REG_VSTART, 0x02 },
-                { OV7670_REG_VSTOP, 0x7a },     { OV7670_REG_VREF, 0x0a },
-
-                { OV7670_REG_COM3, 0 }, { OV7670_REG_COM14, 0 },
-        /* Mystery scaling numbers */
-                { 0x70, 0x3a },         { 0x71, 0x35 },
-                { 0x72, 0x11 },         { 0x73, 0xf0 },
-                { 0xa2, 0x02 },
-/*              { OV7670_REG_COM10, 0x0 }, */
-
-        /* Gamma curve values */
-                { 0x7a, 0x20 },
-                { 0x7b, 0x10 },
-                { 0x7c, 0x1e },
-                { 0x7d, 0x35 },
-                { 0x7e, 0x5a },         { 0x7f, 0x69 },
-                { 0x80, 0x76 },         { 0x81, 0x80 },
-                { 0x82, 0x88 },         { 0x83, 0x8f },
-                { 0x84, 0x96 },         { 0x85, 0xa3 },
-                { 0x86, 0xaf },         { 0x87, 0xc4 },
-                { 0x88, 0xd7 },         { 0x89, 0xe8 },
-
-        /* AGC and AEC parameters.  Note we start by disabling those features,
-           then turn them only after tweaking the values. */
-                { OV7670_REG_COM8, OV7670_COM8_FASTAEC
-                                 | OV7670_COM8_AECSTEP
-                                 | OV7670_COM8_BFILT },
-                { OV7670_REG_GAIN, 0 }, { OV7670_REG_AECH, 0 },
-                { OV7670_REG_COM4, 0x40 }, /* magic reserved bit */
-                { OV7670_REG_COM9, 0x18 }, /* 4x gain + magic rsvd bit */
-                { OV7670_REG_BD50MAX, 0x05 },   { OV7670_REG_BD60MAX, 0x07 },
-                { OV7670_REG_AEW, 0x95 },       { OV7670_REG_AEB, 0x33 },
-                { OV7670_REG_VPT, 0xe3 },       { OV7670_REG_HAECC1, 0x78 },
-                { OV7670_REG_HAECC2, 0x68 },
-                { 0xa1, 0x03 }, /* magic */
-                { OV7670_REG_HAECC3, 0xd8 },    { OV7670_REG_HAECC4, 0xd8 },
-                { OV7670_REG_HAECC5, 0xf0 },    { OV7670_REG_HAECC6, 0x90 },
-                { OV7670_REG_HAECC7, 0x94 },
-                { OV7670_REG_COM8, OV7670_COM8_FASTAEC
-                                | OV7670_COM8_AECSTEP
-                                | OV7670_COM8_BFILT
-                                | OV7670_COM8_AGC
-                                | OV7670_COM8_AEC },
-
-        /* Almost all of these are magic "reserved" values.  */
-                { OV7670_REG_COM5, 0x61 },      { OV7670_REG_COM6, 0x4b },
-                { 0x16, 0x02 },
-                { OV7670_REG_MVFP, 0x07 },
-                { 0x21, 0x02 },         { 0x22, 0x91 },
-                { 0x29, 0x07 },         { 0x33, 0x0b },
-                { 0x35, 0x0b },         { 0x37, 0x1d },
-                { 0x38, 0x71 },         { 0x39, 0x2a },
-                { OV7670_REG_COM12, 0x78 },     { 0x4d, 0x40 },
-                { 0x4e, 0x20 },         { OV7670_REG_GFIX, 0 },
-                { 0x6b, 0x4a },         { 0x74, 0x10 },
-                { 0x8d, 0x4f },         { 0x8e, 0 },
-                { 0x8f, 0 },            { 0x90, 0 },
-                { 0x91, 0 },            { 0x96, 0 },
-                { 0x9a, 0 },            { 0xb0, 0x84 },
-                { 0xb1, 0x0c },         { 0xb2, 0x0e },
-                { 0xb3, 0x82 },         { 0xb8, 0x0a },
-
-        /* More reserved magic, some of which tweaks white balance */
-                { 0x43, 0x0a },         { 0x44, 0xf0 },
-                { 0x45, 0x34 },         { 0x46, 0x58 },
-                { 0x47, 0x28 },         { 0x48, 0x3a },
-                { 0x59, 0x88 },         { 0x5a, 0x88 },
-                { 0x5b, 0x44 },         { 0x5c, 0x67 },
-                { 0x5d, 0x49 },         { 0x5e, 0x0e },
-                { 0x6c, 0x0a },         { 0x6d, 0x55 },
-                { 0x6e, 0x11 },         { 0x6f, 0x9f },
-                                                /* "9e for advance AWB" */
-                { 0x6a, 0x40 },         { OV7670_REG_BLUE, 0x40 },
-                { OV7670_REG_RED, 0x60 },
-                { OV7670_REG_COM8, OV7670_COM8_FASTAEC
-                                | OV7670_COM8_AECSTEP
-                                | OV7670_COM8_BFILT
-                                | OV7670_COM8_AGC
-                                | OV7670_COM8_AEC
-                                | OV7670_COM8_AWB },
-
-        /* Matrix coefficients */
-                { 0x4f, 0x80 },         { 0x50, 0x80 },
-                { 0x51, 0 },            { 0x52, 0x22 },
-                { 0x53, 0x5e },         { 0x54, 0x80 },
-                { 0x58, 0x9e },
-
-                { OV7670_REG_COM16, OV7670_COM16_AWBGAIN },
-                { OV7670_REG_EDGE, 0 },
-                { 0x75, 0x05 },         { 0x76, 0xe1 },
-                { 0x4c, 0 },            { 0x77, 0x01 },
-                { OV7670_REG_COM13, OV7670_COM13_GAMMA
-                                  | OV7670_COM13_UVSAT
-                                  | 2},         /* was 3 */
-                { 0x4b, 0x09 },
-                { 0xc9, 0x60 },         { OV7670_REG_COM16, 0x38 },
-                { 0x56, 0x40 },
-
-                { 0x34, 0x11 },
-                { OV7670_REG_COM11, OV7670_COM11_EXP|OV7670_COM11_HZAUTO },
-                { 0xa4, 0x88 },         { 0x96, 0 },
-                { 0x97, 0x30 },         { 0x98, 0x20 },
-                { 0x99, 0x30 },         { 0x9a, 0x84 },
-                { 0x9b, 0x29 },         { 0x9c, 0x03 },
-                { 0x9d, 0x4c },         { 0x9e, 0x3f },
-                { 0x78, 0x04 },
-
-        /* Extra-weird stuff.  Some sort of multiplexor register */
-                { 0x79, 0x01 },         { 0xc8, 0xf0 },
-                { 0x79, 0x0f },         { 0xc8, 0x00 },
-                { 0x79, 0x10 },         { 0xc8, 0x7e },
-                { 0x79, 0x0a },         { 0xc8, 0x80 },
-                { 0x79, 0x0b },         { 0xc8, 0x01 },
-                { 0x79, 0x0c },         { 0xc8, 0x0f },
-                { 0x79, 0x0d },         { 0xc8, 0x20 },
-                { 0x79, 0x09 },         { 0xc8, 0x80 },
-                { 0x79, 0x02 },         { 0xc8, 0xc0 },
-                { 0x79, 0x03 },         { 0xc8, 0x40 },
-                { 0x79, 0x05 },         { 0xc8, 0x30 },
-                { 0x79, 0x26 },
-        };
 
         PDEBUG(D_PROBE, "starting OV7xx0 configuration");
 
@@ -1011,8 +1198,9 @@ static int ov7xx0_configure(struct sd *sd)
                         switch (low) {
                         case 0x30:
                                 PDEBUG(D_PROBE, "Sensor is an OV7630/OV7635");
-                                sd->sensor = SEN_OV7630;
-                                break;
+                                PDEBUG(D_ERR,
+                                      "7630 is not supported by this driver");
+                                return -1;
                         case 0x40:
                                 PDEBUG(D_PROBE, "Sensor is an OV7645");
                                 sd->sensor = SEN_OV7640; /* FIXME */
@@ -1038,32 +1226,6 @@ static int ov7xx0_configure(struct sd *sd)
                 return -1;
         }
 
-        switch (sd->sensor) {
-        case SEN_OV7620:
-                PDEBUG(D_PROBE, "Writing 7620 registers");
-                if (write_i2c_regvals(sd, norm_7620, ARRAY_SIZE(norm_7620)))
-                        return -1;
-                break;
-        case SEN_OV7630:
-                PDEBUG(D_ERR, "7630 is not supported by this driver version");
-                return -1;
-        case SEN_OV7640:
-                PDEBUG(D_PROBE, "Writing 7640 registers");
-                if (write_i2c_regvals(sd, norm_7640, ARRAY_SIZE(norm_7640)))
-                        return -1;
-                break;
-        case SEN_OV7670:
-                PDEBUG(D_PROBE, "Writing 7670 registers");
-                if (write_i2c_regvals(sd, norm_7670, ARRAY_SIZE(norm_7670)))
-                        return -1;
-                break;
-        default:
-                PDEBUG(D_PROBE, "Writing 7610 registers");
-                if (write_i2c_regvals(sd, norm_7610, ARRAY_SIZE(norm_7610)))
-                        return -1;
-                break;
-        }
-
         /* Set sensor-specific vars */
 /*      sd->sif = 0;            already done */
         return 0;
@@ -1073,141 +1235,7 @@ static int ov7xx0_configure(struct sd *sd)
 static int ov6xx0_configure(struct sd *sd)
 {
         int rc;
-        static const struct ov_i2c_regvals norm_6x20[] = {
-                { 0x12, 0x80 }, /* reset */
-                { 0x11, 0x01 },
-                { 0x03, 0x60 },
-                { 0x05, 0x7f }, /* For when autoadjust is off */
-                { 0x07, 0xa8 },
-                /* The ratio of 0x0c and 0x0d  controls the white point */
-                { 0x0c, 0x24 },
-                { 0x0d, 0x24 },
-                { 0x0f, 0x15 }, /* COMS */
-                { 0x10, 0x75 }, /* AEC Exposure time */
-                { 0x12, 0x24 }, /* Enable AGC */
-                { 0x14, 0x04 },
-                /* 0x16: 0x06 helps frame stability with moving objects */
-                { 0x16, 0x06 },
-/*              { 0x20, 0x30 },  * Aperture correction enable */
-                { 0x26, 0xb2 }, /* BLC enable */
-                /* 0x28: 0x05 Selects RGB format if RGB on */
-                { 0x28, 0x05 },
-                { 0x2a, 0x04 }, /* Disable framerate adjust */
-/*              { 0x2b, 0xac },  * Framerate; Set 2a[7] first */
-                { 0x2d, 0x99 },
-                { 0x33, 0xa0 }, /* Color Processing Parameter */
-                { 0x34, 0xd2 }, /* Max A/D range */
-                { 0x38, 0x8b },
-                { 0x39, 0x40 },
-
-                { 0x3c, 0x39 }, /* Enable AEC mode changing */
-                { 0x3c, 0x3c }, /* Change AEC mode */
-                { 0x3c, 0x24 }, /* Disable AEC mode changing */
-
-                { 0x3d, 0x80 },
-                /* These next two registers (0x4a, 0x4b) are undocumented.
-                 * They control the color balance */
-                { 0x4a, 0x80 },
-                { 0x4b, 0x80 },
-                { 0x4d, 0xd2 }, /* This reduces noise a bit */
-                { 0x4e, 0xc1 },
-                { 0x4f, 0x04 },
-/* Do 50-53 have any effect? */
-/* Toggle 0x12[2] off and on here? */
-        };
-
-        static const struct ov_i2c_regvals norm_6x30[] = {
-                { 0x12, 0x80 }, /* Reset */
-                { 0x00, 0x1f }, /* Gain */
-                { 0x01, 0x99 }, /* Blue gain */
-                { 0x02, 0x7c }, /* Red gain */
-                { 0x03, 0xc0 }, /* Saturation */
-                { 0x05, 0x0a }, /* Contrast */
-                { 0x06, 0x95 }, /* Brightness */
-                { 0x07, 0x2d }, /* Sharpness */
-                { 0x0c, 0x20 },
-                { 0x0d, 0x20 },
-                { 0x0e, 0x20 },
-                { 0x0f, 0x05 },
-                { 0x10, 0x9a },
-                { 0x11, 0x00 }, /* Pixel clock = fastest */
-                { 0x12, 0x24 }, /* Enable AGC and AWB */
-                { 0x13, 0x21 },
-                { 0x14, 0x80 },
-                { 0x15, 0x01 },
-                { 0x16, 0x03 },
-                { 0x17, 0x38 },
-                { 0x18, 0xea },
-                { 0x19, 0x04 },
-                { 0x1a, 0x93 },
-                { 0x1b, 0x00 },
-                { 0x1e, 0xc4 },
-                { 0x1f, 0x04 },
-                { 0x20, 0x20 },
-                { 0x21, 0x10 },
-                { 0x22, 0x88 },
-                { 0x23, 0xc0 }, /* Crystal circuit power level */
-                { 0x25, 0x9a }, /* Increase AEC black ratio */
-                { 0x26, 0xb2 }, /* BLC enable */
-                { 0x27, 0xa2 },
-                { 0x28, 0x00 },
-                { 0x29, 0x00 },
-                { 0x2a, 0x84 }, /* 60 Hz power */
-                { 0x2b, 0xa8 }, /* 60 Hz power */
-                { 0x2c, 0xa0 },
-                { 0x2d, 0x95 }, /* Enable auto-brightness */
-                { 0x2e, 0x88 },
-                { 0x33, 0x26 },
-                { 0x34, 0x03 },
-                { 0x36, 0x8f },
-                { 0x37, 0x80 },
-                { 0x38, 0x83 },
-                { 0x39, 0x80 },
-                { 0x3a, 0x0f },
-                { 0x3b, 0x3c },
-                { 0x3c, 0x1a },
-                { 0x3d, 0x80 },
-                { 0x3e, 0x80 },
-                { 0x3f, 0x0e },
-                { 0x40, 0x00 }, /* White bal */
-                { 0x41, 0x00 }, /* White bal */
-                { 0x42, 0x80 },
-                { 0x43, 0x3f }, /* White bal */
-                { 0x44, 0x80 },
-                { 0x45, 0x20 },
-                { 0x46, 0x20 },
-                { 0x47, 0x80 },
-                { 0x48, 0x7f },
-                { 0x49, 0x00 },
-                { 0x4a, 0x00 },
-                { 0x4b, 0x80 },
-                { 0x4c, 0xd0 },
-                { 0x4d, 0x10 }, /* U = 0.563u, V = 0.714v */
-                { 0x4e, 0x40 },
-                { 0x4f, 0x07 }, /* UV avg., col. killer: max */
-                { 0x50, 0xff },
-                { 0x54, 0x23 }, /* Max AGC gain: 18dB */
-                { 0x55, 0xff },
-                { 0x56, 0x12 },
-                { 0x57, 0x81 },
-                { 0x58, 0x75 },
-                { 0x59, 0x01 }, /* AGC dark current comp.: +1 */
-                { 0x5a, 0x2c },
-                { 0x5b, 0x0f }, /* AWB chrominance levels */
-                { 0x5c, 0x10 },
-                { 0x3d, 0x80 },
-                { 0x27, 0xa6 },
-                { 0x12, 0x20 }, /* Toggle AWB */
-                { 0x12, 0x24 },
-        };
-
-        PDEBUG(D_PROBE, "starting sensor configuration");
-
-        if (init_ov_sensor(sd) < 0) {
-                PDEBUG(D_ERR, "Failed to read sensor ID.");
-                return -1;
-        }
-        PDEBUG(D_PROBE, "OV6xx0 sensor detected");
+        PDEBUG(D_PROBE, "starting OV6xx0 configuration");
 
         /* Detect sensor (sub)type */
         rc = i2c_r(sd, OV7610_REG_COM_I);
@@ -1251,15 +1279,6 @@ static int ov6xx0_configure(struct sd *sd)
         /* Set sensor-specific vars */
         sd->sif = 1;
 
-        if (sd->sensor == SEN_OV6620) {
-                PDEBUG(D_PROBE, "Writing 6x20 registers");
-                if (write_i2c_regvals(sd, norm_6x20, ARRAY_SIZE(norm_6x20)))
-                        return -1;
-        } else {
-                PDEBUG(D_PROBE, "Writing 6x30 registers");
-                if (write_i2c_regvals(sd, norm_6x30, ARRAY_SIZE(norm_6x30)))
-                        return -1;
-        }
         return 0;
 }
 
@@ -1298,22 +1317,31 @@ static int sd_config(struct gspca_dev *gspca_dev,
         ov51x_led_control(sd, 0);       /* turn LED off */
 
         /* Test for 76xx */
-        sd->primary_i2c_slave = OV7xx0_SID;
         if (ov51x_set_slave_ids(sd, OV7xx0_SID) < 0)
                 goto error;
 
         /* The OV519 must be more aggressive about sensor detection since
          * I2C write will never fail if the sensor is not present. We have
          * to try to initialize the sensor to detect its presence */
-        if (init_ov_sensor(sd) < 0) {
+        if (init_ov_sensor(sd) >= 0) {
+                if (ov7xx0_configure(sd) < 0) {
+                        PDEBUG(D_ERR, "Failed to configure OV7xx0");
+                        goto error;
+                }
+        } else {
+
                 /* Test for 6xx0 */
-                sd->primary_i2c_slave = OV6xx0_SID;
                 if (ov51x_set_slave_ids(sd, OV6xx0_SID) < 0)
                         goto error;
 
-                if (init_ov_sensor(sd) < 0) {
+                if (init_ov_sensor(sd) >= 0) {
+                        if (ov6xx0_configure(sd) < 0) {
+                                PDEBUG(D_ERR, "Failed to configure OV6xx0");
+                                goto error;
+                        }
+                } else {
+
                         /* Test for 8xx0 */
-                        sd->primary_i2c_slave = OV8xx0_SID;
                         if (ov51x_set_slave_ids(sd, OV8xx0_SID) < 0)
                                 goto error;
 
@@ -1321,24 +1349,13 @@ static int sd_config(struct gspca_dev *gspca_dev,
                                 PDEBUG(D_ERR,
                                         "Can't determine sensor slave IDs");
                                 goto error;
-                        } else {
-                                if (ov8xx0_configure(sd) < 0) {
-                                        PDEBUG(D_ERR,
-                                           "Failed to configure OV8xx0 sensor");
-                                        goto error;
-                                }
                         }
-                } else {
-                        if (ov6xx0_configure(sd) < 0) {
-                                PDEBUG(D_ERR, "Failed to configure OV6xx0");
+                        if (ov8xx0_configure(sd) < 0) {
+                                PDEBUG(D_ERR,
+                                   "Failed to configure OV8xx0 sensor");
                                 goto error;
                         }
                 }
-        } else {
-                if (ov7xx0_configure(sd) < 0) {
-                        PDEBUG(D_ERR, "Failed to configure OV7xx0");
-                        goto error;
-                }
         }
 
         cam = &gspca_dev->cam;
@@ -1355,15 +1372,53 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->colors = COLOR_DEF;
         sd->hflip = HFLIP_DEF;
         sd->vflip = VFLIP_DEF;
+        if (sd->sensor != SEN_OV7670)
+                gspca_dev->ctrl_dis = (1 << HFLIP_IDX)
+                                        | (1 << VFLIP_IDX);
         return 0;
 error:
         PDEBUG(D_ERR, "OV519 Config failed");
         return -EBUSY;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        /* initialize the sensor */
+        switch (sd->sensor) {
+        case SEN_OV6620:
+                if (write_i2c_regvals(sd, norm_6x20, ARRAY_SIZE(norm_6x20)))
+                        return -EIO;
+                break;
+        case SEN_OV6630:
+                if (write_i2c_regvals(sd, norm_6x30, ARRAY_SIZE(norm_6x30)))
+                        return -EIO;
+                break;
+        default:
+/*      case SEN_OV7610: */
+/*      case SEN_OV76BE: */
+                if (write_i2c_regvals(sd, norm_7610, ARRAY_SIZE(norm_7610)))
+                        return -EIO;
+                break;
+        case SEN_OV7620:
+                if (write_i2c_regvals(sd, norm_7620, ARRAY_SIZE(norm_7620)))
+                        return -EIO;
+                break;
+        case SEN_OV7640:
+                if (write_i2c_regvals(sd, norm_7640, ARRAY_SIZE(norm_7640)))
+                        return -EIO;
+                break;
+        case SEN_OV7670:
+                if (write_i2c_regvals(sd, norm_7670, ARRAY_SIZE(norm_7670)))
+                        return -EIO;
+                break;
+        case SEN_OV8610:
+                if (write_i2c_regvals(sd, norm_8610, ARRAY_SIZE(norm_8610)))
+                        return -EIO;
+                break;
+        }
         return 0;
 }
 
@@ -1827,14 +1882,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         ov51x_led_control((struct sd *) gspca_dev, 0);
 }
 
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
@@ -2091,11 +2138,9 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
 };
 
@@ -2132,6 +2177,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index 7ef18d578811..83b5f740c947 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -56,12 +56,6 @@ MODULE_LICENSE("GPL");
 #define PAC207_GAIN_KNEE                20
 
 #define PAC207_AUTOGAIN_DEADZONE        30
-/* We calculating the autogain at the end of the transfer of a frame, at this
-   moment a frame with the old settings is being transmitted, and a frame is
-   being captured with the old settings. So if we adjust the autogain we must
-   ignore atleast the 2 next frames for the new settings to come into effect
-   before doing any other adjustments */
-#define PAC207_AUTOGAIN_IGNORE_FRAMES   3
 
 /* specific webcam descriptor */
 struct sd {
@@ -131,7 +125,8 @@ static struct ctrl sd_ctrls[] = {
                 .minimum = 0,
                 .maximum = 1,
                 .step   = 1,
-                .default_value = 1,
+#define AUTOGAIN_DEF 1
+                .default_value = AUTOGAIN_DEF,
                 .flags = 0,
             },
             .set = sd_setautogain,
@@ -181,9 +176,6 @@ static const __u8 pac207_sensor_init[][8] = {
                         /* 48 reg_72 Rate Control end BalSize_4a =0x36 */
 static const __u8 PacReg72[] = { 0x00, 0x00, 0x36, 0x00 };
 
-static const unsigned char pac207_sof_marker[5] =
-                { 0xff, 0xff, 0x00, 0xff, 0x96 };
-
 static int pac207_write_regs(struct gspca_dev *gspca_dev, u16 index,
         const u8 *buffer, u16 length)
 {
@@ -259,35 +251,32 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 return -ENODEV;
         }
 
-        pac207_write_reg(gspca_dev, 0x41, 0x00);
-                                /* Bit_0=Image Format,
-                                 * Bit_1=LED,
-                                 * Bit_2=Compression test mode enable */
-        pac207_write_reg(gspca_dev, 0x0f, 0x00); /* Power Control */
-        pac207_write_reg(gspca_dev, 0x11, 0x30); /* Analog Bias */
-
         PDEBUG(D_PROBE,
                 "Pixart PAC207BCA Image Processor and Control Chip detected"
                 " (vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x05;
         cam->cam_mode = sif_mode;
         cam->nmodes = ARRAY_SIZE(sif_mode);
         sd->brightness = PAC207_BRIGHTNESS_DEFAULT;
         sd->exposure = PAC207_EXPOSURE_DEFAULT;
         sd->gain = PAC207_GAIN_DEFAULT;
+        sd->autogain = AUTOGAIN_DEF;
 
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
+        pac207_write_reg(gspca_dev, 0x41, 0x00);
+                                /* Bit_0=Image Format,
+                                 * Bit_1=LED,
+                                 * Bit_2=Compression test mode enable */
+        pac207_write_reg(gspca_dev, 0x0f, 0x00); /* Power Control */
+        pac207_write_reg(gspca_dev, 0x11, 0x30); /* Analog Bias */
 
-        sd->autogain = 1;
         return 0;
 }
 
@@ -343,14 +332,8 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         pac207_write_reg(gspca_dev, 0x0f, 0x00); /* Power Control */
 }
 
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-/* this function is called at close time */
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
+/* Include pac common sof detection functions */
+#include "pac_common.h"
 
 static void pac207_do_auto_gain(struct gspca_dev *gspca_dev)
 {
@@ -365,33 +348,7 @@ static void pac207_do_auto_gain(struct gspca_dev *gspca_dev)
         else if (gspca_auto_gain_n_exposure(gspca_dev, avg_lum,
                         100 + sd->brightness / 2, PAC207_AUTOGAIN_DEADZONE,
                         PAC207_GAIN_KNEE, PAC207_EXPOSURE_KNEE))
-                sd->autogain_ignore_frames = PAC207_AUTOGAIN_IGNORE_FRAMES;
-}
-
-static unsigned char *pac207_find_sof(struct gspca_dev *gspca_dev,
-                                        unsigned char *m, int len)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-        int i;
-
-        /* Search for the SOF marker (fixed part) in the header */
-        for (i = 0; i < len; i++) {
-                if (m[i] == pac207_sof_marker[sd->sof_read]) {
-                        sd->sof_read++;
-                        if (sd->sof_read == sizeof(pac207_sof_marker)) {
-                                PDEBUG(D_STREAM,
-                                        "SOF found, bytes to analyze: %u."
-                                        " Frame starts at byte #%u",
-                                        len, i + 1);
-                                sd->sof_read = 0;
-                                return m + i + 1;
-                        }
-                } else {
-                        sd->sof_read = 0;
-                }
-        }
-
-        return NULL;
+                sd->autogain_ignore_frames = PAC_AUTOGAIN_IGNORE_FRAMES;
 }
 
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
@@ -402,14 +359,14 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         struct sd *sd = (struct sd *) gspca_dev;
         unsigned char *sof;
 
-        sof = pac207_find_sof(gspca_dev, data, len);
+        sof = pac_find_sof(gspca_dev, data, len);
         if (sof) {
                 int n;
 
                 /* finish decoding current frame */
                 n = sof - data;
-                if (n > sizeof pac207_sof_marker)
-                        n -= sizeof pac207_sof_marker;
+                if (n > sizeof pac_sof_marker)
+                        n -= sizeof pac_sof_marker;
                 else
                         n = 0;
                 frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
@@ -537,7 +494,7 @@ static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
                 sd->gain = PAC207_GAIN_DEFAULT;
                 if (gspca_dev->streaming) {
                         sd->autogain_ignore_frames =
-                                PAC207_AUTOGAIN_IGNORE_FRAMES;
+                                PAC_AUTOGAIN_IGNORE_FRAMES;
                         setexposure(gspca_dev);
                         setgain(gspca_dev);
                 }
@@ -560,11 +517,9 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .dq_callback = pac207_do_auto_gain,
         .pkt_scan = sd_pkt_scan,
 };
@@ -597,6 +552,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index 815bea6edc44..d4be51843286 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -19,6 +19,36 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+/* Some documentation about various registers as determined by trial and error.
+   When the register addresses differ between the 7202 and the 7311 the 2
+   different addresses are written as 7302addr/7311addr, when one of the 2
+   addresses is a - sign that register description is not valid for the
+   matching IC.
+
+   Register page 1:
+
+   Address      Description
+   -/0x08       Unknown compressor related, must always be 8 except when not
+                in 640x480 resolution and page 4 reg 2 <= 3 then set it to 9 !
+   -/0x1b       Auto white balance related, bit 0 is AWB enable (inverted)
+                bits 345 seem to toggle per color gains on/off (inverted)
+   0x78         Global control, bit 6 controls the LED (inverted)
+   -/0x80       JPEG compression ratio ? Best not touched
+
+   Register page 3/4:
+
+   Address      Description
+   0x02         Clock divider 2-63, fps =~ 60 / val. Must be a multiple of 3 on
+                the 7302, so one of 3, 6, 9, ..., except when between 6 and 12?
+   -/0x0f       Master gain 1-245, low value = high gain
+   0x10/-       Master gain 0-31
+   -/0x10       Another gain 0-15, limited influence (1-2x gain I guess)
+   0x21         Bitfield: 0-1 unused, 2-3 vflip/hflip, 4-5 unknown, 6-7 unused
+   -/0x27       Seems to toggle various gains on / off, Setting bit 7 seems to
+                completely disable the analog amplification block. Set to 0x68
+                for max gain, 0x14 for minimal gain.
+*/
+
 #define MODULE_NAME "pac7311"
 
 #include "gspca.h"
@@ -31,18 +61,23 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
 
-        int lum_sum;
-        atomic_t avg_lum;
-        atomic_t do_gain;
-
         unsigned char brightness;
         unsigned char contrast;
         unsigned char colors;
+        unsigned char gain;
+        unsigned char exposure;
         unsigned char autogain;
+        __u8 hflip;
+        __u8 vflip;
+
+        __u8 sensor;
+#define SENSOR_PAC7302 0
+#define SENSOR_PAC7311 1
 
-        char ffseq;
-        signed char ag_cnt;
-#define AG_CNT_START 13
+        u8 sof_read;
+        u8 autogain_ignore_frames;
+
+        atomic_t avg_lum;
 };
 
 /* V4L2 controls supported by the driver */
@@ -54,8 +89,18 @@ 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_sethflip(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_gethflip(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 int sd_setgain(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val);
 
 static struct ctrl sd_ctrls[] = {
+/* This control is pac7302 only */
+#define BRIGHTNESS_IDX 0
         {
             {
                 .id      = V4L2_CID_BRIGHTNESS,
@@ -71,13 +116,15 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_setbrightness,
             .get = sd_getbrightness,
         },
+/* This control is for both the 7302 and the 7311 */
         {
             {
                 .id      = V4L2_CID_CONTRAST,
                 .type    = V4L2_CTRL_TYPE_INTEGER,
                 .name    = "Contrast",
                 .minimum = 0,
-                .maximum = 255,
+#define CONTRAST_MAX 255
+                .maximum = CONTRAST_MAX,
                 .step    = 1,
 #define CONTRAST_DEF 127
                 .default_value = CONTRAST_DEF,
@@ -85,13 +132,16 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_setcontrast,
             .get = sd_getcontrast,
         },
+/* This control is pac7302 only */
+#define SATURATION_IDX 2
         {
             {
                 .id      = V4L2_CID_SATURATION,
                 .type    = V4L2_CTRL_TYPE_INTEGER,
-                .name    = "Color",
+                .name    = "Saturation",
                 .minimum = 0,
-                .maximum = 255,
+#define COLOR_MAX 255
+                .maximum = COLOR_MAX,
                 .step    = 1,
 #define COLOR_DEF 127
                 .default_value = COLOR_DEF,
@@ -99,6 +149,39 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_setcolors,
             .get = sd_getcolors,
         },
+/* All controls below are for both the 7302 and the 7311 */
+        {
+            {
+                .id      = V4L2_CID_GAIN,
+                .type    = V4L2_CTRL_TYPE_INTEGER,
+                .name    = "Gain",
+                .minimum = 0,
+#define GAIN_MAX 255
+                .maximum = GAIN_MAX,
+                .step    = 1,
+#define GAIN_DEF 127
+#define GAIN_KNEE 255 /* Gain seems to cause little noise on the pac73xx */
+                .default_value = GAIN_DEF,
+            },
+            .set = sd_setgain,
+            .get = sd_getgain,
+        },
+        {
+            {
+                .id      = V4L2_CID_EXPOSURE,
+                .type    = V4L2_CTRL_TYPE_INTEGER,
+                .name    = "Exposure",
+                .minimum = 0,
+#define EXPOSURE_MAX 255
+                .maximum = EXPOSURE_MAX,
+                .step    = 1,
+#define EXPOSURE_DEF  16 /*  32 ms / 30 fps */
+#define EXPOSURE_KNEE 50 /* 100 ms / 10 fps */
+                .default_value = EXPOSURE_DEF,
+            },
+            .set = sd_setexposure,
+            .get = sd_getexposure,
+        },
         {
             {
                 .id      = V4L2_CID_AUTOGAIN,
@@ -113,101 +196,207 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_setautogain,
             .get = sd_getautogain,
         },
+        {
+            {
+                .id      = V4L2_CID_HFLIP,
+                .type    = V4L2_CTRL_TYPE_BOOLEAN,
+                .name    = "Mirror",
+                .minimum = 0,
+                .maximum = 1,
+                .step    = 1,
+#define HFLIP_DEF 0
+                .default_value = HFLIP_DEF,
+            },
+            .set = sd_sethflip,
+            .get = sd_gethflip,
+        },
+        {
+            {
+                .id      = V4L2_CID_VFLIP,
+                .type    = V4L2_CTRL_TYPE_BOOLEAN,
+                .name    = "Vflip",
+                .minimum = 0,
+                .maximum = 1,
+                .step    = 1,
+#define VFLIP_DEF 0
+                .default_value = VFLIP_DEF,
+            },
+            .set = sd_setvflip,
+            .get = sd_getvflip,
+        },
 };
 
 static struct v4l2_pix_format vga_mode[] = {
-        {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+        {160, 120, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,
                 .bytesperline = 160,
                 .sizeimage = 160 * 120 * 3 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
                 .priv = 2},
-        {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+        {320, 240, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,
                 .bytesperline = 320,
                 .sizeimage = 320 * 240 * 3 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
                 .priv = 1},
-        {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+        {640, 480, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 640 * 480 * 3 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
                 .priv = 0},
 };
 
-#define PAC7311_JPEG_HEADER_SIZE (sizeof pac7311_jpeg_header)   /* (594) */
-
-static const __u8 pac7311_jpeg_header[] = {
-        0xff, 0xd8,
-        0xff, 0xe0, 0x00, 0x03, 0x20,
-        0xff, 0xc0, 0x00, 0x11, 0x08,
-                0x01, 0xe0,                     /* 12: height */
-                0x02, 0x80,                     /* 14: width */
-                0x03,                           /* 16 */
-                        0x01, 0x21, 0x00,
-                        0x02, 0x11, 0x01,
-                        0x03, 0x11, 0x01,
-        0xff, 0xdb, 0x00, 0x84,
-        0x00, 0x10, 0x0b, 0x0c, 0x0e, 0x0c, 0x0a, 0x10, 0x0e, 0x0d,
-        0x0e, 0x12, 0x11, 0x10, 0x13, 0x18, 0x28, 0x1a, 0x18, 0x16,
-        0x16, 0x18, 0x31, 0x23, 0x25, 0x1d, 0x28, 0x3a, 0x33, 0x3d,
-        0x3c, 0x39, 0x33, 0x38, 0x37, 0x40, 0x48, 0x5c, 0x4e, 0x40,
-        0x44, 0x57, 0x45, 0x37, 0x38, 0x50, 0x6d, 0x51, 0x57, 0x5f,
-        0x62, 0x67, 0x68, 0x67, 0x3e, 0x4d, 0x71, 0x79, 0x70, 0x64,
-        0x78, 0x5c, 0x65, 0x67, 0x63, 0x01, 0x11, 0x12, 0x12, 0x18,
-        0x15, 0x18, 0x2f, 0x1a, 0x1a, 0x2f, 0x63, 0x42, 0x38, 0x42,
-        0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
-        0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
-        0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
-        0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
-        0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
-        0xff, 0xc4, 0x01, 0xa2, 0x00, 0x00, 0x01, 0x05, 0x01, 0x01,
-        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-        0x09, 0x0a, 0x0b, 0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02,
-        0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,
-        0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31,
-        0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32,
-        0x81, 0x91, 0xa1, 0x08, 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52,
-        0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
-        0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
-        0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45,
-        0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57,
-        0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
-        0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x83,
-        0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94,
-        0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
-        0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
-        0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-        0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
-        0xd9, 0xda, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8,
-        0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
-        0xf9, 0xfa, 0x01, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01,
-        0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
-        0x0b, 0x11, 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,
-        0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77, 0x00, 0x01,
-        0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41,
-        0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14,
-        0x42, 0x91, 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
-        0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25,
-        0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, 0x27, 0x28, 0x29, 0x2a,
-        0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46,
-        0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
-        0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a,
-        0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x82, 0x83,
-        0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94,
-        0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
-        0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
-        0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-        0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
-        0xd9, 0xda, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
-        0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa,
-        0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03,
-        0x11, 0x00, 0x3f, 0x00
+/* pac 7302 */
+static const __u8 init_7302[] = {
+/*      index,value */
+        0xff, 0x01,             /* page 1 */
+        0x78, 0x00,             /* deactivate */
+        0xff, 0x01,
+        0x78, 0x40,             /* led off */
+};
+static const __u8 start_7302[] = {
+/*      index, len, [value]* */
+        0xff, 1,        0x00,           /* page 0 */
+        0x00, 12,       0x01, 0x40, 0x40, 0x40, 0x01, 0xe0, 0x02, 0x80,
+                        0x00, 0x00, 0x00, 0x00,
+        0x0d, 24,       0x03, 0x01, 0x00, 0xb5, 0x07, 0xcb, 0x00, 0x00,
+                        0x07, 0xc8, 0x00, 0xea, 0x07, 0xcf, 0x07, 0xf7,
+                        0x07, 0x7e, 0x01, 0x0b, 0x00, 0x00, 0x00, 0x11,
+        0x26, 2,        0xaa, 0xaa,
+        0x2e, 1,        0x31,
+        0x38, 1,        0x01,
+        0x3a, 3,        0x14, 0xff, 0x5a,
+        0x43, 11,       0x00, 0x0a, 0x18, 0x11, 0x01, 0x2c, 0x88, 0x11,
+                        0x00, 0x54, 0x11,
+        0x55, 1,        0x00,
+        0x62, 4,        0x10, 0x1e, 0x1e, 0x18,
+        0x6b, 1,        0x00,
+        0x6e, 3,        0x08, 0x06, 0x00,
+        0x72, 3,        0x00, 0xff, 0x00,
+        0x7d, 23,       0x01, 0x01, 0x58, 0x46, 0x50, 0x3c, 0x50, 0x3c,
+                        0x54, 0x46, 0x54, 0x56, 0x52, 0x50, 0x52, 0x50,
+                        0x56, 0x64, 0xa4, 0x00, 0xda, 0x00, 0x00,
+        0xa2, 10,       0x22, 0x2c, 0x3c, 0x54, 0x69, 0x7c, 0x9c, 0xb9,
+                        0xd2, 0xeb,
+        0xaf, 1,        0x02,
+        0xb5, 2,        0x08, 0x08,
+        0xb8, 2,        0x08, 0x88,
+        0xc4, 4,        0xae, 0x01, 0x04, 0x01,
+        0xcc, 1,        0x00,
+        0xd1, 11,       0x01, 0x30, 0x49, 0x5e, 0x6f, 0x7f, 0x8e, 0xa9,
+                        0xc1, 0xd7, 0xec,
+        0xdc, 1,        0x01,
+        0xff, 1,        0x01,           /* page 1 */
+        0x12, 3,        0x02, 0x00, 0x01,
+        0x3e, 2,        0x00, 0x00,
+        0x76, 5,        0x01, 0x20, 0x40, 0x00, 0xf2,
+        0x7c, 1,        0x00,
+        0x7f, 10,       0x4b, 0x0f, 0x01, 0x2c, 0x02, 0x58, 0x03, 0x20,
+                        0x02, 0x00,
+        0x96, 5,        0x01, 0x10, 0x04, 0x01, 0x04,
+        0xc8, 14,       0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00,
+                        0x07, 0x00, 0x01, 0x07, 0x04, 0x01,
+        0xd8, 1,        0x01,
+        0xdb, 2,        0x00, 0x01,
+        0xde, 7,        0x00, 0x01, 0x04, 0x04, 0x00, 0x00, 0x00,
+        0xe6, 4,        0x00, 0x00, 0x00, 0x01,
+        0xeb, 1,        0x00,
+        0xff, 1,        0x02,           /* page 2 */
+        0x22, 1,        0x00,
+        0xff, 1,        0x03,           /* page 3 */
+        0x00, 255,                      /* load the page 3 */
+        0x11, 1,        0x01,
+        0xff, 1,        0x02,           /* page 2 */
+        0x13, 1,        0x00,
+        0x22, 4,        0x1f, 0xa4, 0xf0, 0x96,
+        0x27, 2,        0x14, 0x0c,
+        0x2a, 5,        0xc8, 0x00, 0x18, 0x12, 0x22,
+        0x64, 8,        0x00, 0x00, 0xf0, 0x01, 0x14, 0x44, 0x44, 0x44,
+        0x6e, 1,        0x08,
+        0xff, 1,        0x01,           /* page 1 */
+        0x78, 1,        0x00,
+        0, 0                            /* end of sequence */
+};
+
+/* page 3 - the value 0xaa says skip the index - see reg_w_page() */
+static const __u8 page3_7302[] = {
+        0x90, 0x40, 0x03, 0x50, 0xc2, 0x01, 0x14, 0x16,
+        0x14, 0x12, 0x00, 0x00, 0x00, 0x02, 0x33, 0x00,
+        0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x47, 0x01, 0xb3, 0x01, 0x00,
+        0x00, 0x08, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x21,
+        0x00, 0x00, 0x00, 0x54, 0xf4, 0x02, 0x52, 0x54,
+        0xa4, 0xb8, 0xe0, 0x2a, 0xf6, 0x00, 0x00, 0x00,
+        0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0xfc, 0x00, 0xf2, 0x1f, 0x04, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0xc0, 0xc0, 0x10, 0x00, 0x00,
+        0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x40, 0xff, 0x03, 0x19, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0xc8, 0xc8,
+        0xc8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
+        0x08, 0x10, 0x24, 0x40, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x00, 0x02, 0x47, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x02, 0xfa, 0x00, 0x64, 0x5a, 0x28, 0x00,
+        0x00
+};
+
+/* pac 7311 */
+static const __u8 init_7311[] = {
+        0x78, 0x40,     /* Bit_0=start stream, Bit_6=LED */
+        0x78, 0x40,     /* Bit_0=start stream, Bit_6=LED */
+        0x78, 0x44,     /* Bit_0=start stream, Bit_6=LED */
+        0xff, 0x04,
+        0x27, 0x80,
+        0x28, 0xca,
+        0x29, 0x53,
+        0x2a, 0x0e,
+        0xff, 0x01,
+        0x3e, 0x20,
+};
+
+static const __u8 start_7311[] = {
+/*      index, len, [value]* */
+        0xff, 1,        0x01,           /* page 1 */
+        0x02, 43,       0x48, 0x0a, 0x40, 0x08, 0x00, 0x00, 0x08, 0x00,
+                        0x06, 0xff, 0x11, 0xff, 0x5a, 0x30, 0x90, 0x4c,
+                        0x00, 0x07, 0x00, 0x0a, 0x10, 0x00, 0xa0, 0x10,
+                        0x02, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x01, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00,
+        0x3e, 42,       0x00, 0x00, 0x78, 0x52, 0x4a, 0x52, 0x78, 0x6e,
+                        0x48, 0x46, 0x48, 0x6e, 0x5f, 0x49, 0x42, 0x49,
+                        0x5f, 0x5f, 0x49, 0x42, 0x49, 0x5f, 0x6e, 0x48,
+                        0x46, 0x48, 0x6e, 0x78, 0x52, 0x4a, 0x52, 0x78,
+                        0x00, 0x00, 0x09, 0x1b, 0x34, 0x49, 0x5c, 0x9b,
+                        0xd0, 0xff,
+        0x78, 6,        0x44, 0x00, 0xf2, 0x01, 0x01, 0x80,
+        0x7f, 18,       0x2a, 0x1c, 0x00, 0xc8, 0x02, 0x58, 0x03, 0x84,
+                        0x12, 0x00, 0x1a, 0x04, 0x08, 0x0c, 0x10, 0x14,
+                        0x18, 0x20,
+        0x96, 3,        0x01, 0x08, 0x04,
+        0xa0, 4,        0x44, 0x44, 0x44, 0x04,
+        0xf0, 13,       0x01, 0x00, 0x00, 0x00, 0x22, 0x00, 0x20, 0x00,
+                        0x3f, 0x00, 0x0a, 0x01, 0x00,
+        0xff, 1,        0x04,           /* page 4 */
+        0x00, 254,                      /* load the page 4 */
+        0x11, 1,        0x01,
+        0, 0                            /* end of sequence */
+};
+
+/* page 4 - the value 0xaa says skip the index - see reg_w_page() */
+static const __u8 page4_7311[] = {
+        0xaa, 0xaa, 0x04, 0x54, 0x07, 0x2b, 0x09, 0x0f,
+        0x09, 0x00, 0xaa, 0xaa, 0x07, 0x00, 0x00, 0x62,
+        0x08, 0xaa, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x03, 0xa0, 0x01, 0xf4, 0xaa,
+        0xaa, 0x00, 0x08, 0xaa, 0x03, 0xaa, 0x00, 0x68,
+        0xca, 0x10, 0x06, 0x78, 0x00, 0x00, 0x00, 0x00,
+        0x23, 0x28, 0x04, 0x11, 0x00, 0x00
 };
 
 static void reg_w_buf(struct gspca_dev *gspca_dev,
-                  __u16 index,
-                  const char *buffer, __u16 len)
+                  __u8 index,
+                  const char *buffer, int len)
 {
         memcpy(gspca_dev->usb_buf, buffer, len);
         usb_control_msg(gspca_dev->dev,
@@ -219,21 +408,9 @@ static void reg_w_buf(struct gspca_dev *gspca_dev,
                         500);
 }
 
-static __u8 reg_r(struct gspca_dev *gspca_dev,
-                             __u16 index)
-{
-        usb_control_msg(gspca_dev->dev,
-                        usb_rcvctrlpipe(gspca_dev->dev, 0),
-                        0,                      /* request */
-                        USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                        0,                      /* value */
-                        index, gspca_dev->usb_buf, 1,
-                        500);
-        return gspca_dev->usb_buf[0];
-}
 
 static void reg_w(struct gspca_dev *gspca_dev,
-                  __u16 index,
+                  __u8 index,
                   __u8 value)
 {
         gspca_dev->usb_buf[0] = value;
@@ -241,10 +418,78 @@ static void reg_w(struct gspca_dev *gspca_dev,
                         usb_sndctrlpipe(gspca_dev->dev, 0),
                         0,                      /* request */
                         USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                        value, index, gspca_dev->usb_buf, 1,
+                        0, index, gspca_dev->usb_buf, 1,
                         500);
 }
 
+static void reg_w_seq(struct gspca_dev *gspca_dev,
+                const __u8 *seq, int len)
+{
+        while (--len >= 0) {
+                reg_w(gspca_dev, seq[0], seq[1]);
+                seq += 2;
+        }
+}
+
+/* load the beginning of a page */
+static void reg_w_page(struct gspca_dev *gspca_dev,
+                        const __u8 *page, int len)
+{
+        int index;
+
+        for (index = 0; index < len; index++) {
+                if (page[index] == 0xaa)                /* skip this index */
+                        continue;
+                gspca_dev->usb_buf[0] = page[index];
+                usb_control_msg(gspca_dev->dev,
+                                usb_sndctrlpipe(gspca_dev->dev, 0),
+                                0,                      /* request */
+                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                                0, index, gspca_dev->usb_buf, 1,
+                                500);
+        }
+}
+
+/* output a variable sequence */
+static void reg_w_var(struct gspca_dev *gspca_dev,
+                        const __u8 *seq)
+{
+        int index, len;
+
+        for (;;) {
+                index = *seq++;
+                len = *seq++;
+                switch (len) {
+                case 0:
+                        return;
+                case 254:
+                        reg_w_page(gspca_dev, page4_7311, sizeof page4_7311);
+                        break;
+                case 255:
+                        reg_w_page(gspca_dev, page3_7302, sizeof page3_7302);
+                        break;
+                default:
+                        if (len > 64) {
+                                PDEBUG(D_ERR|D_STREAM,
+                                        "Incorrect variable sequence");
+                                return;
+                        }
+                        while (len > 0) {
+                                if (len < 8) {
+                                        reg_w_buf(gspca_dev, index, seq, len);
+                                        seq += len;
+                                        break;
+                                }
+                                reg_w_buf(gspca_dev, index, seq, 8);
+                                seq += 8;
+                                index += 8;
+                                len -= 8;
+                        }
+                }
+        }
+        /* not reached */
+}
+
 /* this function is called at probe time */
 static int sd_config(struct gspca_dev *gspca_dev,
                         const struct usb_device_id *id)
@@ -252,203 +497,245 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
 
-        PDEBUG(D_CONF, "Find Sensor PAC7311");
-        reg_w(gspca_dev, 0x78, 0x40); /* Bit_0=start stream, Bit_7=LED */
-        reg_w(gspca_dev, 0x78, 0x40); /* Bit_0=start stream, Bit_7=LED */
-        reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_7=LED */
-        reg_w(gspca_dev, 0xff, 0x04);
-        reg_w(gspca_dev, 0x27, 0x80);
-        reg_w(gspca_dev, 0x28, 0xca);
-        reg_w(gspca_dev, 0x29, 0x53);
-        reg_w(gspca_dev, 0x2a, 0x0e);
-        reg_w(gspca_dev, 0xff, 0x01);
-        reg_w(gspca_dev, 0x3e, 0x20);
-
         cam = &gspca_dev->cam;
         cam->epaddr = 0x05;
-        cam->cam_mode = vga_mode;
-        cam->nmodes = ARRAY_SIZE(vga_mode);
+
+        sd->sensor = id->driver_info;
+        if (sd->sensor == SENSOR_PAC7302) {
+                PDEBUG(D_CONF, "Find Sensor PAC7302");
+                cam->cam_mode = &vga_mode[2];   /* only 640x480 */
+                cam->nmodes = 1;
+        } else {
+                PDEBUG(D_CONF, "Find Sensor PAC7311");
+                cam->cam_mode = vga_mode;
+                cam->nmodes = ARRAY_SIZE(vga_mode);
+                gspca_dev->ctrl_dis = (1 << BRIGHTNESS_IDX)
+                                | (1 << SATURATION_IDX);
+        }
 
         sd->brightness = BRIGHTNESS_DEF;
         sd->contrast = CONTRAST_DEF;
         sd->colors = COLOR_DEF;
+        sd->gain = GAIN_DEF;
+        sd->exposure = EXPOSURE_DEF;
         sd->autogain = AUTOGAIN_DEF;
-        sd->ag_cnt = -1;
+        sd->hflip = HFLIP_DEF;
+        sd->vflip = VFLIP_DEF;
         return 0;
 }
 
-static void setbrightness(struct gspca_dev *gspca_dev)
+/* This function is used by pac7302 only */
+static void setbrightcont(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        int i, v;
+        static const __u8 max[10] =
+                {0x29, 0x33, 0x42, 0x5a, 0x6e, 0x80, 0x9f, 0xbb,
+                 0xd4, 0xec};
+        static const __u8 delta[10] =
+                {0x35, 0x33, 0x33, 0x2f, 0x2a, 0x25, 0x1e, 0x17,
+                 0x11, 0x0b};
+
+        reg_w(gspca_dev, 0xff, 0x00);   /* page 0 */
+        for (i = 0; i < 10; i++) {
+                v = max[i];
+                v += (sd->brightness - BRIGHTNESS_MAX)
+                        * 150 / BRIGHTNESS_MAX;         /* 200 ? */
+                v -= delta[i] * sd->contrast / CONTRAST_MAX;
+                if (v < 0)
+                        v = 0;
+                else if (v > 0xff)
+                        v = 0xff;
+                reg_w(gspca_dev, 0xa2 + i, v);
+        }
+        reg_w(gspca_dev, 0xdc, 0x01);
+}
+
+/* This function is used by pac7311 only */
+static void setcontrast(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int brightness;
 
-/*jfm: inverted?*/
-        brightness = BRIGHTNESS_MAX - sd->brightness;
         reg_w(gspca_dev, 0xff, 0x04);
-/*      reg_w(gspca_dev, 0x0e, 0x00); */
-        reg_w(gspca_dev, 0x0f, brightness);
+        reg_w(gspca_dev, 0x10, sd->contrast >> 4);
         /* load registers to sensor (Bit 0, auto clear) */
         reg_w(gspca_dev, 0x11, 0x01);
-        PDEBUG(D_CONF|D_STREAM, "brightness: %i", brightness);
 }
 
-static void setcontrast(struct gspca_dev *gspca_dev)
+/* This function is used by pac7302 only */
+static void setcolors(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
+        int i, v;
+        static const int a[9] =
+                {217, -212, 0, -101, 170, -67, -38, -315, 355};
+        static const int b[9] =
+                {19, 106, 0, 19, 106, 1, 19, 106, 1};
 
-        reg_w(gspca_dev, 0xff, 0x01);
-        reg_w(gspca_dev, 0x80, sd->contrast);
-        /* load registers to sensor (Bit 0, auto clear) */
+        reg_w(gspca_dev, 0xff, 0x03);   /* page 3 */
         reg_w(gspca_dev, 0x11, 0x01);
-        PDEBUG(D_CONF|D_STREAM, "contrast: %i", sd->contrast);
+        reg_w(gspca_dev, 0xff, 0x00);   /* page 0 */
+        reg_w(gspca_dev, 0xff, 0x00);   /* page 0 */
+        for (i = 0; i < 9; i++) {
+                v = a[i] * sd->colors / COLOR_MAX + b[i];
+                reg_w(gspca_dev, 0x0f + 2 * i, (v >> 8) & 0x07);
+                reg_w(gspca_dev, 0x0f + 2 * i + 1, v);
+        }
+        reg_w(gspca_dev, 0xdc, 0x01);
+        PDEBUG(D_CONF|D_STREAM, "color: %i", sd->colors);
 }
 
-static void setcolors(struct gspca_dev *gspca_dev)
+static void setgain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        reg_w(gspca_dev, 0xff, 0x01);
-        reg_w(gspca_dev, 0x10, sd->colors);
+        if (sd->sensor == SENSOR_PAC7302) {
+                reg_w(gspca_dev, 0xff, 0x03);           /* page 3 */
+                reg_w(gspca_dev, 0x10, sd->gain >> 3);
+        } else {
+                int gain = GAIN_MAX - sd->gain;
+                if (gain < 1)
+                        gain = 1;
+                else if (gain > 245)
+                        gain = 245;
+                reg_w(gspca_dev, 0xff, 0x04);           /* page 4 */
+                reg_w(gspca_dev, 0x0e, 0x00);
+                reg_w(gspca_dev, 0x0f, gain);
+        }
         /* load registers to sensor (Bit 0, auto clear) */
         reg_w(gspca_dev, 0x11, 0x01);
-        PDEBUG(D_CONF|D_STREAM, "color: %i", sd->colors);
 }
 
-static void setautogain(struct gspca_dev *gspca_dev)
+static void setexposure(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
+        __u8 reg;
+
+        /* register 2 of frame 3/4 contains the clock divider configuring the
+           no fps according to the formula: 60 / reg. sd->exposure is the
+           desired exposure time in ms. */
+        reg = 120 * sd->exposure / 1000;
+        if (reg < 2)
+                reg = 2;
+        else if (reg > 63)
+                reg = 63;
+
+        if (sd->sensor == SENSOR_PAC7302) {
+                /* On the pac7302 reg2 MUST be a multiple of 3, so round it to
+                   the nearest multiple of 3, except when between 6 and 12? */
+                if (reg < 6 || reg > 12)
+                        reg = ((reg + 1) / 3) * 3;
+                reg_w(gspca_dev, 0xff, 0x03);           /* page 3 */
+                reg_w(gspca_dev, 0x02, reg);
+        } else {
+                reg_w(gspca_dev, 0xff, 0x04);           /* page 4 */
+                reg_w(gspca_dev, 0x02, reg);
+                /* Page 1 register 8 must always be 0x08 except when not in
+                   640x480 mode and Page3/4 reg 2 <= 3 then it must be 9 */
+                reg_w(gspca_dev, 0xff, 0x01);
+                if (gspca_dev->cam.cam_mode[(int)gspca_dev->curr_mode].priv &&
+                                reg <= 3)
+                        reg_w(gspca_dev, 0x08, 0x09);
+                else
+                        reg_w(gspca_dev, 0x08, 0x08);
+        }
+        /* load registers to sensor (Bit 0, auto clear) */
+        reg_w(gspca_dev, 0x11, 0x01);
+}
 
-        if (sd->autogain) {
-                sd->lum_sum = 0;
-                sd->ag_cnt = AG_CNT_START;
+static void sethvflip(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        __u8 data;
+
+        if (sd->sensor == SENSOR_PAC7302) {
+                reg_w(gspca_dev, 0xff, 0x03);           /* page 3 */
+                data = (sd->hflip ? 0x08 : 0x00)
+                        | (sd->vflip ? 0x04 : 0x00);
         } else {
-                sd->ag_cnt = -1;
+                reg_w(gspca_dev, 0xff, 0x04);           /* page 4 */
+                data = (sd->hflip ? 0x04 : 0x00)
+                        | (sd->vflip ? 0x08 : 0x00);
         }
+        reg_w(gspca_dev, 0x21, data);
+        /* load registers to sensor (Bit 0, auto clear) */
+        reg_w(gspca_dev, 0x11, 0x01);
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
-        reg_w(gspca_dev, 0x78, 0x00);   /* Turn on LED */
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        if (sd->sensor == SENSOR_PAC7302)
+                reg_w_seq(gspca_dev, init_7302, sizeof init_7302);
+        else
+                reg_w_seq(gspca_dev, init_7311, sizeof init_7311);
+
         return 0;
 }
 
 static void sd_start(struct gspca_dev *gspca_dev)
 {
-        reg_w(gspca_dev, 0xff, 0x01);
-        reg_w_buf(gspca_dev, 0x0002, "\x48\x0a\x40\x08\x00\x00\x08\x00", 8);
-        reg_w_buf(gspca_dev, 0x000a, "\x06\xff\x11\xff\x5a\x30\x90\x4c", 8);
-        reg_w_buf(gspca_dev, 0x0012, "\x00\x07\x00\x0a\x10\x00\xa0\x10", 8);
-        reg_w_buf(gspca_dev, 0x001a, "\x02\x00\x00\x00\x00\x0b\x01\x00", 8);
-        reg_w_buf(gspca_dev, 0x0022, "\x00\x00\x00\x00\x00\x00\x00\x00", 8);
-        reg_w_buf(gspca_dev, 0x002a, "\x00\x00\x00", 3);
-        reg_w_buf(gspca_dev, 0x003e, "\x00\x00\x78\x52\x4a\x52\x78\x6e", 8);
-        reg_w_buf(gspca_dev, 0x0046, "\x48\x46\x48\x6e\x5f\x49\x42\x49", 8);
-        reg_w_buf(gspca_dev, 0x004e, "\x5f\x5f\x49\x42\x49\x5f\x6e\x48", 8);
-        reg_w_buf(gspca_dev, 0x0056, "\x46\x48\x6e\x78\x52\x4a\x52\x78", 8);
-        reg_w_buf(gspca_dev, 0x005e, "\x00\x00\x09\x1b\x34\x49\x5c\x9b", 8);
-        reg_w_buf(gspca_dev, 0x0066, "\xd0\xff", 2);
-        reg_w_buf(gspca_dev, 0x0078, "\x44\x00\xf2\x01\x01\x80", 6);
-        reg_w_buf(gspca_dev, 0x007f, "\x2a\x1c\x00\xc8\x02\x58\x03\x84", 8);
-        reg_w_buf(gspca_dev, 0x0087, "\x12\x00\x1a\x04\x08\x0c\x10\x14", 8);
-        reg_w_buf(gspca_dev, 0x008f, "\x18\x20", 2);
-        reg_w_buf(gspca_dev, 0x0096, "\x01\x08\x04", 3);
-        reg_w_buf(gspca_dev, 0x00a0, "\x44\x44\x44\x04", 4);
-        reg_w_buf(gspca_dev, 0x00f0, "\x01\x00\x00\x00\x22\x00\x20\x00", 8);
-        reg_w_buf(gspca_dev, 0x00f8, "\x3f\x00\x0a\x01\x00", 5);
+        struct sd *sd = (struct sd *) gspca_dev;
 
-        reg_w(gspca_dev, 0xff, 0x04);
-        reg_w(gspca_dev, 0x02, 0x04);
-        reg_w(gspca_dev, 0x03, 0x54);
-        reg_w(gspca_dev, 0x04, 0x07);
-        reg_w(gspca_dev, 0x05, 0x2b);
-        reg_w(gspca_dev, 0x06, 0x09);
-        reg_w(gspca_dev, 0x07, 0x0f);
-        reg_w(gspca_dev, 0x08, 0x09);
-        reg_w(gspca_dev, 0x09, 0x00);
-        reg_w(gspca_dev, 0x0c, 0x07);
-        reg_w(gspca_dev, 0x0d, 0x00);
-        reg_w(gspca_dev, 0x0e, 0x00);
-        reg_w(gspca_dev, 0x0f, 0x62);
-        reg_w(gspca_dev, 0x10, 0x08);
-        reg_w(gspca_dev, 0x12, 0x07);
-        reg_w(gspca_dev, 0x13, 0x00);
-        reg_w(gspca_dev, 0x14, 0x00);
-        reg_w(gspca_dev, 0x15, 0x00);
-        reg_w(gspca_dev, 0x16, 0x00);
-        reg_w(gspca_dev, 0x17, 0x00);
-        reg_w(gspca_dev, 0x18, 0x00);
-        reg_w(gspca_dev, 0x19, 0x00);
-        reg_w(gspca_dev, 0x1a, 0x00);
-        reg_w(gspca_dev, 0x1b, 0x03);
-        reg_w(gspca_dev, 0x1c, 0xa0);
-        reg_w(gspca_dev, 0x1d, 0x01);
-        reg_w(gspca_dev, 0x1e, 0xf4);
-        reg_w(gspca_dev, 0x21, 0x00);
-        reg_w(gspca_dev, 0x22, 0x08);
-        reg_w(gspca_dev, 0x24, 0x03);
-        reg_w(gspca_dev, 0x26, 0x00);
-        reg_w(gspca_dev, 0x27, 0x01);
-        reg_w(gspca_dev, 0x28, 0xca);
-        reg_w(gspca_dev, 0x29, 0x10);
-        reg_w(gspca_dev, 0x2a, 0x06);
-        reg_w(gspca_dev, 0x2b, 0x78);
-        reg_w(gspca_dev, 0x2c, 0x00);
-        reg_w(gspca_dev, 0x2d, 0x00);
-        reg_w(gspca_dev, 0x2e, 0x00);
-        reg_w(gspca_dev, 0x2f, 0x00);
-        reg_w(gspca_dev, 0x30, 0x23);
-        reg_w(gspca_dev, 0x31, 0x28);
-        reg_w(gspca_dev, 0x32, 0x04);
-        reg_w(gspca_dev, 0x33, 0x11);
-        reg_w(gspca_dev, 0x34, 0x00);
-        reg_w(gspca_dev, 0x35, 0x00);
-        reg_w(gspca_dev, 0x11, 0x01);
-        setcontrast(gspca_dev);
-        setbrightness(gspca_dev);
-        setcolors(gspca_dev);
-        setautogain(gspca_dev);
+        sd->sof_read = 0;
+
+        if (sd->sensor == SENSOR_PAC7302) {
+                reg_w_var(gspca_dev, start_7302);
+                setbrightcont(gspca_dev);
+                setcolors(gspca_dev);
+        } else {
+                reg_w_var(gspca_dev, start_7311);
+                setcontrast(gspca_dev);
+        }
+        setgain(gspca_dev);
+        setexposure(gspca_dev);
+        sethvflip(gspca_dev);
 
         /* set correct resolution */
         switch (gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv) {
-        case 2:                                 /* 160x120 */
-                reg_w(gspca_dev, 0xff, 0x04);
-                reg_w(gspca_dev, 0x02, 0x03);
+        case 2:                                 /* 160x120 pac7311 */
                 reg_w(gspca_dev, 0xff, 0x01);
-                reg_w(gspca_dev, 0x08, 0x09);
                 reg_w(gspca_dev, 0x17, 0x20);
-                reg_w(gspca_dev, 0x1b, 0x00);
-/*              reg_w(gspca_dev, 0x80, 0x69); */
                 reg_w(gspca_dev, 0x87, 0x10);
                 break;
-        case 1:                                 /* 320x240 */
-                reg_w(gspca_dev, 0xff, 0x04);
-                reg_w(gspca_dev, 0x02, 0x03);
+        case 1:                                 /* 320x240 pac7311 */
                 reg_w(gspca_dev, 0xff, 0x01);
-                reg_w(gspca_dev, 0x08, 0x09);
                 reg_w(gspca_dev, 0x17, 0x30);
-/*              reg_w(gspca_dev, 0x80, 0x3f); */
                 reg_w(gspca_dev, 0x87, 0x11);
                 break;
         case 0:                                 /* 640x480 */
-                reg_w(gspca_dev, 0xff, 0x04);
-                reg_w(gspca_dev, 0x02, 0x03);
+                if (sd->sensor == SENSOR_PAC7302)
+                        break;
                 reg_w(gspca_dev, 0xff, 0x01);
-                reg_w(gspca_dev, 0x08, 0x08);
                 reg_w(gspca_dev, 0x17, 0x00);
-/*              reg_w(gspca_dev, 0x80, 0x1c); */
                 reg_w(gspca_dev, 0x87, 0x12);
                 break;
         }
 
+        sd->sof_read = 0;
+        sd->autogain_ignore_frames = 0;
+        atomic_set(&sd->avg_lum, -1);
+
         /* start stream */
         reg_w(gspca_dev, 0xff, 0x01);
-        reg_w(gspca_dev, 0x78, 0x04);
-        reg_w(gspca_dev, 0x78, 0x05);
+        if (sd->sensor == SENSOR_PAC7302)
+                reg_w(gspca_dev, 0x78, 0x01);
+        else
+                reg_w(gspca_dev, 0x78, 0x05);
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
 {
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        if (sd->sensor == SENSOR_PAC7302) {
+                reg_w(gspca_dev, 0xff, 0x01);
+                reg_w(gspca_dev, 0x78, 0x00);
+                reg_w(gspca_dev, 0x78, 0x00);
+                return;
+        }
         reg_w(gspca_dev, 0xff, 0x04);
         reg_w(gspca_dev, 0x27, 0x80);
         reg_w(gspca_dev, 0x28, 0xca);
@@ -456,187 +743,147 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0x2a, 0x0e);
         reg_w(gspca_dev, 0xff, 0x01);
         reg_w(gspca_dev, 0x3e, 0x20);
-        reg_w(gspca_dev, 0x78, 0x04); /* Bit_0=start stream, Bit_7=LED */
-        reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_7=LED */
-        reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_7=LED */
+        reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */
+        reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */
+        reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */
 }
 
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
-}
+        struct sd *sd = (struct sd *) gspca_dev;
 
-/* this function is called at close time */
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-        reg_w(gspca_dev, 0xff, 0x04);
-        reg_w(gspca_dev, 0x27, 0x80);
-        reg_w(gspca_dev, 0x28, 0xca);
-        reg_w(gspca_dev, 0x29, 0x53);
-        reg_w(gspca_dev, 0x2a, 0x0e);
-        reg_w(gspca_dev, 0xff, 0x01);
-        reg_w(gspca_dev, 0x3e, 0x20);
-        reg_w(gspca_dev, 0x78, 0x04); /* Bit_0=start stream, Bit_7=LED */
-        reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_7=LED */
-        reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_7=LED */
+        if (sd->sensor == SENSOR_PAC7302) {
+                reg_w(gspca_dev, 0xff, 0x01);
+                reg_w(gspca_dev, 0x78, 0x40);
+        }
 }
 
+/* Include pac common sof detection functions */
+#include "pac_common.h"
+
 static void do_autogain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int luma;
-        int luma_mean = 128;
-        int luma_delta = 20;
-        __u8 spring = 5;
-        int Gbright;
+        int avg_lum = atomic_read(&sd->avg_lum);
+        int desired_lum, deadzone;
 
-        if (!atomic_read(&sd->do_gain))
+        if (avg_lum == -1)
                 return;
-        atomic_set(&sd->do_gain, 0);
-
-        luma = atomic_read(&sd->avg_lum);
-        Gbright = reg_r(gspca_dev, 0x02);
-        PDEBUG(D_FRAM, "luma mean %d", luma);
-        if (luma < luma_mean - luma_delta ||
-            luma > luma_mean + luma_delta) {
-                Gbright += (luma_mean - luma) >> spring;
-                if (Gbright > 0x1a)
-                        Gbright = 0x1a;
-                else if (Gbright < 4)
-                        Gbright = 4;
-                PDEBUG(D_FRAM, "gbright %d", Gbright);
-                reg_w(gspca_dev, 0xff, 0x04);
-                reg_w(gspca_dev, 0x0f, Gbright);
-                /* load registers to sensor (Bit 0, auto clear) */
-                reg_w(gspca_dev, 0x11, 0x01);
+
+        if (sd->sensor == SENSOR_PAC7302) {
+                desired_lum = 270 + sd->brightness * 4;
+                /* Hack hack, with the 7202 the first exposure step is
+                   pretty large, so if we're about to make the first
+                   exposure increase make the deadzone large to avoid
+                   oscilating */
+                if (desired_lum > avg_lum && sd->gain == GAIN_DEF &&
+                                sd->exposure > EXPOSURE_DEF &&
+                                sd->exposure < 42)
+                        deadzone = 90;
+                else
+                        deadzone = 30;
+        } else {
+                desired_lum = 200;
+                deadzone = 20;
         }
+
+        if (sd->autogain_ignore_frames > 0)
+                sd->autogain_ignore_frames--;
+        else if (gspca_auto_gain_n_exposure(gspca_dev, avg_lum, desired_lum,
+                        deadzone, GAIN_KNEE, EXPOSURE_KNEE))
+                sd->autogain_ignore_frames = PAC_AUTOGAIN_IGNORE_FRAMES;
 }
 
+static const unsigned char pac7311_jpeg_header1[] = {
+  0xff, 0xd8, 0xff, 0xc0, 0x00, 0x11, 0x08
+};
+
+static const unsigned char pac7311_jpeg_header2[] = {
+  0x03, 0x01, 0x21, 0x00, 0x02, 0x11, 0x01, 0x03, 0x11, 0x01, 0xff, 0xda,
+  0x00, 0x0c, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3f, 0x00
+};
+
+/* this function is run at interrupt level */
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
                         int len)                        /* iso packet length */
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        unsigned char tmpbuf[4];
-        int i, p, ffseq;
-
-/*      if (len < 5) { */
-        if (len < 6) {
-/*              gspca_dev->last_packet_type = DISCARD_PACKET; */
-                return;
-        }
-
-        ffseq = sd->ffseq;
-
-        for (p = 0; p < len - 6; p++) {
-                if ((data[0 + p] == 0xff)
-                    && (data[1 + p] == 0xff)
-                    && (data[2 + p] == 0x00)
-                    && (data[3 + p] == 0xff)
-                    && (data[4 + p] == 0x96)) {
-
-                        /* start of frame */
-                        if (sd->ag_cnt >= 0 && p > 28) {
-                                sd->lum_sum += data[p - 23];
-                                if (--sd->ag_cnt < 0) {
-                                        sd->ag_cnt = AG_CNT_START;
-                                        atomic_set(&sd->avg_lum,
-                                                sd->lum_sum / AG_CNT_START);
-                                        sd->lum_sum = 0;
-                                        atomic_set(&sd->do_gain, 1);
-                                }
-                        }
+        unsigned char *sof;
+
+        sof = pac_find_sof(gspca_dev, data, len);
+        if (sof) {
+                unsigned char tmpbuf[4];
+                int n, lum_offset, footer_length;
+
+                if (sd->sensor == SENSOR_PAC7302) {
+                  /* 6 bytes after the FF D9 EOF marker a number of lumination
+                     bytes are send corresponding to different parts of the
+                     image, the 14th and 15th byte after the EOF seem to
+                     correspond to the center of the image */
+                  lum_offset = 61 + sizeof pac_sof_marker;
+                  footer_length = 74;
+                } else {
+                  lum_offset = 24 + sizeof pac_sof_marker;
+                  footer_length = 26;
+                }
 
-                        /* copy the end of data to the current frame */
+                /* Finish decoding current frame */
+                n = (sof - data) - (footer_length + sizeof pac_sof_marker);
+                if (n < 0) {
+                        frame->data_end += n;
+                        n = 0;
+                }
+                frame = gspca_frame_add(gspca_dev, INTER_PACKET, frame,
+                                        data, n);
+                if (gspca_dev->last_packet_type != DISCARD_PACKET &&
+                                frame->data_end[-2] == 0xff &&
+                                frame->data_end[-1] == 0xd9)
                         frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
-                                                data, p);
-
-                        /* put the JPEG header in the new frame */
-                        gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
-                                        (unsigned char *) pac7311_jpeg_header,
-                                        12);
+                                                NULL, 0);
+
+                n = sof - data;
+                len -= n;
+                data = sof;
+
+                /* Get average lumination */
+                if (gspca_dev->last_packet_type == LAST_PACKET &&
+                                n >= lum_offset)
+                        atomic_set(&sd->avg_lum, data[-lum_offset] +
+                                                data[-lum_offset + 1]);
+                else
+                        atomic_set(&sd->avg_lum, -1);
+
+                /* Start the new frame with the jpeg header */
+                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+                        pac7311_jpeg_header1, sizeof(pac7311_jpeg_header1));
+                if (sd->sensor == SENSOR_PAC7302) {
+                        /* The PAC7302 has the image rotated 90 degrees */
+                        tmpbuf[0] = gspca_dev->width >> 8;
+                        tmpbuf[1] = gspca_dev->width & 0xff;
+                        tmpbuf[2] = gspca_dev->height >> 8;
+                        tmpbuf[3] = gspca_dev->height & 0xff;
+                } else {
                         tmpbuf[0] = gspca_dev->height >> 8;
                         tmpbuf[1] = gspca_dev->height & 0xff;
                         tmpbuf[2] = gspca_dev->width >> 8;
                         tmpbuf[3] = gspca_dev->width & 0xff;
-                        gspca_frame_add(gspca_dev, INTER_PACKET, frame,
-                                        tmpbuf, 4);
-                        gspca_frame_add(gspca_dev, INTER_PACKET, frame,
-                                (unsigned char *) &pac7311_jpeg_header[16],
-                                PAC7311_JPEG_HEADER_SIZE - 16);
-
-                        data += p + 7;
-                        len -= p + 7;
-                        ffseq = 0;
-                        break;
                 }
+                gspca_frame_add(gspca_dev, INTER_PACKET, frame, tmpbuf, 4);
+                gspca_frame_add(gspca_dev, INTER_PACKET, frame,
+                        pac7311_jpeg_header2, sizeof(pac7311_jpeg_header2));
         }
-
-        /* remove the 'ff ff ff xx' sequences */
-        switch (ffseq) {
-        case 3:
-                data += 1;
-                len -= 1;
-                break;
-        case 2:
-                if (data[0] == 0xff) {
-                        data += 2;
-                        len -= 2;
-                        frame->data_end -= 2;
-                }
-                break;
-        case 1:
-                if (data[0] == 0xff
-                    && data[1] == 0xff) {
-                        data += 3;
-                        len -= 3;
-                        frame->data_end -= 1;
-                }
-                break;
-        }
-        for (i = 0; i < len - 4; i++) {
-                if (data[i] == 0xff
-                    && data[i + 1] == 0xff
-                    && data[i + 2] == 0xff) {
-                        memmove(&data[i], &data[i + 4], len - i - 4);
-                        len -= 4;
-                }
-        }
-        ffseq = 0;
-        if (data[len - 4] == 0xff) {
-                if (data[len - 3] == 0xff
-                    && data[len - 2] == 0xff) {
-                        len -= 4;
-                }
-        } else if (data[len - 3] == 0xff) {
-                if (data[len - 2] == 0xff
-                    && data[len - 1] == 0xff)
-                        ffseq = 3;
-        } else if (data[len - 2] == 0xff) {
-                if (data[len - 1] == 0xff)
-                        ffseq = 2;
-        } else if (data[len - 1] == 0xff)
-                ffseq = 1;
-        sd->ffseq = ffseq;
         gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
 }
 
-static void getbrightness(struct gspca_dev *gspca_dev)
-{
-/*      sd->brightness = reg_r(gspca_dev, 0x08);
-        return sd->brightness;  */
-/*      PDEBUG(D_CONF, "Called pac7311_getbrightness: Not implemented yet"); */
-}
-
-
-
 static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
         sd->brightness = val;
         if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
+                setbrightcont(gspca_dev);
         return 0;
 }
 
@@ -644,7 +891,6 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        getbrightness(gspca_dev);
         *val = sd->brightness;
         return 0;
 }
@@ -654,8 +900,12 @@ static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
         struct sd *sd = (struct sd *) gspca_dev;
 
         sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
+        if (gspca_dev->streaming) {
+                if (sd->sensor == SENSOR_PAC7302)
+                        setbrightcont(gspca_dev);
+                else
+                        setcontrast(gspca_dev);
+        }
         return 0;
 }
 
@@ -663,7 +913,6 @@ static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-/*      getcontrast(gspca_dev); */
         *val = sd->contrast;
         return 0;
 }
@@ -682,18 +931,66 @@ static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-/*      getcolors(gspca_dev); */
         *val = sd->colors;
         return 0;
 }
 
+static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        sd->gain = val;
+        if (gspca_dev->streaming)
+                setgain(gspca_dev);
+        return 0;
+}
+
+static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        *val = sd->gain;
+        return 0;
+}
+
+static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        sd->exposure = val;
+        if (gspca_dev->streaming)
+                setexposure(gspca_dev);
+        return 0;
+}
+
+static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        *val = sd->exposure;
+        return 0;
+}
+
 static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
         sd->autogain = val;
-        if (gspca_dev->streaming)
-                setautogain(gspca_dev);
+        /* when switching to autogain set defaults to make sure
+           we are on a valid point of the autogain gain /
+           exposure knee graph, and give this change time to
+           take effect before doing autogain. */
+        if (sd->autogain) {
+                sd->exposure = EXPOSURE_DEF;
+                sd->gain = GAIN_DEF;
+                if (gspca_dev->streaming) {
+                        sd->autogain_ignore_frames =
+                                PAC_AUTOGAIN_IGNORE_FRAMES;
+                        setexposure(gspca_dev);
+                        setgain(gspca_dev);
+                }
+        }
+
         return 0;
 }
 
@@ -705,30 +1002,67 @@ static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
         return 0;
 }
 
+static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        sd->hflip = val;
+        if (gspca_dev->streaming)
+                sethvflip(gspca_dev);
+        return 0;
+}
+
+static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        *val = sd->hflip;
+        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)
+                sethvflip(gspca_dev);
+        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 struct sd_desc sd_desc = {
         .name = MODULE_NAME,
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
         .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
         .dq_callback = do_autogain,
 };
 
 /* -- module initialisation -- */
 static __devinitdata struct usb_device_id device_table[] = {
-        {USB_DEVICE(0x093a, 0x2600)},
-        {USB_DEVICE(0x093a, 0x2601)},
-        {USB_DEVICE(0x093a, 0x2603)},
-        {USB_DEVICE(0x093a, 0x2608)},
-        {USB_DEVICE(0x093a, 0x260e)},
-        {USB_DEVICE(0x093a, 0x260f)},
-        {USB_DEVICE(0x093a, 0x2621)},
+        {USB_DEVICE(0x093a, 0x2600), .driver_info = SENSOR_PAC7311},
+        {USB_DEVICE(0x093a, 0x2601), .driver_info = SENSOR_PAC7311},
+        {USB_DEVICE(0x093a, 0x2603), .driver_info = SENSOR_PAC7311},
+        {USB_DEVICE(0x093a, 0x2608), .driver_info = SENSOR_PAC7311},
+        {USB_DEVICE(0x093a, 0x260e), .driver_info = SENSOR_PAC7311},
+        {USB_DEVICE(0x093a, 0x260f), .driver_info = SENSOR_PAC7311},
+        {USB_DEVICE(0x093a, 0x2621), .driver_info = SENSOR_PAC7302},
+        {USB_DEVICE(0x093a, 0x2624), .driver_info = SENSOR_PAC7302},
+        {USB_DEVICE(0x093a, 0x2626), .driver_info = SENSOR_PAC7302},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -746,6 +1080,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/pac_common.h b/drivers/media/video/gspca/pac_common.h
new file mode 100644
index 000000000000..34d4b1494cd5
--- /dev/null
+++ b/drivers/media/video/gspca/pac_common.h
@@ -0,0 +1,60 @@
+/*
+ * Pixart PAC207BCA / PAC73xx common functions
+ *
+ * Copyright (C) 2008 Hans de Goede <j.w.r.degoede@hhs.nl>
+ * Copyright (C) 2005 Thomas Kaiser thomas@kaiser-linux.li
+ * Copyleft (C) 2005 Michel Xhaard mxhaard@magic.fr
+ *
+ * V4L2 by Jean-Francois Moine <http://moinejf.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; 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
+ *
+ */
+
+/* We calculate the autogain at the end of the transfer of a frame, at this
+   moment a frame with the old settings is being transmitted, and a frame is
+   being captured with the old settings. So if we adjust the autogain we must
+   ignore atleast the 2 next frames for the new settings to come into effect
+   before doing any other adjustments */
+#define PAC_AUTOGAIN_IGNORE_FRAMES      3
+
+static const unsigned char pac_sof_marker[5] =
+                { 0xff, 0xff, 0x00, 0xff, 0x96 };
+
+static unsigned char *pac_find_sof(struct gspca_dev *gspca_dev,
+                                        unsigned char *m, int len)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        int i;
+
+        /* Search for the SOF marker (fixed part) in the header */
+        for (i = 0; i < len; i++) {
+                if (m[i] == pac_sof_marker[sd->sof_read]) {
+                        sd->sof_read++;
+                        if (sd->sof_read == sizeof(pac_sof_marker)) {
+                                PDEBUG(D_FRAM,
+                                        "SOF found, bytes to analyze: %u."
+                                        " Frame starts at byte #%u",
+                                        len, i + 1);
+                                sd->sof_read = 0;
+                                return m + i + 1;
+                        }
+                } else {
+                        sd->sof_read = 0;
+                }
+        }
+
+        return NULL;
+}
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 11210c71f66c..5dd78c6766ea 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -20,6 +20,26 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+/* Some documentation on known sonixb registers:
+
+Reg     Use
+0x10    high nibble red gain low nibble blue gain
+0x11    low nibble green gain
+0x12    hstart
+0x13    vstart
+0x15    hsize (hsize = register-value * 16)
+0x16    vsize (vsize = register-value * 16)
+0x17    bit 0 toggle compression quality (according to sn9c102 driver)
+0x18    bit 7 enables compression, bit 4-5 set image down scaling:
+        00 scale 1, 01 scale 1/2, 10, scale 1/4
+0x19    high-nibble is sensor clock divider, changes exposure on sensors which
+        use a clock generated by the bridge. Some sensors have their own clock.
+0x1c    auto_exposure area (for avg_lum) startx (startx = register-value * 32)
+0x1d    auto_exposure area (for avg_lum) starty (starty = register-value * 32)
+0x1e    auto_exposure area (for avg_lum) stopx (hsize = (0x1e - 0x1c) * 32)
+0x1f    auto_exposure area (for avg_lum) stopy (vsize = (0x1f - 0x1d) * 32)
+*/
+
 #define MODULE_NAME "sonixb"
 
 #include "gspca.h"
@@ -31,10 +51,8 @@ MODULE_LICENSE("GPL");
 /* specific webcam descriptor */
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
-
-        struct sd_desc sd_desc;         /* our nctrls differ dependend upon the
-                                           sensor, so we use a per cam copy */
         atomic_t avg_lum;
+        int prev_avg_lum;
 
         unsigned char gain;
         unsigned char exposure;
@@ -44,8 +62,12 @@ struct sd {
         unsigned char frames_to_drop;
         unsigned char freq;             /* light freq filter setting */
 
-        unsigned char fr_h_sz;          /* size of frame header */
-        char sensor;                    /* Type of image sensor chip */
+        __u8 bridge;                    /* Type of bridge */
+#define BRIDGE_101 0
+#define BRIDGE_102 0 /* We make no difference between 101 and 102 */
+#define BRIDGE_103 1
+
+        __u8 sensor;                    /* Type of image sensor chip */
 #define SENSOR_HV7131R 0
 #define SENSOR_OV6650 1
 #define SENSOR_OV7630 2
@@ -53,16 +75,35 @@ struct sd {
 #define SENSOR_PAS202 4
 #define SENSOR_TAS5110 5
 #define SENSOR_TAS5130CXX 6
-        char sensor_has_gain;
-        __u8 sensor_addr;
         __u8 reg11;
 };
 
-/* flags used in the device id table */
+typedef const __u8 sensor_init_t[8];
+
+struct sensor_data {
+        const __u8 *bridge_init[2];
+        int bridge_init_size[2];
+        sensor_init_t *sensor_init;
+        int sensor_init_size;
+        sensor_init_t *sensor_bridge_init[2];
+        int sensor_bridge_init_size[2];
+        int flags;
+        unsigned ctrl_dis;
+        __u8 sensor_addr;
+};
+
+/* sensor_data flags */
 #define F_GAIN 0x01             /* has gain */
-#define F_AUTO 0x02             /* has autogain */
-#define F_SIF  0x04             /* sif or vga */
-#define F_H18  0x08             /* long (18 b) or short (12 b) frame header */
+#define F_SIF  0x02             /* sif or vga */
+
+/* priv field of struct v4l2_pix_format flags (do not use low nibble!) */
+#define MODE_RAW 0x10           /* raw bayer mode */
+#define MODE_REDUCED_SIF 0x20   /* vga mode (320x240 / 160x120) on sif cam */
+
+/* ctrl_dis helper macros */
+#define NO_EXPO ((1 << EXPOSURE_IDX) | (1 << AUTOGAIN_IDX))
+#define NO_FREQ (1 << FREQ_IDX)
+#define NO_BRIGHTNESS (1 << BRIGHTNESS_IDX)
 
 #define COMP2 0x8f
 #define COMP 0xc7               /* 0x87 //0x07 */
@@ -73,6 +114,18 @@ struct sd {
 
 #define SYS_CLK 0x04
 
+#define SENS(bridge_1, bridge_3, sensor, sensor_1, \
+        sensor_3, _flags, _ctrl_dis, _sensor_addr) \
+{ \
+        .bridge_init = { bridge_1, bridge_3 }, \
+        .bridge_init_size = { sizeof(bridge_1), sizeof(bridge_3) }, \
+        .sensor_init = sensor, \
+        .sensor_init_size = sizeof(sensor), \
+        .sensor_bridge_init = { sensor_1, sensor_3,}, \
+        .sensor_bridge_init_size = { sizeof(sensor_1), sizeof(sensor_3)}, \
+        .flags = _flags, .ctrl_dis = _ctrl_dis, .sensor_addr = _sensor_addr \
+}
+
 /* We calculate the autogain at the end of the transfer of a frame, at this
    moment a frame with the old settings is being transmitted, and a frame is
    being captured with the old settings. So if we adjust the autogain we must
@@ -95,6 +148,7 @@ static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val);
 
 static struct ctrl sd_ctrls[] = {
+#define BRIGHTNESS_IDX 0
         {
             {
                 .id      = V4L2_CID_BRIGHTNESS,
@@ -109,6 +163,7 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_setbrightness,
             .get = sd_getbrightness,
         },
+#define GAIN_IDX 1
         {
             {
                 .id      = V4L2_CID_GAIN,
@@ -124,6 +179,7 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_setgain,
             .get = sd_getgain,
         },
+#define EXPOSURE_IDX 2
         {
                 {
                         .id = V4L2_CID_EXPOSURE,
@@ -140,6 +196,7 @@ static struct ctrl sd_ctrls[] = {
                 .set = sd_setexposure,
                 .get = sd_getexposure,
         },
+#define AUTOGAIN_IDX 3
         {
                 {
                         .id = V4L2_CID_AUTOGAIN,
@@ -155,6 +212,7 @@ static struct ctrl sd_ctrls[] = {
                 .set = sd_setautogain,
                 .get = sd_getautogain,
         },
+#define FREQ_IDX 4
         {
                 {
                         .id      = V4L2_CID_POWER_LINE_FREQUENCY,
@@ -172,31 +230,56 @@ static struct ctrl sd_ctrls[] = {
 };
 
 static struct v4l2_pix_format vga_mode[] = {
+        {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 160,
+                .sizeimage = 160 * 120 * 5 / 4,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 2 | MODE_RAW},
         {160, 120, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
                 .bytesperline = 160,
-                .sizeimage = 160 * 120,
+                .sizeimage = 160 * 120 * 5 / 4,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 2},
         {320, 240, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
                 .bytesperline = 320,
-                .sizeimage = 320 * 240,
+                .sizeimage = 320 * 240 * 5 / 4,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 1},
         {640, 480, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
                 .bytesperline = 640,
-                .sizeimage = 640 * 480,
+                .sizeimage = 640 * 480 * 5 / 4,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 0},
 };
 static struct v4l2_pix_format sif_mode[] = {
+        {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 160,
+                .sizeimage = 160 * 120,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1 | MODE_RAW | MODE_REDUCED_SIF},
+        {160, 120, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
+                .bytesperline = 160,
+                .sizeimage = 160 * 120 * 5 / 4,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1 | MODE_REDUCED_SIF},
+        {176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 176,
+                .sizeimage = 176 * 144 * 5 / 4,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1 | MODE_RAW},
         {176, 144, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
                 .bytesperline = 176,
-                .sizeimage = 176 * 144,
+                .sizeimage = 176 * 144 * 5 / 4,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 1},
+        {320, 240, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
+                .bytesperline = 320,
+                .sizeimage = 320 * 240 * 5 / 4,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 0 | MODE_REDUCED_SIF},
         {352, 288, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
                 .bytesperline = 352,
-                .sizeimage = 352 * 288,
+                .sizeimage = 352 * 288 * 5 / 4,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 0},
 };
@@ -204,7 +287,7 @@ static struct v4l2_pix_format sif_mode[] = {
 static const __u8 initHv7131[] = {
         0x46, 0x77, 0x00, 0x04, 0x00, 0x00, 0x00, 0x80, 0x11, 0x00, 0x00, 0x00,
         0x00, 0x00,
-        0x00, 0x00, 0x00, 0x03, 0x01, 0x00,     /* shift from 0x02 0x01 0x00 */
+        0x00, 0x00, 0x00, 0x02, 0x01, 0x00,
         0x28, 0x1e, 0x60, 0x8a, 0x20,
         0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c
 };
@@ -218,8 +301,8 @@ static const __u8 hv7131_sensor_init[][8] = {
 static const __u8 initOv6650[] = {
         0x44, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
         0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x02, 0x01, 0x0a, 0x16, 0x12, 0x68, 0x0b,
-        0x10, 0x1d, 0x10, 0x00, 0x06, 0x1f, 0x00
+        0x00, 0x01, 0x01, 0x0a, 0x16, 0x12, 0x68, 0x8b,
+        0x10, 0x1d, 0x10, 0x02, 0x02, 0x09, 0x07
 };
 static const __u8 ov6650_sensor_init[][8] =
 {
@@ -257,15 +340,15 @@ static const __u8 ov6650_sensor_init[][8] =
 static const __u8 initOv7630[] = {
         0x04, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* r01 .. r08 */
         0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* r09 .. r10 */
-        0x00, 0x02, 0x01, 0x0a,                         /* r11 .. r14 */
+        0x00, 0x01, 0x01, 0x0a,                         /* r11 .. r14 */
         0x28, 0x1e,                     /* H & V sizes     r15 .. r16 */
-        0x68, COMP1, MCK_INIT1,                         /* r17 .. r19 */
+        0x68, COMP2, MCK_INIT1,                         /* r17 .. r19 */
         0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c              /* r1a .. r1f */
 };
 static const __u8 initOv7630_3[] = {
         0x44, 0x44, 0x00, 0x1a, 0x20, 0x20, 0x20, 0x80, /* r01 .. r08 */
         0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, /* r09 .. r10 */
-        0x00, 0x01, 0x01, 0x0a,                         /* r11 .. r14 */
+        0x00, 0x02, 0x01, 0x0a,                         /* r11 .. r14 */
         0x28, 0x1e,                     /* H & V sizes     r15 .. r16 */
         0x68, 0x8f, MCK_INIT1,                          /* r17 .. r19 */
         0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c, 0x00,       /* r1a .. r20 */
@@ -294,47 +377,65 @@ static const __u8 ov7630_sensor_init[][8] = {
         {0xd0, 0x21, 0x17, 0x1c, 0xbd, 0x06, 0xf6, 0x10},
 };
 
+static const __u8 ov7630_sensor_init_3[][8] = {
+        {0xa0, 0x21, 0x13, 0x80, 0x00,  0x00, 0x00, 0x10},
+};
+
 static const __u8 initPas106[] = {
         0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x40, 0x00, 0x00, 0x00,
         0x00, 0x00,
-        0x00, 0x00, 0x00, 0x05, 0x01, 0x00,
-        0x16, 0x12, 0x28, COMP1, MCK_INIT1,
-        0x18, 0x10, 0x04, 0x03, 0x11, 0x0c
+        0x00, 0x00, 0x00, 0x04, 0x01, 0x00,
+        0x16, 0x12, 0x24, COMP1, MCK_INIT1,
+        0x18, 0x10, 0x02, 0x02, 0x09, 0x07
 };
 /* compression 0x86 mckinit1 0x2b */
-static const __u8 pas106_data[][2] = {
-        {0x02, 0x04},           /* Pixel Clock Divider 6 */
-        {0x03, 0x13},           /* Frame Time MSB */
-/*      {0x03, 0x12},            * Frame Time MSB */
-        {0x04, 0x06},           /* Frame Time LSB */
-/*      {0x04, 0x05},            * Frame Time LSB */
-        {0x05, 0x65},           /* Shutter Time Line Offset */
-/*      {0x05, 0x6d},            * Shutter Time Line Offset */
-/*      {0x06, 0xb1},            * Shutter Time Pixel Offset */
-        {0x06, 0xcd},           /* Shutter Time Pixel Offset */
-        {0x07, 0xc1},           /* Black Level Subtract Sign */
-/*      {0x07, 0x00},            * Black Level Subtract Sign */
-        {0x08, 0x06},           /* Black Level Subtract Level */
-        {0x08, 0x06},           /* Black Level Subtract Level */
-/*      {0x08, 0x01},            * Black Level Subtract Level */
-        {0x09, 0x05},           /* Color Gain B Pixel 5 a */
-        {0x0a, 0x04},           /* Color Gain G1 Pixel 1 5 */
-        {0x0b, 0x04},           /* Color Gain G2 Pixel 1 0 5 */
-        {0x0c, 0x05},           /* Color Gain R Pixel 3 1 */
-        {0x0d, 0x00},           /* Color GainH  Pixel */
-        {0x0e, 0x0e},           /* Global Gain */
-        {0x0f, 0x00},           /* Contrast */
-        {0x10, 0x06},           /* H&V synchro polarity */
-        {0x11, 0x06},           /* ?default */
-        {0x12, 0x06},           /* DAC scale */
-        {0x14, 0x02},           /* ?default */
-        {0x13, 0x01},           /* Validate Settings */
+static const __u8 pas106_sensor_init[][8] = {
+        /* Pixel Clock Divider 6 */
+        { 0xa1, 0x40, 0x02, 0x04, 0x00, 0x00, 0x00, 0x14 },
+        /* Frame Time MSB (also seen as 0x12) */
+        { 0xa1, 0x40, 0x03, 0x13, 0x00, 0x00, 0x00, 0x14 },
+        /* Frame Time LSB (also seen as 0x05) */
+        { 0xa1, 0x40, 0x04, 0x06, 0x00, 0x00, 0x00, 0x14 },
+        /* Shutter Time Line Offset (also seen as 0x6d) */
+        { 0xa1, 0x40, 0x05, 0x65, 0x00, 0x00, 0x00, 0x14 },
+        /* Shutter Time Pixel Offset (also seen as 0xb1) */
+        { 0xa1, 0x40, 0x06, 0xcd, 0x00, 0x00, 0x00, 0x14 },
+        /* Black Level Subtract Sign (also seen 0x00) */
+        { 0xa1, 0x40, 0x07, 0xc1, 0x00, 0x00, 0x00, 0x14 },
+        /* Black Level Subtract Level (also seen 0x01) */
+        { 0xa1, 0x40, 0x08, 0x06, 0x00, 0x00, 0x00, 0x14 },
+        { 0xa1, 0x40, 0x08, 0x06, 0x00, 0x00, 0x00, 0x14 },
+        /* Color Gain B Pixel 5 a */
+        { 0xa1, 0x40, 0x09, 0x05, 0x00, 0x00, 0x00, 0x14 },
+        /* Color Gain G1 Pixel 1 5 */
+        { 0xa1, 0x40, 0x0a, 0x04, 0x00, 0x00, 0x00, 0x14 },
+        /* Color Gain G2 Pixel 1 0 5 */
+        { 0xa1, 0x40, 0x0b, 0x04, 0x00, 0x00, 0x00, 0x14 },
+        /* Color Gain R Pixel 3 1 */
+        { 0xa1, 0x40, 0x0c, 0x05, 0x00, 0x00, 0x00, 0x14 },
+        /* Color GainH  Pixel */
+        { 0xa1, 0x40, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x14 },
+        /* Global Gain */
+        { 0xa1, 0x40, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x14 },
+        /* Contrast */
+        { 0xa1, 0x40, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x14 },
+        /* H&V synchro polarity */
+        { 0xa1, 0x40, 0x10, 0x06, 0x00, 0x00, 0x00, 0x14 },
+        /* ?default */
+        { 0xa1, 0x40, 0x11, 0x06, 0x00, 0x00, 0x00, 0x14 },
+        /* DAC scale */
+        { 0xa1, 0x40, 0x12, 0x06, 0x00, 0x00, 0x00, 0x14 },
+        /* ?default */
+        { 0xa1, 0x40, 0x14, 0x02, 0x00, 0x00, 0x00, 0x14 },
+        /* Validate Settings */
+        { 0xa1, 0x40, 0x13, 0x01, 0x00, 0x00, 0x00, 0x14 },
 };
+
 static const __u8 initPas202[] = {
         0x44, 0x44, 0x21, 0x30, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00,
         0x00, 0x00,
-        0x00, 0x00, 0x00, 0x07, 0x03, 0x0a,     /* 6 */
-        0x28, 0x1e, 0x28, 0x89, 0x30,
+        0x00, 0x00, 0x00, 0x06, 0x03, 0x0a,
+        0x28, 0x1e, 0x28, 0x89, 0x20,
         0x00, 0x00, 0x02, 0x03, 0x0f, 0x0c
 };
 static const __u8 pas202_sensor_init[][8] = {
@@ -364,7 +465,7 @@ static const __u8 pas202_sensor_init[][8] = {
 static const __u8 initTas5110[] = {
         0x44, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x11, 0x00, 0x00, 0x00,
         0x00, 0x00,
-        0x00, 0x01, 0x00, 0x46, 0x09, 0x0a,     /* shift from 0x45 0x09 0x0a */
+        0x00, 0x01, 0x00, 0x45, 0x09, 0x0a,
         0x16, 0x12, 0x60, 0x86, 0x2b,
         0x14, 0x0a, 0x02, 0x02, 0x09, 0x07
 };
@@ -377,7 +478,7 @@ static const __u8 tas5110_sensor_init[][8] = {
 static const __u8 initTas5130[] = {
         0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x11, 0x00, 0x00, 0x00,
         0x00, 0x00,
-        0x00, 0x01, 0x00, 0x69, 0x0c, 0x0a,
+        0x00, 0x01, 0x00, 0x68, 0x0c, 0x0a,
         0x28, 0x1e, 0x60, COMP, MCK_INIT,
         0x18, 0x10, 0x04, 0x03, 0x11, 0x0c
 };
@@ -389,6 +490,21 @@ static const __u8 tas5130_sensor_init[][8] = {
         {0x30, 0x11, 0x02, 0x20, 0x70, 0x00, 0x00, 0x10},
 };
 
+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,
+        F_GAIN, 0, 0x21),
+SENS(initPas106, NULL, pas106_sensor_init, NULL, NULL, F_SIF, NO_EXPO|NO_FREQ,
+        0),
+SENS(initPas202, initPas202, pas202_sensor_init, NULL, NULL, 0,
+        NO_EXPO|NO_FREQ, 0),
+SENS(initTas5110, NULL, tas5110_sensor_init, NULL, NULL, F_GAIN|F_SIF,
+        NO_BRIGHTNESS|NO_FREQ, 0),
+SENS(initTas5130, NULL, tas5130_sensor_init, NULL, NULL, 0, NO_EXPO|NO_FREQ,
+        0),
+};
+
 /* get one byte in gspca_dev->usb_buf */
 static void reg_r(struct gspca_dev *gspca_dev,
                   __u16 value)
@@ -409,7 +525,7 @@ static void reg_w(struct gspca_dev *gspca_dev,
                   int len)
 {
 #ifdef GSPCA_DEBUG
-        if (len > sizeof gspca_dev->usb_buf) {
+        if (len > USB_BUF_SZ) {
                 PDEBUG(D_ERR|D_PACK, "reg_w: buffer overflow");
                 return;
         }
@@ -425,26 +541,6 @@ static void reg_w(struct gspca_dev *gspca_dev,
                         500);
 }
 
-static void reg_w_big(struct gspca_dev *gspca_dev,
-                  __u16 value,
-                  const __u8 *buffer,
-                  int len)
-{
-        __u8 *tmpbuf;
-
-        tmpbuf = kmalloc(len, GFP_KERNEL);
-        memcpy(tmpbuf, buffer, len);
-        usb_control_msg(gspca_dev->dev,
-                        usb_sndctrlpipe(gspca_dev->dev, 0),
-                        0x08,                   /* request */
-                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
-                        value,
-                        0,                      /* index */
-                        tmpbuf, len,
-                        500);
-        kfree(tmpbuf);
-}
-
 static int i2c_w(struct gspca_dev *gspca_dev, const __u8 *buffer)
 {
         int retry = 60;
@@ -487,7 +583,7 @@ static void setbrightness(struct gspca_dev *gspca_dev)
                         {0xa0, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x10};
 
                 /* change reg 0x06 */
-                i2cOV[1] = sd->sensor_addr;
+                i2cOV[1] = sensor_data[sd->sensor].sensor_addr;
                 i2cOV[3] = sd->brightness;
                 if (i2c_w(gspca_dev, i2cOV) < 0)
                         goto err;
@@ -545,9 +641,6 @@ static void setbrightness(struct gspca_dev *gspca_dev)
                         goto err;
                 break;
             }
-        case SENSOR_TAS5110:
-                /* FIXME figure out howto control brightness on TAS5110 */
-                break;
         }
         return;
 err:
@@ -577,7 +670,7 @@ static void setsensorgain(struct gspca_dev *gspca_dev)
         case SENSOR_OV7630: {
                 __u8 i2c[] = {0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10};
 
-                i2c[1] = sd->sensor_addr;
+                i2c[1] = sensor_data[sd->sensor].sensor_addr;
                 i2c[3] = gain >> 2;
                 if (i2c_w(gspca_dev, i2c) < 0)
                         goto err;
@@ -604,7 +697,7 @@ static void setgain(struct gspca_dev *gspca_dev)
         rgb_value = gain;
         reg_w(gspca_dev, 0x11, &rgb_value, 1);
 
-        if (sd->sensor_has_gain)
+        if (sensor_data[sd->sensor].flags & F_GAIN)
                 setsensorgain(gspca_dev);
 }
 
@@ -665,6 +758,11 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 else if (reg11 > 16)
                         reg11 = 16;
 
+                /* In 640x480, if the reg11 has less than 3, the image is
+                   unstable (not enough bandwidth). */
+                if (gspca_dev->width == 640 && reg11 < 3)
+                        reg11 = 3;
+
                 /* frame exposure time in ms = 1000 * reg11 / 30    ->
                 reg10 = sd->exposure * 2 * reg10_max / (1000 * reg11 / 30) */
                 reg10 = (sd->exposure * 60 * reg10_max) / (1000 * reg11);
@@ -678,13 +776,8 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 else if (reg10 > reg10_max)
                         reg10 = reg10_max;
 
-                /* In 640x480, if the reg11 has less than 3, the image is
-                   unstable (not enough bandwidth). */
-                if (gspca_dev->width == 640 && reg11 < 3)
-                        reg11 = 3;
-
                 /* Write reg 10 and reg11 low nibble */
-                i2c[1] = sd->sensor_addr;
+                i2c[1] = sensor_data[sd->sensor].sensor_addr;
                 i2c[3] = reg10;
                 i2c[4] |= reg11 - 1;
 
@@ -724,7 +817,7 @@ static void setfreq(struct gspca_dev *gspca_dev)
                                         ? 0x4f : 0x8a;
                         break;
                 }
-                i2c[1] = sd->sensor_addr;
+                i2c[1] = sensor_data[sd->sensor].sensor_addr;
                 if (i2c_w(gspca_dev, i2c) < 0)
                         PDEBUG(D_ERR, "i2c error setfreq");
                 break;
@@ -757,30 +850,19 @@ static int sd_config(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam;
-        int sif = 0;
 
-        /* nctrls depends upon the sensor, so we use a per cam copy */
-        memcpy(&sd->sd_desc, gspca_dev->sd_desc, sizeof(struct sd_desc));
-        gspca_dev->sd_desc = &sd->sd_desc;
+        reg_r(gspca_dev, 0x00);
+        if (gspca_dev->usb_buf[0] != 0x10)
+                return -ENODEV;
 
         /* copy the webcam info from the device id */
-        sd->sensor = (id->driver_info >> 24) & 0xff;
-        if (id->driver_info & (F_GAIN << 16))
-                sd->sensor_has_gain = 1;
-        if (id->driver_info & (F_AUTO << 16))
-                sd->sd_desc.dq_callback = do_autogain;
-        if (id->driver_info & (F_SIF << 16))
-                sif = 1;
-        if (id->driver_info & (F_H18 << 16))
-                sd->fr_h_sz = 18;               /* size of frame header */
-        else
-                sd->fr_h_sz = 12;
-        sd->sd_desc.nctrls = (id->driver_info >> 8) & 0xff;
-        sd->sensor_addr = id->driver_info & 0xff;
+        sd->sensor = id->driver_info >> 8;
+        sd->bridge = id->driver_info & 0xff;
+        gspca_dev->ctrl_dis = sensor_data[sd->sensor].ctrl_dis;
 
         cam = &gspca_dev->cam;
         cam->epaddr = 0x01;
-        if (!sif) {
+        if (!(sensor_data[sd->sensor].flags & F_SIF)) {
                 cam->cam_mode = vga_mode;
                 cam->nmodes = ARRAY_SIZE(vga_mode);
         } else {
@@ -790,157 +872,98 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->brightness = BRIGHTNESS_DEF;
         sd->gain = GAIN_DEF;
         sd->exposure = EXPOSURE_DEF;
-        sd->autogain = AUTOGAIN_DEF;
+        if (gspca_dev->ctrl_dis & (1 << AUTOGAIN_IDX))
+                sd->autogain = 0; /* Disable do_autogain callback */
+        else
+                sd->autogain = AUTOGAIN_DEF;
         sd->freq = FREQ_DEF;
 
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
-        reg_r(gspca_dev, 0x00);
-        if (gspca_dev->usb_buf[0] != 0x10)
-                return -ENODEV;
-        return 0;
-}
+        const __u8 stop = 0x09; /* Disable stream turn of LED */
 
-static void pas106_i2cinit(struct gspca_dev *gspca_dev)
-{
-        int i;
-        const __u8 *data;
-        __u8 i2c1[] = { 0xa1, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14 };
-
-        i = ARRAY_SIZE(pas106_data);
-        data = pas106_data[0];
-        while (--i >= 0) {
-                memcpy(&i2c1[2], data, 2);
-                                        /* copy 2 bytes from the template */
-                if (i2c_w(gspca_dev, i2c1) < 0)
-                        PDEBUG(D_ERR, "i2c error pas106");
-                data += 2;
-        }
+        reg_w(gspca_dev, 0x01, &stop, 1);
+
+        return 0;
 }
 
 /* -- start the camera -- */
 static void sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        int mode, l = 0x1f;
+        struct cam *cam = &gspca_dev->cam;
+        int mode, l;
         const __u8 *sn9c10x;
-        __u8 reg17_19[3];
-
-        mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
+        __u8 reg12_19[8];
+
+        mode = cam->cam_mode[gspca_dev->curr_mode].priv & 0x07;
+        sn9c10x = sensor_data[sd->sensor].bridge_init[sd->bridge];
+        l = sensor_data[sd->sensor].bridge_init_size[sd->bridge];
+        memcpy(reg12_19, &sn9c10x[0x12 - 1], 8);
+        reg12_19[6] = sn9c10x[0x18 - 1] | (mode << 4);
+        /* Special cases where reg 17 and or 19 value depends on mode */
         switch (sd->sensor) {
-        case SENSOR_HV7131R:
-                sn9c10x = initHv7131;
-                reg17_19[0] = 0x60;
-                reg17_19[1] = (mode << 4) | 0x8a;
-                reg17_19[2] = 0x20;
-                break;
-        case SENSOR_OV6650:
-                sn9c10x = initOv6650;
-                reg17_19[0] = 0x68;
-                reg17_19[1] = (mode << 4) | 0x8b;
-                reg17_19[2] = 0x20;
-                break;
-        case SENSOR_OV7630:
-                if (sd->fr_h_sz == 18) { /* SN9C103 */
-                        sn9c10x = initOv7630_3;
-                        l = sizeof initOv7630_3;
-                } else
-                        sn9c10x = initOv7630;
-                reg17_19[0] = 0x68;
-                reg17_19[1] = (mode << 4) | COMP2;
-                reg17_19[2] = MCK_INIT1;
-                break;
-        case SENSOR_PAS106:
-                sn9c10x = initPas106;
-                reg17_19[0] = 0x24;             /* 0x28 */
-                reg17_19[1] = (mode << 4) | COMP1;
-                reg17_19[2] = MCK_INIT1;
-                break;
         case SENSOR_PAS202:
-                sn9c10x = initPas202;
-                reg17_19[0] = mode ? 0x24 : 0x20;
-                reg17_19[1] = (mode << 4) | 0x89;
-                reg17_19[2] = 0x20;
+                reg12_19[5] = mode ? 0x24 : 0x20;
                 break;
-        case SENSOR_TAS5110:
-                sn9c10x = initTas5110;
-                reg17_19[0] = 0x60;
-                reg17_19[1] = (mode << 4) | 0x86;
-                reg17_19[2] = 0x2b;             /* 0xf3; */
-                break;
-        default:
-/*      case SENSOR_TAS5130CXX: */
-                sn9c10x = initTas5130;
-                reg17_19[0] = 0x60;
-                reg17_19[1] = (mode << 4) | COMP;
-                reg17_19[2] = mode ? 0x23 : 0x43;
+        case SENSOR_TAS5130CXX:
+                /* probably not mode specific at all most likely the upper
+                   nibble of 0x19 is exposure (clock divider) just as with
+                   the tas5110, we need someone to test this. */
+                reg12_19[7] = mode ? 0x23 : 0x43;
                 break;
         }
+        /* Disable compression when the raw bayer format has been selected */
+        if (cam->cam_mode[gspca_dev->curr_mode].priv & MODE_RAW)
+                reg12_19[6] &= ~0x80;
+
+        /* Vga mode emulation on SIF sensor? */
+        if (cam->cam_mode[gspca_dev->curr_mode].priv & MODE_REDUCED_SIF) {
+                reg12_19[0] += 16; /* 0x12: hstart adjust */
+                reg12_19[1] += 24; /* 0x13: vstart adjust */
+                reg12_19[3] = 320 / 16; /* 0x15: hsize */
+                reg12_19[4] = 240 / 16; /* 0x16: vsize */
+        }
 
         /* reg 0x01 bit 2 video transfert on */
         reg_w(gspca_dev, 0x01, &sn9c10x[0x01 - 1], 1);
         /* reg 0x17 SensorClk enable inv Clk 0x60 */
         reg_w(gspca_dev, 0x17, &sn9c10x[0x17 - 1], 1);
         /* Set the registers from the template */
-        reg_w_big(gspca_dev, 0x01, sn9c10x, l);
-        switch (sd->sensor) {
-        case SENSOR_HV7131R:
-                i2c_w_vector(gspca_dev, hv7131_sensor_init,
-                                sizeof hv7131_sensor_init);
-                break;
-        case SENSOR_OV6650:
-                i2c_w_vector(gspca_dev, ov6650_sensor_init,
-                                sizeof ov6650_sensor_init);
-                break;
-        case SENSOR_OV7630:
-                i2c_w_vector(gspca_dev, ov7630_sensor_init,
-                                sizeof ov7630_sensor_init);
-                if (sd->fr_h_sz == 18) { /* SN9C103 */
-                        const __u8 i2c[] = { 0xa0, 0x21, 0x13, 0x80, 0x00,
-                                                0x00, 0x00, 0x10 };
-                        i2c_w(gspca_dev, i2c);
-                }
-                break;
-        case SENSOR_PAS106:
-                pas106_i2cinit(gspca_dev);
-                break;
-        case SENSOR_PAS202:
-                i2c_w_vector(gspca_dev, pas202_sensor_init,
-                                sizeof pas202_sensor_init);
-                break;
-        case SENSOR_TAS5110:
-                i2c_w_vector(gspca_dev, tas5110_sensor_init,
-                                sizeof tas5110_sensor_init);
-                break;
-        default:
-/*      case SENSOR_TAS5130CXX: */
-                i2c_w_vector(gspca_dev, tas5130_sensor_init,
-                                sizeof tas5130_sensor_init);
-                break;
-        }
+        reg_w(gspca_dev, 0x01, sn9c10x, l);
+
+        /* Init the sensor */
+        i2c_w_vector(gspca_dev, sensor_data[sd->sensor].sensor_init,
+                        sensor_data[sd->sensor].sensor_init_size);
+        if (sensor_data[sd->sensor].sensor_bridge_init[sd->bridge])
+                i2c_w_vector(gspca_dev,
+                        sensor_data[sd->sensor].sensor_bridge_init[sd->bridge],
+                        sensor_data[sd->sensor].sensor_bridge_init_size[
+                                sd->bridge]);
+
         /* H_size V_size 0x28, 0x1e -> 640x480. 0x16, 0x12 -> 352x288 */
-        reg_w(gspca_dev, 0x15, &sn9c10x[0x15 - 1], 2);
+        reg_w(gspca_dev, 0x15, &reg12_19[3], 2);
         /* compression register */
-        reg_w(gspca_dev, 0x18, &reg17_19[1], 1);
+        reg_w(gspca_dev, 0x18, &reg12_19[6], 1);
         /* H_start */
-        reg_w(gspca_dev, 0x12, &sn9c10x[0x12 - 1], 1);
+        reg_w(gspca_dev, 0x12, &reg12_19[0], 1);
         /* V_START */
-        reg_w(gspca_dev, 0x13, &sn9c10x[0x13 - 1], 1);
+        reg_w(gspca_dev, 0x13, &reg12_19[1], 1);
         /* reset 0x17 SensorClk enable inv Clk 0x60 */
                                 /*fixme: ov7630 [17]=68 8f (+20 if 102)*/
-        reg_w(gspca_dev, 0x17, &reg17_19[0], 1);
+        reg_w(gspca_dev, 0x17, &reg12_19[5], 1);
         /*MCKSIZE ->3 */        /*fixme: not ov7630*/
-        reg_w(gspca_dev, 0x19, &reg17_19[2], 1);
+        reg_w(gspca_dev, 0x19, &reg12_19[7], 1);
         /* AE_STRX AE_STRY AE_ENDX AE_ENDY */
         reg_w(gspca_dev, 0x1c, &sn9c10x[0x1c - 1], 4);
         /* Enable video transfert */
         reg_w(gspca_dev, 0x01, &sn9c10x[0], 1);
         /* Compression */
-        reg_w(gspca_dev, 0x18, &reg17_19[1], 2);
+        reg_w(gspca_dev, 0x18, &reg12_19[6], 2);
         msleep(20);
 
         sd->reg11 = -1;
@@ -957,18 +980,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
 {
-        __u8 ByteSend;
-
-        ByteSend = 0x09;        /* 0X00 */
-        reg_w(gspca_dev, 0x01, &ByteSend, 1);
-}
-
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
+        sd_init(gspca_dev);
 }
 
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
@@ -978,6 +990,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 {
         int i;
         struct sd *sd = (struct sd *) gspca_dev;
+        struct cam *cam = &gspca_dev->cam;
 
         /* frames start with:
          *      ff ff 00 c4 c4 96       synchro
@@ -998,20 +1011,31 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                             && data[5 + i] == 0x96) {   /* start of frame */
                                 int lum = -1;
                                 int pkt_type = LAST_PACKET;
+                                int fr_h_sz = (sd->bridge == BRIDGE_103) ?
+                                        18 : 12;
 
-                                if (len - i < sd->fr_h_sz) {
+                                if (len - i < fr_h_sz) {
                                         PDEBUG(D_STREAM, "packet too short to"
                                                 " get avg brightness");
-                                } else if (sd->fr_h_sz == 12) {
-                                        lum = data[i + 8] + (data[i + 9] << 8);
-                                } else {
+                                } else if (sd->bridge == BRIDGE_103) {
                                         lum = data[i + 9] +
                                                 (data[i + 10] << 8);
+                                } else {
+                                        lum = data[i + 8] + (data[i + 9] << 8);
                                 }
-                                if (lum == 0) {
+                                /* When exposure changes midway a frame we
+                                   get a lum of 0 in this case drop 2 frames
+                                   as the frames directly after an exposure
+                                   change have an unstable image. Sometimes lum
+                                   *really* is 0 (cam used in low light with
+                                   low exposure setting), so do not drop frames
+                                   if the previous lum was 0 too. */
+                                if (lum == 0 && sd->prev_avg_lum != 0) {
                                         lum = -1;
                                         sd->frames_to_drop = 2;
-                                }
+                                        sd->prev_avg_lum = 0;
+                                } else
+                                        sd->prev_avg_lum = lum;
                                 atomic_set(&sd->avg_lum, lum);
 
                                 if (sd->frames_to_drop) {
@@ -1021,14 +1045,25 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 
                                 frame = gspca_frame_add(gspca_dev, pkt_type,
                                                         frame, data, 0);
-                                data += i + sd->fr_h_sz;
-                                len -= i + sd->fr_h_sz;
+                                data += i + fr_h_sz;
+                                len -= i + fr_h_sz;
                                 gspca_frame_add(gspca_dev, FIRST_PACKET,
                                                 frame, data, len);
                                 return;
                         }
                 }
         }
+
+        if (cam->cam_mode[gspca_dev->curr_mode].priv & MODE_RAW) {
+                /* In raw mode we sometimes get some garbage after the frame
+                   ignore this */
+                int used = frame->data_end - frame->data;
+                int size = cam->cam_mode[gspca_dev->curr_mode].sizeimage;
+
+                if (used + len > size)
+                        len = size - used;
+        }
+
         gspca_frame_add(gspca_dev, INTER_PACKET,
                         frame, data, len);
 }
@@ -1162,58 +1197,45 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
         .querymenu = sd_querymenu,
+        .dq_callback = do_autogain,
 };
 
 /* -- module initialisation -- */
-#define SFCI(sensor, flags, nctrls, i2c_addr) \
-        .driver_info = (SENSOR_ ## sensor << 24) \
-                        | ((flags) << 16) \
-                        | ((nctrls) << 8) \
-                        | (i2c_addr)
+#define SB(sensor, bridge) \
+        .driver_info = (SENSOR_ ## sensor << 8) | BRIDGE_ ## bridge
+
+
 static __devinitdata struct usb_device_id device_table[] = {
-#ifndef CONFIG_USB_SN9C102
-        {USB_DEVICE(0x0c45, 0x6001),                    /* SN9C102 */
-                        SFCI(TAS5110, F_GAIN|F_AUTO|F_SIF, 4, 0)},
-        {USB_DEVICE(0x0c45, 0x6005),                    /* SN9C101 */
-                        SFCI(TAS5110, F_GAIN|F_AUTO|F_SIF, 4, 0)},
-        {USB_DEVICE(0x0c45, 0x6007),                    /* SN9C101 */
-                        SFCI(TAS5110, F_GAIN|F_AUTO|F_SIF, 4, 0)},
-        {USB_DEVICE(0x0c45, 0x6009),                    /* SN9C101 */
-                        SFCI(PAS106, F_SIF, 2, 0)},
-        {USB_DEVICE(0x0c45, 0x600d),                    /* SN9C101 */
-                        SFCI(PAS106, F_SIF, 2, 0)},
+        {USB_DEVICE(0x0c45, 0x6001), SB(TAS5110, 102)}, /* TAS5110C1B */
+        {USB_DEVICE(0x0c45, 0x6005), SB(TAS5110, 101)}, /* TAS5110C1B */
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
+        {USB_DEVICE(0x0c45, 0x6007), SB(TAS5110, 101)}, /* TAS5110D */
+        {USB_DEVICE(0x0c45, 0x6009), SB(PAS106, 101)},
+        {USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)},
 #endif
-        {USB_DEVICE(0x0c45, 0x6011),            /* SN9C101 - SN9C101G */
-                        SFCI(OV6650, F_GAIN|F_AUTO|F_SIF, 5, 0x60)},
-#ifndef CONFIG_USB_SN9C102
-        {USB_DEVICE(0x0c45, 0x6019),                    /* SN9C101 */
-                        SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
-        {USB_DEVICE(0x0c45, 0x6024),                    /* SN9C102 */
-                        SFCI(TAS5130CXX, 0, 2, 0)},
-        {USB_DEVICE(0x0c45, 0x6025),                    /* SN9C102 */
-                        SFCI(TAS5130CXX, 0, 2, 0)},
-        {USB_DEVICE(0x0c45, 0x6028),                    /* SN9C102 */
-                        SFCI(PAS202, 0, 2, 0)},
-        {USB_DEVICE(0x0c45, 0x6029),                    /* SN9C101 */
-                        SFCI(PAS106, F_SIF, 2, 0)},
-        {USB_DEVICE(0x0c45, 0x602c),                    /* SN9C102 */
-                        SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
-        {USB_DEVICE(0x0c45, 0x602d),                    /* SN9C102 */
-                        SFCI(HV7131R, 0, 2, 0)},
-        {USB_DEVICE(0x0c45, 0x602e),                    /* SN9C102 */
-                        SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
-        {USB_DEVICE(0x0c45, 0x60af),                    /* SN9C103 */
-                        SFCI(PAS202, F_H18, 2, 0)},
-        {USB_DEVICE(0x0c45, 0x60b0),                    /* SN9C103 */
-                        SFCI(OV7630, F_GAIN|F_AUTO|F_H18, 5, 0x21)},
+        {USB_DEVICE(0x0c45, 0x6011), SB(OV6650, 101)},
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
+        {USB_DEVICE(0x0c45, 0x6019), SB(OV7630, 101)},
+        {USB_DEVICE(0x0c45, 0x6024), SB(TAS5130CXX, 102)},
+        {USB_DEVICE(0x0c45, 0x6025), SB(TAS5130CXX, 102)},
+        {USB_DEVICE(0x0c45, 0x6028), SB(PAS202, 102)},
+        {USB_DEVICE(0x0c45, 0x6029), SB(PAS106, 102)},
+        {USB_DEVICE(0x0c45, 0x602c), SB(OV7630, 102)},
 #endif
+        {USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)},
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
+        {USB_DEVICE(0x0c45, 0x602e), SB(OV7630, 102)},
+#endif
+        {USB_DEVICE(0x0c45, 0x608f), SB(OV7630, 103)},
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
+        {USB_DEVICE(0x0c45, 0x60af), SB(PAS202, 103)},
+#endif
+        {USB_DEVICE(0x0c45, 0x60b0), SB(OV7630, 103)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -1231,6 +1253,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 245a30ec5fb1..d75b1d20b318 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -54,8 +54,10 @@ struct sd {
 #define SENSOR_HV7131R 0
 #define SENSOR_MI0360 1
 #define SENSOR_MO4000 2
-#define SENSOR_OV7648 3
-#define SENSOR_OV7660 4
+#define SENSOR_OM6802 3
+#define SENSOR_OV7630 4
+#define SENSOR_OV7648 5
+#define SENSOR_OV7660 6
         unsigned char i2c_base;
 };
 
@@ -76,7 +78,8 @@ static struct ctrl sd_ctrls[] = {
                 .type    = V4L2_CTRL_TYPE_INTEGER,
                 .name    = "Brightness",
                 .minimum = 0,
-                .maximum = 0xffff,
+#define BRIGHTNESS_MAX 0xffff
+                .maximum = BRIGHTNESS_MAX,
                 .step    = 1,
 #define BRIGHTNESS_DEF 0x7fff
                 .default_value = BRIGHTNESS_DEF,
@@ -90,7 +93,8 @@ static struct ctrl sd_ctrls[] = {
                 .type    = V4L2_CTRL_TYPE_INTEGER,
                 .name    = "Contrast",
                 .minimum = 0,
-                .maximum = 127,
+#define CONTRAST_MAX 127
+                .maximum = CONTRAST_MAX,
                 .step    = 1,
 #define CONTRAST_DEF 63
                 .default_value = CONTRAST_DEF,
@@ -104,14 +108,15 @@ static struct ctrl sd_ctrls[] = {
                 .type    = V4L2_CTRL_TYPE_INTEGER,
                 .name    = "Color",
                 .minimum = 0,
-                .maximum = 255,
+                .maximum = 64,
                 .step    = 1,
-#define COLOR_DEF 127
+#define COLOR_DEF 32
                 .default_value = COLOR_DEF,
             },
             .set = sd_setcolors,
             .get = sd_getcolors,
         },
+#define AUTOGAIN_IDX 3
         {
             {
                 .id      = V4L2_CID_AUTOGAIN,
@@ -131,7 +136,7 @@ static struct ctrl sd_ctrls[] = {
 static struct v4l2_pix_format vga_mode[] = {
         {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 160,
-                .sizeimage = 160 * 120 * 3 / 8 + 590,
+                .sizeimage = 160 * 120 * 4 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
                 .priv = 2},
         {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
@@ -180,6 +185,31 @@ static const __u8 sn_mo4000[] = {
         0x08,   0x00,   0x00,   0x00,   0x00,   0x00,   0x00,   0x00
 };
 
+static const __u8 sn_om6802[] = {
+/*      reg0    reg1    reg2    reg3    reg4    reg5    reg6    reg7 */
+        0x00,   0x23,   0x72,   0x00,   0x1a,   0x34,   0x27,   0x20,
+/*      reg8    reg9    rega    regb    regc    regd    rege    regf */
+        0x80,   0x34,   0x00,   0x00,   0x00,   0x00,   0x00,   0x00,
+/*      reg10   reg11   reg12   reg13   reg14   reg15   reg16   reg17 */
+        0x03,   0x00,   0x51,   0x01,   0x00,   0x28,   0x1e,   0x40,
+/*      reg18   reg19   reg1a   reg1b   reg1c   reg1d   reg1e   reg1f */
+        0x05,   0x00,   0x00,   0x00,   0x00,   0x00,   0x00,   0x00,
+        0x08,   0x22,   0x44,   0x63,   0x7d,   0x92,   0xa3,   0xaf,
+        0xbc,   0xc4,   0xcd,   0xd5,   0xdc,   0xe1,   0xe8,   0xef,
+        0xf7
+};
+
+static const __u8 sn_ov7630[] = {
+/*      reg0    reg1    reg2    reg3    reg4    reg5    reg6    reg7 */
+        0x00,   0x21,   0x40,   0x00,   0x1a,   0x20,   0x1f,   0x20,
+/*      reg8    reg9    rega    regb    regc    regd    rege    regf */
+        0xa1,   0x21,   0x76,   0x21,   0x00,   0x00,   0x00,   0x10,
+/*      reg10   reg11   reg12   reg13   reg14   reg15   reg16   reg17 */
+        0x03,   0x00,   0x04,   0x01,   0x0a,   0x28,   0x1e,   0xc2,
+/*      reg18   reg19   reg1a   reg1b   reg1c   reg1d   reg1e   reg1f */
+        0x0b,   0x00,   0x00,   0x00,   0x00,   0x00
+};
+
 static const __u8 sn_ov7648[] = {
 /*      reg0    reg1    reg2    reg3    reg4    reg5    reg6    reg7 */
         0x00,   0x21,   0x62,   0x00,   0x1a,   0x20,   0x20,   0x20,
@@ -207,31 +237,22 @@ static const __u8 *sn_tb[] = {
         sn_hv7131,
         sn_mi0360,
         sn_mo4000,
+        sn_om6802,
+        sn_ov7630,
         sn_ov7648,
         sn_ov7660
 };
 
-static const __u8 regsn20[] = {
+static const __u8 gamma_def[] = {
         0x00, 0x2d, 0x46, 0x5a, 0x6c, 0x7c, 0x8b, 0x99,
         0xa6, 0xb2, 0xbf, 0xca, 0xd5, 0xe0, 0xeb, 0xf5, 0xff
 };
-static const __u8 regsn20_sn9c325[] = {
-        0x0a, 0x3a, 0x56, 0x6c, 0x7e, 0x8d, 0x9a, 0xa4,
-        0xaf, 0xbb, 0xc5, 0xcd, 0xd5, 0xde, 0xe8, 0xed, 0xf5
-};
 
 static const __u8 reg84[] = {
         0x14, 0x00, 0x27, 0x00, 0x07, 0x00, 0xe5, 0x0f,
         0xe4, 0x0f, 0x38, 0x00, 0x3e, 0x00, 0xc3, 0x0f,
-/*      0x00, 0x00, 0x00, 0x00, 0x00 */
-        0xf7, 0x0f, 0x0a, 0x00, 0x00
-};
-static const __u8 reg84_sn9c325[] = {
-        0x14, 0x00, 0x27, 0x00, 0x07, 0x00, 0xe4, 0x0f,
-        0xd3, 0x0f, 0x4b, 0x00, 0x48, 0x00, 0xc0, 0x0f,
-        0xf8, 0x0f, 0x00, 0x00, 0x00
+        0xf7, 0x0f, 0x00, 0x00, 0x00
 };
-
 static const __u8 hv7131r_sensor_init[][8] = {
         {0xC1, 0x11, 0x01, 0x08, 0x01, 0x00, 0x00, 0x10},
         {0xB1, 0x11, 0x34, 0x17, 0x7F, 0x00, 0x00, 0x10},
@@ -340,6 +361,92 @@ static const __u8 mo4000_sensor_init[][8] = {
         {0xa1, 0x21, 0x11, 0x38, 0x00, 0x00, 0x00, 0x10},
         {}
 };
+static __u8 om6802_sensor_init[][8] = {
+        {0xa0, 0x34, 0x90, 0x05, 0x00, 0x00, 0x00, 0x10},
+        {0xa0, 0x34, 0x49, 0x85, 0x00, 0x00, 0x00, 0x10},
+        {0xa0, 0x34, 0x5a, 0xc0, 0x00, 0x00, 0x00, 0x10},
+        {0xa0, 0x34, 0xdd, 0x18, 0x00, 0x00, 0x00, 0x10},
+/*      {0xa0, 0x34, 0xfb, 0x11, 0x00, 0x00, 0x00, 0x10}, */
+        {0xa0, 0x34, 0xf0, 0x04, 0x00, 0x00, 0x00, 0x10},
+                                        /* white balance & auto-exposure */
+/*      {0xa0, 0x34, 0xf1, 0x02, 0x00, 0x00, 0x00, 0x10},
+                                                         * set color mode */
+/*      {0xa0, 0x34, 0xfe, 0x5b, 0x00, 0x00, 0x00, 0x10},
+                                                 * max AGC value in AE */
+/*      {0xa0, 0x34, 0xe5, 0x00, 0x00, 0x00, 0x00, 0x10},
+                                                         * preset AGC */
+/*      {0xa0, 0x34, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x10},
+                                                 * preset brightness */
+/*      {0xa0, 0x34, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x10},
+                                                         * preset contrast */
+/*      {0xa0, 0x34, 0xe8, 0x31, 0x00, 0x00, 0x00, 0x10},
+                                                         * preset gamma */
+        {0xa0, 0x34, 0xe9, 0x0f, 0x00, 0x00, 0x00, 0x10},
+                                        /* luminance mode (0x4f = AE) */
+        {0xa0, 0x34, 0xe4, 0xff, 0x00, 0x00, 0x00, 0x10},
+                                                        /* preset shutter */
+/*      {0xa0, 0x34, 0xef, 0x00, 0x00, 0x00, 0x00, 0x10},
+                                                         * auto frame rate */
+/*      {0xa0, 0x34, 0xfb, 0xee, 0x00, 0x00, 0x00, 0x10}, */
+
+/*      {0xa0, 0x34, 0x71, 0x84, 0x00, 0x00, 0x00, 0x10}, */
+/*      {0xa0, 0x34, 0x72, 0x05, 0x00, 0x00, 0x00, 0x10}, */
+/*      {0xa0, 0x34, 0x68, 0x80, 0x00, 0x00, 0x00, 0x10}, */
+/*      {0xa0, 0x34, 0x69, 0x01, 0x00, 0x00, 0x00, 0x10}, */
+        {}
+};
+static const __u8 ov7630_sensor_init[][8] = {
+        {0xa1, 0x21, 0x76, 0x01, 0x00, 0x00, 0x00, 0x10},
+        {0xa1, 0x21, 0x12, 0xc8, 0x00, 0x00, 0x00, 0x10},
+/* win: delay 20ms */
+        {0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},
+        {0xa1, 0x21, 0x12, 0xc8, 0x00, 0x00, 0x00, 0x10},
+/* win: delay 20ms */
+        {0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},
+/* win: i2c_r from 00 to 80 */
+        {0xd1, 0x21, 0x03, 0x80, 0x10, 0x20, 0x80, 0x10},
+        {0xb1, 0x21, 0x0c, 0x20, 0x20, 0x00, 0x00, 0x10},
+        {0xd1, 0x21, 0x11, 0x00, 0x48, 0xc0, 0x00, 0x10},
+        {0xb1, 0x21, 0x15, 0x80, 0x03, 0x00, 0x00, 0x10},
+        {0xd1, 0x21, 0x17, 0x1b, 0xbd, 0x05, 0xf6, 0x10},
+        {0xa1, 0x21, 0x1b, 0x04, 0x00, 0x00, 0x00, 0x10},
+        {0xd1, 0x21, 0x1f, 0x00, 0x80, 0x80, 0x80, 0x10},
+        {0xd1, 0x21, 0x23, 0xde, 0x10, 0x8a, 0xa0, 0x10},
+        {0xc1, 0x21, 0x27, 0xca, 0xa2, 0x74, 0x00, 0x10},
+        {0xd1, 0x21, 0x2a, 0x88, 0x00, 0x88, 0x01, 0x10},
+        {0xc1, 0x21, 0x2e, 0x80, 0x00, 0x18, 0x00, 0x10},
+        {0xa1, 0x21, 0x21, 0x08, 0x00, 0x00, 0x00, 0x10},
+        {0xa1, 0x21, 0x22, 0x00, 0x00, 0x00, 0x00, 0x10},
+        {0xa1, 0x21, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x10},
+        {0xb1, 0x21, 0x32, 0xc2, 0x08, 0x00, 0x00, 0x10},
+        {0xb1, 0x21, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x10},
+        {0xd1, 0x21, 0x60, 0x05, 0x40, 0x12, 0x57, 0x10},
+        {0xa1, 0x21, 0x64, 0x73, 0x00, 0x00, 0x00, 0x10},
+        {0xd1, 0x21, 0x65, 0x00, 0x55, 0x01, 0xac, 0x10},
+        {0xa1, 0x21, 0x69, 0x38, 0x00, 0x00, 0x00, 0x10},
+        {0xd1, 0x21, 0x6f, 0x1f, 0x01, 0x00, 0x10, 0x10},
+        {0xd1, 0x21, 0x73, 0x50, 0x20, 0x02, 0x01, 0x10},
+        {0xd1, 0x21, 0x77, 0xf3, 0x90, 0x98, 0x98, 0x10},
+        {0xc1, 0x21, 0x7b, 0x00, 0x4c, 0xf7, 0x00, 0x10},
+        {0xd1, 0x21, 0x17, 0x1b, 0xbd, 0x05, 0xf6, 0x10},
+        {0xa1, 0x21, 0x1b, 0x04, 0x00, 0x00, 0x00, 0x10},
+/* */
+        {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, 0x10, 0x32, 0x00, 0x00, 0x00, 0x10},
+        {0xa1, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10},
+        {0xb1, 0x21, 0x01, 0x80, 0x80, 0x00, 0x00, 0x10},
+/* */
+        {0xa1, 0x21, 0x11, 0x00, 0x00, 0x00, 0x00, 0x10},
+        {0xa1, 0x21, 0x2a, 0x88, 0x00, 0x00, 0x00, 0x10},
+        {0xa1, 0x21, 0x2b, 0x34, 0x00, 0x00, 0x00, 0x10},
+/* */
+        {0xa1, 0x21, 0x10, 0x83, 0x00, 0x00, 0x00, 0x10},
+/*      {0xb1, 0x21, 0x01, 0x88, 0x70, 0x00, 0x00, 0x10}, */
+        {}
+};
 static const __u8 ov7660_sensor_init[][8] = {
         {0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, /* reset SCCB */
 /*              (delay 20ms) */
@@ -506,10 +613,16 @@ static const __u8 qtable4[] = {
         0x29, 0x29, 0x29, 0x29
 };
 
-/* read <len> bytes (len < sizeof gspca_dev->usb_buf) to gspca_dev->usb_buf */
+/* read <len> bytes to gspca_dev->usb_buf */
 static void reg_r(struct gspca_dev *gspca_dev,
                   __u16 value, int len)
 {
+#ifdef GSPCA_DEBUG
+        if (len > USB_BUF_SZ) {
+                err("reg_r: buffer overflow");
+                return;
+        }
+#endif
         usb_control_msg(gspca_dev->dev,
                         usb_rcvctrlpipe(gspca_dev->dev, 0),
                         0,
@@ -542,29 +655,20 @@ static void reg_w(struct gspca_dev *gspca_dev,
 {
         PDEBUG(D_USBO, "reg_w [%02x] = %02x %02x ..",
                 value, buffer[0], buffer[1]);
-        if (len <= sizeof gspca_dev->usb_buf) {
-                memcpy(gspca_dev->usb_buf, buffer, len);
-                usb_control_msg(gspca_dev->dev,
-                                usb_sndctrlpipe(gspca_dev->dev, 0),
-                                0x08,
-                           USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
-                                value, 0,
-                                gspca_dev->usb_buf, len,
-                                500);
-        } else {
-                __u8 *tmpbuf;
-
-                tmpbuf = kmalloc(len, GFP_KERNEL);
-                memcpy(tmpbuf, buffer, len);
-                usb_control_msg(gspca_dev->dev,
-                                usb_sndctrlpipe(gspca_dev->dev, 0),
-                                0x08,
-                           USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
-                                value, 0,
-                                tmpbuf, len,
-                                500);
-                kfree(tmpbuf);
+#ifdef GSPCA_DEBUG
+        if (len > USB_BUF_SZ) {
+                err("reg_w: buffer overflow");
+                return;
         }
+#endif
+        memcpy(gspca_dev->usb_buf, buffer, len);
+        usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
+                        0x08,
+                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
+                        value, 0,
+                        gspca_dev->usb_buf, len,
+                        500);
 }
 
 /* I2C write 1 byte */
@@ -665,7 +769,7 @@ static int configure_gpio(struct gspca_dev *gspca_dev,
         static const __u8 regd4[] = {0x60, 0x00, 0x00};
 
         reg_w1(gspca_dev, 0xf1, 0x00);
-        reg_w1(gspca_dev, 0x01, 0x00);          /*jfm was sn9c1xx[1] in v1*/
+        reg_w1(gspca_dev, 0x01, sn9c1xx[1]);
 
         /* configure gpio */
         reg_w(gspca_dev, 0x01, &sn9c1xx[1], 2);
@@ -685,21 +789,41 @@ static int configure_gpio(struct gspca_dev *gspca_dev,
 
         reg_w(gspca_dev, 0x03, &sn9c1xx[3], 0x0f);
 
-        switch (sd->bridge) {
-        case BRIDGE_SN9C325:
+        switch (sd->sensor) {
+        case SENSOR_OM6802:
+                reg_w1(gspca_dev, 0x02, 0x71);
+                reg_w1(gspca_dev, 0x01, 0x42);
+                reg_w1(gspca_dev, 0x17, 0x64);
+                reg_w1(gspca_dev, 0x01, 0x42);
+                break;
+/*jfm: from win trace */
+        case SENSOR_OV7630:
+                reg_w1(gspca_dev, 0x01, 0x61);
+                reg_w1(gspca_dev, 0x17, 0xe2);
+                reg_w1(gspca_dev, 0x01, 0x60);
+                reg_w1(gspca_dev, 0x01, 0x40);
+                break;
+        case SENSOR_OV7648:
                 reg_w1(gspca_dev, 0x01, 0x43);
                 reg_w1(gspca_dev, 0x17, 0xae);
                 reg_w1(gspca_dev, 0x01, 0x42);
                 break;
+/*jfm: from win trace */
+        case SENSOR_OV7660:
+                reg_w1(gspca_dev, 0x01, 0x61);
+                reg_w1(gspca_dev, 0x17, 0x20);
+                reg_w1(gspca_dev, 0x01, 0x60);
+                reg_w1(gspca_dev, 0x01, 0x40);
+                break;
         default:
                 reg_w1(gspca_dev, 0x01, 0x43);
                 reg_w1(gspca_dev, 0x17, 0x61);
                 reg_w1(gspca_dev, 0x01, 0x42);
-        }
-
-        if (sd->sensor == SENSOR_HV7131R) {
-                if (probesensor(gspca_dev) < 0)
-                        return -ENODEV;
+                if (sd->sensor == SENSOR_HV7131R) {
+                        if (probesensor(gspca_dev) < 0)
+                                return -ENODEV;
+                }
+                break;
         }
         return 0;
 }
@@ -737,6 +861,40 @@ static void mo4000_InitSensor(struct gspca_dev *gspca_dev)
         }
 }
 
+static void om6802_InitSensor(struct gspca_dev *gspca_dev)
+{
+        int i = 0;
+
+        while (om6802_sensor_init[i][0]) {
+                i2c_w8(gspca_dev, om6802_sensor_init[i]);
+                i++;
+        }
+}
+
+static void ov7630_InitSensor(struct gspca_dev *gspca_dev)
+{
+        int i = 0;
+
+        i2c_w8(gspca_dev, ov7630_sensor_init[i]);       /* 76 01 */
+        i++;
+        i2c_w8(gspca_dev, ov7630_sensor_init[i]);       /* 12 c8 (RGB+SRST) */
+        i++;
+        msleep(20);
+        i2c_w8(gspca_dev, ov7630_sensor_init[i]);       /* 12 48 */
+        i++;
+        i2c_w8(gspca_dev, ov7630_sensor_init[i]);       /* 12 c8 */
+        i++;
+        msleep(20);
+        i2c_w8(gspca_dev, ov7630_sensor_init[i]);       /* 12 48 */
+        i++;
+/*jfm:win i2c_r from 00 to 80*/
+
+        while (ov7630_sensor_init[i][0]) {
+                i2c_w8(gspca_dev, ov7630_sensor_init[i]);
+                i++;
+        }
+}
+
 static void ov7648_InitSensor(struct gspca_dev *gspca_dev)
 {
         int i = 0;
@@ -783,11 +941,19 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->autogain = AUTOGAIN_DEF;
         sd->ag_cnt = -1;
 
+        switch (sd->sensor) {
+        case SENSOR_OV7630:
+        case SENSOR_OV7648:
+        case SENSOR_OV7660:
+                gspca_dev->ctrl_dis = (1 << AUTOGAIN_IDX);
+                break;
+        }
+
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 /*      const __u8 *sn9c1xx; */
@@ -891,16 +1057,53 @@ static unsigned int setexposure(struct gspca_dev *gspca_dev,
                         | ((expoMo10[3] & 0x30) >> 4));
                 break;
             }
+        case SENSOR_OM6802: {
+                __u8 gainOm[] =
+                        { 0xa0, 0x34, 0xe5, 0x00, 0x00, 0x00, 0x00, 0x10 };
+
+                if (expo > 0x03ff)
+                        expo = 0x03ff;
+                 if (expo < 0x0001)
+                        expo = 0x0001;
+                gainOm[3] = expo >> 2;
+                i2c_w8(gspca_dev, gainOm);
+                reg_w1(gspca_dev, 0x96, (expo >> 5) & 0x1f);
+                PDEBUG(D_CONF, "set exposure %d", gainOm[3]);
+                break;
+            }
         }
         return expo;
 }
 
+/* this function is used for sensors o76xx only */
+static void setbrightcont(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        unsigned 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
+                        / BRIGHTNESS_MAX;
+        else
+                val = 0;
+        reg84_full[0x12] = val;                 /* 00..1f */
+        reg_w(gspca_dev, 0x84, reg84_full, sizeof reg84_full);
+}
+
+/* sensor != ov76xx */
 static void setbrightness(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         unsigned int expo;
         __u8 k2;
 
+        k2 = sd->brightness >> 10;
         switch (sd->sensor) {
         case SENSOR_HV7131R:
                 expo = sd->brightness << 4;
@@ -915,12 +1118,17 @@ static void setbrightness(struct gspca_dev *gspca_dev)
                 expo = sd->brightness >> 4;
                 sd->exposure = setexposure(gspca_dev, expo);
                 break;
+        case SENSOR_OM6802:
+                expo = sd->brightness >> 6;
+                sd->exposure = setexposure(gspca_dev, expo);
+                k2 = sd->brightness >> 11;
+                break;
         }
 
-        k2 = sd->brightness >> 10;
         reg_w1(gspca_dev, 0x96, k2);
 }
 
+/* sensor != ov76xx */
 static void setcontrast(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -937,31 +1145,30 @@ static void setcontrast(struct gspca_dev *gspca_dev)
 static void setcolors(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        __u8 data;
-        int colour;
+        __u8 blue, red;
 
-        colour = sd->colors - 128;
-        if (colour > 0)
-                data = (colour + 32) & 0x7f;    /* blue */
-        else
-                data = (-colour + 32) & 0x7f;   /* red */
-        reg_w1(gspca_dev, 0x05, data);
+        if (sd->colors >= 32) {
+                red = 32 + (sd->colors - 32) / 2;
+                blue = 64 - sd->colors;
+        } else {
+                red = sd->colors;
+                blue = 32 + (32 - sd->colors) / 2;
+        }
+        reg_w1(gspca_dev, 0x05, red);
+/*      reg_w1(gspca_dev, 0x07, 32); */
+        reg_w1(gspca_dev, 0x06, blue);
 }
 
 static void setautogain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        switch (sd->sensor) {
-        case SENSOR_HV7131R:
-        case SENSOR_MO4000:
-        case SENSOR_MI0360:
-                if (sd->autogain)
-                        sd->ag_cnt = AG_CNT_START;
-                else
-                        sd->ag_cnt = -1;
-                break;
-        }
+        if (gspca_dev->ctrl_dis & (1 << AUTOGAIN_IDX))
+                return;
+        if (sd->autogain)
+                sd->ag_cnt = AG_CNT_START;
+        else
+                sd->ag_cnt = -1;
 }
 
 /* -- start the camera -- */
@@ -975,13 +1182,12 @@ static void sd_start(struct gspca_dev *gspca_dev)
         static const __u8 C0[] = { 0x2d, 0x2d, 0x3a, 0x05, 0x04, 0x3f };
         static const __u8 CA[] = { 0x28, 0xd8, 0x14, 0xec };
         static const __u8 CE[] = { 0x32, 0xdd, 0x2d, 0xdd };    /* MI0360 */
-        static const __u8 CE_sn9c325[] =
-                        { 0x32, 0xdd, 0x32, 0xdd };     /* OV7648 - SN9C325 */
+        static const __u8 CE_ov76xx[] =
+                        { 0x32, 0xdd, 0x32, 0xdd };     /* OV7630/48 */
 
         sn9c1xx = sn_tb[(int) sd->sensor];
         configure_gpio(gspca_dev, sn9c1xx);
 
-/*      reg_w1(gspca_dev, 0x01, 0x44);          jfm from win trace*/
         reg_w1(gspca_dev, 0x15, sn9c1xx[0x15]);
         reg_w1(gspca_dev, 0x16, sn9c1xx[0x16]);
         reg_w1(gspca_dev, 0x12, sn9c1xx[0x12]);
@@ -994,10 +1200,17 @@ static void sd_start(struct gspca_dev *gspca_dev)
         reg_w1(gspca_dev, 0xc8, 0x50);
         reg_w1(gspca_dev, 0xc9, 0x3c);
         reg_w1(gspca_dev, 0x18, sn9c1xx[0x18]);
-        switch (sd->bridge) {
-        case BRIDGE_SN9C325:
+        switch (sd->sensor) {
+        case SENSOR_OV7630:
+                reg17 = 0xe2;
+                break;
+        case SENSOR_OV7648:
                 reg17 = 0xae;
                 break;
+/*jfm: from win trace */
+        case SENSOR_OV7660:
+                reg17 = 0xa0;
+                break;
         default:
                 reg17 = 0x60;
                 break;
@@ -1007,24 +1220,11 @@ static void sd_start(struct gspca_dev *gspca_dev)
         reg_w1(gspca_dev, 0x07, sn9c1xx[7]);
         reg_w1(gspca_dev, 0x06, sn9c1xx[6]);
         reg_w1(gspca_dev, 0x14, sn9c1xx[0x14]);
-        switch (sd->bridge) {
-        case BRIDGE_SN9C325:
-                reg_w(gspca_dev, 0x20, regsn20_sn9c325,
-                                sizeof regsn20_sn9c325);
-                for (i = 0; i < 8; i++)
-                        reg_w(gspca_dev, 0x84, reg84_sn9c325,
-                                        sizeof reg84_sn9c325);
-                reg_w1(gspca_dev, 0x9a, 0x0a);
-                reg_w1(gspca_dev, 0x99, 0x60);
-                break;
-        default:
-                reg_w(gspca_dev, 0x20, regsn20, sizeof regsn20);
-                for (i = 0; i < 8; i++)
-                        reg_w(gspca_dev, 0x84, reg84, sizeof reg84);
+        reg_w(gspca_dev, 0x20, gamma_def, sizeof gamma_def);
+        for (i = 0; i < 8; i++)
+                reg_w(gspca_dev, 0x84, reg84, sizeof reg84);
                 reg_w1(gspca_dev, 0x9a, 0x08);
                 reg_w1(gspca_dev, 0x99, 0x59);
-                break;
-        }
 
         mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
         if (mode)
@@ -1049,6 +1249,15 @@ static void sd_start(struct gspca_dev *gspca_dev)
 /*                      reg1 = 0x06;     * 640 clk 24Mz (done) */
                 }
                 break;
+        case SENSOR_OM6802:
+                om6802_InitSensor(gspca_dev);
+                reg17 = 0x64;           /* 640 MCKSIZE */
+                break;
+        case SENSOR_OV7630:
+                ov7630_InitSensor(gspca_dev);
+                reg17 = 0xe2;
+                reg1 = 0x44;
+                break;
         case SENSOR_OV7648:
                 ov7648_InitSensor(gspca_dev);
                 reg17 = 0xa2;
@@ -1073,9 +1282,10 @@ static void sd_start(struct gspca_dev *gspca_dev)
         }
         reg_w(gspca_dev, 0xc0, C0, 6);
         reg_w(gspca_dev, 0xca, CA, 4);
-        switch (sd->bridge) {
-        case BRIDGE_SN9C325:
-                reg_w(gspca_dev, 0xce, CE_sn9c325, 4);
+        switch (sd->sensor) {
+        case SENSOR_OV7630:
+        case SENSOR_OV7648:
+                reg_w(gspca_dev, 0xce, CE_ov76xx, 4);
                 break;
         default:
                 reg_w(gspca_dev, 0xce, CE, 4);
@@ -1093,10 +1303,20 @@ static void sd_start(struct gspca_dev *gspca_dev)
         reg_w1(gspca_dev, 0x18, reg18);
 
         reg_w1(gspca_dev, 0x17, reg17);
-        reg_w1(gspca_dev, 0x01, reg1);
-        setbrightness(gspca_dev);
-        setcontrast(gspca_dev);
+        switch (sd->sensor) {
+        case SENSOR_HV7131R:
+        case SENSOR_MI0360:
+        case SENSOR_MO4000:
+        case SENSOR_OM6802:
+                setbrightness(gspca_dev);
+                setcontrast(gspca_dev);
+                break;
+        default:                        /* OV76xx */
+                setbrightcont(gspca_dev);
+                break;
+        }
         setautogain(gspca_dev);
+        reg_w1(gspca_dev, 0x01, reg1);
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -1119,6 +1339,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
                 i2c_w8(gspca_dev, stopmi0360);
                 data = 0x29;
                 break;
+        case SENSOR_OV7630:
         case SENSOR_OV7648:
                 data = 0x29;
                 break;
@@ -1132,15 +1353,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_w1(gspca_dev, 0x17, sn9c1xx[0x17]);
         reg_w1(gspca_dev, 0x01, sn9c1xx[1]);
         reg_w1(gspca_dev, 0x01, data);
-        reg_w1(gspca_dev, 0xf1, 0x01);
-}
-
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
+        reg_w1(gspca_dev, 0xf1, 0x00);
 }
 
 static void do_autogain(struct gspca_dev *gspca_dev)
@@ -1174,6 +1387,7 @@ static void do_autogain(struct gspca_dev *gspca_dev)
                 default:
 /*              case SENSOR_MO4000: */
 /*              case SENSOR_MI0360: */
+/*              case SENSOR_OM6802: */
                         expotimes = sd->exposure;
                         expotimes += (luma_mean - delta) >> 6;
                         if (expotimes < 0)
@@ -1229,69 +1443,24 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
 }
 
-static unsigned int getexposure(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-        __u8 hexpo, mexpo, lexpo;
-
-        switch (sd->sensor) {
-        case SENSOR_HV7131R:
-                /* read sensor exposure */
-                i2c_r5(gspca_dev, 0x25);
-                return (gspca_dev->usb_buf[0] << 16)
-                        | (gspca_dev->usb_buf[1] << 8)
-                        | gspca_dev->usb_buf[2];
-        case SENSOR_MI0360:
-                /* read sensor exposure */
-                i2c_r5(gspca_dev, 0x09);
-                return (gspca_dev->usb_buf[0] << 8)
-                        | gspca_dev->usb_buf[1];
-        case SENSOR_MO4000:
-                i2c_r5(gspca_dev, 0x0e);
-                hexpo = 0;              /* gspca_dev->usb_buf[1] & 0x07; */
-                mexpo = 0x40;           /* gspca_dev->usb_buf[2] & 0xff; */
-                lexpo = (gspca_dev->usb_buf[1] & 0x30) >> 4;
-                PDEBUG(D_CONF, "exposure %d",
-                        (hexpo << 10) | (mexpo << 2) | lexpo);
-                return (hexpo << 10) | (mexpo << 2) | lexpo;
-        default:
-/*      case SENSOR_OV7648:             * jfm: is it ok for 7648? */
-/*      case SENSOR_OV7660: */
-                /* read sensor exposure */
-                i2c_r5(gspca_dev, 0x04);
-                hexpo = gspca_dev->usb_buf[3] & 0x2f;
-                lexpo = gspca_dev->usb_buf[0] & 0x02;
-                i2c_r5(gspca_dev, 0x08);
-                mexpo = gspca_dev->usb_buf[2];
-                return (hexpo << 10) | (mexpo << 2) | lexpo;
-        }
-}
-
-static void getbrightness(struct gspca_dev *gspca_dev)
-{
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        /* hardcoded registers seem not readable */
-        switch (sd->sensor) {
-        case SENSOR_HV7131R:
-                sd->brightness = getexposure(gspca_dev) >> 4;
-                break;
-        case SENSOR_MI0360:
-                sd->brightness = getexposure(gspca_dev) << 4;
-                break;
-        case SENSOR_MO4000:
-                sd->brightness = getexposure(gspca_dev) << 4;
-                break;
-        }
-}
-
 static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
         sd->brightness = val;
-        if (gspca_dev->streaming)
-                setbrightness(gspca_dev);
+        if (gspca_dev->streaming) {
+                switch (sd->sensor) {
+                case SENSOR_HV7131R:
+                case SENSOR_MI0360:
+                case SENSOR_MO4000:
+                case SENSOR_OM6802:
+                        setbrightness(gspca_dev);
+                        break;
+                default:                        /* OV76xx */
+                        setbrightcont(gspca_dev);
+                        break;
+                }
+        }
         return 0;
 }
 
@@ -1299,7 +1468,6 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        getbrightness(gspca_dev);
         *val = sd->brightness;
         return 0;
 }
@@ -1309,8 +1477,19 @@ static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
         struct sd *sd = (struct sd *) gspca_dev;
 
         sd->contrast = val;
-        if (gspca_dev->streaming)
-                setcontrast(gspca_dev);
+        if (gspca_dev->streaming) {
+                switch (sd->sensor) {
+                case SENSOR_HV7131R:
+                case SENSOR_MI0360:
+                case SENSOR_MO4000:
+                case SENSOR_OM6802:
+                        setcontrast(gspca_dev);
+                        break;
+                default:                        /* OV76xx */
+                        setbrightcont(gspca_dev);
+                        break;
+                }
+        }
         return 0;
 }
 
@@ -1364,11 +1543,9 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
         .dq_callback = do_autogain,
 };
@@ -1379,7 +1556,7 @@ static const struct sd_desc sd_desc = {
                         | (SENSOR_ ## sensor << 8) \
                         | (i2c_addr)
 static const __devinitdata struct usb_device_id device_table[] = {
-#ifndef CONFIG_USB_SN9C102
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
         {USB_DEVICE(0x0458, 0x7025), BSI(SN9C120, MI0360, 0x5d)},
         {USB_DEVICE(0x045e, 0x00f5), BSI(SN9C105, OV7660, 0x21)},
         {USB_DEVICE(0x045e, 0x00f7), BSI(SN9C105, OV7660, 0x21)},
@@ -1406,15 +1583,17 @@ static const __devinitdata struct usb_device_id device_table[] = {
 /*      {USB_DEVICE(0x0c45, 0x6108), BSI(SN9C120, OM6801, 0x??)}, */
 /*      {USB_DEVICE(0x0c45, 0x6122), BSI(SN9C110, ICM105C, 0x??)}, */
 /*      {USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */
-        {USB_DEVICE(0x0c45, 0x612a), BSI(SN9C325, OV7648, 0x21)},
-/* bw600.inf:
-        {USB_DEVICE(0x0c45, 0x612a), BSI(SN9C110, OV7648, 0x21)}, */
+        {USB_DEVICE(0x0c45, 0x6128), BSI(SN9C110, OM6802, 0x21)}, /*sn9c325?*/
+/*bw600.inf:*/
+        {USB_DEVICE(0x0c45, 0x612a), BSI(SN9C110, OV7648, 0x21)}, /*sn9c325?*/
         {USB_DEVICE(0x0c45, 0x612c), BSI(SN9C110, MO4000, 0x21)},
-/*      {USB_DEVICE(0x0c45, 0x612e), BSI(SN9C110, OV7630, 0x??)}, */
+        {USB_DEVICE(0x0c45, 0x612e), BSI(SN9C110, OV7630, 0x21)},
 /*      {USB_DEVICE(0x0c45, 0x612f), BSI(SN9C110, ICM105C, 0x??)}, */
-#ifndef CONFIG_USB_SN9C102
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
         {USB_DEVICE(0x0c45, 0x6130), BSI(SN9C120, MI0360, 0x5d)},
+#endif
         {USB_DEVICE(0x0c45, 0x6138), BSI(SN9C120, MO4000, 0x21)},
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
 /*      {USB_DEVICE(0x0c45, 0x613a), BSI(SN9C120, OV7648, 0x??)}, */
         {USB_DEVICE(0x0c45, 0x613b), BSI(SN9C120, OV7660, 0x21)},
         {USB_DEVICE(0x0c45, 0x613c), BSI(SN9C120, HV7131R, 0x11)},
@@ -1438,6 +1617,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index 17fe2c2a440d..6e733901fcca 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -645,8 +645,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -880,14 +880,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
                 gspca_dev->usb_buf[0]);
 }
 
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
@@ -1051,11 +1043,9 @@ static struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
 };
 
@@ -1093,6 +1083,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index 51a3c3429ef0..e9eb59bae4fb 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -1953,8 +1953,8 @@ error:
         return -EINVAL;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -2023,11 +2023,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
-}
-
-/* this function is called at close time */
-static void sd_close(struct gspca_dev *gspca_dev)
-{
         reg_write(gspca_dev->dev, SPCA501_REG_CTLRL, 0x05, 0x00);
 }
 
@@ -2120,11 +2115,10 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
         .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
 };
 
@@ -2154,6 +2148,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index eda29d609359..f601daf19ebe 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -655,8 +655,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int ret;
@@ -743,11 +743,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
-}
-
-/* this function is called at close time */
-static void sd_close(struct gspca_dev *gspca_dev)
-{
         /* This maybe reset or power control */
         reg_write(gspca_dev->dev, 0x03, 0x03, 0x20);
         reg_write(gspca_dev->dev, 0x03, 0x01, 0x0);
@@ -825,11 +820,10 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
         .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
 };
 
@@ -855,6 +849,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c
index f622fa75766d..195dce96ef06 100644
--- a/drivers/media/video/gspca/spca506.c
+++ b/drivers/media/video/gspca/spca506.c
@@ -313,8 +313,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
 
@@ -560,14 +560,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_w(dev, 0x03, 0x00, 0x0003);
 }
 
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
@@ -740,11 +732,9 @@ static struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
 };
 
@@ -772,6 +762,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index 699340c17dea..281ce02103a3 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -1521,8 +1521,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;                       /* success */
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
 /*      write_vector(gspca_dev, spca508_open_data); */
         return 0;
@@ -1554,15 +1554,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_write(gspca_dev->dev, 0x8112, 0x20);
 }
 
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-/* this function is called at close time */
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
@@ -1633,11 +1624,9 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
 };
 
@@ -1667,6 +1656,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 1073ac3d2ec6..cfbc9ebc5c5d 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -32,69 +32,48 @@ MODULE_LICENSE("GPL");
 struct sd {
         struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-        unsigned short contrast;
-        __u8 brightness;
+        __u16 contrast;                 /* rev72a only */
+#define CONTRAST_MIN 0x0000
+#define CONTRAST_DEF 0x2000
+#define CONTRAST_MAX 0x3fff
+
+        __u16 exposure;                 /* rev12a only */
+#define EXPOSURE_MIN 1
+#define EXPOSURE_DEF 200
+#define EXPOSURE_MAX (4095 - 900) /* see set_exposure */
+
+        __u8 brightness;                /* rev72a only */
+#define BRIGHTNESS_MIN 0
+#define BRIGHTNESS_DEF 32
+#define BRIGHTNESS_MAX 63
+
+        __u8 white;                     /* rev12a only */
+#define WHITE_MIN 1
+#define WHITE_DEF 0x40
+#define WHITE_MAX 0x7f
+
         __u8 autogain;
+#define AUTOGAIN_MIN 0
+#define AUTOGAIN_DEF 1
+#define AUTOGAIN_MAX 1
+
+        __u8 gain;                      /* rev12a only */
+#define GAIN_MIN 0x0
+#define GAIN_DEF 0x24
+#define GAIN_MAX 0x24
+
+#define EXPO12A_DEF 3
+        __u8 expo12a;           /* expo/gain? for rev 12a */
 
         __u8 chip_revision;
+#define Rev012A 0
+#define Rev072A 1
+
         signed char ag_cnt;
 #define AG_CNT_START 13
 };
 
-/* V4L2 controls supported by the driver */
-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getcontrast(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 struct ctrl sd_ctrls[] = {
-#define SD_BRIGHTNESS 0
-        {
-         {
-          .id = V4L2_CID_BRIGHTNESS,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Brightness",
-          .minimum = 0,
-          .maximum = 63,
-          .step = 1,
-          .default_value = 32,
-          },
-         .set = sd_setbrightness,
-         .get = sd_getbrightness,
-         },
-#define SD_CONTRAST 1
-        {
-         {
-          .id = V4L2_CID_CONTRAST,
-          .type = V4L2_CTRL_TYPE_INTEGER,
-          .name = "Contrast",
-          .minimum = 0,
-          .maximum = 0x3fff,
-          .step = 1,
-          .default_value = 0x2000,
-          },
-         .set = sd_setcontrast,
-         .get = sd_getcontrast,
-         },
-#define SD_AUTOGAIN 2
-        {
-         {
-          .id = V4L2_CID_AUTOGAIN,
-          .type = V4L2_CTRL_TYPE_BOOLEAN,
-          .name = "Auto Gain",
-          .minimum = 0,
-          .maximum = 1,
-          .step = 1,
-          .default_value = 1,
-          },
-         .set = sd_setautogain,
-         .get = sd_getautogain,
-         },
-};
-
-static struct v4l2_pix_format sif_mode[] = {
+static struct v4l2_pix_format sif_012a_mode[] = {
         {160, 120, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
                 .bytesperline = 160,
                 .sizeimage = 160 * 120,
@@ -117,6 +96,29 @@ static struct v4l2_pix_format sif_mode[] = {
                 .priv = 0},
 };
 
+static struct v4l2_pix_format sif_072a_mode[] = {
+        {160, 120, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+                .bytesperline = 160,
+                .sizeimage = 160 * 120,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 3},
+        {176, 144, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+                .bytesperline = 176,
+                .sizeimage = 176 * 144,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 2},
+        {320, 240, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+                .bytesperline = 320,
+                .sizeimage = 320 * 240,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 1},
+        {352, 288, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE,
+                .bytesperline = 352,
+                .sizeimage = 352 * 288,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = 0},
+};
+
 /*
  * Initialization data
  * I'm not very sure how to split initialization from open data
@@ -143,12 +145,8 @@ static struct v4l2_pix_format sif_mode[] = {
 #define SPCA561_INDEX_I2C_BASE 0x8800
 #define SPCA561_SNAPBIT 0x20
 #define SPCA561_SNAPCTRL 0x40
-enum {
-        Rev072A = 0,
-        Rev012A,
-};
 
-static void reg_w_val(struct usb_device *dev, __u16 index, __u16 value)
+static void reg_w_val(struct usb_device *dev, __u16 index, __u8 value)
 {
         int ret;
 
@@ -198,12 +196,6 @@ static void reg_w_buf(struct gspca_dev *gspca_dev,
                         index, gspca_dev->usb_buf, len, 500);
 }
 
-static void i2c_init(struct gspca_dev *gspca_dev, __u8 mode)
-{
-        reg_w_val(gspca_dev->dev, 0x92, 0x8804);
-        reg_w_val(gspca_dev->dev, mode, 0x8802);
-}
-
 static void i2c_write(struct gspca_dev *gspca_dev, __u16 valeur, __u16 reg)
 {
         int retry = 60;
@@ -212,9 +204,9 @@ static void i2c_write(struct gspca_dev *gspca_dev, __u16 valeur, __u16 reg)
 
         DataLow = valeur;
         DataHight = valeur >> 8;
-        reg_w_val(gspca_dev->dev, reg, 0x8801);
-        reg_w_val(gspca_dev->dev, DataLow, 0x8805);
-        reg_w_val(gspca_dev->dev, DataHight, 0x8800);
+        reg_w_val(gspca_dev->dev, 0x8801, reg);
+        reg_w_val(gspca_dev->dev, 0x8805, DataLow);
+        reg_w_val(gspca_dev->dev, 0x8800, DataHight);
         while (retry--) {
                 reg_r(gspca_dev, 0x8803, 1);
                 if (!gspca_dev->usb_buf[0])
@@ -228,14 +220,14 @@ static int i2c_read(struct gspca_dev *gspca_dev, __u16 reg, __u8 mode)
         __u8 value;
         __u8 vallsb;
 
-        reg_w_val(gspca_dev->dev, 0x92, 0x8804);
-        reg_w_val(gspca_dev->dev, reg, 0x8801);
-        reg_w_val(gspca_dev->dev, (mode | 0x01), 0x8802);
-        while (retry--) {
+        reg_w_val(gspca_dev->dev, 0x8804, 0x92);
+        reg_w_val(gspca_dev->dev, 0x8801, reg);
+        reg_w_val(gspca_dev->dev, 0x8802, (mode | 0x01));
+        do {
                 reg_r(gspca_dev, 0x8803, 1);
                 if (!gspca_dev->usb_buf)
                         break;
-        }
+        } while (--retry);
         if (retry == 0)
                 return -1;
         reg_r(gspca_dev, 0x8800, 1);
@@ -438,21 +430,10 @@ static const __u16 spca561_init_data[][2] = {
         {0x0035, 0x8801},       /* 0x14 - set gain general */
         {0x001f, 0x8805},       /* 0x14 */
         {0x0000, 0x8800},
-        {0x0030, 0x8112},
+        {0x000e, 0x8112},       /* white balance - was 30 */
         {}
 };
 
-static void sensor_reset(struct gspca_dev *gspca_dev)
-{
-        reg_w_val(gspca_dev->dev, 0x8631, 0xc8);
-        reg_w_val(gspca_dev->dev, 0x8634, 0xc8);
-        reg_w_val(gspca_dev->dev, 0x8112, 0x00);
-        reg_w_val(gspca_dev->dev, 0x8114, 0x00);
-        reg_w_val(gspca_dev->dev, 0x8118, 0x21);
-        i2c_init(gspca_dev, 0x14);
-        i2c_write(gspca_dev, 1, 0x0d);
-        i2c_write(gspca_dev, 0, 0x0d);
-}
 
 /******************** QC Express etch2 stuff ********************/
 static const __u16 Pb100_1map8300[][2] = {
@@ -462,9 +443,9 @@ static const __u16 Pb100_1map8300[][2] = {
         {0x8303, 0x0125},       /* image area */
         {0x8304, 0x0169},
         {0x8328, 0x000b},
-        {0x833c, 0x0001},
+        {0x833c, 0x0001},               /*fixme: win:07*/
 
-        {0x832f, 0x0419},
+        {0x832f, 0x1904},               /*fixme: was 0419*/
         {0x8307, 0x00aa},
         {0x8301, 0x0003},
         {0x8302, 0x000e},
@@ -478,9 +459,10 @@ static const __u16 Pb100_2map8300[][2] = {
 };
 
 static const __u16 spca561_161rev12A_data1[][2] = {
-        {0x21, 0x8118},
-        {0x01, 0x8114},
-        {0x00, 0x8112},
+        {0x29, 0x8118},         /* white balance - was 21 */
+        {0x08, 0x8114},         /* white balance - was 01 */
+        {0x0e, 0x8112},         /* white balance - was 00 */
+        {0x00, 0x8102},         /* white balance - new */
         {0x92, 0x8804},
         {0x04, 0x8802},         /* windows uses 08 */
         {}
@@ -505,14 +487,16 @@ static const __u16 spca561_161rev12A_data2[][2] = {
         {0xb0, 0x8603},
 
         /* sensor gains */
+        {0x07, 0x8601},         /* white balance - new */
+        {0x07, 0x8602},         /* white balance - new */
         {0x00, 0x8610},         /* *red */
         {0x00, 0x8611},         /* 3f   *green */
         {0x00, 0x8612},         /* green *blue */
         {0x00, 0x8613},         /* blue *green */
-        {0x35, 0x8614},         /* green *red */
-        {0x35, 0x8615},         /* 40   *green */
-        {0x35, 0x8616},         /* 7a   *blue */
-        {0x35, 0x8617},         /* 40   *green */
+        {0x43, 0x8614},         /* green *red - white balance - was 0x35 */
+        {0x40, 0x8615},         /* 40   *green - white balance - was 0x35 */
+        {0x71, 0x8616},         /* 7a   *blue - white balance - was 0x35 */
+        {0x40, 0x8617},         /* 40   *green - white balance - was 0x35 */
 
         {0x0c, 0x8620},         /* 0c */
         {0xc8, 0x8631},         /* c8 */
@@ -527,6 +511,7 @@ static const __u16 spca561_161rev12A_data2[][2] = {
         {0xdf, 0x863c},         /* df */
         {0xf0, 0x8505},
         {0x32, 0x850a},
+/*      {0x99, 0x8700},          * - white balance - new (removed) */
         {}
 };
 
@@ -545,9 +530,10 @@ static void sensor_mapwrite(struct gspca_dev *gspca_dev,
 }
 static void init_161rev12A(struct gspca_dev *gspca_dev)
 {
-        sensor_reset(gspca_dev);
+/*      sensor_reset(gspca_dev);        (not in win) */
         write_vector(gspca_dev, spca561_161rev12A_data1);
         sensor_mapwrite(gspca_dev, Pb100_1map8300);
+/*fixme: should be in sd_start*/
         write_vector(gspca_dev, spca561_161rev12A_data2);
         sensor_mapwrite(gspca_dev, Pb100_2map8300);
 }
@@ -581,35 +567,38 @@ static int sd_config(struct gspca_dev *gspca_dev,
         }
 
         cam = &gspca_dev->cam;
-        cam->dev_name = (char *) id->driver_info;
         cam->epaddr = 0x01;
         gspca_dev->nbalt = 7 + 1;       /* choose alternate 7 first */
-        cam->cam_mode = sif_mode;
-        cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
 
         sd->chip_revision = id->driver_info;
-        sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
-        sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
-        sd->autogain = sd_ctrls[SD_AUTOGAIN].qctrl.default_value;
+        if (sd->chip_revision == Rev012A) {
+                cam->cam_mode = sif_012a_mode;
+                cam->nmodes = ARRAY_SIZE(sif_012a_mode);
+        } else {
+                cam->cam_mode = sif_072a_mode;
+                cam->nmodes = ARRAY_SIZE(sif_072a_mode);
+        }
+        sd->brightness = BRIGHTNESS_DEF;
+        sd->contrast = CONTRAST_DEF;
+        sd->white = WHITE_DEF;
+        sd->exposure = EXPOSURE_DEF;
+        sd->autogain = AUTOGAIN_DEF;
+        sd->gain = GAIN_DEF;
+        sd->expo12a = EXPO12A_DEF;
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init_12a(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-
-        switch (sd->chip_revision) {
-        case Rev072A:
-                PDEBUG(D_STREAM, "Chip revision id: 072a");
-                write_vector(gspca_dev, spca561_init_data);
-                break;
-        default:
-/*      case Rev012A: */
-                PDEBUG(D_STREAM, "Chip revision id: 012a");
-                init_161rev12A(gspca_dev);
-                break;
-        }
+        PDEBUG(D_STREAM, "Chip revision: 012a");
+        init_161rev12A(gspca_dev);
+        return 0;
+}
+static int sd_init_72a(struct gspca_dev *gspca_dev)
+{
+        PDEBUG(D_STREAM, "Chip revision: 072a");
+        write_vector(gspca_dev, spca561_init_data);
         return 0;
 }
 
@@ -618,25 +607,20 @@ static void setcontrast(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
         struct usb_device *dev = gspca_dev->dev;
         __u8 lowb;
-        int expotimes;
 
         switch (sd->chip_revision) {
         case Rev072A:
                 lowb = sd->contrast >> 8;
-                reg_w_val(dev, lowb, 0x8651);
-                reg_w_val(dev, lowb, 0x8652);
-                reg_w_val(dev, lowb, 0x8653);
-                reg_w_val(dev, lowb, 0x8654);
+                reg_w_val(dev, 0x8651, lowb);
+                reg_w_val(dev, 0x8652, lowb);
+                reg_w_val(dev, 0x8653, lowb);
+                reg_w_val(dev, 0x8654, lowb);
                 break;
-        case Rev012A: {
-                __u8 Reg8391[] =
-                        { 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00 };
-
-                /* Write camera sensor settings */
-                expotimes = (sd->contrast >> 5) & 0x07ff;
-                Reg8391[0] = expotimes & 0xff;  /* exposure */
-                Reg8391[1] = 0x18 | (expotimes >> 8);
-                Reg8391[2] = sd->brightness;    /* gain */
+        default: {
+/*      case Rev012A: { */
+                static const __u8 Reg8391[] =
+                        { 0x92, 0x30, 0x20, 0x00, 0x0c, 0x00, 0x00, 0x00 };
+
                 reg_w_buf(gspca_dev, 0x8391, Reg8391, 8);
                 reg_w_buf(gspca_dev, 0x8390, Reg8391, 8);
                 break;
@@ -644,93 +628,151 @@ static void setcontrast(struct gspca_dev *gspca_dev)
         }
 }
 
-static void setautogain(struct gspca_dev *gspca_dev)
+/* rev12a only */
+static void setwhite(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
+        __u16 white;
+        __u8 reg8614, reg8616;
+
+        white = sd->white;
+        /* try to emulate MS-win as possible */
+        reg8616 = 0x90 - white * 5 / 8;
+        reg_w_val(gspca_dev->dev, 0x8616, reg8616);
+        reg8614 = 0x20 + white * 3 / 8;
+        reg_w_val(gspca_dev->dev, 0x8614, reg8614);
+}
 
-        if (sd->chip_revision == Rev072A) {
-                if (sd->autogain)
-                        sd->ag_cnt = AG_CNT_START;
-                else
-                        sd->ag_cnt = -1;
+/* rev 12a only */
+static void setexposure(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+        int expo;
+        int clock_divider;
+        __u8 data[2];
+
+        /* Register 0x8309 controls exposure for the spca561,
+           the basic exposure setting goes from 1-2047, where 1 is completely
+           dark and 2047 is very bright. It not only influences exposure but
+           also the framerate (to allow for longer exposure) from 1 - 300 it
+           only raises the exposure time then from 300 - 600 it halves the
+           framerate to be able to further raise the exposure time and for every
+           300 more it halves the framerate again. This allows for a maximum
+           exposure time of circa 0.2 - 0.25 seconds (30 / (2000/3000) fps).
+           Sometimes this is not enough, the 1-2047 uses bits 0-10, bits 11-12
+           configure a divider for the base framerate which us used at the
+           exposure setting of 1-300. These bits configure the base framerate
+           according to the following formula: fps = 60 / (value + 2) */
+        if (sd->exposure < 2048) {
+                expo = sd->exposure;
+                clock_divider = 0;
+        } else {
+                /* Add 900 to make the 0 setting of the second part of the
+                   exposure equal to the 2047 setting of the first part. */
+                expo = (sd->exposure - 2048) + 900;
+                clock_divider = 3;
         }
+        expo |= clock_divider << 11;
+        data[0] = expo;
+        data[1] = expo >> 8;
+        reg_w_buf(gspca_dev, 0x8309, data, 2);
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+/* rev 12a only */
+static void setgain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
+        __u8 data[2];
+
+        data[0] = sd->gain;
+        data[1] = 0;
+        reg_w_buf(gspca_dev, 0x8335, data, 2);
+}
+
+static void setautogain(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        if (sd->autogain)
+                sd->ag_cnt = AG_CNT_START;
+        else
+                sd->ag_cnt = -1;
+}
+
+static void sd_start_12a(struct gspca_dev *gspca_dev)
+{
         struct usb_device *dev = gspca_dev->dev;
-        int Clck;
+        int Clck = 0x8a; /* lower 0x8X values lead to fps > 30 */
         __u8 Reg8307[] = { 0xaa, 0x00 };
         int mode;
 
         mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
-        switch (sd->chip_revision) {
-        case Rev072A:
-                switch (mode) {
-                default:
-/*              case 0:
-                case 1: */
-                        Clck = 0x25;
-                        break;
-                case 2:
-                        Clck = 0x22;
-                        break;
-                case 3:
-                        Clck = 0x21;
-                        break;
-                }
-                reg_w_val(dev, 0x8500, mode);   /* mode */
-                reg_w_val(dev, 0x8700, Clck);   /* 0x27 clock */
-                reg_w_val(dev, 0x8112, 0x10 | 0x20);
-                setautogain(gspca_dev);
-                break;
+        if (mode <= 1) {
+                /* Use compression on 320x240 and above */
+                reg_w_val(dev, 0x8500, 0x10 | mode);
+        } else {
+                /* I couldn't get the compression to work below 320x240
+                 * Fortunately at these resolutions the bandwidth
+                 * is sufficient to push raw frames at ~20fps */
+                reg_w_val(dev, 0x8500, mode);
+        }               /* -- qq@kuku.eu.org */
+        reg_w_buf(gspca_dev, 0x8307, Reg8307, 2);
+        reg_w_val(gspca_dev->dev, 0x8700, Clck);
+                                        /* 0x8f 0x85 0x27 clock */
+        reg_w_val(gspca_dev->dev, 0x8112, 0x1e | 0x20);
+        reg_w_val(gspca_dev->dev, 0x850b, 0x03);
+        setcontrast(gspca_dev);
+        setwhite(gspca_dev);
+        setautogain(gspca_dev);
+        setexposure(gspca_dev);
+}
+static void sd_start_72a(struct gspca_dev *gspca_dev)
+{
+        struct usb_device *dev = gspca_dev->dev;
+        int Clck;
+        int mode;
+
+        mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
+        switch (mode) {
         default:
-/*      case Rev012A: */
-                switch (mode) {
-                case 0:
-                case 1:
-                        Clck = 0x8a;
-                        break;
-                case 2:
-                        Clck = 0x85;
-                        break;
-                default:
-                        Clck = 0x83;
-                        break;
-                }
-                if (mode <= 1) {
-                        /* Use compression on 320x240 and above */
-                        reg_w_val(dev, 0x8500, 0x10 | mode);
-                } else {
-                        /* I couldn't get the compression to work below 320x240
-                         * Fortunately at these resolutions the bandwidth
-                         * is sufficient to push raw frames at ~20fps */
-                        reg_w_val(dev, 0x8500, mode);
-                }               /* -- qq@kuku.eu.org */
-                reg_w_buf(gspca_dev, 0x8307, Reg8307, 2);
-                reg_w_val(gspca_dev->dev, 0x8700, Clck);
-                                                /* 0x8f 0x85 0x27 clock */
-                reg_w_val(gspca_dev->dev, 0x8112, 0x1e | 0x20);
-                reg_w_val(gspca_dev->dev, 0x850b, 0x03);
-                setcontrast(gspca_dev);
+/*      case 0:
+        case 1: */
+                Clck = 0x25;
+                break;
+        case 2:
+                Clck = 0x22;
+                break;
+        case 3:
+                Clck = 0x21;
                 break;
         }
+        reg_w_val(dev, 0x8500, mode);   /* mode */
+        reg_w_val(dev, 0x8700, Clck);   /* 0x27 clock */
+        reg_w_val(dev, 0x8112, 0x10 | 0x20);
+        setautogain(gspca_dev);
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
 {
-        reg_w_val(gspca_dev->dev, 0x8112, 0x20);
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        if (sd->chip_revision == Rev012A) {
+                reg_w_val(gspca_dev->dev, 0x8112, 0x0e);
+        } else {
+                reg_w_val(gspca_dev->dev, 0x8112, 0x20);
+/*              reg_w_val(gspca_dev->dev, 0x8102, 0x00); ?? */
+        }
 }
 
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
-}
+        struct sd *sd = (struct sd *) gspca_dev;
 
-/* this function is called at close time */
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-        reg_w_val(gspca_dev->dev, 0x8114, 0);
+        if (sd->chip_revision == Rev012A) {
+                reg_w_val(gspca_dev->dev, 0x8118, 0x29);
+                reg_w_val(gspca_dev->dev, 0x8114, 0x08);
+        }
+/*      reg_w_val(gspca_dev->dev, 0x8114, 0); */
 }
 
 static void do_autogain(struct gspca_dev *gspca_dev)
@@ -744,6 +786,7 @@ static void do_autogain(struct gspca_dev *gspca_dev)
         __u8 luma_mean = 110;
         __u8 luma_delta = 20;
         __u8 spring = 4;
+        __u8 reg8339[2];
 
         if (sd->ag_cnt < 0)
                 return;
@@ -798,13 +841,16 @@ static void do_autogain(struct gspca_dev *gspca_dev)
                 }
                 break;
         case Rev012A:
-                /* sensor registers is access and memory mapped to 0x8300 */
-                /* readind all 0x83xx block the sensor */
-                /*
-                 * The data from the header seem wrong where is the luma
-                 * and chroma mean value
-                 * at the moment set exposure in contrast set
-                 */
+                reg_r(gspca_dev, 0x8330, 2);
+                if (gspca_dev->usb_buf[1] > 0x08) {
+                        reg8339[0] = ++sd->expo12a;
+                        reg8339[1] = 0;
+                        reg_w_buf(gspca_dev, 0x8339, reg8339, 2);
+                } else if (gspca_dev->usb_buf[1] < 0x02) {
+                        reg8339[0] = --sd->expo12a;
+                        reg8339[1] = 0;
+                        reg_w_buf(gspca_dev, 0x8339, reg8339, 2);
+                }
                 break;
         }
 }
@@ -814,6 +860,8 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         __u8 *data,             /* isoc packet */
                         int len)                /* iso packet length */
 {
+        struct sd *sd = (struct sd *) gspca_dev;
+
         switch (data[0]) {
         case 0:         /* start of frame */
                 frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
@@ -826,8 +874,13 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                                         frame, data, len);
                 } else {
                         /* raw bayer (with a header, which we skip) */
-                        data += 20;
-                        len -= 20;
+                        if (sd->chip_revision == Rev012A) {
+                                data += 20;
+                                len -= 20;
+                        } else {
+                                data += 16;
+                                len -= 16;
+                        }
                         gspca_frame_add(gspca_dev, FIRST_PACKET,
                                                 frame, data, len);
                 }
@@ -841,24 +894,17 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
 }
 
+/* rev 72a only */
 static void setbrightness(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         __u8 value;
 
-        switch (sd->chip_revision) {
-        case Rev072A:
-                value = sd->brightness;
-                reg_w_val(gspca_dev->dev, value, 0x8611);
-                reg_w_val(gspca_dev->dev, value, 0x8612);
-                reg_w_val(gspca_dev->dev, value, 0x8613);
-                reg_w_val(gspca_dev->dev, value, 0x8614);
-                break;
-        default:
-/*      case Rev012A: */
-                setcontrast(gspca_dev);
-                break;
-        }
+        value = sd->brightness;
+        reg_w_val(gspca_dev->dev, 0x8611, value);
+        reg_w_val(gspca_dev->dev, 0x8612, value);
+        reg_w_val(gspca_dev->dev, 0x8613, value);
+        reg_w_val(gspca_dev->dev, 0x8614, value);
 }
 
 static void getbrightness(struct gspca_dev *gspca_dev)
@@ -866,52 +912,38 @@ static void getbrightness(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
         __u16 tot;
 
-        switch (sd->chip_revision) {
-        case Rev072A:
-                tot = 0;
-                reg_r(gspca_dev, 0x8611, 1);
-                tot += gspca_dev->usb_buf[0];
-                reg_r(gspca_dev, 0x8612, 1);
-                tot += gspca_dev->usb_buf[0];
-                reg_r(gspca_dev, 0x8613, 1);
-                tot += gspca_dev->usb_buf[0];
-                reg_r(gspca_dev, 0x8614, 1);
-                tot += gspca_dev->usb_buf[0];
-                sd->brightness = tot >> 2;
-                break;
-        default:
-/*      case Rev012A: */
-                /* no way to read sensor settings */
-                break;
-        }
+        tot = 0;
+        reg_r(gspca_dev, 0x8611, 1);
+        tot += gspca_dev->usb_buf[0];
+        reg_r(gspca_dev, 0x8612, 1);
+        tot += gspca_dev->usb_buf[0];
+        reg_r(gspca_dev, 0x8613, 1);
+        tot += gspca_dev->usb_buf[0];
+        reg_r(gspca_dev, 0x8614, 1);
+        tot += gspca_dev->usb_buf[0];
+        sd->brightness = tot >> 2;
 }
 
+/* rev72a only */
 static void getcontrast(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         __u16 tot;
 
-        switch (sd->chip_revision) {
-        case Rev072A:
-                tot = 0;
-                reg_r(gspca_dev, 0x8651, 1);
-                tot += gspca_dev->usb_buf[0];
-                reg_r(gspca_dev, 0x8652, 1);
-                tot += gspca_dev->usb_buf[0];
-                reg_r(gspca_dev, 0x8653, 1);
-                tot += gspca_dev->usb_buf[0];
-                reg_r(gspca_dev, 0x8654, 1);
-                tot += gspca_dev->usb_buf[0];
-                sd->contrast = tot << 6;
-                break;
-        default:
-/*      case Rev012A: */
-                /* no way to read sensor settings */
-                break;
-        }
+        tot = 0;
+        reg_r(gspca_dev, 0x8651, 1);
+        tot += gspca_dev->usb_buf[0];
+        reg_r(gspca_dev, 0x8652, 1);
+        tot += gspca_dev->usb_buf[0];
+        reg_r(gspca_dev, 0x8653, 1);
+        tot += gspca_dev->usb_buf[0];
+        reg_r(gspca_dev, 0x8654, 1);
+        tot += gspca_dev->usb_buf[0];
+        sd->contrast = tot << 6;
         PDEBUG(D_CONF, "get contrast %d", sd->contrast);
 }
 
+/* rev 72a only */
 static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -931,6 +963,7 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
         return 0;
 }
 
+/* rev 72a only */
 static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -968,20 +1001,190 @@ static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
         return 0;
 }
 
+/* rev12a only */
+static int sd_setwhite(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        sd->white = val;
+        if (gspca_dev->streaming)
+                setwhite(gspca_dev);
+        return 0;
+}
+
+static int sd_getwhite(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        *val = sd->white;
+        return 0;
+}
+
+/* rev12a only */
+static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        sd->exposure = val;
+        if (gspca_dev->streaming)
+                setexposure(gspca_dev);
+        return 0;
+}
+
+static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        *val = sd->exposure;
+        return 0;
+}
+
+/* rev12a only */
+static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        sd->gain = val;
+        if (gspca_dev->streaming)
+                setgain(gspca_dev);
+        return 0;
+}
+
+static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        *val = sd->gain;
+        return 0;
+}
+
+/* control tables */
+static struct ctrl sd_ctrls_12a[] = {
+        {
+            {
+                .id = V4L2_CID_DO_WHITE_BALANCE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "While Balance",
+                .minimum = WHITE_MIN,
+                .maximum = WHITE_MAX,
+                .step = 1,
+                .default_value = WHITE_DEF,
+            },
+            .set = sd_setwhite,
+            .get = sd_getwhite,
+        },
+        {
+            {
+                .id = V4L2_CID_EXPOSURE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Exposure",
+                .minimum = EXPOSURE_MIN,
+                .maximum = EXPOSURE_MAX,
+                .step = 1,
+                .default_value = EXPOSURE_DEF,
+            },
+            .set = sd_setexposure,
+            .get = sd_getexposure,
+        },
+        {
+            {
+                .id = V4L2_CID_AUTOGAIN,
+                .type = V4L2_CTRL_TYPE_BOOLEAN,
+                .name = "Auto Gain",
+                .minimum = AUTOGAIN_MIN,
+                .maximum = AUTOGAIN_MAX,
+                .step = 1,
+                .default_value = AUTOGAIN_DEF,
+            },
+            .set = sd_setautogain,
+            .get = sd_getautogain,
+        },
+        {
+            {
+                .id = V4L2_CID_GAIN,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Gain",
+                .minimum = GAIN_MIN,
+                .maximum = GAIN_MAX,
+                .step = 1,
+                .default_value = GAIN_DEF,
+            },
+            .set = sd_setgain,
+            .get = sd_getgain,
+        },
+};
+
+static struct ctrl sd_ctrls_72a[] = {
+        {
+           {
+                .id = V4L2_CID_BRIGHTNESS,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Brightness",
+                .minimum = BRIGHTNESS_MIN,
+                .maximum = BRIGHTNESS_MAX,
+                .step = 1,
+                .default_value = BRIGHTNESS_DEF,
+            },
+            .set = sd_setbrightness,
+            .get = sd_getbrightness,
+        },
+        {
+            {
+                .id = V4L2_CID_CONTRAST,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Contrast",
+                .minimum = CONTRAST_MIN,
+                .maximum = CONTRAST_MAX,
+                .step = 1,
+                .default_value = CONTRAST_DEF,
+            },
+            .set = sd_setcontrast,
+            .get = sd_getcontrast,
+        },
+        {
+            {
+                .id = V4L2_CID_AUTOGAIN,
+                .type = V4L2_CTRL_TYPE_BOOLEAN,
+                .name = "Auto Gain",
+                .minimum = AUTOGAIN_MIN,
+                .maximum = AUTOGAIN_MAX,
+                .step = 1,
+                .default_value = AUTOGAIN_DEF,
+            },
+            .set = sd_setautogain,
+            .get = sd_getautogain,
+        },
+};
+
 /* sub-driver description */
-static const struct sd_desc sd_desc = {
+static const struct sd_desc sd_desc_12a = {
+        .name = MODULE_NAME,
+        .ctrls = sd_ctrls_12a,
+        .nctrls = ARRAY_SIZE(sd_ctrls_12a),
+        .config = sd_config,
+        .init = sd_init_12a,
+        .start = sd_start_12a,
+        .stopN = sd_stopN,
+        .stop0 = sd_stop0,
+        .pkt_scan = sd_pkt_scan,
+/*      .dq_callback = do_autogain,      * fixme */
+};
+static const struct sd_desc sd_desc_72a = {
         .name = MODULE_NAME,
-        .ctrls = sd_ctrls,
-        .nctrls = ARRAY_SIZE(sd_ctrls),
+        .ctrls = sd_ctrls_72a,
+        .nctrls = ARRAY_SIZE(sd_ctrls_72a),
         .config = sd_config,
-        .open = sd_open,
-        .start = sd_start,
+        .init = sd_init_72a,
+        .start = sd_start_72a,
         .stopN = sd_stopN,
         .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
         .dq_callback = do_autogain,
 };
+static const struct sd_desc *sd_desc[2] = {
+        &sd_desc_12a,
+        &sd_desc_72a
+};
 
 /* -- module initialisation -- */
 static const __devinitdata struct usb_device_id device_table[] = {
@@ -1009,7 +1212,9 @@ MODULE_DEVICE_TABLE(usb, device_table);
 static int sd_probe(struct usb_interface *intf,
                     const struct usb_device_id *id)
 {
-        return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
+        return gspca_dev_probe(intf, id,
+                                sd_desc[id->driver_info],
+                                sizeof(struct sd),
                                THIS_MODULE);
 }
 
@@ -1018,6 +1223,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 16219cf6a6d5..2f2de429e273 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -306,8 +306,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         int ret;
 
@@ -398,14 +398,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         PDEBUG(D_STREAM, "camera stopped");
 }
 
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
@@ -535,11 +527,9 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
         .querymenu = sd_querymenu,
 };
@@ -564,6 +554,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index 54efa48bee01..1cfcc6c49558 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -449,31 +449,47 @@ static const __u8 qtable_spca504_default[2][64] = {
          0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e}
 };
 
-static void reg_r(struct usb_device *dev,
-                           __u16 req,
-                           __u16 index,
-                           __u8 *buffer, __u16 length)
+/* read <len> bytes to gspca_dev->usb_buf */
+static void reg_r(struct gspca_dev *gspca_dev,
+                  __u16 req,
+                  __u16 index,
+                  __u16 len)
 {
-        usb_control_msg(dev,
-                        usb_rcvctrlpipe(dev, 0),
+#ifdef GSPCA_DEBUG
+        if (len > USB_BUF_SZ) {
+                err("reg_r: buffer overflow");
+                return;
+        }
+#endif
+        usb_control_msg(gspca_dev->dev,
+                        usb_rcvctrlpipe(gspca_dev->dev, 0),
                         req,
                         USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                         0,              /* value */
-                        index, buffer, length,
+                        index,
+                        len ? gspca_dev->usb_buf : NULL, len,
                         500);
 }
 
-static void reg_w(struct usb_device *dev,
-                            __u16 req,
-                            __u16 value,
-                            __u16 index,
-                            __u8 *buffer, __u16 length)
+/* write <len> bytes from gspca_dev->usb_buf */
+static void reg_w(struct gspca_dev *gspca_dev,
+                   __u16 req,
+                   __u16 value,
+                   __u16 index,
+                   __u16 len)
 {
-        usb_control_msg(dev,
-                        usb_sndctrlpipe(dev, 0),
+#ifdef GSPCA_DEBUG
+        if (len > USB_BUF_SZ) {
+                err("reg_w: buffer overflow");
+                return;
+        }
+#endif
+        usb_control_msg(gspca_dev->dev,
+                        usb_sndctrlpipe(gspca_dev->dev, 0),
                         req,
                         USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                        value, index, buffer, length,
+                        value, index,
+                        len ? gspca_dev->usb_buf : NULL, len,
                         500);
 }
 
@@ -634,7 +650,7 @@ static int spca504B_PollingDataReady(struct gspca_dev *gspca_dev)
         int count = 10;
 
         while (--count > 0) {
-                reg_r(gspca_dev->dev, 0x21, 0, gspca_dev->usb_buf, 1);
+                reg_r(gspca_dev, 0x21, 0, 1);
                 if ((gspca_dev->usb_buf[0] & 0x01) == 0)
                         break;
                 msleep(10);
@@ -644,15 +660,14 @@ static int spca504B_PollingDataReady(struct gspca_dev *gspca_dev)
 
 static void spca504B_WaitCmdStatus(struct gspca_dev *gspca_dev)
 {
-        struct usb_device *dev = gspca_dev->dev;
         int count = 50;
 
         while (--count > 0) {
-                reg_r(dev, 0x21, 1, gspca_dev->usb_buf, 1);
+                reg_r(gspca_dev, 0x21, 1, 1);
                 if (gspca_dev->usb_buf[0] != 0) {
                         gspca_dev->usb_buf[0] = 0;
-                        reg_w(dev, 0x21, 0, 1, gspca_dev->usb_buf, 1);
-                        reg_r(dev, 0x21, 1, gspca_dev->usb_buf, 1);
+                        reg_w(gspca_dev, 0x21, 0, 1, 1);
+                        reg_r(gspca_dev, 0x21, 1, 1);
                         spca504B_PollingDataReady(gspca_dev);
                         break;
                 }
@@ -662,16 +677,14 @@ static void spca504B_WaitCmdStatus(struct gspca_dev *gspca_dev)
 
 static void spca50x_GetFirmware(struct gspca_dev *gspca_dev)
 {
-        struct usb_device *dev = gspca_dev->dev;
         __u8 *data;
 
-        data = kmalloc(64, GFP_KERNEL);
-        reg_r(dev, 0x20, 0, data, 5);
+        data = gspca_dev->usb_buf;
+        reg_r(gspca_dev, 0x20, 0, 5);
         PDEBUG(D_STREAM, "FirmWare : %d %d %d %d %d ",
                 data[0], data[1], data[2], data[3], data[4]);
-        reg_r(dev, 0x23, 0, data, 64);
-        reg_r(dev, 0x23, 1, data, 64);
-        kfree(data);
+        reg_r(gspca_dev, 0x23, 0, 64);
+        reg_r(gspca_dev, 0x23, 1, 64);
 }
 
 static void spca504B_SetSizeType(struct gspca_dev *gspca_dev)
@@ -686,21 +699,21 @@ static void spca504B_SetSizeType(struct gspca_dev *gspca_dev)
         Type = 0;
         switch (sd->bridge) {
         case BRIDGE_SPCA533:
-                reg_w(dev, 0x31, 0, 0, NULL, 0);
+                reg_w(gspca_dev, 0x31, 0, 0, 0);
                 spca504B_WaitCmdStatus(gspca_dev);
                 rc = spca504B_PollingDataReady(gspca_dev);
                 spca50x_GetFirmware(gspca_dev);
                 gspca_dev->usb_buf[0] = 2;                      /* type */
-                reg_w(dev, 0x24, 0, 8, gspca_dev->usb_buf, 1);
-                reg_r(dev, 0x24, 8, gspca_dev->usb_buf, 1);
+                reg_w(gspca_dev, 0x24, 0, 8, 1);
+                reg_r(gspca_dev, 0x24, 8, 1);
 
                 gspca_dev->usb_buf[0] = Size;
-                reg_w(dev, 0x25, 0, 4, gspca_dev->usb_buf, 1);
-                reg_r(dev, 0x25, 4, gspca_dev->usb_buf, 1);     /* size */
+                reg_w(gspca_dev, 0x25, 0, 4, 1);
+                reg_r(gspca_dev, 0x25, 4, 1);                   /* size */
                 rc = spca504B_PollingDataReady(gspca_dev);
 
                 /* Init the cam width height with some values get on init ? */
-                reg_w(dev, 0x31, 0, 4, NULL, 0);
+                reg_w(gspca_dev, 0x31, 0, 4, 0);
                 spca504B_WaitCmdStatus(gspca_dev);
                 rc = spca504B_PollingDataReady(gspca_dev);
                 break;
@@ -708,12 +721,12 @@ static void spca504B_SetSizeType(struct gspca_dev *gspca_dev)
 /* case BRIDGE_SPCA504B: */
 /* case BRIDGE_SPCA536: */
                 gspca_dev->usb_buf[0] = Size;
-                reg_w(dev, 0x25, 0, 4, gspca_dev->usb_buf, 1);
-                reg_r(dev, 0x25, 4, gspca_dev->usb_buf, 1);     /* size */
+                reg_w(gspca_dev, 0x25, 0, 4, 1);
+                reg_r(gspca_dev, 0x25, 4, 1);                   /* size */
                 Type = 6;
                 gspca_dev->usb_buf[0] = Type;
-                reg_w(dev, 0x27, 0, 0, gspca_dev->usb_buf, 1);
-                reg_r(dev, 0x27, 0, gspca_dev->usb_buf, 1);     /* type */
+                reg_w(gspca_dev, 0x27, 0, 0, 1);
+                reg_r(gspca_dev, 0x27, 0, 1);                   /* type */
                 rc = spca504B_PollingDataReady(gspca_dev);
                 break;
         case BRIDGE_SPCA504:
@@ -752,18 +765,15 @@ static void spca504_wait_status(struct gspca_dev *gspca_dev)
 
 static void spca504B_setQtable(struct gspca_dev *gspca_dev)
 {
-        struct usb_device *dev = gspca_dev->dev;
-
         gspca_dev->usb_buf[0] = 3;
-        reg_w(dev, 0x26, 0, 0, gspca_dev->usb_buf, 1);
-        reg_r(dev, 0x26, 0, gspca_dev->usb_buf, 1);
+        reg_w(gspca_dev, 0x26, 0, 0, 1);
+        reg_r(gspca_dev, 0x26, 0, 1);
         spca504B_PollingDataReady(gspca_dev);
 }
 
 static void sp5xx_initContBrigHueRegisters(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
         int pollreg = 1;
 
         switch (sd->bridge) {
@@ -774,20 +784,20 @@ static void sp5xx_initContBrigHueRegisters(struct gspca_dev *gspca_dev)
         default:
 /*      case BRIDGE_SPCA533: */
 /*      case BRIDGE_SPCA504B: */
-                reg_w(dev, 0, 0, 0x21a7, NULL, 0);      /* brightness */
-                reg_w(dev, 0, 0x20, 0x21a8, NULL, 0);   /* contrast */
-                reg_w(dev, 0, 0, 0x21ad, NULL, 0);      /* hue */
-                reg_w(dev, 0, 1, 0x21ac, NULL, 0);      /* sat/hue */
-                reg_w(dev, 0, 0x20, 0x21ae, NULL, 0);   /* saturation */
-                reg_w(dev, 0, 0, 0x21a3, NULL, 0);      /* gamma */
+                reg_w(gspca_dev, 0, 0, 0x21a7, 0);      /* brightness */
+                reg_w(gspca_dev, 0, 0x20, 0x21a8, 0);   /* contrast */
+                reg_w(gspca_dev, 0, 0, 0x21ad, 0);      /* hue */
+                reg_w(gspca_dev, 0, 1, 0x21ac, 0);      /* sat/hue */
+                reg_w(gspca_dev, 0, 0x20, 0x21ae, 0);   /* saturation */
+                reg_w(gspca_dev, 0, 0, 0x21a3, 0);      /* gamma */
                 break;
         case BRIDGE_SPCA536:
-                reg_w(dev, 0, 0, 0x20f0, NULL, 0);
-                reg_w(dev, 0, 0x21, 0x20f1, NULL, 0);
-                reg_w(dev, 0, 0x40, 0x20f5, NULL, 0);
-                reg_w(dev, 0, 1, 0x20f4, NULL, 0);
-                reg_w(dev, 0, 0x40, 0x20f6, NULL, 0);
-                reg_w(dev, 0, 0, 0x2089, NULL, 0);
+                reg_w(gspca_dev, 0, 0, 0x20f0, 0);
+                reg_w(gspca_dev, 0, 0x21, 0x20f1, 0);
+                reg_w(gspca_dev, 0, 0x40, 0x20f5, 0);
+                reg_w(gspca_dev, 0, 1, 0x20f4, 0);
+                reg_w(gspca_dev, 0, 0x40, 0x20f6, 0);
+                reg_w(gspca_dev, 0, 0, 0x2089, 0);
                 break;
         }
         if (pollreg)
@@ -799,7 +809,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                         const struct usb_device_id *id)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct usb_device *dev = gspca_dev->dev;
         struct cam *cam;
 
         cam = &gspca_dev->cam;
@@ -811,7 +820,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
         if (sd->subtype == AiptekMiniPenCam13) {
 /* try to get the firmware as some cam answer 2.0.1.2.2
  * and should be a spca504b then overwrite that setting */
-                reg_r(dev, 0x20, 0, gspca_dev->usb_buf, 1);
+                reg_r(gspca_dev, 0x20, 0, 1);
                 switch (gspca_dev->usb_buf[0]) {
                 case 1:
                         break;          /* (right bridge/subtype) */
@@ -848,8 +857,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct usb_device *dev = gspca_dev->dev;
@@ -860,12 +869,12 @@ static int sd_open(struct gspca_dev *gspca_dev)
 
         switch (sd->bridge) {
         case BRIDGE_SPCA504B:
-                reg_w(dev, 0x1d, 0, 0, NULL, 0);
-                reg_w(dev, 0, 1, 0x2306, NULL, 0);
-                reg_w(dev, 0, 0, 0x0d04, NULL, 0);
-                reg_w(dev, 0, 0, 0x2000, NULL, 0);
-                reg_w(dev, 0, 0x13, 0x2301, NULL, 0);
-                reg_w(dev, 0, 0, 0x2306, NULL, 0);
+                reg_w(gspca_dev, 0x1d, 0, 0, 0);
+                reg_w(gspca_dev, 0, 1, 0x2306, 0);
+                reg_w(gspca_dev, 0, 0, 0x0d04, 0);
+                reg_w(gspca_dev, 0, 0, 0x2000, 0);
+                reg_w(gspca_dev, 0, 0x13, 0x2301, 0);
+                reg_w(gspca_dev, 0, 0, 0x2306, 0);
                 /* fall thru */
         case BRIDGE_SPCA533:
                 rc = spca504B_PollingDataReady(gspca_dev);
@@ -873,12 +882,12 @@ static int sd_open(struct gspca_dev *gspca_dev)
                 break;
         case BRIDGE_SPCA536:
                 spca50x_GetFirmware(gspca_dev);
-                reg_r(dev, 0x00, 0x5002, gspca_dev->usb_buf, 1);
+                reg_r(gspca_dev, 0x00, 0x5002, 1);
                 gspca_dev->usb_buf[0] = 0;
-                reg_w(dev, 0x24, 0, 0, gspca_dev->usb_buf, 1);
-                reg_r(dev, 0x24, 0, gspca_dev->usb_buf, 1);
+                reg_w(gspca_dev, 0x24, 0, 0, 1);
+                reg_r(gspca_dev, 0x24, 0, 1);
                 rc = spca504B_PollingDataReady(gspca_dev);
-                reg_w(dev, 0x34, 0, 0, NULL, 0);
+                reg_w(gspca_dev, 0x34, 0, 0, 0);
                 spca504B_WaitCmdStatus(gspca_dev);
                 break;
         case BRIDGE_SPCA504C:   /* pccam600 */
@@ -971,12 +980,12 @@ static void sd_start(struct gspca_dev *gspca_dev)
 /*      case BRIDGE_SPCA536: */
                 if (sd->subtype == MegapixV4 ||
                     sd->subtype == LogitechClickSmart820) {
-                        reg_w(dev, 0xf0, 0, 0, NULL, 0);
+                        reg_w(gspca_dev, 0xf0, 0, 0, 0);
                         spca504B_WaitCmdStatus(gspca_dev);
-                        reg_r(dev, 0xf0, 4, NULL, 0);
+                        reg_r(gspca_dev, 0xf0, 4, 0);
                         spca504B_WaitCmdStatus(gspca_dev);
                 } else {
-                        reg_w(dev, 0x31, 0, 4, NULL, 0);
+                        reg_w(gspca_dev, 0x31, 0, 4, 0);
                         spca504B_WaitCmdStatus(gspca_dev);
                         rc = spca504B_PollingDataReady(gspca_dev);
                 }
@@ -1045,7 +1054,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 /*      case BRIDGE_SPCA533: */
 /*      case BRIDGE_SPCA536: */
 /*      case BRIDGE_SPCA504B: */
-                reg_w(dev, 0x31, 0, 0, NULL, 0);
+                reg_w(gspca_dev, 0x31, 0, 0, 0);
                 spca504B_WaitCmdStatus(gspca_dev);
                 spca504B_PollingDataReady(gspca_dev);
                 break;
@@ -1069,14 +1078,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         }
 }
 
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
@@ -1369,11 +1370,9 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
 };
 
@@ -1456,6 +1455,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index 91b555c34c68..f034c748fc7e 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -30,7 +30,7 @@
 
 #define MAX_GAMMA 0x10          /* 0 to 15 */
 
-#define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 3)
+#define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0)
 
 MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>");
 MODULE_DESCRIPTION("GSPCA/T613 (JPEG Compliance) USB Camera Driver");
@@ -233,7 +233,7 @@ static char *effects_control[] = {
 static struct v4l2_pix_format vga_mode_t16[] = {
         {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 160,
-                .sizeimage = 160 * 120 * 3 / 8 + 590,
+                .sizeimage = 160 * 120 * 4 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
                 .priv = 4},
         {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
@@ -391,7 +391,7 @@ static void reg_w(struct gspca_dev *gspca_dev,
                                 NULL, 0, 500);
                 return;
         }
-        if (len <= sizeof gspca_dev->usb_buf) {
+        if (len <= USB_BUF_SZ) {
                 memcpy(gspca_dev->usb_buf, buffer, len);
                 usb_control_msg(gspca_dev->dev,
                                 usb_sndctrlpipe(gspca_dev->dev, 0),
@@ -552,6 +552,13 @@ static int init_default_parameters(struct gspca_dev *gspca_dev)
         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;
@@ -893,18 +900,6 @@ static void sd_start(struct gspca_dev *gspca_dev)
         setcolors(gspca_dev);
 }
 
-static void sd_stopN(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
@@ -972,24 +967,14 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
         return -EINVAL;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
-{
-        init_default_parameters(gspca_dev);
-        return 0;
-}
-
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
-        .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
         .querymenu = sd_querymenu,
 };
@@ -1014,6 +999,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index 1ff8ba2f7fe5..084af05302a0 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -331,8 +331,8 @@ static void tv_8532_PollReg(struct gspca_dev *gspca_dev)
         }
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         reg_w_1(gspca_dev, TV8532_AD_SLOPE, 0x32);
         reg_w_1(gspca_dev, TV8532_AD_BITCTRL, 0x00);
@@ -450,14 +450,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_w_1(gspca_dev, TV8532_GPIO_OE, 0x0b);
 }
 
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-}
-
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void tv8532_preprocess(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -611,11 +603,9 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
-        .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
 };
 
@@ -644,6 +634,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index f4a52956e0d9..bd4c226c9a07 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -69,6 +69,7 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_setautogain,
             .get = sd_getautogain,
         },
+#define LIGHTFREQ_IDX 1
         {
             {
                 .id      = V4L2_CID_POWER_LINE_FREQUENCY,
@@ -87,12 +88,12 @@ static struct ctrl sd_ctrls[] = {
 };
 
 static struct v4l2_pix_format vc0321_mode[] = {
-        {320, 240, V4L2_PIX_FMT_YUV420, V4L2_FIELD_NONE,
+        {320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
                 .bytesperline = 320,
                 .sizeimage = 320 * 240 * 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .priv = 1},
-        {640, 480, V4L2_PIX_FMT_YUV420, V4L2_FIELD_NONE,
+        {640, 480, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 640 * 480 * 2,
                 .colorspace = V4L2_COLORSPACE_SRGB,
@@ -1463,6 +1464,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->qindex = 7;
         sd->autogain = AUTOGAIN_DEF;
         sd->lightfreq = FREQ_DEF;
+        if (sd->sensor != SENSOR_OV7670)
+                gspca_dev->ctrl_dis = (1 << LIGHTFREQ_IDX);
 
         if (sd->bridge == BRIDGE_VC0321) {
                 reg_r(gspca_dev, 0x8a, 0, 3);
@@ -1474,8 +1477,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         return 0;
 }
@@ -1637,19 +1640,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
         reg_w(dev, 0x89, 0xffff, 0xffff);
 }
 
-/* this function is called at close time */
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-/*      struct usb_device *dev = gspca_dev->dev;
-        __u8 buffread;
-
-        reg_w(dev, 0x89, 0xffff, 0xffff);
-        reg_w(dev, 0xa0, 0x01, 0xb301);
-        reg_w(dev, 0xa0, 0x09, 0xb303);
-        reg_w(dev, 0x89, 0xffff, 0xffff);
-*/
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,      /* target */
                         __u8 *data,                     /* isoc packet */
@@ -1738,11 +1728,10 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = ARRAY_SIZE(sd_ctrls),
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
         .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
         .querymenu = sd_querymenu,
 };
@@ -1774,6 +1763,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index bc7d0eedcd81..8d7c27e6ac77 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -85,6 +85,7 @@ static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val);
 
 static struct ctrl sd_ctrls[] = {
+#define BRIGHTNESS_IDX 0
 #define SD_BRIGHTNESS 0
         {
             {
@@ -141,6 +142,7 @@ static struct ctrl sd_ctrls[] = {
             .set = sd_setautogain,
             .get = sd_getautogain,
         },
+#define LIGHTFREQ_IDX 4
 #define SD_FREQ 4
         {
             {
@@ -6964,8 +6966,13 @@ static int zcxx_probeSensor(struct gspca_dev *gspca_dev)
         case SENSOR_MC501CB:
                 return -1;              /* don't probe */
         case SENSOR_TAS5130C_VF0250:
-                                /* may probe but with write in reg 0x0010 */
+                        /* may probe but with no write in reg 0x0010 */
                 return -1;              /* don't probe */
+        case SENSOR_PAS106:
+                sensor =  sif_probe(gspca_dev);
+                if (sensor >= 0)
+                        return sensor;
+                break;
         }
         sensor = vga_2wr_probe(gspca_dev);
         if (sensor >= 0) {
@@ -6974,12 +6981,10 @@ static int zcxx_probeSensor(struct gspca_dev *gspca_dev)
                 /* next probe is needed for OmniVision ? */
         }
         sensor2 = vga_3wr_probe(gspca_dev);
-        if (sensor2 >= 0) {
-                if (sensor >= 0)
-                        return sensor;
-                return sensor2;
-        }
-        return sif_probe(gspca_dev);
+        if (sensor2 >= 0
+            && sensor >= 0)
+                return sensor;
+        return sensor2;
 }
 
 /* this function is called at probe time */
@@ -7147,13 +7152,27 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->lightfreq = sd_ctrls[SD_FREQ].qctrl.default_value;
         sd->sharpness = sd_ctrls[SD_SHARPNESS].qctrl.default_value;
 
+        switch (sd->sensor) {
+        case SENSOR_GC0305:
+        case SENSOR_OV7620:
+        case SENSOR_PO2030:
+                gspca_dev->ctrl_dis = (1 << BRIGHTNESS_IDX);
+                break;
+        case SENSOR_HDCS2020:
+        case SENSOR_HV7131B:
+        case SENSOR_HV7131C:
+        case SENSOR_OV7630C:
+                gspca_dev->ctrl_dis = (1 << LIGHTFREQ_IDX);
+                break;
+        }
+
         /* switch the led off */
         reg_w(gspca_dev->dev, 0x01, 0x0000);
         return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
         reg_w(gspca_dev->dev, 0x01, 0x0000);
         return 0;
@@ -7314,10 +7333,6 @@ static void sd_start(struct gspca_dev *gspca_dev)
         }
 }
 
-static void sd_stopN(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -7325,11 +7340,6 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
         send_unknown(gspca_dev->dev, sd->sensor);
 }
 
-/* this function is called at close time */
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-}
-
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         struct gspca_frame *frame,
                         __u8 *data,
@@ -7489,37 +7499,30 @@ static const struct sd_desc sd_desc = {
         .ctrls = sd_ctrls,
         .nctrls = sizeof sd_ctrls / sizeof sd_ctrls[0],
         .config = sd_config,
-        .open = sd_open,
+        .init = sd_init,
         .start = sd_start,
-        .stopN = sd_stopN,
         .stop0 = sd_stop0,
-        .close = sd_close,
         .pkt_scan = sd_pkt_scan,
         .querymenu = sd_querymenu,
 };
 
 static const __devinitdata struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x041e)},
-#ifndef CONFIG_USB_ZC0301
         {USB_DEVICE(0x041e, 0x4017)},
-        {USB_DEVICE(0x041e, 0x401c)},
+        {USB_DEVICE(0x041e, 0x401c), .driver_info = SENSOR_PAS106},
         {USB_DEVICE(0x041e, 0x401e)},
         {USB_DEVICE(0x041e, 0x401f)},
-#endif
+        {USB_DEVICE(0x041e, 0x4022)},
         {USB_DEVICE(0x041e, 0x4029)},
-#ifndef CONFIG_USB_ZC0301
-        {USB_DEVICE(0x041e, 0x4034)},
-        {USB_DEVICE(0x041e, 0x4035)},
+        {USB_DEVICE(0x041e, 0x4034), .driver_info = SENSOR_PAS106},
+        {USB_DEVICE(0x041e, 0x4035), .driver_info = SENSOR_PAS106},
         {USB_DEVICE(0x041e, 0x4036)},
         {USB_DEVICE(0x041e, 0x403a)},
-#endif
         {USB_DEVICE(0x041e, 0x4051), .driver_info = SENSOR_TAS5130C_VF0250},
         {USB_DEVICE(0x041e, 0x4053), .driver_info = SENSOR_TAS5130C_VF0250},
-#ifndef CONFIG_USB_ZC0301
         {USB_DEVICE(0x0458, 0x7007)},
         {USB_DEVICE(0x0458, 0x700c)},
         {USB_DEVICE(0x0458, 0x700f)},
-#endif
         {USB_DEVICE(0x0461, 0x0a00)},
         {USB_DEVICE(0x046d, 0x08a0)},
         {USB_DEVICE(0x046d, 0x08a1)},
@@ -7531,7 +7534,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
         {USB_DEVICE(0x046d, 0x08aa)},
         {USB_DEVICE(0x046d, 0x08ac)},
         {USB_DEVICE(0x046d, 0x08ad)},
-#ifndef CONFIG_USB_ZC0301
+#if !defined CONFIG_USB_ZC0301 && !defined CONFIG_USB_ZC0301_MODULE
         {USB_DEVICE(0x046d, 0x08ae)},
 #endif
         {USB_DEVICE(0x046d, 0x08af)},
@@ -7541,27 +7544,25 @@ static const __devinitdata struct usb_device_id device_table[] = {
         {USB_DEVICE(0x046d, 0x08d8)},
         {USB_DEVICE(0x046d, 0x08da)},
         {USB_DEVICE(0x046d, 0x08dd), .driver_info = SENSOR_MC501CB},
-        {USB_DEVICE(0x0471, 0x0325)},
-        {USB_DEVICE(0x0471, 0x0326)},
-        {USB_DEVICE(0x0471, 0x032d)},
-        {USB_DEVICE(0x0471, 0x032e)},
+        {USB_DEVICE(0x0471, 0x0325), .driver_info = SENSOR_PAS106},
+        {USB_DEVICE(0x0471, 0x0326), .driver_info = SENSOR_PAS106},
+        {USB_DEVICE(0x0471, 0x032d), .driver_info = SENSOR_PAS106},
+        {USB_DEVICE(0x0471, 0x032e), .driver_info = SENSOR_PAS106},
         {USB_DEVICE(0x055f, 0xc005)},
-#ifndef CONFIG_USB_ZC0301
         {USB_DEVICE(0x055f, 0xd003)},
         {USB_DEVICE(0x055f, 0xd004)},
-#endif
         {USB_DEVICE(0x0698, 0x2003)},
+        {USB_DEVICE(0x0ac8, 0x0301), .driver_info = SENSOR_PAS106},
         {USB_DEVICE(0x0ac8, 0x0302)},
-#ifndef CONFIG_USB_ZC0301
         {USB_DEVICE(0x0ac8, 0x301b)},
+#if !defined CONFIG_USB_ZC0301 && !defined CONFIG_USB_ZC0301_MODULE
         {USB_DEVICE(0x0ac8, 0x303b)},
 #endif
         {USB_DEVICE(0x0ac8, 0x305b), .driver_info = SENSOR_TAS5130C_VF0250},
-#ifndef CONFIG_USB_ZC0301
         {USB_DEVICE(0x0ac8, 0x307b)},
         {USB_DEVICE(0x10fd, 0x0128)},
+        {USB_DEVICE(0x10fd, 0x804d)},
         {USB_DEVICE(0x10fd, 0x8050)},
-#endif
         {}                      /* end of entry */
 };
 #undef DVNAME
@@ -7581,6 +7582,10 @@ static struct usb_driver sd_driver = {
         .id_table = device_table,
         .probe = sd_probe,
         .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+        .suspend = gspca_suspend,
+        .resume = gspca_resume,
+#endif
 };
 
 static int __init sd_mod_init(void)
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index aea1664948ce..4afc7ea07e86 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -688,7 +688,7 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)
         spin_lock_init(&itv->lock);
         spin_lock_init(&itv->dma_reg_lock);
 
-        itv->irq_work_queues = create_workqueue(itv->name);
+        itv->irq_work_queues = create_singlethread_workqueue(itv->name);
         if (itv->irq_work_queues == NULL) {
                 IVTV_ERR("Could not create ivtv workqueue\n");
                 return -1;
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index ab287b48fc2b..2ceb5227637c 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -251,6 +251,7 @@ struct ivtv_mailbox_data {
 #define IVTV_F_I_DEC_PAUSED        20   /* the decoder is paused */
 #define IVTV_F_I_INITED            21   /* set after first open */
 #define IVTV_F_I_FAILED            22   /* set if first open failed */
+#define IVTV_F_I_WORK_INITED       23   /* worker thread was initialized */
 
 /* Event notifications */
 #define IVTV_F_I_EV_DEC_STOPPED    28   /* decoder stopped event */
diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c
index fba150a6cd23..34f3ab827858 100644
--- a/drivers/media/video/ivtv/ivtv-irq.c
+++ b/drivers/media/video/ivtv/ivtv-irq.c
@@ -76,6 +76,13 @@ void ivtv_irq_work_handler(struct work_struct *work)
 
         DEFINE_WAIT(wait);
 
+        if (test_and_clear_bit(IVTV_F_I_WORK_INITED, &itv->i_flags)) {
+                struct sched_param param = { .sched_priority = 99 };
+
+                /* This thread must use the FIFO scheduler as it
+                   is realtime sensitive. */
+                sched_setscheduler(current, SCHED_FIFO, &param);
+        }
         if (test_and_clear_bit(IVTV_F_I_WORK_HANDLER_PIO, &itv->i_flags))
                 ivtv_pio_work_handler(itv);
 
@@ -678,34 +685,14 @@ static void ivtv_irq_enc_start_cap(struct ivtv *itv)
 
 static void ivtv_irq_enc_vbi_cap(struct ivtv *itv)
 {
-        struct ivtv_stream *s_mpg = &itv->streams[IVTV_ENC_STREAM_TYPE_MPG];
         u32 data[CX2341X_MBOX_MAX_DATA];
         struct ivtv_stream *s;
 
         IVTV_DEBUG_HI_IRQ("ENC START VBI CAP\n");
         s = &itv->streams[IVTV_ENC_STREAM_TYPE_VBI];
 
-        /* If more than two VBI buffers are pending, then
-           clear the old ones and start with this new one.
-           This can happen during transition stages when MPEG capturing is
-           started, but the first interrupts haven't arrived yet. During
-           that period VBI requests can accumulate without being able to
-           DMA the data. Since at most four VBI DMA buffers are available,
-           we just drop the old requests when there are already three
-           requests queued. */
-        if (s->sg_pending_size > 2) {
-                struct ivtv_buffer *buf;
-                list_for_each_entry(buf, &s->q_predma.list, list)
-                        ivtv_buf_sync_for_cpu(s, buf);
-                ivtv_queue_move(s, &s->q_predma, NULL, &s->q_free, 0);
-                s->sg_pending_size = 0;
-        }
-        /* if we can append the data, and the MPEG stream isn't capturing,
-           then start a DMA request for just the VBI data. */
-        if (!stream_enc_dma_append(s, data) &&
-                        !test_bit(IVTV_F_S_STREAMING, &s_mpg->s_flags)) {
+        if (!stream_enc_dma_append(s, data))
                 set_bit(ivtv_use_pio(s) ? IVTV_F_S_PIO_PENDING : IVTV_F_S_DMA_PENDING, &s->s_flags);
-        }
 }
 
 static void ivtv_irq_dec_vbi_reinsert(struct ivtv *itv)
diff --git a/drivers/media/video/ivtv/ivtv-queue.h b/drivers/media/video/ivtv/ivtv-queue.h
index 7cfc0c9ab050..476556afd39a 100644
--- a/drivers/media/video/ivtv/ivtv-queue.h
+++ b/drivers/media/video/ivtv/ivtv-queue.h
@@ -23,7 +23,7 @@
 #define IVTV_QUEUE_H
 
 #define IVTV_DMA_UNMAPPED       ((u32) -1)
-#define SLICED_VBI_PIO 1
+#define SLICED_VBI_PIO 0
 
 /* ivtv_buffer utility functions */
 
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 54d2023b26c4..730e85d86fc8 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -363,7 +363,7 @@ static void ivtv_vbi_setup(struct ivtv *itv)
         /* Every X number of frames a VBI interrupt arrives (frames as in 25 or 30 fps) */
         data[1] = 1;
         /* The VBI frames are stored in a ringbuffer with this size (with a VBI frame as unit) */
-        data[2] = raw ? 4 : 8;
+        data[2] = raw ? 4 : 4 * (itv->vbi.raw_size / itv->vbi.enc_size);
         /* The start/stop codes determine which VBI lines end up in the raw VBI data area.
            The codes are from table 24 in the saa7115 datasheet. Each raw/sliced/video line
            is framed with codes FF0000XX where XX is the SAV/EAV (Start/End of Active Video)
diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c
index 71798f0da27f..1ce9deb1104f 100644
--- a/drivers/media/video/ivtv/ivtv-vbi.c
+++ b/drivers/media/video/ivtv/ivtv-vbi.c
@@ -293,6 +293,7 @@ static u32 compress_sliced_buf(struct ivtv *itv, u32 line, u8 *buf, u32 size, u8
         u32 line_size = itv->vbi.sliced_decoder_line_size;
         struct v4l2_decode_vbi_line vbi;
         int i;
+        unsigned lines = 0;
 
         /* find the first valid line */
         for (i = 0; i < size; i++, buf++) {
@@ -313,7 +314,8 @@ static u32 compress_sliced_buf(struct ivtv *itv, u32 line, u8 *buf, u32 size, u8
                 }
                 vbi.p = p + 4;
                 itv->video_dec_func(itv, VIDIOC_INT_DECODE_VBI_LINE, &vbi);
-                if (vbi.type) {
+                if (vbi.type && !(lines & (1 << vbi.line))) {
+                        lines |= 1 << vbi.line;
                         itv->vbi.sliced_data[line].id = vbi.type;
                         itv->vbi.sliced_data[line].field = vbi.is_second_field;
                         itv->vbi.sliced_data[line].line = vbi.line;
diff --git a/drivers/media/video/ivtv/ivtv-version.h b/drivers/media/video/ivtv/ivtv-version.h
index 442f43f11b73..8cd753d30bf7 100644
--- a/drivers/media/video/ivtv/ivtv-version.h
+++ b/drivers/media/video/ivtv/ivtv-version.h
@@ -22,7 +22,7 @@
 
 #define IVTV_DRIVER_NAME "ivtv"
 #define IVTV_DRIVER_VERSION_MAJOR 1
-#define IVTV_DRIVER_VERSION_MINOR 3
+#define IVTV_DRIVER_VERSION_MINOR 4
 #define IVTV_DRIVER_VERSION_PATCHLEVEL 0
 
 #define IVTV_VERSION __stringify(IVTV_DRIVER_VERSION_MAJOR) "." __stringify(IVTV_DRIVER_VERSION_MINOR) "." __stringify(IVTV_DRIVER_VERSION_PATCHLEVEL)
diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c
index 4895540be195..2fd4b4a44aa9 100644
--- a/drivers/media/video/ks0127.c
+++ b/drivers/media/video/ks0127.c
@@ -679,26 +679,27 @@ static int ks0127_command(struct i2c_client *client,
 
         case DECODER_ENABLE_OUTPUT:
         {
+                int enable;
 
-                int *iarg = arg;
-                int enable = (*iarg != 0);
-                        if (enable) {
-                                dprintk("ks0127: command "
+                iarg = arg;
+                enable = (*iarg != 0);
+                if (enable) {
+                        dprintk("ks0127: command "
                                         "DECODER_ENABLE_OUTPUT on "
                                         "(%d)\n", enable);
-                                /* All output pins on */
-                                ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x30);
-                                /* Obey the OEN pin */
-                                ks0127_and_or(ks, KS_CDEM, 0x7f, 0x00);
-                        } else {
-                                dprintk("ks0127: command "
+                        /* All output pins on */
+                        ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x30);
+                        /* Obey the OEN pin */
+                        ks0127_and_or(ks, KS_CDEM, 0x7f, 0x00);
+                } else {
+                        dprintk("ks0127: command "
                                         "DECODER_ENABLE_OUTPUT off "
                                         "(%d)\n", enable);
-                                /* Video output pins off */
-                                ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x00);
-                                /* Ignore the OEN pin */
-                                ks0127_and_or(ks, KS_CDEM, 0x7f, 0x80);
-                        }
+                        /* Video output pins off */
+                        ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x00);
+                        /* Ignore the OEN pin */
+                        ks0127_and_or(ks, KS_CDEM, 0x7f, 0x80);
+                }
         }
                 break;
 
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 7c8ef6ac6c39..a9ef7802eb5f 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1806,6 +1806,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
         memcpy(meye.video_dev, &meye_template, sizeof(meye_template));
         meye.video_dev->parent = &meye.mchip_dev->dev;
 
+        ret = -EIO;
         if ((ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1))) {
                 printk(KERN_ERR "meye: unable to power on the camera\n");
                 printk(KERN_ERR "meye: did you enable the camera in "
@@ -1813,7 +1814,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
                 goto outsonypienable;
         }
 
-        ret = -EIO;
         if ((ret = pci_enable_device(meye.mchip_dev))) {
                 printk(KERN_ERR "meye: pci_enable_device failed\n");
                 goto outenabledev;
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index f68e91fbe7fb..8ef578caba3b 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -931,27 +931,29 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
+static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standard)
 {
-        struct mxb* mxb = (struct mxb*)dev->ext_priv;
+        struct mxb *mxb = (struct mxb *)dev->ext_priv;
         int zero = 0;
         int one = 1;
 
-        if(V4L2_STD_PAL_I == std->id ) {
+        if (V4L2_STD_PAL_I == standard->id) {
                 v4l2_std_id std = V4L2_STD_PAL_I;
+
                 DEB_D(("VIDIOC_S_STD: setting mxb for PAL_I.\n"));
                 /* 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, DECODER_SET_GPIO, &zero);
                 mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std);
         } else {
                 v4l2_std_id std = V4L2_STD_PAL_BG;
+
                 DEB_D(("VIDIOC_S_STD: setting mxb for PAL/NTSC/SECAM.\n"));
                 /* 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, DECODER_SET_GPIO, &one);
                 mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_STD, &std);
         }
         return 0;
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index 9edaca4371d7..3d3c48db45d9 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -626,9 +626,9 @@ ov511_i2c_write_internal(struct usb_ov511 *ov,
                         break;
 
                 /* Retry until idle */
-                do
+                do {
                         rc = reg_r(ov, R511_I2C_CTL);
-                while (rc > 0 && ((rc&1) == 0));
+                } while (rc > 0 && ((rc&1) == 0));
                 if (rc < 0)
                         break;
 
@@ -703,9 +703,9 @@ ov511_i2c_read_internal(struct usb_ov511 *ov, unsigned char reg)
                         return rc;
 
                 /* Retry until idle */
-                do
-                         rc = reg_r(ov, R511_I2C_CTL);
-                while (rc > 0 && ((rc&1) == 0));
+                do {
+                        rc = reg_r(ov, R511_I2C_CTL);
+                } while (rc > 0 && ((rc & 1) == 0));
                 if (rc < 0)
                         return rc;
 
@@ -729,9 +729,9 @@ ov511_i2c_read_internal(struct usb_ov511 *ov, unsigned char reg)
                         return rc;
 
                 /* Retry until idle */
-                do
+                do {
                         rc = reg_r(ov, R511_I2C_CTL);
-                while (rc > 0 && ((rc&1) == 0));
+                } while (rc > 0 && ((rc&1) == 0));
                 if (rc < 0)
                         return rc;
 
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 00425d743656..7c84f795db54 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -1019,10 +1019,23 @@ static int init_mediavision(void)
  *      Initialization and module stuff
  */
 
+#ifndef MODULE
+static int enable;
+module_param(enable, int, 0);
+#endif
+
 static int __init init_pms_cards(void)
 {
         printk(KERN_INFO "Mediavision Pro Movie Studio driver 0.02\n");
 
+#ifndef MODULE
+        if (!enable) {
+                printk(KERN_INFO "PMS: not enabled, use pms.enable=1 to "
+                                 "probe\n");
+                return -ENODEV;
+        }
+#endif
+
         data_port = io_port +1;
 
         if(init_mediavision())
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c
index 1cccd5c77048..dbc560742553 100644
--- a/drivers/media/video/pwc/pwc-ctrl.c
+++ b/drivers/media/video/pwc/pwc-ctrl.c
@@ -1635,15 +1635,15 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
 
         case VIDIOCPWCGVIDCMD:
         {
-                ARG_DEF(struct pwc_video_command, cmd);
-
-                ARGR(cmd).type = pdev->type;
-                ARGR(cmd).release = pdev->release;
-                ARGR(cmd).command_len = pdev->cmd_len;
-                memcpy(&ARGR(cmd).command_buf, pdev->cmd_buf, pdev->cmd_len);
-                ARGR(cmd).bandlength = pdev->vbandlength;
-                ARGR(cmd).frame_size = pdev->frame_size;
-                ARG_OUT(cmd)
+                ARG_DEF(struct pwc_video_command, vcmd);
+
+                ARGR(vcmd).type = pdev->type;
+                ARGR(vcmd).release = pdev->release;
+                ARGR(vcmd).command_len = pdev->cmd_len;
+                memcpy(&ARGR(vcmd).command_buf, pdev->cmd_buf, pdev->cmd_len);
+                ARGR(vcmd).bandlength = pdev->vbandlength;
+                ARGR(vcmd).frame_size = pdev->frame_size;
+                ARG_OUT(vcmd)
                 break;
         }
         /*
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index bcd1c8f6cf6b..ad733caec720 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1489,10 +1489,9 @@ static int saa7115_probe(struct i2c_client *client,
                  client->addr << 1, client->adapter->name);
 
         state = kzalloc(sizeof(struct saa711x_state), GFP_KERNEL);
-        i2c_set_clientdata(client, state);
-        if (state == NULL) {
+        if (state == NULL)
                 return -ENOMEM;
-        }
+        i2c_set_clientdata(client, state);
         state->input = -1;
         state->output = SAA7115_IPORT_ON;
         state->enable = 1;
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index f481277892da..acceed5d04ae 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -1397,7 +1397,7 @@ static int se401_probe(struct usb_interface *intf,
         mutex_init(&se401->lock);
         wmb();
 
-        if (video_register_device(&se401->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
+        if (video_register_device(&se401->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
                 kfree(se401);
                 err("video_register_device failed");
                 return -EIO;
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 23408764d0ef..2da6938718f2 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -3312,6 +3312,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         cam->v4ldev->fops = &sn9c102_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
+        cam->v4ldev->parent = &udev->dev;
 
         init_completion(&cam->probe);
 
diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/video/sn9c102/sn9c102_devtable.h
index 6ff489baacf3..90a401dc3884 100644
--- a/drivers/media/video/sn9c102/sn9c102_devtable.h
+++ b/drivers/media/video/sn9c102/sn9c102_devtable.h
@@ -40,11 +40,14 @@ struct sn9c102_device;
 
 static const struct usb_device_id sn9c102_id_table[] = {
         /* SN9C101 and SN9C102 */
+#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE
         { SN9C102_USB_DEVICE(0x0c45, 0x6001, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6005, BRIDGE_SN9C102), },
+#endif
         { SN9C102_USB_DEVICE(0x0c45, 0x6007, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6009, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), }, OV6650 */
         { SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6024, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6025, BRIDGE_SN9C102), },
@@ -53,29 +56,33 @@ static const struct usb_device_id sn9c102_id_table[] = {
         { SN9C102_USB_DEVICE(0x0c45, 0x602a, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x602b, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x602c, BRIDGE_SN9C102), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), }, HV7131R */
         { SN9C102_USB_DEVICE(0x0c45, 0x602e, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6030, BRIDGE_SN9C102), },
         /* SN9C103 */
         { SN9C102_USB_DEVICE(0x0c45, 0x6080, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6082, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x6083, BRIDGE_SN9C103), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x6083, BRIDGE_SN9C103), }, HY7131D/E */
         { SN9C102_USB_DEVICE(0x0c45, 0x6088, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x608a, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x608b, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x608c, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x608e, BRIDGE_SN9C103), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x608e, BRIDGE_SN9C103), }, CISVF10 */
+#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE
         { SN9C102_USB_DEVICE(0x0c45, 0x608f, BRIDGE_SN9C103), },
+#endif
         { SN9C102_USB_DEVICE(0x0c45, 0x60a0, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60a2, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60a3, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60a8, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60aa, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ab, BRIDGE_SN9C103), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60a8, BRIDGE_SN9C103), }, PAS106 */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60aa, BRIDGE_SN9C103), }, TAS5130 */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60ab, BRIDGE_SN9C103), }, TAS5130 */
         { SN9C102_USB_DEVICE(0x0c45, 0x60ac, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60ae, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60af, BRIDGE_SN9C103), },
+#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE
         { SN9C102_USB_DEVICE(0x0c45, 0x60b0, BRIDGE_SN9C103), },
+#endif
         { SN9C102_USB_DEVICE(0x0c45, 0x60b2, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60b3, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60b8, BRIDGE_SN9C103), },
@@ -105,7 +112,7 @@ static const struct usb_device_id sn9c102_id_table[] = {
         { SN9C102_USB_DEVICE(0x0c45, 0x6108, BRIDGE_SN9C120), },
         { SN9C102_USB_DEVICE(0x0c45, 0x610f, BRIDGE_SN9C120), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6130, BRIDGE_SN9C120), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), }, MO8000 */
         { SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), },
         { SN9C102_USB_DEVICE(0x0c45, 0x613b, BRIDGE_SN9C120), },
         { SN9C102_USB_DEVICE(0x0c45, 0x613c, BRIDGE_SN9C120), },
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index 56dc3d6b5b29..dce947439459 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -1462,7 +1462,7 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id
         mutex_init (&stv680->lock);
         wmb ();
 
-        if (video_register_device (stv680->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
+        if (video_register_device(stv680->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
                 PDEBUG (0, "STV(e): video_register_device failed");
                 retval = -EIO;
                 goto error_vdev;
diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index 59166b760104..cc27efe121dd 100644
--- a/drivers/media/video/usbvideo/ibmcam.c
+++ b/drivers/media/video/usbvideo/ibmcam.c
@@ -736,12 +736,12 @@ static enum ParseState ibmcam_model2_320x240_parse_lines(
                  * make black color and quit the horizontal scanning loop.
                  */
                 if (((frame->curline + 2) >= scanHeight) || (i >= scanLength)) {
-                        const int j = i * V4L_BYTES_PER_PIXEL;
+                        const int offset = i * V4L_BYTES_PER_PIXEL;
 #if USES_IBMCAM_PUTPIXEL
                         /* Refresh 'f' because we don't use it much with PUTPIXEL */
-                        f = frame->data + (v4l_linesize * frame->curline) + j;
+                        f = frame->data + (v4l_linesize * frame->curline) + offset;
 #endif
-                        memset(f, 0, v4l_linesize - j);
+                        memset(f, 0, v4l_linesize - offset);
                         break;
                 }
 
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index b7792451a299..2eb45829791c 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -866,7 +866,7 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
         cam->udev = dev;
         cam->bulkEndpoint = bulkEndpoint;
 
-        if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1) == -1) {
+        if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1) < 0) {
                 kfree(cam);
                 printk(KERN_WARNING "video_register_device failed\n");
                 return -EIO;
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 6f36006aecda..155fdec9ac7d 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -257,6 +257,9 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
         int ret;
         char *name_base;
 
+        if (vfd == NULL)
+                return -EINVAL;
+
         switch (type) {
         case VFL_TYPE_GRABBER:
                 base = MINOR_VFL_TYPE_GRABBER_MIN;
@@ -281,7 +284,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
         default:
                 printk(KERN_ERR "%s called with unknown type: %d\n",
                        __func__, type);
-                return -1;
+                return -EINVAL;
         }
 
         /* pick a minor number */
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index fdfe7739c96e..140ef92c19c1 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -499,7 +499,7 @@ static void dbgbuf(unsigned int cmd, struct video_device *vfd,
                         p->timestamp.tv_sec / 3600,
                         (int)(p->timestamp.tv_sec / 60) % 60,
                         (int)(p->timestamp.tv_sec % 60),
-                        p->timestamp.tv_usec,
+                        (long)p->timestamp.tv_usec,
                         p->index,
                         prt_names(p->type, v4l2_type_names),
                         p->bytesused, p->flags,
@@ -674,7 +674,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
          __video_do_ioctl will be called again, with one or more
          V4L2 ioctls.
          ********************************************************/
-        if (_IOC_TYPE(cmd) == 'v')
+        if (_IOC_TYPE(cmd) == 'v' && _IOC_NR(cmd) < BASE_VIDIOCPRIVATE)
                 return v4l_compat_translate_ioctl(inode, file, cmd, arg,
                                                 __video_do_ioctl);
 #endif
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 3518af071a2e..8ba8daafd7ea 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1021,13 +1021,13 @@ static int vivi_release(void)
                 dev = list_entry(list, struct vivi_dev, vivi_devlist);
 
                 if (-1 != dev->vfd->minor) {
-                        video_unregister_device(dev->vfd);
-                        printk(KERN_INFO "%s: /dev/video%d unregistered.\n",
+                        printk(KERN_INFO "%s: unregistering /dev/video%d\n",
                                 VIVI_MODULE_NAME, dev->vfd->minor);
+                        video_unregister_device(dev->vfd);
                 } else {
-                        video_device_release(dev->vfd);
-                        printk(KERN_INFO "%s: /dev/video%d released.\n",
+                        printk(KERN_INFO "%s: releasing /dev/video%d\n",
                                 VIVI_MODULE_NAME, dev->vfd->minor);
+                        video_device_release(dev->vfd);
                 }
 
                 kfree(dev);
@@ -1104,19 +1104,29 @@ static struct video_device vivi_template = {
         Initialization and module stuff
    ------------------------------------------------------------------*/
 
+/* This routine allocates from 1 to n_devs virtual drivers.
+
+   The real maximum number of virtual drivers will depend on how many drivers
+   will succeed. This is limited to the maximum number of devices that
+   videodev supports. Since there are 64 minors for video grabbers, this is
+   currently the theoretical maximum limit. However, a further limit does
+   exist at videodev that forbids any driver to register more than 32 video
+   grabbers.
+ */
 static int __init vivi_init(void)
 {
         int ret = -ENOMEM, i;
         struct vivi_dev *dev;
         struct video_device *vfd;
 
+        if (n_devs <= 0)
+                n_devs = 1;
+
         for (i = 0; i < n_devs; i++) {
                 dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-                if (NULL == dev)
+                if (!dev)
                         break;
 
-                list_add_tail(&dev->vivi_devlist, &vivi_devlist);
-
                 /* init video dma queues */
                 INIT_LIST_HEAD(&dev->vidq.active);
                 init_waitqueue_head(&dev->vidq.wq);
@@ -1126,14 +1136,27 @@ static int __init vivi_init(void)
                 mutex_init(&dev->mutex);
 
                 vfd = video_device_alloc();
-                if (NULL == vfd)
+                if (!vfd) {
+                        kfree(dev);
                         break;
+                }
 
                 *vfd = vivi_template;
 
                 ret = video_register_device(vfd, VFL_TYPE_GRABBER, video_nr);
-                if (ret < 0)
+                if (ret < 0) {
+                        video_device_release(vfd);
+                        kfree(dev);
+
+                        /* If some registers succeeded, keep driver */
+                        if (i)
+                                ret = 0;
+
                         break;
+                }
+
+                /* Now that everything is fine, let's add it to device list */
+                list_add_tail(&dev->vivi_devlist, &vivi_devlist);
 
                 snprintf(vfd->name, sizeof(vfd->name), "%s (%i)",
                          vivi_template.name, vfd->minor);
@@ -1149,11 +1172,16 @@ static int __init vivi_init(void)
         if (ret < 0) {
                 vivi_release();
                 printk(KERN_INFO "Error %d while loading vivi driver\n", ret);
-        } else
+        } else {
                 printk(KERN_INFO "Video Technology Magazine Virtual Video "
                         "Capture Board ver %u.%u.%u successfully loaded.\n",
                         (VIVI_VERSION >> 16) & 0xFF, (VIVI_VERSION >> 8) & 0xFF,
                         VIVI_VERSION & 0xFF);
+
+                /* n_devs will reflect the actual number of allocated devices */
+                n_devs = i;
+        }
+
         return ret;
 }
 
@@ -1169,10 +1197,10 @@ MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board");
 MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");
 MODULE_LICENSE("Dual BSD/GPL");
 
-module_param(video_nr, int, 0);
+module_param(video_nr, uint, 0444);
 MODULE_PARM_DESC(video_nr, "video iminor start number");
 
-module_param(n_devs, int, 0);
+module_param(n_devs, uint, 0444);
 MODULE_PARM_DESC(n_devs, "number of video devices to create");
 
 module_param_named(debug, vivi_template.debug, int, 0444);
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index 9402f40095b4..2ff00bc5ad64 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -334,7 +334,7 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port)
         memcpy(&cam->vdev, &w9966_template, sizeof(struct video_device));
         cam->vdev.priv = cam;
 
-        if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, video_nr) == -1)
+        if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, video_nr) < 0)
                 return -1;
 
         w9966_setState(cam, W9966_STATE_VDEV, W9966_STATE_VDEV);
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 550ce7bd5c87..0c3287734c93 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -1988,6 +1988,7 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         cam->v4ldev->fops = &zc0301_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
+        cam->v4ldev->parent = &udev->dev;
         video_set_drvdata(cam->v4ldev, cam);
 
         init_completion(&cam->probe);
diff --git a/drivers/media/video/zc0301/zc0301_sensor.h b/drivers/media/video/zc0301/zc0301_sensor.h
index 70fe6fc6cdd5..b0cd49c438a3 100644
--- a/drivers/media/video/zc0301/zc0301_sensor.h
+++ b/drivers/media/video/zc0301/zc0301_sensor.h
@@ -60,27 +60,8 @@ zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor);
 
 #define ZC0301_ID_TABLE                                                       \
 static const struct usb_device_id zc0301_id_table[] =  {                      \
-        { ZC0301_USB_DEVICE(0x041e, 0x4017, 0xff), }, /* ICM105 */            \
-        { ZC0301_USB_DEVICE(0x041e, 0x401c, 0xff), }, /* PAS106 */            \
-        { ZC0301_USB_DEVICE(0x041e, 0x401e, 0xff), }, /* HV7131 */            \
-        { ZC0301_USB_DEVICE(0x041e, 0x401f, 0xff), }, /* TAS5130 */           \
-        { ZC0301_USB_DEVICE(0x041e, 0x4022, 0xff), },                         \
-        { ZC0301_USB_DEVICE(0x041e, 0x4034, 0xff), }, /* PAS106 */            \
-        { ZC0301_USB_DEVICE(0x041e, 0x4035, 0xff), }, /* PAS106 */            \
-        { ZC0301_USB_DEVICE(0x041e, 0x4036, 0xff), }, /* HV7131 */            \
-        { ZC0301_USB_DEVICE(0x041e, 0x403a, 0xff), }, /* HV7131 */            \
-        { ZC0301_USB_DEVICE(0x0458, 0x7007, 0xff), }, /* TAS5130 */           \
-        { ZC0301_USB_DEVICE(0x0458, 0x700c, 0xff), }, /* TAS5130 */           \
-        { ZC0301_USB_DEVICE(0x0458, 0x700f, 0xff), }, /* TAS5130 */           \
         { ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */            \
-        { ZC0301_USB_DEVICE(0x055f, 0xd003, 0xff), }, /* TAS5130 */           \
-        { ZC0301_USB_DEVICE(0x055f, 0xd004, 0xff), }, /* TAS5130 */           \
-        { ZC0301_USB_DEVICE(0x0ac8, 0x0301, 0xff), },                         \
-        { ZC0301_USB_DEVICE(0x0ac8, 0x301b, 0xff), }, /* PB-0330/HV7131 */    \
         { ZC0301_USB_DEVICE(0x0ac8, 0x303b, 0xff), }, /* PB-0330 */           \
-        { ZC0301_USB_DEVICE(0x10fd, 0x0128, 0xff), }, /* TAS5130 */           \
-        { ZC0301_USB_DEVICE(0x10fd, 0x8050, 0xff), }, /* TAS5130 */           \
-        { ZC0301_USB_DEVICE(0x10fd, 0x804e, 0xff), }, /* TAS5130 */           \
         { }                                                                   \
 };
 
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c
index 7a1ef6c262de..3e56203e4947 100644
--- a/drivers/misc/fujitsu-laptop.c
+++ b/drivers/misc/fujitsu-laptop.c
@@ -463,6 +463,13 @@ static struct dmi_system_id __initdata fujitsu_dmi_table[] = {
                      DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK S6410"),
                      },
          .callback = dmi_check_cb_s6410},
+        {
+         .ident = "FUJITSU LifeBook P8010",
+         .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P8010"),
+                    },
+         .callback = dmi_check_cb_s6410},
         {}
 };
 
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index d3eb7903c346..6b9300779a43 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -3086,7 +3086,6 @@ static struct ibm_struct wan_driver_data = {
         .read = wan_read,
         .write = wan_write,
         .exit = wan_exit,
-        .flags.experimental = 1,
 };
 
 /*************************************************************************
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 86dbb366415a..6986f3926244 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -103,8 +103,10 @@ static int mmc_blk_open(struct inode *inode, struct file *filp)
                         check_disk_change(inode->i_bdev);
                 ret = 0;
 
-                if ((filp->f_mode & FMODE_WRITE) && md->read_only)
+                if ((filp->f_mode & FMODE_WRITE) && md->read_only) {
+                        mmc_blk_put(md);
                         ret = -EROFS;
+                }
         }
 
         return ret;
diff --git a/drivers/mtd/nand/atmel_nand_ecc.h b/drivers/mtd/nand/atmel_nand_ecc.h
index 1ee7f993db1c..578c776e1356 100644
--- a/drivers/mtd/nand/atmel_nand_ecc.h
+++ b/drivers/mtd/nand/atmel_nand_ecc.h
@@ -2,6 +2,9 @@
  * Error Corrected Code Controller (ECC) - System peripherals regsters.
  * Based on AT91SAM9260 datasheet revision B.
  *
+ * Copyright (C) 2007 Andrew Victor
+ * Copyright (C) 2007 Atmel Corporation.
+ *
  * 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
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index cbab654b03c8..edb1e322113d 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -109,7 +109,7 @@ struct tmio_nand {
 
         void __iomem *ccr;
         void __iomem *fcr;
-        unsigned long fcr_phys;
+        unsigned long fcr_base;
 
         unsigned int irq;
 
@@ -316,8 +316,8 @@ static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio)
         tmio_iowrite8(0x81, tmio->ccr + CCR_ICC);
 
         /* (10h)BaseAddress    0x1000 spba.spba2 */
-        tmio_iowrite16(tmio->fcr_phys, tmio->ccr + CCR_BASE);
-        tmio_iowrite16(tmio->fcr_phys >> 16, tmio->ccr + CCR_BASE + 16);
+        tmio_iowrite16(tmio->fcr_base, tmio->ccr + CCR_BASE);
+        tmio_iowrite16(tmio->fcr_base >> 16, tmio->ccr + CCR_BASE + 2);
 
         /* (04h)Command Register I/O spcmd */
         tmio_iowrite8(0x02, tmio->ccr + CCR_COMMAND);
@@ -395,7 +395,7 @@ static int tmio_probe(struct platform_device *dev)
                 goto err_iomap_ccr;
         }
 
-        tmio->fcr_phys = (unsigned long)fcr->start;
+        tmio->fcr_base = fcr->start & 0xfffff;
         tmio->fcr = ioremap(fcr->start, fcr->end - fcr->start + 1);
         if (!tmio->fcr) {
                 retval = -EIO;
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index a14dba1afcc5..fd705d1295a7 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -151,6 +151,8 @@ struct sw_rx_page {
 #define PAGES_PER_SGE_SHIFT             0
 #define PAGES_PER_SGE                   (1 << PAGES_PER_SGE_SHIFT)
 
+#define BCM_RX_ETH_PAYLOAD_ALIGN        64
+
 /* SGE ring related macros */
 #define NUM_RX_SGE_PAGES                2
 #define RX_SGE_CNT              (BCM_PAGE_SIZE / sizeof(struct eth_rx_sge))
@@ -750,8 +752,7 @@ struct bnx2x {
 
         u32                     rx_csum;
         u32                     rx_offset;
-        u32                     rx_buf_use_size;        /* useable size */
-        u32                     rx_buf_size;            /* with alignment */
+        u32                     rx_buf_size;
 #define ETH_OVREHEAD                    (ETH_HLEN + 8)  /* 8 for CRC + VLAN */
 #define ETH_MIN_PACKET_SIZE             60
 #define ETH_MAX_PACKET_SIZE             1500
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 82deea0a63f5..a8eb3c4a47c8 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -59,8 +59,8 @@
 #include "bnx2x.h"
 #include "bnx2x_init.h"
 
-#define DRV_MODULE_VERSION      "1.45.20"
-#define DRV_MODULE_RELDATE      "2008/08/25"
+#define DRV_MODULE_VERSION      "1.45.21"
+#define DRV_MODULE_RELDATE      "2008/09/03"
 #define BNX2X_BC_VER            0x040200
 
 /* Time in jiffies before concluding the transmitter is hung */
@@ -1027,7 +1027,7 @@ static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,
         if (unlikely(skb == NULL))
                 return -ENOMEM;
 
-        mapping = pci_map_single(bp->pdev, skb->data, bp->rx_buf_use_size,
+        mapping = pci_map_single(bp->pdev, skb->data, bp->rx_buf_size,
                                  PCI_DMA_FROMDEVICE);
         if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
                 dev_kfree_skb(skb);
@@ -1169,7 +1169,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
         /* move empty skb from pool to prod and map it */
         prod_rx_buf->skb = fp->tpa_pool[queue].skb;
         mapping = pci_map_single(bp->pdev, fp->tpa_pool[queue].skb->data,
-                                 bp->rx_buf_use_size, PCI_DMA_FROMDEVICE);
+                                 bp->rx_buf_size, PCI_DMA_FROMDEVICE);
         pci_unmap_addr_set(prod_rx_buf, mapping, mapping);
 
         /* move partial skb from cons to pool (don't unmap yet) */
@@ -1276,7 +1276,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
            pool entry status to BNX2X_TPA_STOP even if new skb allocation
            fails. */
         pci_unmap_single(bp->pdev, pci_unmap_addr(rx_buf, mapping),
-                         bp->rx_buf_use_size, PCI_DMA_FROMDEVICE);
+                         bp->rx_buf_size, PCI_DMA_FROMDEVICE);
 
         if (likely(new_skb)) {
                 /* fix ip xsum and give it to the stack */
@@ -1520,7 +1520,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                         } else if (bnx2x_alloc_rx_skb(bp, fp, bd_prod) == 0) {
                                 pci_unmap_single(bp->pdev,
                                         pci_unmap_addr(rx_buf, mapping),
-                                                 bp->rx_buf_use_size,
+                                                 bp->rx_buf_size,
                                                  PCI_DMA_FROMDEVICE);
                                 skb_reserve(skb, pad);
                                 skb_put(skb, len);
@@ -4229,7 +4229,7 @@ static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,
                 if (fp->tpa_state[i] == BNX2X_TPA_START)
                         pci_unmap_single(bp->pdev,
                                          pci_unmap_addr(rx_buf, mapping),
-                                         bp->rx_buf_use_size,
+                                         bp->rx_buf_size,
                                          PCI_DMA_FROMDEVICE);
 
                 dev_kfree_skb(skb);
@@ -4245,15 +4245,14 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp)
         u16 ring_prod, cqe_ring_prod;
         int i, j;
 
-        bp->rx_buf_use_size = bp->dev->mtu;
-        bp->rx_buf_use_size += bp->rx_offset + ETH_OVREHEAD;
-        bp->rx_buf_size = bp->rx_buf_use_size + 64;
+        bp->rx_buf_size = bp->dev->mtu;
+        bp->rx_buf_size += bp->rx_offset + ETH_OVREHEAD +
+                BCM_RX_ETH_PAYLOAD_ALIGN;
 
         if (bp->flags & TPA_ENABLE_FLAG) {
                 DP(NETIF_MSG_IFUP,
-                   "rx_buf_use_size %d  rx_buf_size %d  effective_mtu %d\n",
-                   bp->rx_buf_use_size, bp->rx_buf_size,
-                   bp->dev->mtu + ETH_OVREHEAD);
+                   "rx_buf_size %d  effective_mtu %d\n",
+                   bp->rx_buf_size, bp->dev->mtu + ETH_OVREHEAD);
 
                 for_each_queue(bp, j) {
                         struct bnx2x_fastpath *fp = &bp->fp[j];
@@ -4462,9 +4461,10 @@ static void bnx2x_init_context(struct bnx2x *bp)
                 context->ustorm_st_context.common.status_block_id = sb_id;
                 context->ustorm_st_context.common.flags =
                         USTORM_ETH_ST_CONTEXT_CONFIG_ENABLE_MC_ALIGNMENT;
-                context->ustorm_st_context.common.mc_alignment_size = 64;
+                context->ustorm_st_context.common.mc_alignment_size =
+                        BCM_RX_ETH_PAYLOAD_ALIGN;
                 context->ustorm_st_context.common.bd_buff_size =
-                                                bp->rx_buf_use_size;
+                                                bp->rx_buf_size;
                 context->ustorm_st_context.common.bd_page_base_hi =
                                                 U64_HI(fp->rx_desc_mapping);
                 context->ustorm_st_context.common.bd_page_base_lo =
@@ -4717,7 +4717,7 @@ static void bnx2x_init_internal_func(struct bnx2x *bp)
         }
 
         /* Init CQ ring mapping and aggregation size */
-        max_agg_size = min((u32)(bp->rx_buf_use_size +
+        max_agg_size = min((u32)(bp->rx_buf_size +
                                  8*BCM_PAGE_SIZE*PAGES_PER_SGE),
                            (u32)0xffff);
         for_each_queue(bp, i) {
@@ -5940,7 +5940,7 @@ static void bnx2x_free_rx_skbs(struct bnx2x *bp)
 
                         pci_unmap_single(bp->pdev,
                                          pci_unmap_addr(rx_buf, mapping),
-                                         bp->rx_buf_use_size,
+                                         bp->rx_buf_size,
                                          PCI_DMA_FROMDEVICE);
 
                         rx_buf->skb = NULL;
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 331b86b01fa9..0b6ecef9a849 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5975,10 +5975,12 @@ static void nv_shutdown(struct pci_dev *pdev)
         if (netif_running(dev))
                 nv_close(dev);
 
-        pci_enable_wake(pdev, PCI_D3hot, np->wolenabled);
-        pci_enable_wake(pdev, PCI_D3cold, np->wolenabled);
         pci_disable_device(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
+        if (system_state == SYSTEM_POWER_OFF) {
+                if (pci_enable_wake(pdev, PCI_D3cold, np->wolenabled))
+                        pci_enable_wake(pdev, PCI_D3hot, np->wolenabled);
+                pci_set_power_state(pdev, PCI_D3hot);
+        }
 }
 #else
 #define nv_suspend NULL
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 53f41b649f03..a417be7f8be5 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2304,6 +2304,12 @@ static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter
         int vector, v_budget;
 
         /*
+         * Set the default interrupt throttle rate.
+         */
+        adapter->rx_eitr = (1000000 / IXGBE_DEFAULT_ITR_RX_USECS);
+        adapter->tx_eitr = (1000000 / IXGBE_DEFAULT_ITR_TX_USECS);
+
+        /*
          * It's easy to be greedy for MSI-X vectors, but it really
          * doesn't do us much good if we have a lot more vectors
          * than CPU's.  So let's be conservative and only ask for
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 32bb47adbe39..008fd6618a5f 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -359,16 +359,6 @@ static void netxen_pcie_strap_init(struct netxen_adapter *adapter)
         int i, pos;
         struct pci_dev *pdev;
 
-        pdev = pci_get_device(0x1166, 0x0140, NULL);
-        if (pdev) {
-                pci_dev_put(pdev);
-                adapter->hw_read_wx(adapter,
-                        NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &chicken, 4);
-                chicken |= 0x4000;
-                adapter->hw_write_wx(adapter,
-                        NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &chicken, 4);
-        }
-
         pdev = adapter->pdev;
 
         adapter->hw_read_wx(adapter,
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 3f682d49a4e6..52bf11b73c6e 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -784,6 +784,7 @@ static struct pcmcia_device_id axnet_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FEther PCC-TXD", 0x5261440f, 0x436768c5),
         PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FEtherII PCC-TXD", 0x5261440f, 0x730df72e),
         PCMCIA_DEVICE_PROD_ID12("Dynalink", "L100C16", 0x55632fd5, 0x66bc2a90),
+        PCMCIA_DEVICE_PROD_ID12("IO DATA", "ETXPCM", 0x547e66dc, 0x233adac2),
         PCMCIA_DEVICE_PROD_ID12("Linksys", "EtherFast 10/100 PC Card (PCMPC100 V3)", 0x0733cc81, 0x232019a8),
         PCMCIA_DEVICE_PROD_ID12("MELCO", "LPC3-TX", 0x481e0094, 0xf91af609),
         PCMCIA_DEVICE_PROD_ID12("PCMCIA", "100BASE", 0x281f1c5d, 0x7c2add04),
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 2d4c4ad89b8d..ebc1ae6bcbe5 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -1626,6 +1626,7 @@ static struct pcmcia_device_id pcnet_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-TD", 0x5261440f, 0xc49bd73d),
         PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d),
         PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-T", 0x5261440f, 0x6705fcaa),
+        PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-TD", 0x5261440f, 0x47d5ca83),
         PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FastEther PCC-TX", 0x5261440f, 0x485e85d9),
         PCMCIA_DEVICE_PROD_ID12("Corega,K.K.", "Ethernet LAN Card", 0x110d26d9, 0x9fd2f0a2),
         PCMCIA_DEVICE_PROD_ID12("corega,K.K.", "Ethernet LAN Card", 0x9791a90e, 0x9fd2f0a2),
@@ -1737,7 +1738,6 @@ static struct pcmcia_device_id pcnet_ids[] = {
         PCMCIA_DEVICE_PROD_ID1("CyQ've 10 Base-T LAN CARD", 0x94faf360),
         PCMCIA_DEVICE_PROD_ID1("EP-210 PCMCIA LAN CARD.", 0x8850b4de),
         PCMCIA_DEVICE_PROD_ID1("ETHER-C16", 0x06a8514f),
-        PCMCIA_DEVICE_PROD_ID1("IC-CARD", 0x60cb09a6),
         PCMCIA_DEVICE_PROD_ID1("NE2000 Compatible", 0x75b8ad5a),
         PCMCIA_DEVICE_PROD_ID2("EN-6200P2", 0xa996d078),
         /* too generic! */
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index a84ba487c713..8c19307e5040 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -117,7 +117,7 @@ static void ctrl_callback(struct urb *urb)
         case -ENOENT:
                 break;
         default:
-                if (netif_msg_drv(pegasus))
+                if (netif_msg_drv(pegasus) && printk_ratelimit())
                         dev_dbg(&pegasus->intf->dev, "%s, status %d\n",
                                 __FUNCTION__, urb->status);
         }
@@ -166,7 +166,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
                 set_current_state(TASK_RUNNING);
                 if (ret == -ENODEV)
                         netif_device_detach(pegasus->net);
-                if (netif_msg_drv(pegasus))
+                if (netif_msg_drv(pegasus) && printk_ratelimit())
                         dev_err(&pegasus->intf->dev, "%s, status %d\n",
                                         __FUNCTION__, ret);
                 goto out;
@@ -275,7 +275,7 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data)
         if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {
                 if (ret == -ENODEV)
                         netif_device_detach(pegasus->net);
-                if (netif_msg_drv(pegasus))
+                if (netif_msg_drv(pegasus) && printk_ratelimit())
                         dev_err(&pegasus->intf->dev, "%s, status %d\n",
                                         __FUNCTION__, ret);
                 goto out;
@@ -1209,8 +1209,7 @@ static void pegasus_set_multicast(struct net_device *net)
                 pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS;
                 if (netif_msg_link(pegasus))
                         pr_info("%s: Promiscuous mode enabled.\n", net->name);
-        } else if (net->mc_count ||
-                   (net->flags & IFF_ALLMULTI)) {
+        } else if (net->mc_count || (net->flags & IFF_ALLMULTI)) {
                 pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST;
                 pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
                 if (netif_msg_link(pegasus))
@@ -1220,6 +1219,8 @@ static void pegasus_set_multicast(struct net_device *net)
                 pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
         }
 
+        pegasus->ctrl_urb->status = 0;
+
         pegasus->flags |= ETH_REGS_CHANGE;
         ctrl_callback(pegasus->ctrl_urb);
 }
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 95b337149484..c5107f269f24 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -1067,8 +1067,16 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                 tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
                 tx_status->flags &= ~ATH_TX_BAR;
         }
-        if (tx_status->flags)
-                tx_info->status.excessive_retries = 1;
+
+        if (tx_status->flags & (ATH_TX_ERROR | ATH_TX_XRETRY)) {
+                if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) {
+                        /* Frame was not ACKed, but an ACK was expected */
+                        tx_info->status.excessive_retries = 1;
+                }
+        } else {
+                /* Frame was ACKed */
+                tx_info->flags |= IEEE80211_TX_STAT_ACK;
+        }
 
         tx_info->status.retry_count = tx_status->retries;
 
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index 157f830ee6b8..550129f717e2 100644
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -357,9 +357,9 @@ static int ath_tx_prepare(struct ath_softc *sc,
         txctl->flags = ATH9K_TXDESC_CLRDMASK;    /* needed for crypto errors */
 
         if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK)
-                tx_info->flags |= ATH9K_TXDESC_NOACK;
+                txctl->flags |= ATH9K_TXDESC_NOACK;
         if (tx_info->flags & IEEE80211_TX_CTL_USE_RTS_CTS)
-                tx_info->flags |= ATH9K_TXDESC_RTSENA;
+                txctl->flags |= ATH9K_TXDESC_RTSENA;
 
         /*
          * Setup for rate calculations.
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 754fef5b592f..90a2b6dee7c0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -1153,7 +1153,8 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,
             !sta->ht_info.ht_supported)
                 return -1;
 
-        if (priv->current_ht_config.tx_mimo_ps_mode == IWL_MIMO_PS_STATIC)
+        if (((sta->ht_info.cap & IEEE80211_HT_CAP_MIMO_PS) >> 2)
+                                                == IWL_MIMO_PS_STATIC)
                 return -1;
 
         /* Need both Tx chains/antennas to support MIMO */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index c0b73c4d6f44..e01f048a02dd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -181,14 +181,14 @@ static int iwl4965_check_rxon_cmd(struct iwl_rxon_cmd *rxon)
 }
 
 /**
- * iwl4965_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed
+ * iwl_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed
  * @priv: staging_rxon is compared to active_rxon
  *
  * If the RXON structure is changing enough to require a new tune,
  * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
  * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
  */
-static int iwl4965_full_rxon_required(struct iwl_priv *priv)
+static int iwl_full_rxon_required(struct iwl_priv *priv)
 {
 
         /* These items are only settable from the full RXON command */
@@ -207,7 +207,6 @@ static int iwl4965_full_rxon_required(struct iwl_priv *priv)
              priv->active_rxon.ofdm_ht_single_stream_basic_rates) ||
             (priv->staging_rxon.ofdm_ht_dual_stream_basic_rates !=
              priv->active_rxon.ofdm_ht_dual_stream_basic_rates) ||
-            (priv->staging_rxon.rx_chain != priv->active_rxon.rx_chain) ||
             (priv->staging_rxon.assoc_id != priv->active_rxon.assoc_id))
                 return 1;
 
@@ -263,7 +262,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)
         /* If we don't need to send a full RXON, we can use
          * iwl4965_rxon_assoc_cmd which is used to reconfigure filter
          * and other flags for the current radio configuration. */
-        if (!iwl4965_full_rxon_required(priv)) {
+        if (!iwl_full_rxon_required(priv)) {
                 ret = iwl_send_rxon_assoc(priv);
                 if (ret) {
                         IWL_ERROR("Error setting RXON_ASSOC (%d)\n", ret);
@@ -587,8 +586,6 @@ static void iwl4965_ht_conf(struct iwl_priv *priv,
                 iwl_conf->supported_chan_width = 0;
         }
 
-        iwl_conf->tx_mimo_ps_mode =
-                (u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2);
         memcpy(iwl_conf->supp_mcs_set, ht_conf->supp_mcs_set, 16);
 
         iwl_conf->control_channel = ht_bss_conf->primary_channel;
@@ -2190,7 +2187,10 @@ static void __iwl4965_down(struct iwl_priv *priv)
         udelay(5);
 
         /* FIXME: apm_ops.suspend(priv) */
-        priv->cfg->ops->lib->apm_ops.reset(priv);
+        if (exit_pending || test_bit(STATUS_IN_SUSPEND, &priv->status))
+                priv->cfg->ops->lib->apm_ops.stop(priv);
+        else
+                priv->cfg->ops->lib->apm_ops.reset(priv);
         priv->cfg->ops->lib->free_shared_mem(priv);
 
  exit:
@@ -3588,7 +3588,7 @@ static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
 
         priv->assoc_id = 0;
         timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
-        priv->timestamp = le64_to_cpu(timestamp) +  (priv->beacon_int * 1000);
+        priv->timestamp = le64_to_cpu(timestamp);
 
         IWL_DEBUG_MAC80211("leave\n");
         spin_unlock_irqrestore(&priv->lock, flags);
@@ -4372,15 +4372,18 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
         iwl_dbgfs_unregister(priv);
         sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group);
 
+        /* ieee80211_unregister_hw call wil cause iwl4965_mac_stop to
+         * to be called and iwl4965_down since we are removing the device
+         * we need to set STATUS_EXIT_PENDING bit.
+         */
+        set_bit(STATUS_EXIT_PENDING, &priv->status);
         if (priv->mac80211_registered) {
                 ieee80211_unregister_hw(priv->hw);
                 priv->mac80211_registered = 0;
+        } else {
+                iwl4965_down(priv);
         }
 
-        set_bit(STATUS_EXIT_PENDING, &priv->status);
-
-        iwl4965_down(priv);
-
         /* make sure we flush any pending irq or
          * tasklet for the driver
          */
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index c72f72579bea..80f2f84defa8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -592,12 +592,11 @@ static void iwlcore_free_geos(struct iwl_priv *priv)
         clear_bit(STATUS_GEO_CONFIGURED, &priv->status);
 }
 
-static u8 is_single_rx_stream(struct iwl_priv *priv)
+static bool is_single_rx_stream(struct iwl_priv *priv)
 {
         return !priv->current_ht_config.is_ht ||
                ((priv->current_ht_config.supp_mcs_set[1] == 0) &&
-                (priv->current_ht_config.supp_mcs_set[2] == 0)) ||
-               priv->ps_mode == IWL_MIMO_PS_STATIC;
+                (priv->current_ht_config.supp_mcs_set[2] == 0));
 }
 
 static u8 iwl_is_channel_extension(struct iwl_priv *priv,
@@ -704,33 +703,39 @@ EXPORT_SYMBOL(iwl_set_rxon_ht);
  * MIMO (dual stream) requires at least 2, but works better with 3.
  * This does not determine *which* chains to use, just how many.
  */
-static int iwlcore_get_rx_chain_counter(struct iwl_priv *priv,
-                                        u8 *idle_state, u8 *rx_state)
+static int iwl_get_active_rx_chain_count(struct iwl_priv *priv)
 {
-        u8 is_single = is_single_rx_stream(priv);
-        u8 is_cam = test_bit(STATUS_POWER_PMI, &priv->status) ? 0 : 1;
+        bool is_single = is_single_rx_stream(priv);
+        bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);
 
         /* # of Rx chains to use when expecting MIMO. */
         if (is_single || (!is_cam && (priv->ps_mode == IWL_MIMO_PS_STATIC)))
-                *rx_state = 2;
+                return 2;
         else
-                *rx_state = 3;
+                return 3;
+}
 
+static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)
+{
+        int idle_cnt;
+        bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);
         /* # Rx chains when idling and maybe trying to save power */
         switch (priv->ps_mode) {
         case IWL_MIMO_PS_STATIC:
         case IWL_MIMO_PS_DYNAMIC:
-                *idle_state = (is_cam) ? 2 : 1;
+                idle_cnt = (is_cam) ? 2 : 1;
                 break;
         case IWL_MIMO_PS_NONE:
-                *idle_state = (is_cam) ? *rx_state : 1;
+                idle_cnt = (is_cam) ? active_cnt : 1;
                 break;
+        case IWL_MIMO_PS_INVALID:
         default:
-                *idle_state = 1;
+                IWL_ERROR("invalide mimo ps mode %d\n", priv->ps_mode);
+                WARN_ON(1);
+                idle_cnt = -1;
                 break;
         }
-
-        return 0;
+        return idle_cnt;
 }
 
 /**
@@ -741,34 +746,44 @@ static int iwlcore_get_rx_chain_counter(struct iwl_priv *priv,
  */
 void iwl_set_rxon_chain(struct iwl_priv *priv)
 {
-        u8 is_single = is_single_rx_stream(priv);
-        u8 idle_state, rx_state;
-
-        priv->staging_rxon.rx_chain = 0;
-        rx_state = idle_state = 3;
+        bool is_single = is_single_rx_stream(priv);
+        bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);
+        u8 idle_rx_cnt, active_rx_cnt;
+        u16 rx_chain;
 
         /* Tell uCode which antennas are actually connected.
          * Before first association, we assume all antennas are connected.
          * Just after first association, iwl_chain_noise_calibration()
          *    checks which antennas actually *are* connected. */
-        priv->staging_rxon.rx_chain |=
-                    cpu_to_le16(priv->hw_params.valid_rx_ant <<
-                                                 RXON_RX_CHAIN_VALID_POS);
+        rx_chain = priv->hw_params.valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
 
         /* How many receivers should we use? */
-        iwlcore_get_rx_chain_counter(priv, &idle_state, &rx_state);
-        priv->staging_rxon.rx_chain |=
-                cpu_to_le16(rx_state << RXON_RX_CHAIN_MIMO_CNT_POS);
-        priv->staging_rxon.rx_chain |=
-                cpu_to_le16(idle_state << RXON_RX_CHAIN_CNT_POS);
-
-        if (!is_single && (rx_state >= 2) &&
-            !test_bit(STATUS_POWER_PMI, &priv->status))
+        active_rx_cnt = iwl_get_active_rx_chain_count(priv);
+        idle_rx_cnt = iwl_get_idle_rx_chain_count(priv, active_rx_cnt);
+
+        /* correct rx chain count accoridng hw settings */
+        if (priv->hw_params.rx_chains_num < active_rx_cnt)
+                active_rx_cnt = priv->hw_params.rx_chains_num;
+
+        if (priv->hw_params.rx_chains_num < idle_rx_cnt)
+                idle_rx_cnt = priv->hw_params.rx_chains_num;
+
+        rx_chain |= active_rx_cnt << RXON_RX_CHAIN_MIMO_CNT_POS;
+        rx_chain |= idle_rx_cnt  << RXON_RX_CHAIN_CNT_POS;
+
+        priv->staging_rxon.rx_chain = cpu_to_le16(rx_chain);
+
+        if (!is_single && (active_rx_cnt >= 2) && is_cam)
                 priv->staging_rxon.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK;
         else
                 priv->staging_rxon.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;
 
-        IWL_DEBUG_ASSOC("rx chain %X\n", priv->staging_rxon.rx_chain);
+        IWL_DEBUG_ASSOC("rx_chain=0x%Xi active=%d idle=%d\n",
+                        priv->staging_rxon.rx_chain,
+                        active_rx_cnt, idle_rx_cnt);
+
+        WARN_ON(active_rx_cnt == 0 || idle_rx_cnt == 0 ||
+                active_rx_cnt < idle_rx_cnt);
 }
 EXPORT_SYMBOL(iwl_set_rxon_chain);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index c19db438306c..cdfb343c7ec6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -412,7 +412,6 @@ struct iwl_ht_info {
         /* self configuration data */
         u8 is_ht;
         u8 supported_chan_width;
-        u16 tx_mimo_ps_mode;
         u8 is_green_field;
         u8 sgf;                 /* HT_SHORT_GI_* short guard interval */
         u8 max_amsdu_size;
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
index f3f6ea49fdd2..e81bfc42a7cb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -1173,7 +1173,10 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,
 
         rx_status.antenna = 0;
         rx_status.flag = 0;
-        rx_status.flag |= RX_FLAG_TSFT;
+
+        /* TSF isn't reliable. In order to allow smooth user experience,
+         * this W/A doesn't propagate it to the mac80211 */
+        /*rx_status.flag |= RX_FLAG_TSFT;*/
 
         if ((unlikely(rx_start->cfg_phy_cnt > 20))) {
                 IWL_DEBUG_DROP("dsp size out of range [0,20]: %d/n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 9bb6adb28b73..6c8ac3a87d54 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -421,7 +421,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv,
                 else
                         scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
 
-                if ((scan_ch->type & SCAN_CHANNEL_TYPE_ACTIVE) && n_probes)
+                if (n_probes)
                         scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes);
 
                 scan_ch->active_dwell = cpu_to_le16(active_dwell);
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index ff879d46624a..78b1a7a4ca40 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -402,12 +402,11 @@ static int iwl_hw_tx_queue_init(struct iwl_priv *priv,
 /**
  * iwl_tx_queue_init - Allocate and initialize one tx/cmd queue
  */
-static int iwl_tx_queue_init(struct iwl_priv *priv,
-                             struct iwl_tx_queue *txq,
+static int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
                              int slots_num, u32 txq_id)
 {
         int i, len;
-        int rc = 0;
+        int ret;
 
         /*
          * Alloc buffer array for commands (Tx or other types of commands).
@@ -428,17 +427,14 @@ static int iwl_tx_queue_init(struct iwl_priv *priv,
 
                 txq->cmd[i] = kmalloc(len, GFP_KERNEL);
                 if (!txq->cmd[i])
-                        return -ENOMEM;
+                        goto err;
         }
 
         /* Alloc driver data array and TFD circular buffer */
-        rc = iwl_tx_queue_alloc(priv, txq, txq_id);
-        if (rc) {
-                for (i = 0; i < slots_num; i++)
-                        kfree(txq->cmd[i]);
+        ret = iwl_tx_queue_alloc(priv, txq, txq_id);
+        if (ret)
+                goto err;
 
-                return -ENOMEM;
-        }
         txq->need_update = 0;
 
         /* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise
@@ -452,6 +448,17 @@ static int iwl_tx_queue_init(struct iwl_priv *priv,
         iwl_hw_tx_queue_init(priv, txq);
 
         return 0;
+err:
+        for (i = 0; i < slots_num; i++) {
+                kfree(txq->cmd[i]);
+                txq->cmd[i] = NULL;
+        }
+
+        if (txq_id == IWL_CMD_QUEUE_NUM) {
+                kfree(txq->cmd[slots_num]);
+                txq->cmd[slots_num] = NULL;
+        }
+        return -ENOMEM;
 }
 /**
  * iwl_hw_txq_ctx_free - Free TXQ Context
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 82634a2f1b1d..1aad599816f7 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -352,11 +352,12 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long
                                 continue;
                         r_size = r->end - r->start + 1;
                         /* For bridges size != alignment */
-                        align = (i < PCI_BRIDGE_RESOURCES) ? r_size : r->start;
+                        align = resource_alignment(r);
                         order = __ffs(align) - 20;
                         if (order > 11) {
-                                dev_warn(&dev->dev, "BAR %d too large: "
+                                dev_warn(&dev->dev, "BAR %d bad alignment %llx: "
                                        "%#016llx-%#016llx\n", i,
+                                       (unsigned long long)align,
                                        (unsigned long long)r->start,
                                        (unsigned long long)r->end);
                                 r->flags = 0;
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index d7e9f2152df0..95015cbfd33f 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -405,8 +405,6 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
 
         case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                 extended_irq = &res->data.extended_irq;
-                if (extended_irq->producer_consumer == ACPI_PRODUCER)
-                        return AE_OK;
 
                 if (extended_irq->interrupt_count == 0)
                         pnp_add_irq_resource(dev, 0, IORESOURCE_DISABLED);
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index db00b0591733..f1216cf6fa8f 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -423,7 +423,7 @@ int chp_new(struct chp_id chpid)
         ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);
         if (ret) {
                 device_unregister(&chp->dev);
-                goto out_free;
+                goto out;
         }
         mutex_lock(&channel_subsystems[chpid.cssid]->mutex);
         if (channel_subsystems[chpid.cssid]->cm_enabled) {
@@ -432,14 +432,15 @@ int chp_new(struct chp_id chpid)
                         sysfs_remove_group(&chp->dev.kobj, &chp_attr_group);
                         device_unregister(&chp->dev);
                         mutex_unlock(&channel_subsystems[chpid.cssid]->mutex);
-                        goto out_free;
+                        goto out;
                 }
         }
         channel_subsystems[chpid.cssid]->chps[chpid.id] = chp;
         mutex_unlock(&channel_subsystems[chpid.cssid]->mutex);
-        return ret;
+        goto out;
 out_free:
         kfree(chp);
+out:
         return ret;
 }
 
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 33bff8fec7d1..5954b905e3ca 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -208,8 +208,10 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */
         case 1:         /* status pending */
         case 2:         /* busy */
                 return -EBUSY;
-        default:                /* device/path not operational */
+        case 3:         /* device/path not operational */
                 return cio_start_handle_notoper(sch, lpm);
+        default:
+                return ccode;
         }
 }
 
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 51489eff6b0b..1261e1a9e8cd 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -633,6 +633,11 @@ channel_subsystem_release(struct device *dev)
 
         css = to_css(dev);
         mutex_destroy(&css->mutex);
+        if (css->pseudo_subchannel) {
+                /* Implies that it has been generated but never registered. */
+                css_subchannel_release(&css->pseudo_subchannel->dev);
+                css->pseudo_subchannel = NULL;
+        }
         kfree(css);
 }
 
@@ -785,11 +790,15 @@ init_channel_subsystem (void)
                 }
                 channel_subsystems[i] = css;
                 ret = setup_css(i);
-                if (ret)
-                        goto out_free;
+                if (ret) {
+                        kfree(channel_subsystems[i]);
+                        goto out_unregister;
+                }
                 ret = device_register(&css->device);
-                if (ret)
-                        goto out_free_all;
+                if (ret) {
+                        put_device(&css->device);
+                        goto out_unregister;
+                }
                 if (css_chsc_characteristics.secm) {
                         ret = device_create_file(&css->device,
                                                  &dev_attr_cm_enable);
@@ -802,7 +811,7 @@ init_channel_subsystem (void)
         }
         ret = register_reboot_notifier(&css_reboot_notifier);
         if (ret)
-                goto out_pseudo;
+                goto out_unregister;
         css_init_done = 1;
 
         /* Enable default isc for I/O subchannels. */
@@ -810,18 +819,12 @@ init_channel_subsystem (void)
 
         for_each_subchannel(__init_channel_subsystem, NULL);
         return 0;
-out_pseudo:
-        device_unregister(&channel_subsystems[i]->pseudo_subchannel->dev);
 out_file:
-        device_remove_file(&channel_subsystems[i]->device,
-                           &dev_attr_cm_enable);
+        if (css_chsc_characteristics.secm)
+                device_remove_file(&channel_subsystems[i]->device,
+                                   &dev_attr_cm_enable);
 out_device:
         device_unregister(&channel_subsystems[i]->device);
-out_free_all:
-        kfree(channel_subsystems[i]->pseudo_subchannel->lock);
-        kfree(channel_subsystems[i]->pseudo_subchannel);
-out_free:
-        kfree(channel_subsystems[i]);
 out_unregister:
         while (i > 0) {
                 struct channel_subsystem *css;
@@ -829,6 +832,7 @@ out_unregister:
                 i--;
                 css = channel_subsystems[i];
                 device_unregister(&css->pseudo_subchannel->dev);
+                css->pseudo_subchannel = NULL;
                 if (css_chsc_characteristics.secm)
                         device_remove_file(&css->device,
                                            &dev_attr_cm_enable);
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 550508df952b..84cc9ea346db 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -658,6 +658,13 @@ ccw_device_offline(struct ccw_device *cdev)
 {
         struct subchannel *sch;
 
+        /* Allow ccw_device_offline while disconnected. */
+        if (cdev->private->state == DEV_STATE_DISCONNECTED ||
+            cdev->private->state == DEV_STATE_NOT_OPER) {
+                cdev->private->flags.donotify = 0;
+                ccw_device_done(cdev, DEV_STATE_NOT_OPER);
+                return 0;
+        }
         if (ccw_device_is_orphan(cdev)) {
                 ccw_device_done(cdev, DEV_STATE_OFFLINE);
                 return 0;
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 7b74238ad1c7..e980766bb84b 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -161,7 +161,7 @@ static int usb_console_setup(struct console *co, char *options)
                 if (serial->type->set_termios) {
                         termios->c_cflag = cflag;
                         tty_termios_encode_baud_rate(termios, baud, baud);
-                        serial->type->set_termios(NULL, port, &dummy);
+                        serial->type->set_termios(tty, port, &dummy);
 
                         port->port.tty = NULL;
                         kfree(termios);
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 9c5925927ece..cedfd01c9833 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -378,6 +378,10 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
                         var->red.offset = 11;
                         var->blue.offset = 0;
                         var->green.length = 6;
+                } else if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB555) {
+                        var->red.offset = 10;
+                        var->blue.offset = 0;
+                        var->green.length = 5;
                 } else {
                         /* BGR:555 mode */
                         var->red.offset = 0;
@@ -939,7 +943,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
         ret = register_framebuffer(info);
         if (ret < 0) {
                 dev_err(dev, "failed to register framebuffer device: %d\n", ret);
-                goto free_cmap;
+                goto reset_drvdata;
         }
 
         /* add selected videomode to modelist */
@@ -955,7 +959,8 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
 
         return 0;
 
-
+reset_drvdata:
+        dev_set_drvdata(dev, NULL);
 free_cmap:
         fb_dealloc_cmap(&info->cmap);
 unregister_irqs:
@@ -992,10 +997,11 @@ static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct fb_info *info = dev_get_drvdata(dev);
-        struct atmel_lcdfb_info *sinfo = info->par;
+        struct atmel_lcdfb_info *sinfo;
 
-        if (!sinfo)
+        if (!info || !info->par)
                 return 0;
+        sinfo = info->par;
 
         cancel_work_sync(&sinfo->task);
         exit_backlight(sinfo);
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index d4427cb86979..2e15da5459cf 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -60,7 +60,7 @@
 
 #define PAGES2KB(_p) ((_p)<<(PAGE_SHIFT-10))
 
-#define BALLOON_CLASS_NAME "memory"
+#define BALLOON_CLASS_NAME "xen_memory"
 
 struct balloon_stats {
         /* We aim for 'current allocation' == 'target allocation'. */