656 files changed, 10756 insertions, 7208 deletions

diff --git a/drivers/accessibility/braille/braille_console.c b/drivers/accessibility/braille/braille_console.c
index 0a5f6b2114c5..d672cfe7ca59 100644
--- a/drivers/accessibility/braille/braille_console.c
+++ b/drivers/accessibility/braille/braille_console.c
@@ -376,6 +376,8 @@ int braille_register_console(struct console *console, int index,
         console->flags |= CON_ENABLED;
         console->index = index;
         braille_co = console;
+        register_keyboard_notifier(&keyboard_notifier_block);
+        register_vt_notifier(&vt_notifier_block);
         return 0;
 }
 
@@ -383,15 +385,8 @@ int braille_unregister_console(struct console *console)
 {
         if (braille_co != console)
                 return -EINVAL;
+        unregister_keyboard_notifier(&keyboard_notifier_block);
+        unregister_vt_notifier(&vt_notifier_block);
         braille_co = NULL;
         return 0;
 }
-
-static int __init braille_init(void)
-{
-        register_keyboard_notifier(&keyboard_notifier_block);
-        register_vt_notifier(&vt_notifier_block);
-        return 0;
-}
-
-console_initcall(braille_init);
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/dock.c b/drivers/acpi/dock.c
index bb7c51f712bd..7d2edf143f16 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -563,9 +563,6 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);
  */
 static int handle_eject_request(struct dock_station *ds, u32 event)
 {
-        if (!dock_present(ds))
-                return -ENODEV;
-
         if (dock_in_progress(ds))
                 return -EBUSY;
 
@@ -573,8 +570,16 @@ static int handle_eject_request(struct dock_station *ds, u32 event)
          * here we need to generate the undock
          * event prior to actually doing the undock
          * so that the device struct still exists.
+         * Also, even send the dock event if the
+         * device is not present anymore
          */
         dock_event(ds, event, UNDOCK_EVENT);
+
+        if (!dock_present(ds)) {
+                complete_undock(ds);
+                return -ENODEV;
+        }
+
         hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);
         undock(ds);
         eject_dock(ds);
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 5622aee996b2..13593f9f2197 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -110,6 +110,31 @@ static struct acpi_ec {
         u8 handlers_installed;
 } *boot_ec, *first_ec;
 
+/* 
+ * Some Asus system have exchanged ECDT data/command IO addresses.
+ */
+static int print_ecdt_error(const struct dmi_system_id *id)
+{
+        printk(KERN_NOTICE PREFIX "%s detected - "
+                "ECDT has exchanged control/data I/O address\n",
+                id->ident);
+        return 0;
+}
+
+static struct dmi_system_id __cpuinitdata ec_dmi_table[] = {
+        {
+        print_ecdt_error, "Asus L4R", {
+        DMI_MATCH(DMI_BIOS_VERSION, "1008.006"),
+        DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),
+        DMI_MATCH(DMI_BOARD_NAME, "L4R") }, NULL},
+        {
+        print_ecdt_error, "Asus M6R", {
+        DMI_MATCH(DMI_BIOS_VERSION, "0207"),
+        DMI_MATCH(DMI_PRODUCT_NAME, "M6R"),
+        DMI_MATCH(DMI_BOARD_NAME, "M6R") }, NULL},
+        {},
+};
+
 /* --------------------------------------------------------------------------
                              Transaction Management
    -------------------------------------------------------------------------- */
@@ -196,6 +221,8 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
                                 return 0;
                         msleep(1);
                 }
+                if (acpi_ec_check_status(ec,event))
+                        return 0;
         }
         pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n",
                 acpi_ec_read_status(ec),
@@ -911,6 +938,15 @@ int __init acpi_ec_ecdt_probe(void)
                 pr_info(PREFIX "EC description table is found, configuring boot EC\n");
                 boot_ec->command_addr = ecdt_ptr->control.address;
                 boot_ec->data_addr = ecdt_ptr->data.address;
+                if (dmi_check_system(ec_dmi_table)) {
+                        /*
+                         * If the board falls into ec_dmi_table, it means
+                         * that ECDT table gives the incorrect command/status
+                         * & data I/O address. Just fix it.
+                         */
+                        boot_ec->data_addr = ecdt_ptr->control.address;
+                        boot_ec->command_addr = ecdt_ptr->data.address;
+                }
                 boot_ec->gpe = ecdt_ptr->gpe;
                 boot_ec->handle = ACPI_ROOT_OBJECT;
                 acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle);
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 2a32c843cb4a..8892b9824fae 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -479,5 +479,8 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)
 
         acpi_tb_set_table_loaded_flag(table_index, FALSE);
 
+        /* Table unloaded, remove a reference to the ddb_handle object */
+
+        acpi_ut_remove_reference(ddb_handle);
         return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 084109507c9f..8dd3336efd7e 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -165,8 +165,11 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
                                 "firmware_node");
                 ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
                                 "physical_node");
-                if (acpi_dev->wakeup.flags.valid)
+                if (acpi_dev->wakeup.flags.valid) {
                         device_set_wakeup_capable(dev, true);
+                        device_set_wakeup_enable(dev,
+                                                acpi_dev->wakeup.state.enabled);
+                }
         }
 
         return 0;
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index 549db42f16cf..bd5773878009 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -56,13 +56,14 @@ ACPI_MODULE_NAME("nsnames")
  *              Size            - Size of the pathname
  *              *name_buffer    - Where to return the pathname
  *
- * RETURN:      Places the pathname into the name_buffer, in external format
+ * RETURN:      Status
+ *              Places the pathname into the name_buffer, in external format
  *              (name segments separated by path separators)
  *
  * DESCRIPTION: Generate a full pathaname
  *
  ******************************************************************************/
-void
+acpi_status
 acpi_ns_build_external_path(struct acpi_namespace_node *node,
                             acpi_size size, char *name_buffer)
 {
@@ -77,7 +78,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
         if (index < ACPI_NAME_SIZE) {
                 name_buffer[0] = AML_ROOT_PREFIX;
                 name_buffer[1] = 0;
-                return;
+                return (AE_OK);
         }
 
         /* Store terminator byte, then build name backwards */
@@ -105,11 +106,13 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
 
         if (index != 0) {
                 ACPI_ERROR((AE_INFO,
-                            "Could not construct pathname; index=%X, size=%X, Path=%s",
+                            "Could not construct external pathname; index=%X, size=%X, Path=%s",
                             (u32) index, (u32) size, &name_buffer[size]));
+
+                return (AE_BAD_PARAMETER);
         }
 
-        return;
+        return (AE_OK);
 }
 
 #ifdef ACPI_DEBUG_OUTPUT
@@ -129,6 +132,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
 
 char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 {
+        acpi_status status;
         char *name_buffer;
         acpi_size size;
 
@@ -138,8 +142,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 
         size = acpi_ns_get_pathname_length(node);
         if (!size) {
-                ACPI_ERROR((AE_INFO, "Invalid node failure"));
-                return_PTR(NULL);
+                return (NULL);
         }
 
         /* Allocate a buffer to be returned to caller */
@@ -152,7 +155,11 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 
         /* Build the path in the allocated buffer */
 
-        acpi_ns_build_external_path(node, size, name_buffer);
+        status = acpi_ns_build_external_path(node, size, name_buffer);
+        if (ACPI_FAILURE(status)) {
+                return (NULL);
+        }
+
         return_PTR(name_buffer);
 }
 #endif
@@ -186,7 +193,7 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node)
         while (next_node && (next_node != acpi_gbl_root_node)) {
                 if (ACPI_GET_DESCRIPTOR_TYPE(next_node) != ACPI_DESC_TYPE_NAMED) {
                         ACPI_ERROR((AE_INFO,
-                                    "Invalid NS Node (%p) while traversing path",
+                                    "Invalid Namespace Node (%p) while traversing namespace",
                                     next_node));
                         return 0;
                 }
@@ -234,8 +241,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,
 
         required_size = acpi_ns_get_pathname_length(node);
         if (!required_size) {
-                ACPI_ERROR((AE_INFO, "Invalid node failure"));
-                return_ACPI_STATUS(AE_ERROR);
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         /* Validate/Allocate/Clear caller buffer */
@@ -247,7 +253,11 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,
 
         /* Build the path in the caller buffer */
 
-        acpi_ns_build_external_path(node, required_size, buffer->pointer);
+        status =
+            acpi_ns_build_external_path(node, required_size, buffer->pointer);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X]\n",
                           (char *)buffer->pointer, (u32) required_size));
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 89f3b2abfdc7..cf47805a7448 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -849,7 +849,7 @@ static int __init acpi_irq_penalty_update(char *str, int used)
                 if (irq < 0)
                         continue;
 
-                if (irq >= ACPI_MAX_IRQS)
+                if (irq >= ARRAY_SIZE(acpi_irq_penalty))
                         continue;
 
                 if (used)
@@ -872,10 +872,12 @@ static int __init acpi_irq_penalty_update(char *str, int used)
  */
 void acpi_penalize_isa_irq(int irq, int active)
 {
-        if (active)
-                acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;
-        else
-                acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
+        if (irq >= 0 && irq < ARRAY_SIZE(acpi_irq_penalty)) {
+                if (active)
+                        acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;
+                else
+                        acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
+        }
 }
 
 /*
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index e36422a7122c..ee68ac54c0d4 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -123,7 +123,7 @@ struct acpi_processor_errata errata __read_mostly;
 static int set_no_mwait(const struct dmi_system_id *id)
 {
         printk(KERN_NOTICE PREFIX "%s detected - "
-                "disable mwait for CPU C-stetes\n", id->ident);
+                "disabling mwait for CPU C-states\n", id->ident);
         idle_nomwait = 1;
         return 0;
 }
@@ -138,7 +138,7 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
         {
         set_no_mwait, "Extensa 5220", {
         DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
-        DMI_MATCH(DMI_SYS_VENDOR, "ACER"),
+        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
         DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
         DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL},
         {},
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 283c08f5f4d4..cf5b1b7b684f 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -41,7 +41,6 @@
 #include <linux/pm_qos_params.h>
 #include <linux/clockchips.h>
 #include <linux/cpuidle.h>
-#include <linux/cpuidle.h>
 
 /*
  * Include the apic definitions for x86 to have the APIC timer related defines
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 0133af49cf06..80c251ec6d2a 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -70,8 +70,8 @@ static DEFINE_MUTEX(performance_mutex);
  *  0 -> cpufreq low level drivers initialized -> consider _PPC values
  *  1 -> ignore _PPC totally -> forced by user through boot param
  */
-static unsigned int ignore_ppc = -1;
-module_param(ignore_ppc, uint, 0644);
+static int ignore_ppc = -1;
+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/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index f61ebc679e66..d9063ea414e3 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -587,6 +587,9 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
                         } else {
                                 temp_size_needed +=
                                     acpi_ns_get_pathname_length((*sub_object_list)->reference.node);
+                                if (!temp_size_needed) {
+                                        return_ACPI_STATUS(AE_BAD_PARAMETER);
+                                }
                         }
                 } else {
                         /*
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/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 4ebbba2b6b19..bf5b04de02d1 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -377,6 +377,14 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
         return 0;
 }
 
+static void physical_device_enable_wakeup(struct acpi_device *adev)
+{
+        struct device *dev = acpi_get_physical_device(adev->handle);
+
+        if (dev && device_can_wakeup(dev))
+                device_set_wakeup_enable(dev, adev->wakeup.state.enabled);
+}
+
 static ssize_t
 acpi_system_write_wakeup_device(struct file *file,
                                 const char __user * buffer,
@@ -411,6 +419,7 @@ acpi_system_write_wakeup_device(struct file *file,
                 }
         }
         if (found_dev) {
+                physical_device_enable_wakeup(found_dev);
                 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                         struct acpi_device *dev = container_of(node,
                                                                struct
@@ -428,6 +437,7 @@ acpi_system_write_wakeup_device(struct file *file,
                                        dev->pnp.bus_id, found_dev->pnp.bus_id);
                                 dev->wakeup.state.enabled =
                                     found_dev->wakeup.state.enabled;
+                                physical_device_enable_wakeup(dev);
                         }
                 }
         }
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/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index e7bf34a7b1d2..7dcb67e0b215 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -242,10 +242,12 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
 {
         acpi_status status = AE_OK;
 
-        if (!required_length) {
-                WARN_ON(1);
-                return AE_ERROR;
+        /* Parameter validation */
+
+        if (!buffer || !required_length) {
+                return (AE_BAD_PARAMETER);
         }
+
         switch (buffer->length) {
         case ACPI_NO_BUFFER:
 
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index c5c791a575c9..42609d3a8aa9 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -135,6 +135,10 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                 obj_pointer = object->package.elements;
                 break;
 
+                /*
+                 * These objects have a possible list of notify handlers.
+                 * Device object also may have a GPE block.
+                 */
         case ACPI_TYPE_DEVICE:
 
                 if (object->device.gpe_block) {
@@ -142,9 +146,14 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                                                        gpe_block);
                 }
 
-                /* Walk the handler list for this device */
+                /*lint -fallthrough */
+
+        case ACPI_TYPE_PROCESSOR:
+        case ACPI_TYPE_THERMAL:
+
+                /* Walk the notify handler list for this object */
 
-                handler_desc = object->device.handler;
+                handler_desc = object->common_notify.handler;
                 while (handler_desc) {
                         next_desc = handler_desc->address_space.next;
                         acpi_ut_remove_reference(handler_desc);
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index e25484495e65..916eff399eb3 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -425,6 +425,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
                                acpi_size * obj_length)
 {
         acpi_size length;
+        acpi_size size;
         acpi_status status = AE_OK;
 
         ACPI_FUNCTION_TRACE_PTR(ut_get_simple_object_size, internal_object);
@@ -484,10 +485,14 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
                          * Get the actual length of the full pathname to this object.
                          * The reference will be converted to the pathname to the object
                          */
-                        length +=
-                            ACPI_ROUND_UP_TO_NATIVE_WORD
-                            (acpi_ns_get_pathname_length
-                             (internal_object->reference.node));
+                        size =
+                            acpi_ns_get_pathname_length(internal_object->
+                                                        reference.node);
+                        if (!size) {
+                                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                        }
+
+                        length += ACPI_ROUND_UP_TO_NATIVE_WORD(size);
                         break;
 
                 default:
diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c
index c33b1c6e93b1..cfe2c833474d 100644
--- a/drivers/acpi/wmi.c
+++ b/drivers/acpi/wmi.c
@@ -347,7 +347,7 @@ struct acpi_buffer *out)
         strcpy(method, "WQ");
         strncat(method, block->object_id, 2);
 
-        status = acpi_evaluate_object(handle, method, NULL, out);
+        status = acpi_evaluate_object(handle, method, &input, out);
 
         /*
          * If ACPI_WMI_EXPENSIVE, call the relevant WCxx method, even if
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 ef3e5522e1a4..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 */
@@ -486,6 +486,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(INTEL, 0x502b), board_ahci }, /* Tolapai */
         { 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,
@@ -575,9 +579,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(NVIDIA, 0x0bc7), board_ahci },            /* MCP7B */
 
         /* SiS */
-        { PCI_VDEVICE(SI, 0x1184), board_ahci_nopmp },          /* SiS 966 */
-        { PCI_VDEVICE(SI, 0x1185), board_ahci_nopmp },          /* SiS 968 */
-        { PCI_VDEVICE(SI, 0x0186), board_ahci_nopmp },          /* SiS 968 */
+        { PCI_VDEVICE(SI, 0x1184), board_ahci },                /* SiS 966 */
+        { PCI_VDEVICE(SI, 0x1185), board_ahci },                /* SiS 968 */
+        { PCI_VDEVICE(SI, 0x0186), board_ahci },                /* SiS 968 */
 
         /* Marvell */
         { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },        /* 6145 */
@@ -608,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;
@@ -730,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;
         }
@@ -2531,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/ata_piix.c b/drivers/ata/ata_piix.c
index c294121fd69e..e6b4606e36b6 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -275,6 +275,14 @@ static const struct pci_device_id piix_pci_tbl[] = {
         { 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
         /* SATA Controller IDE (ICH10) */
         { 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+        /* SATA Controller IDE (PCH) */
+        { 0x8086, 0x3b20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+        /* SATA Controller IDE (PCH) */
+        { 0x8086, 0x3b26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+        /* SATA Controller IDE (PCH) */
+        { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+        /* SATA Controller IDE (PCH) */
+        { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
 
         { }     /* terminate list */
 };
@@ -1491,7 +1499,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,
          * off.
          */
         if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2652) {
-                int rc = piix_disable_ahci(pdev);
+                rc = piix_disable_ahci(pdev);
                 if (rc)
                         return rc;
         }
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 5ba96c5052c8..79e3a8e7a84a 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -104,6 +104,7 @@ struct ata_force_param {
         unsigned long   xfer_mask;
         unsigned int    horkage_on;
         unsigned int    horkage_off;
+        unsigned int    lflags;
 };
 
 struct ata_force_ent {
@@ -196,22 +197,23 @@ void ata_force_cbl(struct ata_port *ap)
 }
 
 /**
- *      ata_force_spd_limit - force SATA spd limit according to libata.force
+ *      ata_force_link_limits - force link limits according to libata.force
  *      @link: ATA link of interest
  *
- *      Force SATA spd limit according to libata.force and whine about
- *      it.  When only the port part is specified (e.g. 1:), the limit
- *      applies to all links connected to both the host link and all
- *      fan-out ports connected via PMP.  If the device part is
- *      specified as 0 (e.g. 1.00:), it specifies the first fan-out
- *      link not the host link.  Device number 15 always points to the
- *      host link whether PMP is attached or not.
+ *      Force link flags and SATA spd limit according to libata.force
+ *      and whine about it.  When only the port part is specified
+ *      (e.g. 1:), the limit applies to all links connected to both
+ *      the host link and all fan-out ports connected via PMP.  If the
+ *      device part is specified as 0 (e.g. 1.00:), it specifies the
+ *      first fan-out link not the host link.  Device number 15 always
+ *      points to the host link whether PMP is attached or not.
  *
  *      LOCKING:
  *      EH context.
  */
-static void ata_force_spd_limit(struct ata_link *link)
+static void ata_force_link_limits(struct ata_link *link)
 {
+        bool did_spd = false;
         int linkno, i;
 
         if (ata_is_host_link(link))
@@ -228,13 +230,22 @@ static void ata_force_spd_limit(struct ata_link *link)
                 if (fe->device != -1 && fe->device != linkno)
                         continue;
 
-                if (!fe->param.spd_limit)
-                        continue;
+                /* only honor the first spd limit */
+                if (!did_spd && fe->param.spd_limit) {
+                        link->hw_sata_spd_limit = (1 << fe->param.spd_limit) - 1;
+                        ata_link_printk(link, KERN_NOTICE,
+                                        "FORCE: PHY spd limit set to %s\n",
+                                        fe->param.name);
+                        did_spd = true;
+                }
 
-                link->hw_sata_spd_limit = (1 << fe->param.spd_limit) - 1;
-                ata_link_printk(link, KERN_NOTICE,
-                        "FORCE: PHY spd limit set to %s\n", fe->param.name);
-                return;
+                /* let lflags stack */
+                if (fe->param.lflags) {
+                        link->flags |= fe->param.lflags;
+                        ata_link_printk(link, KERN_NOTICE,
+                                        "FORCE: link flag 0x%x forced -> 0x%x\n",
+                                        fe->param.lflags, link->flags);
+                }
         }
 }
 
@@ -3277,7 +3288,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
                 dev->dma_mode = ata_xfer_mask2mode(dma_mask);
 
                 found = 1;
-                if (dev->dma_mode != 0xff)
+                if (ata_dma_enabled(dev))
                         used_dma = 1;
         }
         if (!found)
@@ -3302,7 +3313,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
 
         /* step 3: set host DMA timings */
         ata_link_for_each_dev(dev, link) {
-                if (!ata_dev_enabled(dev) || dev->dma_mode == 0xff)
+                if (!ata_dev_enabled(dev) || !ata_dma_enabled(dev))
                         continue;
 
                 dev->xfer_mode = dev->dma_mode;
@@ -5188,19 +5199,18 @@ void ata_link_init(struct ata_port *ap, struct ata_link *link, int pmp)
  */
 int sata_link_init_spd(struct ata_link *link)
 {
-        u32 scontrol;
         u8 spd;
         int rc;
 
-        rc = sata_scr_read(link, SCR_CONTROL, &scontrol);
+        rc = sata_scr_read(link, SCR_CONTROL, &link->saved_scontrol);
         if (rc)
                 return rc;
 
-        spd = (scontrol >> 4) & 0xf;
+        spd = (link->saved_scontrol >> 4) & 0xf;
         if (spd)
                 link->hw_sata_spd_limit &= (1 << spd) - 1;
 
-        ata_force_spd_limit(link);
+        ata_force_link_limits(link);
 
         link->sata_spd_limit = link->hw_sata_spd_limit;
 
@@ -5783,9 +5793,10 @@ static void ata_port_detach(struct ata_port *ap)
         ata_port_wait_eh(ap);
 
         /* EH is now guaranteed to see UNLOADING - EH context belongs
-         * to us.  Disable all existing devices.
+         * to us.  Restore SControl and disable all existing devices.
          */
-        ata_port_for_each_link(link, ap) {
+        __ata_port_for_each_link(link, ap) {
+                sata_scr_write(link, SCR_CONTROL, link->saved_scontrol);
                 ata_link_for_each_dev(dev, link)
                         ata_dev_disable(dev);
         }
@@ -5991,6 +6002,9 @@ static int __init ata_parse_force_one(char **cur,
                 { "udma133",    .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 6) },
                 { "udma/133",   .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 6) },
                 { "udma7",      .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 7) },
+                { "nohrst",     .lflags         = ATA_LFLAG_NO_HRST },
+                { "nosrst",     .lflags         = ATA_LFLAG_NO_SRST },
+                { "norst",      .lflags         = ATA_LFLAG_NO_HRST | ATA_LFLAG_NO_SRST },
         };
         char *start = *cur, *p = *cur;
         char *id, *val, *endp;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 58bdc538d229..c1db2f234d2e 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2040,7 +2040,7 @@ static void ata_eh_link_report(struct ata_link *link)
         }
 
         if (ehc->i.serror)
-                ata_port_printk(ap, KERN_ERR,
+                ata_link_printk(link, KERN_ERR,
                   "SError: { %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s}\n",
                   ehc->i.serror & SERR_DATA_RECOVERED ? "RecovData " : "",
                   ehc->i.serror & SERR_COMM_RECOVERED ? "RecovComm " : "",
@@ -2171,18 +2171,12 @@ static int ata_do_reset(struct ata_link *link, ata_reset_fn_t reset,
 }
 
 static int ata_eh_followup_srst_needed(struct ata_link *link,
-                                       int rc, int classify,
-                                       const unsigned int *classes)
+                                       int rc, const unsigned int *classes)
 {
         if ((link->flags & ATA_LFLAG_NO_SRST) || ata_link_offline(link))
                 return 0;
-        if (rc == -EAGAIN) {
-                if (classify)
-                        return 1;
-                rc = 0;
-        }
-        if (rc != 0)
-                return 0;
+        if (rc == -EAGAIN)
+                return 1;
         if (sata_pmp_supported(link->ap) && ata_is_host_link(link))
                 return 1;
         return 0;
@@ -2210,6 +2204,10 @@ int ata_eh_reset(struct ata_link *link, int classify,
          */
         while (ata_eh_reset_timeouts[max_tries] != ULONG_MAX)
                 max_tries++;
+        if (link->flags & ATA_LFLAG_NO_HRST)
+                hardreset = NULL;
+        if (link->flags & ATA_LFLAG_NO_SRST)
+                softreset = NULL;
 
         now = jiffies;
         deadline = ata_deadline(ehc->last_reset, ATA_EH_RESET_COOL_DOWN);
@@ -2247,10 +2245,10 @@ int ata_eh_reset(struct ata_link *link, int classify,
         ehc->i.action &= ~ATA_EH_RESET;
         if (hardreset) {
                 reset = hardreset;
-                ehc->i.action = ATA_EH_HARDRESET;
+                ehc->i.action |= ATA_EH_HARDRESET;
         } else if (softreset) {
                 reset = softreset;
-                ehc->i.action = ATA_EH_SOFTRESET;
+                ehc->i.action |= ATA_EH_SOFTRESET;
         }
 
         if (prereset) {
@@ -2305,9 +2303,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
                         ehc->i.flags |= ATA_EHI_DID_SOFTRESET;
 
                 rc = ata_do_reset(link, reset, classes, deadline);
+                if (rc && rc != -EAGAIN)
+                        goto fail;
 
                 if (reset == hardreset &&
-                    ata_eh_followup_srst_needed(link, rc, classify, classes)) {
+                    ata_eh_followup_srst_needed(link, rc, classes)) {
                         /* okay, let's do follow-up softreset */
                         reset = softreset;
 
@@ -2322,10 +2322,6 @@ int ata_eh_reset(struct ata_link *link, int classify,
                         ata_eh_about_to_do(link, NULL, ATA_EH_RESET);
                         rc = ata_do_reset(link, reset, classes, deadline);
                 }
-
-                /* -EAGAIN can happen if we skipped followup SRST */
-                if (rc && rc != -EAGAIN)
-                        goto fail;
         } else {
                 if (verbose)
                         ata_link_printk(link, KERN_INFO, "no reset method "
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_acpi.c b/drivers/ata/pata_acpi.c
index fbe605711554..eb919c16a03e 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -181,7 +181,7 @@ static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc)
 
         if (adev != acpi->last) {
                 pacpi_set_piomode(ap, adev);
-                if (adev->dma_mode)
+                if (ata_dma_enabled(adev))
                         pacpi_set_dmamode(ap, adev);
                 acpi->last = adev;
         }
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index d7de7baf58a8..e8a0d99d7356 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -183,7 +183,7 @@ static void atiixp_bmdma_start(struct ata_queued_cmd *qc)
         u16 tmp16;
 
         pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &tmp16);
-        if (adev->dma_mode >= XFER_UDMA_0)
+        if (ata_using_udma(adev))
                 tmp16 |= (1 << dn);
         else
                 tmp16 &= ~(1 << dn);
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 744beebaaf49..0c4b271a9d5a 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -149,10 +149,10 @@ static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc)
         struct ata_device *prev = ap->private_data;
 
         /* See if the DMA settings could be wrong */
-        if (adev->dma_mode != 0 && adev != prev && prev != NULL) {
+        if (ata_dma_enabled(adev) && adev != prev && prev != NULL) {
                 /* Maybe, but do the channels match MWDMA/UDMA ? */
-                if ((adev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0) ||
-                    (adev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0))
+                if ((ata_using_udma(adev) && !ata_using_udma(prev)) ||
+                    (ata_using_udma(prev) && !ata_using_udma(adev)))
                         /* Switch the mode bits */
                         cs5530_set_dmamode(ap, adev);
         }
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 27843c70eb9d..0221c9a46769 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -606,7 +606,7 @@ static void it821x_display_disk(int n, u8 *buf)
 {
         unsigned char id[41];
         int mode = 0;
-        char *mtype;
+        char *mtype = "";
         char mbuf[8];
         char *cbl = "(40 wire cable)";
 
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_oldpiix.c b/drivers/ata/pata_oldpiix.c
index e678af383d13..df64f2443001 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -198,7 +198,7 @@ static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc)
 
         if (adev != ap->private_data) {
                 oldpiix_set_piomode(ap, adev);
-                if (adev->dma_mode)
+                if (ata_dma_enabled(adev))
                         oldpiix_set_dmamode(ap, adev);
         }
         return ata_sff_qc_issue(qc);
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index cbab397e3db7..0278fd2b8fb1 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -167,10 +167,10 @@ static unsigned int sc1200_qc_issue(struct ata_queued_cmd *qc)
         struct ata_device *prev = ap->private_data;
 
         /* See if the DMA settings could be wrong */
-        if (adev->dma_mode != 0 && adev != prev && prev != NULL) {
+        if (ata_dma_enabled(adev) && adev != prev && prev != NULL) {
                 /* Maybe, but do the channels match MWDMA/UDMA ? */
-                if ((adev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0) ||
-                    (adev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0))
+                if ((ata_using_udma(adev) && !ata_using_udma(prev)) ||
+                    (ata_using_udma(prev) && !ata_using_udma(adev)))
                         /* Switch the mode bits */
                         sc1200_set_dmamode(ap, adev);
         }
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/pata_via.c b/drivers/ata/pata_via.c
index 57d951b11f2d..8fdb2ce73210 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -324,62 +324,26 @@ static void via_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 }
 
 /**
- *      via_ata_sff_tf_load - send taskfile registers to host controller
+ *      via_tf_load - send taskfile registers to host controller
  *      @ap: Port to which output is sent
  *      @tf: ATA taskfile register set
  *
  *      Outputs ATA taskfile to standard ATA host controller.
  *
  *      Note: This is to fix the internal bug of via chipsets, which
- *  will reset the device register after changing the IEN bit on
- *  ctl register
+ *      will reset the device register after changing the IEN bit on
+ *      ctl register
  */
-static void via_ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
+static void via_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
 {
-        struct ata_ioports *ioaddr = &ap->ioaddr;
-        unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
-
-        if (tf->ctl != ap->last_ctl) {
-                iowrite8(tf->ctl, ioaddr->ctl_addr);
-                iowrite8(tf->device, ioaddr->device_addr);
-                ap->last_ctl = tf->ctl;
-                ata_wait_idle(ap);
-        }
-
-        if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
-                iowrite8(tf->hob_feature, ioaddr->feature_addr);
-                iowrite8(tf->hob_nsect, ioaddr->nsect_addr);
-                iowrite8(tf->hob_lbal, ioaddr->lbal_addr);
-                iowrite8(tf->hob_lbam, ioaddr->lbam_addr);
-                iowrite8(tf->hob_lbah, ioaddr->lbah_addr);
-                VPRINTK("hob: feat 0x%X nsect 0x%X, lba 0x%X 0x%X 0x%X\n",
-                        tf->hob_feature,
-                        tf->hob_nsect,
-                        tf->hob_lbal,
-                        tf->hob_lbam,
-                        tf->hob_lbah);
-        }
+        struct ata_taskfile tmp_tf;
 
-        if (is_addr) {
-                iowrite8(tf->feature, ioaddr->feature_addr);
-                iowrite8(tf->nsect, ioaddr->nsect_addr);
-                iowrite8(tf->lbal, ioaddr->lbal_addr);
-                iowrite8(tf->lbam, ioaddr->lbam_addr);
-                iowrite8(tf->lbah, ioaddr->lbah_addr);
-                VPRINTK("feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n",
-                        tf->feature,
-                        tf->nsect,
-                        tf->lbal,
-                        tf->lbam,
-                        tf->lbah);
+        if (ap->ctl != ap->last_ctl && !(tf->flags & ATA_TFLAG_DEVICE)) {
+                tmp_tf = *tf;
+                tmp_tf.flags |= ATA_TFLAG_DEVICE;
+                tf = &tmp_tf;
         }
-
-        if (tf->flags & ATA_TFLAG_DEVICE) {
-                iowrite8(tf->device, ioaddr->device_addr);
-                VPRINTK("device 0x%X\n", tf->device);
-        }
-
-        ata_wait_idle(ap);
+        ata_sff_tf_load(ap, tf);
 }
 
 static struct scsi_host_template via_sht = {
@@ -392,13 +356,12 @@ static struct ata_port_operations via_port_ops = {
         .set_piomode    = via_set_piomode,
         .set_dmamode    = via_set_dmamode,
         .prereset       = via_pre_reset,
-        .sff_tf_load = via_ata_tf_load,
+        .sff_tf_load    = via_tf_load,
 };
 
 static struct ata_port_operations via_port_ops_noirq = {
         .inherits       = &via_port_ops,
         .sff_data_xfer  = ata_sff_data_xfer_noirq,
-        .sff_tf_load = via_ata_tf_load,
 };
 
 /**
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 3ead02fe379e..5032c32fa505 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -96,6 +96,7 @@ enum {
         PORT_SCR                = 0x20,
 
         /* HOST_CTL bits */
+        HCTL_LEDEN              = (1 << 3),  /* enable LED operation */
         HCTL_IRQOFF             = (1 << 8),  /* global IRQ off */
         HCTL_FTHD0              = (1 << 10), /* fifo threshold 0 */
         HCTL_FTHD1              = (1 << 11), /* fifo threshold 1*/
@@ -540,7 +541,7 @@ static unsigned int inic_qc_issue(struct ata_queued_cmd *qc)
         void __iomem *port_base = inic_port_base(ap);
 
         /* fire up the ADMA engine */
-        writew(HCTL_FTHD0, port_base + HOST_CTL);
+        writew(HCTL_FTHD0 | HCTL_LEDEN, port_base + HOST_CTL);
         writew(IDMA_CTL_GO, port_base + PORT_IDMA_CTL);
         writeb(0, port_base + PORT_CPB_PTQFIFO);
 
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index ad169ffbc4cb..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 },
 
@@ -1134,30 +1135,16 @@ static int mv_qc_defer(struct ata_queued_cmd *qc)
         if (ap->nr_active_links == 0)
                 return 0;
 
-        if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
-                /*
-                 * The port is operating in host queuing mode (EDMA).
-                 * It can accomodate a new qc if the qc protocol
-                 * is compatible with the current host queue mode.
-                 */
-                if (pp->pp_flags & MV_PP_FLAG_NCQ_EN) {
-                        /*
-                         * The host queue (EDMA) is in NCQ mode.
-                         * If the new qc is also an NCQ command,
-                         * then allow the new qc.
-                         */
-                        if (qc->tf.protocol == ATA_PROT_NCQ)
-                                return 0;
-                } else {
-                        /*
-                         * The host queue (EDMA) is in non-NCQ, DMA mode.
-                         * If the new qc is also a non-NCQ, DMA command,
-                         * then allow the new qc.
-                         */
-                        if (qc->tf.protocol == ATA_PROT_DMA)
-                                return 0;
-                }
-        }
+        /*
+         * The port is operating in host queuing mode (EDMA) with NCQ
+         * enabled, allow multiple NCQ commands.  EDMA also allows
+         * queueing multiple DMA commands but libata core currently
+         * doesn't allow it.
+         */
+        if ((pp->pp_flags & MV_PP_FLAG_EDMA_EN) &&
+            (pp->pp_flags & MV_PP_FLAG_NCQ_EN) && ata_is_ncq(qc->tf.protocol))
+                return 0;
+
         return ATA_DEFER_PORT;
 }
 
@@ -3036,7 +3023,8 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx)
                 break;
         case chip_soc:
                 hpriv->ops = &mv_soc_ops;
-                hp_flags |= MV_HP_FLAG_SOC | MV_HP_ERRATA_60X1C0;
+                hp_flags |= MV_HP_FLAG_SOC | MV_HP_GEN_IIE |
+                        MV_HP_ERRATA_60X1C0;
                 break;
 
         default:
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 858f70610eda..14601dc05e41 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -405,28 +405,45 @@ static struct scsi_host_template nv_swncq_sht = {
         .slave_configure        = nv_swncq_slave_config,
 };
 
-static struct ata_port_operations nv_generic_ops = {
+/* OSDL bz3352 reports that some nv controllers can't determine device
+ * signature reliably and nv_hardreset is implemented to work around
+ * the problem.  This was reported on nf3 and it's unclear whether any
+ * other controllers are affected.  However, the workaround has been
+ * applied to all variants and there isn't much to gain by trying to
+ * find out exactly which ones are affected at this point especially
+ * because NV has moved over to ahci for newer controllers.
+ */
+static struct ata_port_operations nv_common_ops = {
         .inherits               = &ata_bmdma_port_ops,
         .hardreset              = nv_hardreset,
         .scr_read               = nv_scr_read,
         .scr_write              = nv_scr_write,
 };
 
+/* OSDL bz11195 reports that link doesn't come online after hardreset
+ * on generic nv's and there have been several other similar reports
+ * on linux-ide.  Disable hardreset for generic nv's.
+ */
+static struct ata_port_operations nv_generic_ops = {
+        .inherits               = &nv_common_ops,
+        .hardreset              = ATA_OP_NULL,
+};
+
 static struct ata_port_operations nv_nf2_ops = {
-        .inherits               = &nv_generic_ops,
+        .inherits               = &nv_common_ops,
         .freeze                 = nv_nf2_freeze,
         .thaw                   = nv_nf2_thaw,
 };
 
 static struct ata_port_operations nv_ck804_ops = {
-        .inherits               = &nv_generic_ops,
+        .inherits               = &nv_common_ops,
         .freeze                 = nv_ck804_freeze,
         .thaw                   = nv_ck804_thaw,
         .host_stop              = nv_ck804_host_stop,
 };
 
 static struct ata_port_operations nv_adma_ops = {
-        .inherits               = &nv_generic_ops,
+        .inherits               = &nv_common_ops,
 
         .check_atapi_dma        = nv_adma_check_atapi_dma,
         .sff_tf_read            = nv_adma_tf_read,
@@ -450,7 +467,7 @@ static struct ata_port_operations nv_adma_ops = {
 };
 
 static struct ata_port_operations nv_swncq_ops = {
-        .inherits               = &nv_generic_ops,
+        .inherits               = &nv_common_ops,
 
         .qc_defer               = ata_std_qc_defer,
         .qc_prep                = nv_swncq_qc_prep,
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index 2ebd07f2ef81..5effec6f5458 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -3,7 +3,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 5667c2f02c51..cc5e28c8885c 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -295,6 +295,12 @@ int class_for_each_device(struct class *class, struct device *start,
 
         if (!class)
                 return -EINVAL;
+        if (!class->p) {
+                WARN(1, "%s called for class '%s' before it was initialized",
+                     __func__, class->name);
+                return -EINVAL;
+        }
+
         mutex_lock(&class->p->class_mutex);
         list_for_each_entry(dev, &class->p->class_devices, node) {
                 if (start) {
@@ -344,6 +350,11 @@ struct device *class_find_device(struct class *class, struct device *start,
 
         if (!class)
                 return NULL;
+        if (!class->p) {
+                WARN(1, "%s called for class '%s' before it was initialized",
+                     __func__, class->name);
+                return NULL;
+        }
 
         mutex_lock(&class->p->class_mutex);
         list_for_each_entry(dev, &class->p->class_devices, node) {
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 068aa1c9538c..d021c98605b3 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -53,7 +53,7 @@ static inline int device_is_not_partition(struct device *dev)
  * it is attached to.  If it is not attached to a bus either, an empty
  * string will be returned.
  */
-const char *dev_driver_string(struct device *dev)
+const char *dev_driver_string(const struct device *dev)
 {
         return dev->driver ? dev->driver->name :
                         (dev->bus ? dev->bus->name :
@@ -541,6 +541,7 @@ void device_initialize(struct device *dev)
         spin_lock_init(&dev->devres_lock);
         INIT_LIST_HEAD(&dev->devres_head);
         device_init_wakeup(dev, 0);
+        device_pm_init(dev);
         set_dev_node(dev, -1);
 }
 
@@ -843,13 +844,19 @@ int device_add(struct device *dev)
 {
         struct device *parent = NULL;
         struct class_interface *class_intf;
-        int error;
+        int error = -EINVAL;
 
         dev = get_device(dev);
-        if (!dev || !strlen(dev->bus_id)) {
-                error = -EINVAL;
-                goto Done;
-        }
+        if (!dev)
+                goto done;
+
+        /* Temporarily support init_name if it is set.
+         * It will override bus_id for now */
+        if (dev->init_name)
+                dev_set_name(dev, "%s", dev->init_name);
+
+        if (!strlen(dev->bus_id))
+                goto done;
 
         pr_debug("device: '%s': %s\n", dev->bus_id, __func__);
 
@@ -897,9 +904,10 @@ int device_add(struct device *dev)
         error = bus_add_device(dev);
         if (error)
                 goto BusError;
-        error = device_pm_add(dev);
+        error = dpm_sysfs_add(dev);
         if (error)
-                goto PMError;
+                goto DPMError;
+        device_pm_add(dev);
         kobject_uevent(&dev->kobj, KOBJ_ADD);
         bus_attach_device(dev);
         if (parent)
@@ -917,10 +925,10 @@ int device_add(struct device *dev)
                                 class_intf->add_dev(dev, class_intf);
                 mutex_unlock(&dev->class->p->class_mutex);
         }
- Done:
+done:
         put_device(dev);
         return error;
- PMError:
+ DPMError:
         bus_remove_device(dev);
  BusError:
         if (dev->bus)
@@ -944,7 +952,7 @@ int device_add(struct device *dev)
         cleanup_device_parent(dev);
         if (parent)
                 put_device(parent);
-        goto Done;
+        goto done;
 }
 
 /**
@@ -1007,6 +1015,7 @@ void device_del(struct device *dev)
         struct class_interface *class_intf;
 
         device_pm_remove(dev);
+        dpm_sysfs_remove(dev);
         if (parent)
                 klist_del(&dev->knode_parent);
         if (MAJOR(dev->devt)) {
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 2ef5acf4368b..1e2bda780e48 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -16,9 +16,6 @@
 #include <linux/string.h>
 #include "base.h"
 
-#define to_dev(node) container_of(node, struct device, driver_list)
-
-
 static struct device *next_device(struct klist_iter *i)
 {
         struct klist_node *n = klist_next(i);
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 3250c5257b74..273a944d4040 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -67,20 +67,16 @@ void device_pm_unlock(void)
  *      device_pm_add - add a device to the list of active devices
  *      @dev:   Device to be added to the list
  */
-int device_pm_add(struct device *dev)
+void device_pm_add(struct device *dev)
 {
-        int error;
-
         pr_debug("PM: Adding info for %s:%s\n",
                  dev->bus ? dev->bus->name : "No Bus",
                  kobject_name(&dev->kobj));
         mutex_lock(&dpm_list_mtx);
         if (dev->parent) {
-                if (dev->parent->power.status >= DPM_SUSPENDING) {
-                        dev_warn(dev, "parent %s is sleeping, will not add\n",
+                if (dev->parent->power.status >= DPM_SUSPENDING)
+                        dev_warn(dev, "parent %s should not be sleeping\n",
                                 dev->parent->bus_id);
-                        WARN_ON(true);
-                }
         } else if (transition_started) {
                 /*
                  * We refuse to register parentless devices while a PM
@@ -89,13 +85,9 @@ int device_pm_add(struct device *dev)
                  */
                 WARN_ON(true);
         }
-        error = dpm_sysfs_add(dev);
-        if (!error) {
-                dev->power.status = DPM_ON;
-                list_add_tail(&dev->power.entry, &dpm_list);
-        }
+
+        list_add_tail(&dev->power.entry, &dpm_list);
         mutex_unlock(&dpm_list_mtx);
-        return error;
 }
 
 /**
@@ -110,7 +102,6 @@ void device_pm_remove(struct device *dev)
                  dev->bus ? dev->bus->name : "No Bus",
                  kobject_name(&dev->kobj));
         mutex_lock(&dpm_list_mtx);
-        dpm_sysfs_remove(dev);
         list_del_init(&dev->power.entry);
         mutex_unlock(&dpm_list_mtx);
 }
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index a3252c0e2887..41f51fae042f 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -1,3 +1,8 @@
+static inline void device_pm_init(struct device *dev)
+{
+        dev->power.status = DPM_ON;
+}
+
 #ifdef CONFIG_PM_SLEEP
 
 /*
@@ -11,12 +16,12 @@ static inline struct device *to_device(struct list_head *entry)
         return container_of(entry, struct device, power.entry);
 }
 
-extern int device_pm_add(struct device *);
+extern void device_pm_add(struct device *);
 extern void device_pm_remove(struct device *);
 
 #else /* CONFIG_PM_SLEEP */
 
-static inline int device_pm_add(struct device *dev) { return 0; }
+static inline void device_pm_add(struct device *dev) {}
 static inline void device_pm_remove(struct device *dev) {}
 
 #endif
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 24b97b0bef99..d070d492e385 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -571,8 +571,8 @@ out_free:
                 list_del(&brd->brd_list);
                 brd_free(brd);
         }
+        unregister_blkdev(RAMDISK_MAJOR, "ramdisk");
 
-        unregister_blkdev(RAMDISK_MAJOR, "brd");
         return -ENOMEM;
 }
 
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index ad98dda6037d..1778e4a2c672 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -707,15 +707,15 @@ static int __init nbd_init(void)
 
         BUILD_BUG_ON(sizeof(struct nbd_request) != 28);
 
-        nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
-        if (!nbd_dev)
-                return -ENOMEM;
-
         if (max_part < 0) {
                 printk(KERN_CRIT "nbd: max_part must be >= 0\n");
                 return -EINVAL;
         }
 
+        nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
+        if (!nbd_dev)
+                return -ENOMEM;
+
         part_shift = 0;
         if (max_part > 0)
                 part_shift = fls(max_part);
@@ -779,6 +779,7 @@ out:
                 blk_cleanup_queue(nbd_dev[i].disk->queue);
                 put_disk(nbd_dev[i].disk);
         }
+        kfree(nbd_dev);
         return err;
 }
 
@@ -795,6 +796,7 @@ static void __exit nbd_cleanup(void)
                 }
         }
         unregister_blkdev(NBD_MAJOR, "nbd");
+        kfree(nbd_dev);
         printk(KERN_INFO "nbd: unregistered device at major %d\n", NBD_MAJOR);
 }
 
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 158eed4d5161..29b7a648cc6e 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -49,7 +49,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>
 #include <linux/file.h>
@@ -2798,14 +2797,9 @@ out_mem:
         return ret;
 }
 
-static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
-        struct pktcdvd_device *pd;
-        long ret;
-
-        lock_kernel();
-        pd = inode->i_bdev->bd_disk->private_data;
+        struct pktcdvd_device *pd = inode->i_bdev->bd_disk->private_data;
 
         VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode));
 
@@ -2818,8 +2812,7 @@ static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case CDROM_LAST_WRITTEN:
         case CDROM_SEND_PACKET:
         case SCSI_IOCTL_SEND_COMMAND:
-                ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
-                break;
+                return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
 
         case CDROMEJECT:
                 /*
@@ -2828,15 +2821,14 @@ static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                  */
                 if (pd->refcnt == 1)
                         pkt_lock_door(pd, 0);
-                ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
-                break;
+                return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
 
         default:
                 VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd);
-                ret = -ENOTTY;
+                return -ENOTTY;
         }
-        unlock_kernel();
-        return ret;
+
+        return 0;
 }
 
 static int pkt_media_changed(struct gendisk *disk)
@@ -2858,7 +2850,7 @@ static struct block_device_operations pktcdvd_ops = {
         .owner =                THIS_MODULE,
         .open =                 pkt_open,
         .release =              pkt_close,
-        .unlocked_ioctl =       pkt_ioctl,
+        .ioctl =                pkt_ioctl,
         .media_changed =        pkt_media_changed,
 };
 
@@ -3023,8 +3015,7 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd)
         mutex_unlock(&ctl_mutex);
 }
 
-static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,
-                                                unsigned long arg)
+static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
         void __user *argp = (void __user *)arg;
         struct pkt_ctrl_command ctrl_cmd;
@@ -3041,22 +3032,16 @@ static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,
         case PKT_CTRL_CMD_SETUP:
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
-                lock_kernel();
                 ret = pkt_setup_dev(new_decode_dev(ctrl_cmd.dev), &pkt_dev);
                 ctrl_cmd.pkt_dev = new_encode_dev(pkt_dev);
-                unlock_kernel();
                 break;
         case PKT_CTRL_CMD_TEARDOWN:
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
-                lock_kernel();
                 ret = pkt_remove_dev(new_decode_dev(ctrl_cmd.pkt_dev));
-                unlock_kernel();
                 break;
         case PKT_CTRL_CMD_STATUS:
-                lock_kernel();
                 pkt_get_status(&ctrl_cmd);
-                unlock_kernel();
                 break;
         default:
                 return -ENOTTY;
@@ -3069,7 +3054,7 @@ static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,
 
 
 static const struct file_operations pkt_ctl_fops = {
-        .unlocked_ioctl  = pkt_ctl_ioctl,
+        .ioctl   = pkt_ctl_ioctl,
         .owner   = THIS_MODULE,
 };
 
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index a235ca787465..7cb4029a5375 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -3,8 +3,8 @@ menu "Bluetooth device drivers"
         depends on BT
 
 config BT_HCIUSB
-        tristate "HCI USB driver"
-        depends on USB
+        tristate "HCI USB driver (old version)"
+        depends on USB && BT_HCIBTUSB=n
         help
           Bluetooth HCI USB driver.
           This driver is required if you want to use Bluetooth devices with
@@ -23,15 +23,13 @@ config BT_HCIUSB_SCO
           Say Y here to compile support for SCO over HCI USB.
 
 config BT_HCIBTUSB
-        tristate "HCI USB driver (alternate version)"
-        depends on USB && EXPERIMENTAL && BT_HCIUSB=n
+        tristate "HCI USB driver"
+        depends on USB
         help
           Bluetooth HCI USB driver.
           This driver is required if you want to use Bluetooth devices with
           USB interface.
 
-          This driver is still experimental and has no SCO support.
-
           Say Y here to compile support for Bluetooth USB devices into the
           kernel or say M to compile it as module (btusb).
 
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 593b7c595038..27058477cc8b 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -60,7 +60,7 @@
 /* ======================== Module parameters ======================== */
 
 
-MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>, Jose Orlando Pereira <jop@di.uminho.pt>");
+MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth driver for the 3Com Bluetooth PCMCIA card");
 MODULE_LICENSE("GPL");
 MODULE_FIRMWARE("BT3CPCC.bin");
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 95ae9ba5661e..29ae99817c60 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2,7 +2,7 @@
  *
  *  Generic Bluetooth USB driver
  *
- *  Copyright (C) 2005-2007  Marcel Holtmann <marcel@holtmann.org>
+ *  Copyright (C) 2005-2008  Marcel Holtmann <marcel@holtmann.org>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@
 #define BT_DBG(D...)
 #endif
 
-#define VERSION "0.2"
+#define VERSION "0.3"
 
 static int ignore_dga;
 static int ignore_csr;
@@ -104,6 +104,9 @@ static struct usb_device_id blacklist_table[] = {
         /* Broadcom BCM2046 */
         { USB_DEVICE(0x0a5c, 0x2151), .driver_info = BTUSB_RESET },
 
+        /* Apple MacBook Pro with Broadcom chip */
+        { USB_DEVICE(0x05ac, 0x820f), .driver_info = BTUSB_RESET },
+
         /* IBM/Lenovo ThinkPad with Broadcom chip */
         { USB_DEVICE(0x0a5c, 0x201e), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
         { USB_DEVICE(0x0a5c, 0x2110), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
@@ -160,12 +163,17 @@ static struct usb_device_id blacklist_table[] = {
         { }     /* Terminating entry */
 };
 
+#define BTUSB_MAX_ISOC_FRAMES   10
+
 #define BTUSB_INTR_RUNNING      0
 #define BTUSB_BULK_RUNNING      1
+#define BTUSB_ISOC_RUNNING      2
 
 struct btusb_data {
         struct hci_dev       *hdev;
         struct usb_device    *udev;
+        struct usb_interface *intf;
+        struct usb_interface *isoc;
 
         spinlock_t lock;
 
@@ -176,10 +184,15 @@ struct btusb_data {
         struct usb_anchor tx_anchor;
         struct usb_anchor intr_anchor;
         struct usb_anchor bulk_anchor;
+        struct usb_anchor isoc_anchor;
 
         struct usb_endpoint_descriptor *intr_ep;
         struct usb_endpoint_descriptor *bulk_tx_ep;
         struct usb_endpoint_descriptor *bulk_rx_ep;
+        struct usb_endpoint_descriptor *isoc_tx_ep;
+        struct usb_endpoint_descriptor *isoc_rx_ep;
+
+        int isoc_altsetting;
 };
 
 static void btusb_intr_complete(struct urb *urb)
@@ -195,6 +208,8 @@ static void btusb_intr_complete(struct urb *urb)
                 return;
 
         if (urb->status == 0) {
+                hdev->stat.byte_rx += urb->actual_length;
+
                 if (hci_recv_fragment(hdev, HCI_EVENT_PKT,
                                                 urb->transfer_buffer,
                                                 urb->actual_length) < 0) {
@@ -216,7 +231,7 @@ static void btusb_intr_complete(struct urb *urb)
         }
 }
 
-static inline int btusb_submit_intr_urb(struct hci_dev *hdev)
+static int btusb_submit_intr_urb(struct hci_dev *hdev)
 {
         struct btusb_data *data = hdev->driver_data;
         struct urb *urb;
@@ -226,6 +241,9 @@ static inline int btusb_submit_intr_urb(struct hci_dev *hdev)
 
         BT_DBG("%s", hdev->name);
 
+        if (!data->intr_ep)
+                return -ENODEV;
+
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb)
                 return -ENOMEM;
@@ -274,6 +292,8 @@ static void btusb_bulk_complete(struct urb *urb)
                 return;
 
         if (urb->status == 0) {
+                hdev->stat.byte_rx += urb->actual_length;
+
                 if (hci_recv_fragment(hdev, HCI_ACLDATA_PKT,
                                                 urb->transfer_buffer,
                                                 urb->actual_length) < 0) {
@@ -295,7 +315,7 @@ static void btusb_bulk_complete(struct urb *urb)
         }
 }
 
-static inline int btusb_submit_bulk_urb(struct hci_dev *hdev)
+static int btusb_submit_bulk_urb(struct hci_dev *hdev)
 {
         struct btusb_data *data = hdev->driver_data;
         struct urb *urb;
@@ -305,6 +325,9 @@ static inline int btusb_submit_bulk_urb(struct hci_dev *hdev)
 
         BT_DBG("%s", hdev->name);
 
+        if (!data->bulk_rx_ep)
+                return -ENODEV;
+
         urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!urb)
                 return -ENOMEM;
@@ -339,6 +362,127 @@ static inline int btusb_submit_bulk_urb(struct hci_dev *hdev)
         return err;
 }
 
+static void btusb_isoc_complete(struct urb *urb)
+{
+        struct hci_dev *hdev = urb->context;
+        struct btusb_data *data = hdev->driver_data;
+        int i, err;
+
+        BT_DBG("%s urb %p status %d count %d", hdev->name,
+                                        urb, urb->status, urb->actual_length);
+
+        if (!test_bit(HCI_RUNNING, &hdev->flags))
+                return;
+
+        if (urb->status == 0) {
+                for (i = 0; i < urb->number_of_packets; i++) {
+                        unsigned int offset = urb->iso_frame_desc[i].offset;
+                        unsigned int length = urb->iso_frame_desc[i].actual_length;
+
+                        if (urb->iso_frame_desc[i].status)
+                                continue;
+
+                        hdev->stat.byte_rx += length;
+
+                        if (hci_recv_fragment(hdev, HCI_SCODATA_PKT,
+                                                urb->transfer_buffer + offset,
+                                                                length) < 0) {
+                                BT_ERR("%s corrupted SCO packet", hdev->name);
+                                hdev->stat.err_rx++;
+                        }
+                }
+        }
+
+        if (!test_bit(BTUSB_ISOC_RUNNING, &data->flags))
+                return;
+
+        usb_anchor_urb(urb, &data->isoc_anchor);
+
+        err = usb_submit_urb(urb, GFP_ATOMIC);
+        if (err < 0) {
+                BT_ERR("%s urb %p failed to resubmit (%d)",
+                                                hdev->name, urb, -err);
+                usb_unanchor_urb(urb);
+        }
+}
+
+static void inline __fill_isoc_descriptor(struct urb *urb, int len, int mtu)
+{
+        int i, offset = 0;
+
+        BT_DBG("len %d mtu %d", len, mtu);
+
+        for (i = 0; i < BTUSB_MAX_ISOC_FRAMES && len >= mtu;
+                                        i++, offset += mtu, len -= mtu) {
+                urb->iso_frame_desc[i].offset = offset;
+                urb->iso_frame_desc[i].length = mtu;
+        }
+
+        if (len && i < BTUSB_MAX_ISOC_FRAMES) {
+                urb->iso_frame_desc[i].offset = offset;
+                urb->iso_frame_desc[i].length = len;
+                i++;
+        }
+
+        urb->number_of_packets = i;
+}
+
+static int btusb_submit_isoc_urb(struct hci_dev *hdev)
+{
+        struct btusb_data *data = hdev->driver_data;
+        struct urb *urb;
+        unsigned char *buf;
+        unsigned int pipe;
+        int err, size;
+
+        BT_DBG("%s", hdev->name);
+
+        if (!data->isoc_rx_ep)
+                return -ENODEV;
+
+        urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_KERNEL);
+        if (!urb)
+                return -ENOMEM;
+
+        size = le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize) *
+                                                BTUSB_MAX_ISOC_FRAMES;
+
+        buf = kmalloc(size, GFP_KERNEL);
+        if (!buf) {
+                usb_free_urb(urb);
+                return -ENOMEM;
+        }
+
+        pipe = usb_rcvisocpipe(data->udev, data->isoc_rx_ep->bEndpointAddress);
+
+        urb->dev      = data->udev;
+        urb->pipe     = pipe;
+        urb->context  = hdev;
+        urb->complete = btusb_isoc_complete;
+        urb->interval = data->isoc_rx_ep->bInterval;
+
+        urb->transfer_flags  = URB_FREE_BUFFER | URB_ISO_ASAP;
+        urb->transfer_buffer = buf;
+        urb->transfer_buffer_length = size;
+
+        __fill_isoc_descriptor(urb, size,
+                        le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize));
+
+        usb_anchor_urb(urb, &data->isoc_anchor);
+
+        err = usb_submit_urb(urb, GFP_KERNEL);
+        if (err < 0) {
+                BT_ERR("%s urb %p submission failed (%d)",
+                                                hdev->name, urb, -err);
+                usb_unanchor_urb(urb);
+                kfree(buf);
+        }
+
+        usb_free_urb(urb);
+
+        return err;
+}
+
 static void btusb_tx_complete(struct urb *urb)
 {
         struct sk_buff *skb = urb->context;
@@ -376,7 +520,7 @@ static int btusb_open(struct hci_dev *hdev)
 
         err = btusb_submit_intr_urb(hdev);
         if (err < 0) {
-                clear_bit(BTUSB_INTR_RUNNING, &hdev->flags);
+                clear_bit(BTUSB_INTR_RUNNING, &data->flags);
                 clear_bit(HCI_RUNNING, &hdev->flags);
         }
 
@@ -392,6 +536,11 @@ static int btusb_close(struct hci_dev *hdev)
         if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))
                 return 0;
 
+        cancel_work_sync(&data->work);
+
+        clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
+        usb_kill_anchored_urbs(&data->isoc_anchor);
+
         clear_bit(BTUSB_BULK_RUNNING, &data->flags);
         usb_kill_anchored_urbs(&data->bulk_anchor);
 
@@ -453,6 +602,9 @@ static int btusb_send_frame(struct sk_buff *skb)
                 break;
 
         case HCI_ACLDATA_PKT:
+                if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1)
+                        return -ENODEV;
+
                 urb = usb_alloc_urb(0, GFP_ATOMIC);
                 if (!urb)
                         return -ENOMEM;
@@ -467,9 +619,31 @@ static int btusb_send_frame(struct sk_buff *skb)
                 break;
 
         case HCI_SCODATA_PKT:
+                if (!data->isoc_tx_ep || hdev->conn_hash.sco_num < 1)
+                        return -ENODEV;
+
+                urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_ATOMIC);
+                if (!urb)
+                        return -ENOMEM;
+
+                pipe = usb_sndisocpipe(data->udev,
+                                        data->isoc_tx_ep->bEndpointAddress);
+
+                urb->dev      = data->udev;
+                urb->pipe     = pipe;
+                urb->context  = skb;
+                urb->complete = btusb_tx_complete;
+                urb->interval = data->isoc_tx_ep->bInterval;
+
+                urb->transfer_flags  = URB_ISO_ASAP;
+                urb->transfer_buffer = skb->data;
+                urb->transfer_buffer_length = skb->len;
+
+                __fill_isoc_descriptor(urb, skb->len,
+                                le16_to_cpu(data->isoc_tx_ep->wMaxPacketSize));
+
                 hdev->stat.sco_tx++;
-                kfree_skb(skb);
-                return 0;
+                break;
 
         default:
                 return -EILSEQ;
@@ -508,22 +682,86 @@ static void btusb_notify(struct hci_dev *hdev, unsigned int evt)
                 schedule_work(&data->work);
 }
 
+static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting)
+{
+        struct btusb_data *data = hdev->driver_data;
+        struct usb_interface *intf = data->isoc;
+        struct usb_endpoint_descriptor *ep_desc;
+        int i, err;
+
+        if (!data->isoc)
+                return -ENODEV;
+
+        err = usb_set_interface(data->udev, 1, altsetting);
+        if (err < 0) {
+                BT_ERR("%s setting interface failed (%d)", hdev->name, -err);
+                return err;
+        }
+
+        data->isoc_altsetting = altsetting;
+
+        data->isoc_tx_ep = NULL;
+        data->isoc_rx_ep = NULL;
+
+        for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++) {
+                ep_desc = &intf->cur_altsetting->endpoint[i].desc;
+
+                if (!data->isoc_tx_ep && usb_endpoint_is_isoc_out(ep_desc)) {
+                        data->isoc_tx_ep = ep_desc;
+                        continue;
+                }
+
+                if (!data->isoc_rx_ep && usb_endpoint_is_isoc_in(ep_desc)) {
+                        data->isoc_rx_ep = ep_desc;
+                        continue;
+                }
+        }
+
+        if (!data->isoc_tx_ep || !data->isoc_rx_ep) {
+                BT_ERR("%s invalid SCO descriptors", hdev->name);
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
 static void btusb_work(struct work_struct *work)
 {
         struct btusb_data *data = container_of(work, struct btusb_data, work);
         struct hci_dev *hdev = data->hdev;
 
-        if (hdev->conn_hash.acl_num == 0) {
+        if (hdev->conn_hash.acl_num > 0) {
+                if (!test_and_set_bit(BTUSB_BULK_RUNNING, &data->flags)) {
+                        if (btusb_submit_bulk_urb(hdev) < 0)
+                                clear_bit(BTUSB_BULK_RUNNING, &data->flags);
+                        else
+                                btusb_submit_bulk_urb(hdev);
+                }
+        } else {
                 clear_bit(BTUSB_BULK_RUNNING, &data->flags);
                 usb_kill_anchored_urbs(&data->bulk_anchor);
-                return;
         }
 
-        if (!test_and_set_bit(BTUSB_BULK_RUNNING, &data->flags)) {
-                if (btusb_submit_bulk_urb(hdev) < 0)
-                        clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-                else
-                        btusb_submit_bulk_urb(hdev);
+        if (hdev->conn_hash.sco_num > 0) {
+                if (data->isoc_altsetting != 2) {
+                        clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
+                        usb_kill_anchored_urbs(&data->isoc_anchor);
+
+                        if (__set_isoc_interface(hdev, 2) < 0)
+                                return;
+                }
+
+                if (!test_and_set_bit(BTUSB_ISOC_RUNNING, &data->flags)) {
+                        if (btusb_submit_isoc_urb(hdev) < 0)
+                                clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
+                        else
+                                btusb_submit_isoc_urb(hdev);
+                }
+        } else {
+                clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
+                usb_kill_anchored_urbs(&data->isoc_anchor);
+
+                __set_isoc_interface(hdev, 0);
         }
 }
 
@@ -589,6 +827,7 @@ static int btusb_probe(struct usb_interface *intf,
         }
 
         data->udev = interface_to_usbdev(intf);
+        data->intf = intf;
 
         spin_lock_init(&data->lock);
 
@@ -597,6 +836,7 @@ static int btusb_probe(struct usb_interface *intf,
         init_usb_anchor(&data->tx_anchor);
         init_usb_anchor(&data->intr_anchor);
         init_usb_anchor(&data->bulk_anchor);
+        init_usb_anchor(&data->isoc_anchor);
 
         hdev = hci_alloc_dev();
         if (!hdev) {
@@ -620,6 +860,9 @@ static int btusb_probe(struct usb_interface *intf,
 
         hdev->owner = THIS_MODULE;
 
+        /* interface numbers are hardcoded in the spec */
+        data->isoc = usb_ifnum_to_if(data->udev, 1);
+
         if (reset || id->driver_info & BTUSB_RESET)
                 set_bit(HCI_QUIRK_RESET_ON_INIT, &hdev->quirks);
 
@@ -628,11 +871,16 @@ static int btusb_probe(struct usb_interface *intf,
                         set_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &hdev->quirks);
         }
 
+        if (id->driver_info & BTUSB_BROKEN_ISOC)
+                data->isoc = NULL;
+
         if (id->driver_info & BTUSB_SNIFFER) {
-                struct usb_device *udev = interface_to_usbdev(intf);
+                struct usb_device *udev = data->udev;
 
                 if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x997)
                         set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);
+
+                data->isoc = NULL;
         }
 
         if (id->driver_info & BTUSB_BCM92035) {
@@ -646,6 +894,16 @@ static int btusb_probe(struct usb_interface *intf,
                 }
         }
 
+        if (data->isoc) {
+                err = usb_driver_claim_interface(&btusb_driver,
+                                                        data->isoc, data);
+                if (err < 0) {
+                        hci_free_dev(hdev);
+                        kfree(data);
+                        return err;
+                }
+        }
+
         err = hci_register_dev(hdev);
         if (err < 0) {
                 hci_free_dev(hdev);
@@ -670,10 +928,22 @@ static void btusb_disconnect(struct usb_interface *intf)
 
         hdev = data->hdev;
 
-        usb_set_intfdata(intf, NULL);
+        __hci_dev_hold(hdev);
+
+        usb_set_intfdata(data->intf, NULL);
+
+        if (data->isoc)
+                usb_set_intfdata(data->isoc, NULL);
 
         hci_unregister_dev(hdev);
 
+        if (intf == data->isoc)
+                usb_driver_release_interface(&btusb_driver, data->intf);
+        else if (data->isoc)
+                usb_driver_release_interface(&btusb_driver, data->isoc);
+
+        __hci_dev_put(hdev);
+
         hci_free_dev(hdev);
 }
 
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 69df187d74ce..8dfcf77cb717 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -577,7 +577,7 @@ module_exit(hci_uart_exit);
 module_param(reset, bool, 0644);
 MODULE_PARM_DESC(reset, "Send HCI reset command on initialization");
 
-MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>");
+MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth HCI UART driver ver " VERSION);
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index e397572bf574..3c453924f838 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -1130,7 +1130,7 @@ module_param(isoc, int, 0644);
 MODULE_PARM_DESC(isoc, "Set isochronous transfers for SCO over HCI support");
 #endif
 
-MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>");
+MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth HCI USB driver ver " VERSION);
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index d97700aa54a9..7320a71b6368 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -377,7 +377,7 @@ module_exit(vhci_exit);
 module_param(minor, int, 0444);
 MODULE_PARM_DESC(minor, "Miscellaneous minor device number");
 
-MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>");
+MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index d9d1b65d206c..74031de517e6 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -408,7 +408,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
         ENSURE(get_last_session, CDC_MULTI_SESSION);
         ENSURE(get_mcn, CDC_MCN);
         ENSURE(reset, CDC_RESET);
-        ENSURE(audio_ioctl, CDC_PLAY_AUDIO);
         ENSURE(generic_packet, CDC_GENERIC_PACKET);
         cdi->mc_flags = 0;
         cdo->n_minors = 0;
@@ -2506,8 +2505,6 @@ static int cdrom_ioctl_get_subchnl(struct cdrom_device_info *cdi,
 
         /* cdinfo(CD_DO_IOCTL,"entering CDROMSUBCHNL\n");*/
 
-        if (!CDROM_CAN(CDC_PLAY_AUDIO))
-                return -ENOSYS;
         if (copy_from_user(&q, argp, sizeof(q)))
                 return -EFAULT;
 
@@ -2538,8 +2535,6 @@ static int cdrom_ioctl_read_tochdr(struct cdrom_device_info *cdi,
 
         /* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCHDR\n"); */
 
-        if (!CDROM_CAN(CDC_PLAY_AUDIO))
-                return -ENOSYS;
         if (copy_from_user(&header, argp, sizeof(header)))
                 return -EFAULT;
 
@@ -2562,8 +2557,6 @@ static int cdrom_ioctl_read_tocentry(struct cdrom_device_info *cdi,
 
         /* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCENTRY\n"); */
 
-        if (!CDROM_CAN(CDC_PLAY_AUDIO))
-                return -ENOSYS;
         if (copy_from_user(&entry, argp, sizeof(entry)))
                 return -EFAULT;
 
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 1e0455bd6df9..1231d95aa695 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -471,6 +471,12 @@ cleanup_sense_final:
         return err;
 }
 
+static int gdrom_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
+                             void *arg)
+{
+        return -EINVAL;
+}
+
 static struct cdrom_device_ops gdrom_ops = {
         .open                   = gdrom_open,
         .release                = gdrom_release,
@@ -478,6 +484,7 @@ static struct cdrom_device_ops gdrom_ops = {
         .media_changed          = gdrom_mediachanged,
         .get_last_session       = gdrom_get_last_session,
         .reset                  = gdrom_hardreset,
+        .audio_ioctl            = gdrom_audio_ioctl,
         .capability             = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
                                   CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
         .n_minors               = 1,
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 9d0dfe6e0d63..031e0e1a1a3b 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -550,12 +550,19 @@ return_complete:
         }
 }
 
+static int viocd_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
+                             void *arg)
+{
+        return -EINVAL;
+}
+
 static struct cdrom_device_ops viocd_dops = {
         .open = viocd_open,
         .release = viocd_release,
         .media_changed = viocd_media_changed,
         .lock_door = viocd_lock_door,
         .generic_packet = viocd_packet,
+        .audio_ioctl = viocd_audio_ioctl,
         .capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET | CDC_DRIVE_STATUS | CDC_GENERIC_PACKET | CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_RAM
 };
 
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index f52931e1c16e..8e8afb6141f9 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2695,15 +2695,13 @@ static __devinit void default_find_bmc(void)
         for (i = 0; ; i++) {
                 if (!ipmi_defaults[i].port)
                         break;
-
-                info = kzalloc(sizeof(*info), GFP_KERNEL);
-                if (!info)
-                        return;
-
 #ifdef CONFIG_PPC_MERGE
                 if (check_legacy_ioport(ipmi_defaults[i].port))
                         continue;
 #endif
+                info = kzalloc(sizeof(*info), GFP_KERNEL);
+                if (!info)
+                        return;
 
                 info->addr_source = NULL;
 
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
index b1414507997c..3a23e7694d55 100644
--- a/drivers/char/pcmcia/ipwireless/tty.c
+++ b/drivers/char/pcmcia/ipwireless/tty.c
@@ -29,7 +29,6 @@
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/uaccess.h>
-#include <linux/version.h>
 
 #include "tty.h"
 #include "network.h"
diff --git a/drivers/char/random.c b/drivers/char/random.c
index e0d0e371909c..7ce1ac4baa6d 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -407,7 +407,7 @@ struct entropy_store {
         /* read-write data: */
         spinlock_t lock;
         unsigned add_ptr;
-        int entropy_count;
+        int entropy_count;      /* Must at no time exceed ->POOLBITS! */
         int input_rotate;
 };
 
@@ -520,6 +520,7 @@ static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes)
 static void credit_entropy_bits(struct entropy_store *r, int nbits)
 {
         unsigned long flags;
+        int entropy_count;
 
         if (!nbits)
                 return;
@@ -527,20 +528,20 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits)
         spin_lock_irqsave(&r->lock, flags);
 
         DEBUG_ENT("added %d entropy credits to %s\n", nbits, r->name);
-        r->entropy_count += nbits;
-        if (r->entropy_count < 0) {
+        entropy_count = r->entropy_count;
+        entropy_count += nbits;
+        if (entropy_count < 0) {
                 DEBUG_ENT("negative entropy/overflow\n");
-                r->entropy_count = 0;
-        } else if (r->entropy_count > r->poolinfo->POOLBITS)
-                r->entropy_count = r->poolinfo->POOLBITS;
+                entropy_count = 0;
+        } else if (entropy_count > r->poolinfo->POOLBITS)
+                entropy_count = r->poolinfo->POOLBITS;
+        r->entropy_count = entropy_count;
 
         /* should we wake readers? */
-        if (r == &input_pool &&
-            r->entropy_count >= random_read_wakeup_thresh) {
+        if (r == &input_pool && entropy_count >= random_read_wakeup_thresh) {
                 wake_up_interruptible(&random_read_wait);
                 kill_fasync(&fasync, SIGIO, POLL_IN);
         }
-
         spin_unlock_irqrestore(&r->lock, flags);
 }
 
@@ -1571,6 +1572,7 @@ u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport)
 
         return half_md4_transform(hash, keyptr->secret);
 }
+EXPORT_SYMBOL_GPL(secure_ipv4_port_ephemeral);
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 509c89ac5bd3..08911ed66494 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -47,7 +47,6 @@
 
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 0e6866fe0f96..e4dce8709541 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -695,13 +695,23 @@ struct tty_driver *tty_find_polling_driver(char *name, int *line)
 {
         struct tty_driver *p, *res = NULL;
         int tty_line = 0;
+        int len;
         char *str;
 
+        for (str = name; *str; str++)
+                if ((*str >= '0' && *str <= '9') || *str == ',')
+                        break;
+        if (!*str)
+                return NULL;
+
+        len = str - name;
+        tty_line = simple_strtoul(str, &str, 10);
+
         mutex_lock(&tty_mutex);
         /* Search through the tty devices to look for a match */
         list_for_each_entry(p, &tty_drivers, tty_drivers) {
-                str = name + strlen(p->name);
-                tty_line = simple_strtoul(str, &str, 10);
+                if (strncmp(name, p->name, len) != 0)
+                        continue;
                 if (*str == ',')
                         str++;
                 if (*str == '\0')
@@ -2496,45 +2506,26 @@ static int tiocgwinsz(struct tty_struct *tty, struct winsize __user *arg)
 }
 
 /**
- *      tiocswinsz              -       implement window size set ioctl
- *      @tty; tty
- *      @arg: user buffer for result
- *
- *      Copies the user idea of the window size to the kernel. Traditionally
- *      this is just advisory information but for the Linux console it
- *      actually has driver level meaning and triggers a VC resize.
+ *      tty_do_resize           -       resize event
+ *      @tty: tty being resized
+ *      @real_tty: real tty (not the same as tty if using a pty/tty pair)
+ *      @rows: rows (character)
+ *      @cols: cols (character)
  *
- *      Locking:
- *              Called function use the console_sem is used to ensure we do
- *      not try and resize the console twice at once.
- *              The tty->termios_mutex is used to ensure we don't double
- *      resize and get confused. Lock order - tty->termios_mutex before
- *      console sem
+ *      Update the termios variables and send the neccessary signals to
+ *      peform a terminal resize correctly
  */
 
-static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty,
-        struct winsize __user *arg)
+int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty,
+                                        struct winsize *ws)
 {
-        struct winsize tmp_ws;
         struct pid *pgrp, *rpgrp;
         unsigned long flags;
 
-        if (copy_from_user(&tmp_ws, arg, sizeof(*arg)))
-                return -EFAULT;
-
-        mutex_lock(&tty->termios_mutex);
-        if (!memcmp(&tmp_ws, &tty->winsize, sizeof(*arg)))
+        /* For a PTY we need to lock the tty side */
+        mutex_lock(&real_tty->termios_mutex);
+        if (!memcmp(ws, &tty->winsize, sizeof(*ws)))
                 goto done;
-
-#ifdef CONFIG_VT
-        if (tty->driver->type == TTY_DRIVER_TYPE_CONSOLE) {
-                if (vc_lock_resize(tty->driver_data, tmp_ws.ws_col,
-                                        tmp_ws.ws_row)) {
-                        mutex_unlock(&tty->termios_mutex);
-                        return -ENXIO;
-                }
-        }
-#endif
         /* Get the PID values and reference them so we can
            avoid holding the tty ctrl lock while sending signals */
         spin_lock_irqsave(&tty->ctrl_lock, flags);
@@ -2550,14 +2541,42 @@ static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty,
         put_pid(pgrp);
         put_pid(rpgrp);
 
-        tty->winsize = tmp_ws;
-        real_tty->winsize = tmp_ws;
+        tty->winsize = *ws;
+        real_tty->winsize = *ws;
 done:
-        mutex_unlock(&tty->termios_mutex);
+        mutex_unlock(&real_tty->termios_mutex);
         return 0;
 }
 
 /**
+ *      tiocswinsz              -       implement window size set ioctl
+ *      @tty; tty
+ *      @arg: user buffer for result
+ *
+ *      Copies the user idea of the window size to the kernel. Traditionally
+ *      this is just advisory information but for the Linux console it
+ *      actually has driver level meaning and triggers a VC resize.
+ *
+ *      Locking:
+ *              Driver dependant. The default do_resize method takes the
+ *      tty termios mutex and ctrl_lock. The console takes its own lock
+ *      then calls into the default method.
+ */
+
+static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty,
+        struct winsize __user *arg)
+{
+        struct winsize tmp_ws;
+        if (copy_from_user(&tmp_ws, arg, sizeof(*arg)))
+                return -EFAULT;
+
+        if (tty->ops->resize)
+                return tty->ops->resize(tty, real_tty, &tmp_ws);
+        else
+                return tty_do_resize(tty, real_tty, &tmp_ws);
+}
+
+/**
  *      tioccons        -       allow admin to move logical console
  *      @file: the file to become console
  *
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index ea9fc5d03b99..bf34e4597421 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -937,12 +937,14 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
                         return 0;
 #endif
         case TIOCGSOFTCAR:
-                return put_user(C_CLOCAL(tty) ? 1 : 0,
+                /* FIXME: for correctness we may need to take the termios
+                   lock here - review */
+                return put_user(C_CLOCAL(real_tty) ? 1 : 0,
                                                 (int __user *)arg);
         case TIOCSSOFTCAR:
                 if (get_user(arg, (unsigned int __user *) arg))
                         return -EFAULT;
-                return tty_change_softcar(tty, arg);
+                return tty_change_softcar(real_tty, arg);
         default:
                 return -ENOIOCTLCMD;
         }
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 1bc00c9d860d..60359c360912 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -803,7 +803,25 @@ static inline int resize_screen(struct vc_data *vc, int width, int height,
  */
 #define VC_RESIZE_MAXCOL (32767)
 #define VC_RESIZE_MAXROW (32767)
-int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
+
+/**
+ *      vc_do_resize    -       resizing method for the tty
+ *      @tty: tty being resized
+ *      @real_tty: real tty (different to tty if a pty/tty pair)
+ *      @vc: virtual console private data
+ *      @cols: columns
+ *      @lines: lines
+ *
+ *      Resize a virtual console, clipping according to the actual constraints.
+ *      If the caller passes a tty structure then update the termios winsize
+ *      information and perform any neccessary signal handling.
+ *
+ *      Caller must hold the console semaphore. Takes the termios mutex and
+ *      ctrl_lock of the tty IFF a tty is passed.
+ */
+
+static int vc_do_resize(struct tty_struct *tty, struct tty_struct *real_tty,
+                struct vc_data *vc, unsigned int cols, unsigned int lines)
 {
         unsigned long old_origin, new_origin, new_scr_end, rlth, rrem, err = 0;
         unsigned int old_cols, old_rows, old_row_size, old_screen_size;
@@ -907,24 +925,15 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
         gotoxy(vc, vc->vc_x, vc->vc_y);
         save_cur(vc);
 
-        if (vc->vc_tty) {
-                struct winsize ws, *cws = &vc->vc_tty->winsize;
-                struct pid *pgrp = NULL;
-
+        if (tty) {
+                /* Rewrite the requested winsize data with the actual
+                   resulting sizes */
+                struct winsize ws;
                 memset(&ws, 0, sizeof(ws));
                 ws.ws_row = vc->vc_rows;
                 ws.ws_col = vc->vc_cols;
                 ws.ws_ypixel = vc->vc_scan_lines;
-
-                spin_lock_irq(&vc->vc_tty->ctrl_lock);
-                if ((ws.ws_row != cws->ws_row || ws.ws_col != cws->ws_col))
-                        pgrp = get_pid(vc->vc_tty->pgrp);
-                spin_unlock_irq(&vc->vc_tty->ctrl_lock);
-                if (pgrp) {
-                        kill_pgrp(vc->vc_tty->pgrp, SIGWINCH, 1);
-                        put_pid(pgrp);
-                }
-                *cws = ws;
+                tty_do_resize(tty, real_tty, &ws);
         }
 
         if (CON_IS_VISIBLE(vc))
@@ -932,14 +941,47 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
         return err;
 }
 
-int vc_lock_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
+/**
+ *      vc_resize               -       resize a VT
+ *      @vc: virtual console
+ *      @cols: columns
+ *      @rows: rows
+ *
+ *      Resize a virtual console as seen from the console end of things. We
+ *      use the common vc_do_resize methods to update the structures. The
+ *      caller must hold the console sem to protect console internals and
+ *      vc->vc_tty
+ */
+
+int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int rows)
+{
+        return vc_do_resize(vc->vc_tty, vc->vc_tty, vc, cols, rows);
+}
+
+/**
+ *      vt_resize               -       resize a VT
+ *      @tty: tty to resize
+ *      @real_tty: tty if a pty/tty pair
+ *      @ws: winsize attributes
+ *
+ *      Resize a virtual terminal. This is called by the tty layer as we
+ *      register our own handler for resizing. The mutual helper does all
+ *      the actual work.
+ *
+ *      Takes the console sem and the called methods then take the tty
+ *      termios_mutex and the tty ctrl_lock in that order.
+ */
+
+int vt_resize(struct tty_struct *tty, struct tty_struct *real_tty,
+        struct winsize *ws)
 {
-        int rc;
+        struct vc_data *vc = tty->driver_data;
+        int ret;
 
         acquire_console_sem();
-        rc = vc_resize(vc, cols, lines);
+        ret = vc_do_resize(tty, real_tty, vc, ws->ws_col, ws->ws_row);
         release_console_sem();
-        return rc;
+        return ret;
 }
 
 void vc_deallocate(unsigned int currcons)
@@ -2907,6 +2949,7 @@ static const struct tty_operations con_ops = {
         .start = con_start,
         .throttle = con_throttle,
         .unthrottle = con_unthrottle,
+        .resize = vt_resize,
 };
 
 int __init vty_init(void)
@@ -4061,7 +4104,6 @@ EXPORT_SYMBOL(default_blu);
 EXPORT_SYMBOL(update_region);
 EXPORT_SYMBOL(redraw_screen);
 EXPORT_SYMBOL(vc_resize);
-EXPORT_SYMBOL(vc_lock_resize);
 EXPORT_SYMBOL(fg_console);
 EXPORT_SYMBOL(console_blank_hook);
 EXPORT_SYMBOL(console_blanked);
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 3211afd9d57e..c904e9ad4a71 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -947,14 +947,16 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                     get_user(cc, &vtsizes->v_cols))
                         ret = -EFAULT;
                 else {
+                        acquire_console_sem();
                         for (i = 0; i < MAX_NR_CONSOLES; i++) {
                                 vc = vc_cons[i].d;
 
                                 if (vc) {
                                         vc->vc_resize_user = 1;
-                                        vc_lock_resize(vc_cons[i].d, cc, ll);
+                                        vc_resize(vc_cons[i].d, cc, ll);
                                 }
                         }
+                        release_console_sem();
                 }
                 break;
         }
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.h b/drivers/char/xilinx_hwicap/buffer_icap.h
index c5b1840906b2..8b0252bf06e2 100644
--- a/drivers/char/xilinx_hwicap/buffer_icap.h
+++ b/drivers/char/xilinx_hwicap/buffer_icap.h
@@ -38,7 +38,6 @@
 
 #include <linux/types.h>
 #include <linux/cdev.h>
-#include <linux/version.h>
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h
index ffabd3ba2bd8..62bda453c90b 100644
--- a/drivers/char/xilinx_hwicap/fifo_icap.h
+++ b/drivers/char/xilinx_hwicap/fifo_icap.h
@@ -38,7 +38,6 @@
 
 #include <linux/types.h>
 #include <linux/cdev.h>
-#include <linux/version.h>
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 8bfee5fb7223..278c9857bcf5 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -74,7 +74,6 @@
  * currently programmed in the FPGA.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
index 1f9c8b082dbe..24d0d9b938fb 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
@@ -38,7 +38,6 @@
 
 #include <linux/types.h>
 #include <linux/cdev.h>
-#include <linux/version.h>
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 5ca1d80de182..71d2ac4e3f46 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,15 @@ 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
+/* Number of reads we try to get two different values */
+#define ACPI_PM_READ_CHECKS 10000
+
 static int __init init_acpi_pm_clocksource(void)
 {
-        u32 value1, value2;
-        unsigned int i;
+        cycle_t value1, value2;
+        unsigned int i, j = 0;
 
         if (!pmtmr_ioport)
                 return -ENODEV;
@@ -187,24 +193,29 @@ 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++) {
+                udelay(100 * j);
+                value1 = clocksource_acpi_pm.read();
+                for (i = 0; i < ACPI_PM_READ_CHECKS; i++) {
+                        value2 = clocksource_acpi_pm.read();
+                        if (value2 == value1)
+                                continue;
+                        if (value2 > value1)
+                                break;
+                        if ((value2 < value1) && ((value2) < 0xFFF))
+                                break;
+                        printk(KERN_INFO "PM-Timer had inconsistent results:"
+                               " 0x%#llx, 0x%#llx - aborting.\n",
+                               value1, value2);
+                        return -EINVAL;
+                }
+                if (i == ACPI_PM_READ_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/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
index ba7b9a6b17a1..a4bec3f919aa 100644
--- a/drivers/cpuidle/governors/ladder.c
+++ b/drivers/cpuidle/governors/ladder.c
@@ -67,10 +67,17 @@ static int ladder_select_state(struct cpuidle_device *dev)
         struct ladder_device *ldev = &__get_cpu_var(ladder_devices);
         struct ladder_device_state *last_state;
         int last_residency, last_idx = ldev->last_state_idx;
+        int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);
 
         if (unlikely(!ldev))
                 return 0;
 
+        /* Special case when user has set very strict latency requirement */
+        if (unlikely(latency_req == 0)) {
+                ladder_do_selection(ldev, last_idx, 0);
+                return 0;
+        }
+
         last_state = &ldev->states[last_idx];
 
         if (dev->states[last_idx].flags & CPUIDLE_FLAG_TIME_VALID)
@@ -81,8 +88,7 @@ static int ladder_select_state(struct cpuidle_device *dev)
         /* consider promotion */
         if (last_idx < dev->state_count - 1 &&
             last_residency > last_state->threshold.promotion_time &&
-            dev->states[last_idx + 1].exit_latency <=
-                        pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) {
+            dev->states[last_idx + 1].exit_latency <= latency_req) {
                 last_state->stats.promotion_count++;
                 last_state->stats.demotion_count = 0;
                 if (last_state->stats.promotion_count >= last_state->threshold.promotion_count) {
@@ -92,7 +98,19 @@ static int ladder_select_state(struct cpuidle_device *dev)
         }
 
         /* consider demotion */
-        if (last_idx > 0 &&
+        if (last_idx > CPUIDLE_DRIVER_STATE_START &&
+            dev->states[last_idx].exit_latency > latency_req) {
+                int i;
+
+                for (i = last_idx - 1; i > CPUIDLE_DRIVER_STATE_START; i--) {
+                        if (dev->states[i].exit_latency <= latency_req)
+                                break;
+                }
+                ladder_do_selection(ldev, last_idx, i);
+                return i;
+        }
+
+        if (last_idx > CPUIDLE_DRIVER_STATE_START &&
             last_residency < last_state->threshold.demotion_time) {
                 last_state->stats.demotion_count++;
                 last_state->stats.promotion_count = 0;
@@ -117,7 +135,7 @@ static int ladder_enable_device(struct cpuidle_device *dev)
         struct ladder_device_state *lstate;
         struct cpuidle_state *state;
 
-        ldev->last_state_idx = 0;
+        ldev->last_state_idx = CPUIDLE_DRIVER_STATE_START;
 
         for (i = 0; i < dev->state_count; i++) {
                 state = &dev->states[i];
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 78d77c5dc35c..8d7cf3f31450 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -34,21 +34,28 @@ static DEFINE_PER_CPU(struct menu_device, menu_devices);
 static int menu_select(struct cpuidle_device *dev)
 {
         struct menu_device *data = &__get_cpu_var(menu_devices);
+        int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);
         int i;
 
+        /* Special case when user has set very strict latency requirement */
+        if (unlikely(latency_req == 0)) {
+                data->last_state_idx = 0;
+                return 0;
+        }
+
         /* determine the expected residency time */
         data->expected_us =
                 (u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000;
 
         /* find the deepest idle state that satisfies our constraints */
-        for (i = 1; i < dev->state_count; i++) {
+        for (i = CPUIDLE_DRIVER_STATE_START + 1; i < dev->state_count; i++) {
                 struct cpuidle_state *s = &dev->states[i];
 
                 if (s->target_residency > data->expected_us)
                         break;
                 if (s->target_residency > data->predicted_us)
                         break;
-                if (s->exit_latency > pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY))
+                if (s->exit_latency > latency_req)
                         break;
         }
 
@@ -67,9 +74,9 @@ static void menu_reflect(struct cpuidle_device *dev)
 {
         struct menu_device *data = &__get_cpu_var(menu_devices);
         int last_idx = data->last_state_idx;
-        unsigned int measured_us =
-                cpuidle_get_last_residency(dev) + data->elapsed_us;
+        unsigned int last_idle_us = cpuidle_get_last_residency(dev);
         struct cpuidle_state *target = &dev->states[last_idx];
+        unsigned int measured_us;
 
         /*
          * Ugh, this idle state doesn't support residency measurements, so we
@@ -77,20 +84,27 @@ static void menu_reflect(struct cpuidle_device *dev)
          * for one full standard timer tick.  However, be aware that this
          * could potentially result in a suboptimal state transition.
          */
-        if (!(target->flags & CPUIDLE_FLAG_TIME_VALID))
-                measured_us = USEC_PER_SEC / HZ;
+        if (unlikely(!(target->flags & CPUIDLE_FLAG_TIME_VALID)))
+                last_idle_us = USEC_PER_SEC / HZ;
+
+        /*
+         * measured_us and elapsed_us are the cumulative idle time, since the
+         * last time we were woken out of idle by an interrupt.
+         */
+        if (data->elapsed_us <= data->elapsed_us + last_idle_us)
+                measured_us = data->elapsed_us + last_idle_us;
+        else
+                measured_us = -1;
+
+        /* Predict time until next break event */
+        data->predicted_us = max(measured_us, data->last_measured_us);
 
-        /* Predict time remaining until next break event */
-        if (measured_us + BREAK_FUZZ < data->expected_us - target->exit_latency) {
-                data->predicted_us = max(measured_us, data->last_measured_us);
+        if (last_idle_us + BREAK_FUZZ <
+            data->expected_us - target->exit_latency) {
                 data->last_measured_us = measured_us;
                 data->elapsed_us = 0;
         } else {
-                if (data->elapsed_us < data->elapsed_us + measured_us)
-                        data->elapsed_us = measured_us;
-                else
-                        data->elapsed_us = -1;
-                data->predicted_us = max(measured_us, data->last_measured_us);
+                data->elapsed_us = measured_us;
         }
 }
 
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index ee827a7f7c6a..b6ad3ac5916e 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -1157,6 +1157,8 @@ static int aead_authenc_givencrypt(
         edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT;
 
         memcpy(req->giv, ctx->iv, crypto_aead_ivsize(authenc));
+        /* avoid consecutive packets going out with same IV */
+        *(__be64 *)req->giv ^= cpu_to_be64(req->seq);
 
         return ipsec_esp(edesc, areq, req->giv, req->seq,
                          ipsec_esp_encrypt_done);
@@ -1449,6 +1451,8 @@ static int talitos_probe(struct of_device *ofdev,
 
         priv->ofdev = ofdev;
 
+        INIT_LIST_HEAD(&priv->alg_list);
+
         tasklet_init(&priv->done_task, talitos_done, (unsigned long)dev);
         tasklet_init(&priv->error_task, talitos_error, (unsigned long)dev);
 
@@ -1575,8 +1579,6 @@ static int talitos_probe(struct of_device *ofdev,
         }
 
         /* register crypto algorithms the device supports */
-        INIT_LIST_HEAD(&priv->alg_list);
-
         for (i = 0; i < ARRAY_SIZE(driver_algs); i++) {
                 if (hw_supports(dev, driver_algs[i].desc_hdr_template)) {
                         struct talitos_crypto_alg *t_alg;
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 94df91771243..0778d99aea7c 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -364,7 +364,7 @@ static void dw_dma_tasklet(unsigned long data)
         int i;
 
         status_block = dma_readl(dw, RAW.BLOCK);
-        status_xfer = dma_readl(dw, RAW.BLOCK);
+        status_xfer = dma_readl(dw, RAW.XFER);
         status_err = dma_readl(dw, RAW.ERROR);
 
         dev_vdbg(dw->dma.dev, "tasklet: status_block=%x status_err=%x\n",
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index a4e4494663bf..0328da020a10 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -25,7 +25,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/memory.h>
-#include <asm/plat-orion/mv_xor.h>
+#include <plat/mv_xor.h>
 #include "mv_xor.h"
 
 static void mv_xor_issue_pending(struct dma_chan *chan);
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index b27b13c5eb5a..4b55ec607a88 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -34,7 +34,6 @@
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
 #include <linux/workqueue.h>
-#include <linux/version.h>
 
 #define EDAC_MC_LABEL_LEN       31
 #define EDAC_DEVICE_NAME_LEN    31
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index fa6d6abefd4d..450902438208 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -12,8 +12,8 @@ config FIREWIRE
           This is the "Juju" FireWire stack, a new alternative implementation
           designed for robustness and simplicity.  You can build either this
           stack, or the old stack (the ieee1394 driver, ohci1394 etc.) or both.
-          Please read http://wiki.linux1394.org/JujuMigration before you
-          enable the new stack.
+          Please read http://ieee1394.wiki.kernel.org/index.php/Juju_Migration
+          before you enable the new stack.
 
           To compile this driver as a module, say M here: the module will be
           called firewire-core.
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 8024e3bfd877..b91ef63126ed 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -669,8 +669,7 @@ static int __init ibft_register_kobjects(struct ibft_table_header *header,
 
         control = (void *)header + sizeof(*header);
         end = (void *)control + control->hdr.length;
-        eot_offset = (void *)header + header->length -
-                     (void *)control - sizeof(*header);
+        eot_offset = (void *)header + header->length - (void *)control;
         rc = ibft_verify_hdr("control", (struct ibft_hdr *)control, id_control,
                              sizeof(*control));
 
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 089c015c01d1..53f0e5af1cc8 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -400,27 +400,31 @@ static void drm_locked_tasklet_func(unsigned long data)
 {
         struct drm_device *dev = (struct drm_device *)data;
         unsigned long irqflags;
-
+        void (*tasklet_func)(struct drm_device *);
+        
         spin_lock_irqsave(&dev->tasklet_lock, irqflags);
+        tasklet_func = dev->locked_tasklet_func;
+        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
 
-        if (!dev->locked_tasklet_func ||
+        if (!tasklet_func ||
             !drm_lock_take(&dev->lock,
                            DRM_KERNEL_CONTEXT)) {
-                spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
                 return;
         }
 
         dev->lock.lock_time = jiffies;
         atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
 
-        dev->locked_tasklet_func(dev);
+        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
+        tasklet_func = dev->locked_tasklet_func;
+        dev->locked_tasklet_func = NULL;
+        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
+        
+        if (tasklet_func != NULL)
+                tasklet_func(dev);
 
         drm_lock_free(&dev->lock,
                       DRM_KERNEL_CONTEXT);
-
-        dev->locked_tasklet_func = NULL;
-
-        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
 }
 
 /**
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 0998723cde79..a4caf95485d7 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -105,14 +105,19 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                   ret ? "interrupted" : "has lock");
         if (ret) return ret;
 
-        sigemptyset(&dev->sigmask);
-        sigaddset(&dev->sigmask, SIGSTOP);
-        sigaddset(&dev->sigmask, SIGTSTP);
-        sigaddset(&dev->sigmask, SIGTTIN);
-        sigaddset(&dev->sigmask, SIGTTOU);
-        dev->sigdata.context = lock->context;
-        dev->sigdata.lock = dev->lock.hw_lock;
-        block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
+        /* don't set the block all signals on the master process for now 
+         * really probably not the correct answer but lets us debug xkb
+         * xserver for now */
+        if (!file_priv->master) {
+                sigemptyset(&dev->sigmask);
+                sigaddset(&dev->sigmask, SIGSTOP);
+                sigaddset(&dev->sigmask, SIGTSTP);
+                sigaddset(&dev->sigmask, SIGTTIN);
+                sigaddset(&dev->sigmask, SIGTTOU);
+                dev->sigdata.context = lock->context;
+                dev->sigdata.lock = dev->lock.hw_lock;
+                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
+        }
 
         if (dev->driver->dma_ready && (lock->flags & _DRM_LOCK_READY))
                 dev->driver->dma_ready(dev);
@@ -150,6 +155,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
         struct drm_lock *lock = data;
         unsigned long irqflags;
+        void (*tasklet_func)(struct drm_device *);
 
         if (lock->context == DRM_KERNEL_CONTEXT) {
                 DRM_ERROR("Process %d using kernel context %d\n",
@@ -158,14 +164,11 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
         }
 
         spin_lock_irqsave(&dev->tasklet_lock, irqflags);
-
-        if (dev->locked_tasklet_func) {
-                dev->locked_tasklet_func(dev);
-
-                dev->locked_tasklet_func = NULL;
-        }
-
+        tasklet_func = dev->locked_tasklet_func;
+        dev->locked_tasklet_func = NULL;
         spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
+        if (tasklet_func != NULL)
+                tasklet_func(dev);
 
         atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
 
diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
index 702df45320f7..4b27d9abb7bc 100644
--- a/drivers/gpu/drm/radeon/r300_cmdbuf.c
+++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c
@@ -77,6 +77,9 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,
                                 return -EFAULT;
                         }
 
+                        box.x2--; /* Hardware expects inclusive bottom-right corner */
+                        box.y2--;
+
                         if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) {
                                 box.x1 = (box.x1) &
                                         R300_CLIPRECT_MASK;
@@ -95,8 +98,8 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,
                                         R300_CLIPRECT_MASK;
                                 box.y2 = (box.y2 + R300_CLIPRECT_OFFSET) &
                                         R300_CLIPRECT_MASK;
-
                         }
+
                         OUT_RING((box.x1 << R300_CLIPRECT_X_SHIFT) |
                                  (box.y1 << R300_CLIPRECT_Y_SHIFT));
                         OUT_RING((box.x2 << R300_CLIPRECT_X_SHIFT) |
@@ -136,6 +139,18 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,
                 ADVANCE_RING();
         }
 
+        /* flus cache and wait idle clean after cliprect change */
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+        OUT_RING(R300_RB3D_DC_FLUSH);
+        ADVANCE_RING();
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+        ADVANCE_RING();
+        /* set flush flag */
+        dev_priv->track_flush |= RADEON_FLUSH_EMITED;
+
         return 0;
 }
 
@@ -166,13 +181,13 @@ void r300_init_reg_flags(struct drm_device *dev)
         ADD_RANGE(0x21DC, 1);
         ADD_RANGE(R300_VAP_UNKNOWN_221C, 1);
         ADD_RANGE(R300_VAP_CLIP_X_0, 4);
-        ADD_RANGE(R300_VAP_PVS_WAITIDLE, 1);
+        ADD_RANGE(R300_VAP_PVS_STATE_FLUSH_REG, 1);
         ADD_RANGE(R300_VAP_UNKNOWN_2288, 1);
         ADD_RANGE(R300_VAP_OUTPUT_VTX_FMT_0, 2);
         ADD_RANGE(R300_VAP_PVS_CNTL_1, 3);
         ADD_RANGE(R300_GB_ENABLE, 1);
         ADD_RANGE(R300_GB_MSPOS0, 5);
-        ADD_RANGE(R300_TX_CNTL, 1);
+        ADD_RANGE(R300_TX_INVALTAGS, 1);
         ADD_RANGE(R300_TX_ENABLE, 1);
         ADD_RANGE(0x4200, 4);
         ADD_RANGE(0x4214, 1);
@@ -388,15 +403,28 @@ static __inline__ int r300_emit_vpu(drm_radeon_private_t *dev_priv,
         if (sz * 16 > cmdbuf->bufsz)
                 return -EINVAL;
 
-        BEGIN_RING(5 + sz * 4);
-        /* Wait for VAP to come to senses.. */
-        /* there is no need to emit it multiple times, (only once before VAP is programmed,
-           but this optimization is for later */
-        OUT_RING_REG(R300_VAP_PVS_WAITIDLE, 0);
+        /* VAP is very sensitive so we purge cache before we program it
+         * and we also flush its state before & after */
+        BEGIN_RING(6);
+        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+        OUT_RING(R300_RB3D_DC_FLUSH);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+        OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0));
+        OUT_RING(0);
+        ADVANCE_RING();
+        /* set flush flag */
+        dev_priv->track_flush |= RADEON_FLUSH_EMITED;
+
+        BEGIN_RING(3 + sz * 4);
         OUT_RING_REG(R300_VAP_PVS_UPLOAD_ADDRESS, addr);
         OUT_RING(CP_PACKET0_TABLE(R300_VAP_PVS_UPLOAD_DATA, sz * 4 - 1));
         OUT_RING_TABLE((int *)cmdbuf->buf, sz * 4);
+        ADVANCE_RING();
 
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0));
+        OUT_RING(0);
         ADVANCE_RING();
 
         cmdbuf->buf += sz * 16;
@@ -424,6 +452,15 @@ static __inline__ int r300_emit_clear(drm_radeon_private_t *dev_priv,
         OUT_RING_TABLE((int *)cmdbuf->buf, 8);
         ADVANCE_RING();
 
+        BEGIN_RING(4);
+        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+        OUT_RING(R300_RB3D_DC_FLUSH);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+        ADVANCE_RING();
+        /* set flush flag */
+        dev_priv->track_flush |= RADEON_FLUSH_EMITED;
+
         cmdbuf->buf += 8 * 4;
         cmdbuf->bufsz -= 8 * 4;
 
@@ -543,22 +580,23 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
         return 0;
 }
 
-static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,
-                                             drm_radeon_kcmd_buffer_t *cmdbuf)
+static __inline__ int r300_emit_draw_indx_2(drm_radeon_private_t *dev_priv,
+                                            drm_radeon_kcmd_buffer_t *cmdbuf)
 {
-        u32 *cmd = (u32 *) cmdbuf->buf;
-        int count, ret;
+        u32 *cmd;
+        int count;
+        int expected_count;
         RING_LOCALS;
 
-        count=(cmd[0]>>16) & 0x3fff;
+        cmd = (u32 *) cmdbuf->buf;
+        count = (cmd[0]>>16) & 0x3fff;
+        expected_count = cmd[1] >> 16;
+        if (!(cmd[1] & R300_VAP_VF_CNTL__INDEX_SIZE_32bit))
+                expected_count = (expected_count+1)/2;
 
-        if ((cmd[1] & 0x8000ffff) != 0x80000810) {
-                DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
-                return -EINVAL;
-        }
-        ret = !radeon_check_offset(dev_priv, cmd[2]);
-        if (ret) {
-                DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
+        if (count && count != expected_count) {
+                DRM_ERROR("3D_DRAW_INDX_2: packet size %i, expected %i\n",
+                        count, expected_count);
                 return -EINVAL;
         }
 
@@ -570,6 +608,50 @@ static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,
         cmdbuf->buf += (count+2)*4;
         cmdbuf->bufsz -= (count+2)*4;
 
+        if (!count) {
+                drm_r300_cmd_header_t header;
+
+                if (cmdbuf->bufsz < 4*4 + sizeof(header)) {
+                        DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER, but stream is too short.\n");
+                        return -EINVAL;
+                }
+
+                header.u = *(unsigned int *)cmdbuf->buf;
+
+                cmdbuf->buf += sizeof(header);
+                cmdbuf->bufsz -= sizeof(header);
+                cmd = (u32 *) cmdbuf->buf;
+
+                if (header.header.cmd_type != R300_CMD_PACKET3 ||
+                    header.packet3.packet != R300_CMD_PACKET3_RAW ||
+                    cmd[0] != CP_PACKET3(RADEON_CP_INDX_BUFFER, 2)) {
+                        DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER.\n");
+                        return -EINVAL;
+                }
+
+                if ((cmd[1] & 0x8000ffff) != 0x80000810) {
+                        DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
+                        return -EINVAL;
+                }
+                if (!radeon_check_offset(dev_priv, cmd[2])) {
+                        DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
+                        return -EINVAL;
+                }
+                if (cmd[3] != expected_count) {
+                        DRM_ERROR("INDX_BUFFER: buffer size %i, expected %i\n",
+                                cmd[3], expected_count);
+                        return -EINVAL;
+                }
+
+                BEGIN_RING(4);
+                OUT_RING(cmd[0]);
+                OUT_RING_TABLE((int *)(cmdbuf->buf + 4), 3);
+                ADVANCE_RING();
+
+                cmdbuf->buf += 4*4;
+                cmdbuf->bufsz -= 4*4;
+        }
+
         return 0;
 }
 
@@ -613,11 +695,22 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv,
         case RADEON_CNTL_BITBLT_MULTI:
                 return r300_emit_bitblt_multi(dev_priv, cmdbuf);
 
-        case RADEON_CP_INDX_BUFFER:     /* DRAW_INDX_2 without INDX_BUFFER seems to lock up the gpu */
-                return r300_emit_indx_buffer(dev_priv, cmdbuf);
-        case RADEON_CP_3D_DRAW_IMMD_2:  /* triggers drawing using in-packet vertex data */
-        case RADEON_CP_3D_DRAW_VBUF_2:  /* triggers drawing of vertex buffers setup elsewhere */
-        case RADEON_CP_3D_DRAW_INDX_2:  /* triggers drawing using indices to vertex buffer */
+        case RADEON_CP_INDX_BUFFER:
+                DRM_ERROR("packet3 INDX_BUFFER without preceding 3D_DRAW_INDX_2 is illegal.\n");
+                return -EINVAL;
+        case RADEON_CP_3D_DRAW_IMMD_2:
+                /* triggers drawing using in-packet vertex data */
+        case RADEON_CP_3D_DRAW_VBUF_2:
+                /* triggers drawing of vertex buffers setup elsewhere */
+                dev_priv->track_flush &= ~(RADEON_FLUSH_EMITED |
+                                           RADEON_PURGE_EMITED);
+                break;
+        case RADEON_CP_3D_DRAW_INDX_2:
+                /* triggers drawing using indices to vertex buffer */
+                /* whenever we send vertex we clear flush & purge */
+                dev_priv->track_flush &= ~(RADEON_FLUSH_EMITED |
+                                           RADEON_PURGE_EMITED);
+                return r300_emit_draw_indx_2(dev_priv, cmdbuf);
         case RADEON_WAIT_FOR_IDLE:
         case RADEON_CP_NOP:
                 /* these packets are safe */
@@ -713,17 +806,53 @@ static __inline__ int r300_emit_packet3(drm_radeon_private_t *dev_priv,
  */
 static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv)
 {
+        uint32_t cache_z, cache_3d, cache_2d;
         RING_LOCALS;
 
-        BEGIN_RING(6);
-        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
-        OUT_RING(R300_RB3D_DSTCACHE_UNKNOWN_0A);
+        cache_z = R300_ZC_FLUSH;
+        cache_2d = R300_RB2D_DC_FLUSH;
+        cache_3d = R300_RB3D_DC_FLUSH;
+        if (!(dev_priv->track_flush & RADEON_PURGE_EMITED)) {
+                /* we can purge, primitive where draw since last purge */
+                cache_z |= R300_ZC_FREE;
+                cache_2d |= R300_RB2D_DC_FREE;
+                cache_3d |= R300_RB3D_DC_FREE;
+        }
+
+        /* flush & purge zbuffer */
+        BEGIN_RING(2);
         OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0));
-        OUT_RING(R300_ZB_ZCACHE_CTLSTAT_ZC_FLUSH_FLUSH_AND_FREE|
-                 R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_FREE);
-        OUT_RING(CP_PACKET3(RADEON_CP_NOP, 0));
-        OUT_RING(0x0);
+        OUT_RING(cache_z);
+        ADVANCE_RING();
+        /* flush & purge 3d */
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+        OUT_RING(cache_3d);
+        ADVANCE_RING();
+        /* flush & purge texture */
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(R300_TX_INVALTAGS, 0));
+        OUT_RING(0);
+        ADVANCE_RING();
+        /* FIXME: is this one really needed ? */
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(R300_RB3D_AARESOLVE_CTL, 0));
+        OUT_RING(0);
+        ADVANCE_RING();
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+        ADVANCE_RING();
+        /* flush & purge 2d through E2 as RB2D will trigger lockup */
+        BEGIN_RING(4);
+        OUT_RING(CP_PACKET0(R300_DSTCACHE_CTLSTAT, 0));
+        OUT_RING(cache_2d);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(RADEON_WAIT_2D_IDLECLEAN |
+                 RADEON_WAIT_HOST_IDLECLEAN);
         ADVANCE_RING();
+        /* set flush & purge flags */
+        dev_priv->track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED;
 }
 
 /**
@@ -905,8 +1034,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
 
         DRM_DEBUG("\n");
 
-        /* See the comment above r300_emit_begin3d for why this call must be here,
-         * and what the cleanup gotos are for. */
+        /* pacify */
         r300_pacify(dev_priv);
 
         if (cmdbuf->nbox <= R300_SIMULTANEOUS_CLIPRECTS) {
diff --git a/drivers/gpu/drm/radeon/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h
index a6802f26afc4..ee6f811599a3 100644
--- a/drivers/gpu/drm/radeon/r300_reg.h
+++ b/drivers/gpu/drm/radeon/r300_reg.h
@@ -317,7 +317,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Therefore, I suspect writing zero to 0x2284 synchronizes the engine and
  * avoids bugs caused by still running shaders reading bad data from memory.
  */
-#define R300_VAP_PVS_WAITIDLE               0x2284 /* GUESS */
+#define R300_VAP_PVS_STATE_FLUSH_REG        0x2284
 
 /* Absolutely no clue what this register is about. */
 #define R300_VAP_UNKNOWN_2288               0x2288
@@ -513,7 +513,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 /* gap */
 
 /* Zero to flush caches. */
-#define R300_TX_CNTL                        0x4100
+#define R300_TX_INVALTAGS                   0x4100
 #define R300_TX_FLUSH                       0x0
 
 /* The upper enable bits are guessed, based on fglrx reported limits. */
@@ -1362,6 +1362,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define R300_RB3D_COLORPITCH2               0x4E40 /* GUESS */
 #define R300_RB3D_COLORPITCH3               0x4E44 /* GUESS */
 
+#define R300_RB3D_AARESOLVE_CTL             0x4E88
 /* gap */
 
 /* Guess by Vladimir.
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index f0de81a5689d..248ab4a7d39f 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -40,6 +40,7 @@
 #define RADEON_FIFO_DEBUG       0
 
 static int radeon_do_cleanup_cp(struct drm_device * dev);
+static void radeon_do_cp_start(drm_radeon_private_t * dev_priv);
 
 static u32 R500_READ_MCIND(drm_radeon_private_t *dev_priv, int addr)
 {
@@ -198,23 +199,8 @@ static int radeon_do_pixcache_flush(drm_radeon_private_t * dev_priv)
                         DRM_UDELAY(1);
                 }
         } else {
-                /* 3D */
-                tmp = RADEON_READ(R300_RB3D_DSTCACHE_CTLSTAT);
-                tmp |= RADEON_RB3D_DC_FLUSH_ALL;
-                RADEON_WRITE(R300_RB3D_DSTCACHE_CTLSTAT, tmp);
-
-                /* 2D */
-                tmp = RADEON_READ(R300_DSTCACHE_CTLSTAT);
-                tmp |= RADEON_RB3D_DC_FLUSH_ALL;
-                RADEON_WRITE(R300_DSTCACHE_CTLSTAT, tmp);
-
-                for (i = 0; i < dev_priv->usec_timeout; i++) {
-                        if (!(RADEON_READ(R300_DSTCACHE_CTLSTAT)
-                          & RADEON_RB3D_DC_BUSY)) {
-                                return 0;
-                        }
-                        DRM_UDELAY(1);
-                }
+                /* don't flush or purge cache here or lockup */
+                return 0;
         }
 
 #if RADEON_FIFO_DEBUG
@@ -237,6 +223,9 @@ static int radeon_do_wait_for_fifo(drm_radeon_private_t * dev_priv, int entries)
                         return 0;
                 DRM_UDELAY(1);
         }
+        DRM_DEBUG("wait for fifo failed status : 0x%08X 0x%08X\n",
+                 RADEON_READ(RADEON_RBBM_STATUS),
+                 RADEON_READ(R300_VAP_CNTL_STATUS));
 
 #if RADEON_FIFO_DEBUG
         DRM_ERROR("failed!\n");
@@ -263,6 +252,9 @@ static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv)
                 }
                 DRM_UDELAY(1);
         }
+        DRM_DEBUG("wait idle failed status : 0x%08X 0x%08X\n",
+                 RADEON_READ(RADEON_RBBM_STATUS),
+                 RADEON_READ(R300_VAP_CNTL_STATUS));
 
 #if RADEON_FIFO_DEBUG
         DRM_ERROR("failed!\n");
@@ -443,14 +435,20 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv)
 
         dev_priv->cp_running = 1;
 
-        BEGIN_RING(6);
-
+        BEGIN_RING(8);
+        /* isync can only be written through cp on r5xx write it here */
+        OUT_RING(CP_PACKET0(RADEON_ISYNC_CNTL, 0));
+        OUT_RING(RADEON_ISYNC_ANY2D_IDLE3D |
+                 RADEON_ISYNC_ANY3D_IDLE2D |
+                 RADEON_ISYNC_WAIT_IDLEGUI |
+                 RADEON_ISYNC_CPSCRATCH_IDLEGUI);
         RADEON_PURGE_CACHE();
         RADEON_PURGE_ZCACHE();
         RADEON_WAIT_UNTIL_IDLE();
-
         ADVANCE_RING();
         COMMIT_RING();
+
+        dev_priv->track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED;
 }
 
 /* Reset the Command Processor.  This will not flush any pending
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 3f0eca957aa7..099381693175 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -220,6 +220,9 @@ struct radeon_virt_surface {
         struct drm_file *file_priv;
 };
 
+#define RADEON_FLUSH_EMITED     (1 < 0)
+#define RADEON_PURGE_EMITED     (1 < 1)
+
 typedef struct drm_radeon_private {
         drm_radeon_ring_buffer_t ring;
         drm_radeon_sarea_t *sarea_priv;
@@ -311,6 +314,7 @@ typedef struct drm_radeon_private {
         unsigned long fb_aper_offset;
 
         int num_gb_pipes;
+        int track_flush;
 } drm_radeon_private_t;
 
 typedef struct drm_radeon_buf_priv {
@@ -693,7 +697,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
 #define R300_ZB_ZCACHE_CTLSTAT                  0x4f18
 #       define R300_ZC_FLUSH                    (1 << 0)
 #       define R300_ZC_FREE                     (1 << 1)
-#       define R300_ZC_FLUSH_ALL                0x3
 #       define R300_ZC_BUSY                     (1 << 31)
 #define RADEON_RB3D_DSTCACHE_CTLSTAT    0x325c
 #       define RADEON_RB3D_DC_FLUSH             (3 << 0)
@@ -701,6 +704,8 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
 #       define RADEON_RB3D_DC_FLUSH_ALL         0xf
 #       define RADEON_RB3D_DC_BUSY              (1 << 31)
 #define R300_RB3D_DSTCACHE_CTLSTAT              0x4e4c
+#       define R300_RB3D_DC_FLUSH               (2 << 0)
+#       define R300_RB3D_DC_FREE                (2 << 2)
 #       define R300_RB3D_DC_FINISH              (1 << 4)
 #define RADEON_RB3D_ZSTENCILCNTL        0x1c2c
 #       define RADEON_Z_TEST_MASK               (7 << 4)
@@ -1246,17 +1251,17 @@ do {									\
                 OUT_RING(RADEON_RB3D_DC_FLUSH);                         \
         } else {                                                        \
                 OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));    \
-                OUT_RING(RADEON_RB3D_DC_FLUSH);                         \
+                OUT_RING(R300_RB3D_DC_FLUSH);                           \
         }                                                               \
 } while (0)
 
 #define RADEON_PURGE_CACHE() do {                                       \
         if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) {     \
                 OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0));  \
-                OUT_RING(RADEON_RB3D_DC_FLUSH_ALL);                     \
+                OUT_RING(RADEON_RB3D_DC_FLUSH | RADEON_RB3D_DC_FREE);   \
         } else {                                                        \
                 OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));    \
-                OUT_RING(RADEON_RB3D_DC_FLUSH_ALL);                     \
+                OUT_RING(R300_RB3D_DC_FLUSH | R300_RB3D_DC_FREE);       \
         }                                                               \
 } while (0)
 
@@ -1273,10 +1278,10 @@ do {									\
 #define RADEON_PURGE_ZCACHE() do {                                      \
         if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) {     \
                 OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0));    \
-                OUT_RING(RADEON_RB3D_ZC_FLUSH_ALL);                     \
+                OUT_RING(RADEON_RB3D_ZC_FLUSH | RADEON_RB3D_ZC_FREE);                   \
         } else {                                                        \
-                OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));    \
-                OUT_RING(R300_ZC_FLUSH_ALL);                            \
+                OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0));        \
+                OUT_RING(R300_ZC_FLUSH | R300_ZC_FREE);                         \
         }                                                               \
 } while (0)
 
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 61e78a4369b9..b15f88249639 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -654,12 +654,12 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE},
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN  | HID_QUIRK_IGNORE_MOUSE },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
 
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index bf4ebfb86fa5..d402e8d813ce 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -77,6 +77,22 @@ config SENSORS_AD7418
           This driver can also be built as a module. If so, the module
           will be called ad7418.
 
+config SENSORS_ADCXX
+        tristate "National Semiconductor ADCxxxSxxx"
+        depends on SPI_MASTER && EXPERIMENTAL
+        help
+          If you say yes here you get support for the National Semiconductor
+          ADC<bb><c>S<sss> chip family, where
+          * bb  is the resolution in number of bits (8, 10, 12)
+          * c   is the number of channels (1, 2, 4, 8)
+          * sss is the maximum conversion speed (021 for 200 kSPS, 051 for 500
+            kSPS and 101 for 1 MSPS)
+
+          Examples : ADC081S101, ADC124S501, ...
+
+          This driver can also be built as a module.  If so, the module
+          will be called adcxx.
+
 config SENSORS_ADM1021
         tristate "Analog Devices ADM1021 and compatibles"
         depends on I2C
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 7943e5cefb06..950134ab8426 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_SENSORS_ABITUGURU)	+= abituguru.o
 obj-$(CONFIG_SENSORS_ABITUGURU3)+= abituguru3.o
 obj-$(CONFIG_SENSORS_AD7414)    += ad7414.o
 obj-$(CONFIG_SENSORS_AD7418)    += ad7418.o
+obj-$(CONFIG_SENSORS_ADCXX)     += adcxx.o
 obj-$(CONFIG_SENSORS_ADM1021)   += adm1021.o
 obj-$(CONFIG_SENSORS_ADM1025)   += adm1025.o
 obj-$(CONFIG_SENSORS_ADM1026)   += adm1026.o
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index f00f497b9ca9..d568c65c1370 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -1,5 +1,8 @@
 /*
-    abituguru3.c Copyright (c) 2006 Hans de Goede <j.w.r.degoede@hhs.nl>
+    abituguru3.c
+
+    Copyright (c) 2006-2008 Hans de Goede <j.w.r.degoede@hhs.nl>
+    Copyright (c) 2008 Alistair John Strachan <alistair@devzero.co.uk>
 
     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
@@ -116,7 +119,7 @@ struct abituguru3_sensor_info {
 
 struct abituguru3_motherboard_info {
         u16 id;
-        const char *name;
+        const char *dmi_name;
         /* + 1 -> end of sensors indicated by a sensor with name == NULL */
         struct abituguru3_sensor_info sensors[ABIT_UGURU3_MAX_NO_SENSORS + 1];
 };
@@ -161,7 +164,7 @@ struct abituguru3_data {
 
 /* Constants */
 static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
-        { 0x000C, "unknown", {
+        { 0x000C, NULL /* Unknown, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR",                 1, 0, 10, 1, 0 },
                 { "DDR VTT",             2, 0, 10, 1, 0 },
@@ -183,7 +186,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX1 Fan",           35, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x000D, "Abit AW8", {
+        { 0x000D, NULL /* Abit AW8, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR",                 1, 0, 10, 1, 0 },
                 { "DDR VTT",             2, 0, 10, 1, 0 },
@@ -212,7 +215,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX5 Fan",           39, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x000E, "AL-8", {
+        { 0x000E, NULL /* AL-8, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR",                 1, 0, 10, 1, 0 },
                 { "DDR VTT",             2, 0, 10, 1, 0 },
@@ -233,7 +236,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "SYS Fan",            34, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x000F, "unknown", {
+        { 0x000F, NULL /* Unknown, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR",                 1, 0, 10, 1, 0 },
                 { "DDR VTT",             2, 0, 10, 1, 0 },
@@ -254,7 +257,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "SYS Fan",            34, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0010, "Abit NI8 SLI GR", {
+        { 0x0010, NULL /* Abit NI8 SLI GR, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR",                 1, 0, 10, 1, 0 },
                 { "DDR VTT",             2, 0, 10, 1, 0 },
@@ -276,7 +279,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "OTES1 Fan",          36, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0011, "Abit AT8 32X", {
+        { 0x0011, NULL /* Abit AT8 32X, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR",                 1, 0, 20, 1, 0 },
                 { "DDR VTT",             2, 0, 10, 1, 0 },
@@ -302,7 +305,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX2 Fan",           36, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0012, "Abit AN8 32X", {
+        { 0x0012, NULL /* Abit AN8 32X, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR",                 1, 0, 20, 1, 0 },
                 { "DDR VTT",             2, 0, 10, 1, 0 },
@@ -324,7 +327,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX1 Fan",           36, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0013, "Abit AW8D", {
+        { 0x0013, NULL /* Abit AW8D, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR",                 1, 0, 10, 1, 0 },
                 { "DDR VTT",             2, 0, 10, 1, 0 },
@@ -353,7 +356,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX5 Fan",           39, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0014, "Abit AB9 Pro", {
+        { 0x0014, NULL /* Abit AB9 Pro, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR",                 1, 0, 10, 1, 0 },
                 { "DDR VTT",             2, 0, 10, 1, 0 },
@@ -374,7 +377,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "SYS Fan",            34, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0015, "unknown", {
+        { 0x0015, NULL /* Unknown, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR",                 1, 0, 20, 1, 0 },
                 { "DDR VTT",             2, 0, 10, 1, 0 },
@@ -398,7 +401,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX3 Fan",           36, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0016, "AW9D-MAX", {
+        { 0x0016, NULL /* AW9D-MAX, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR2",                1, 0, 20, 1, 0 },
                 { "DDR2 VTT",            2, 0, 10, 1, 0 },
@@ -426,7 +429,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "OTES1 Fan",          38, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0017, "unknown", {
+        { 0x0017, NULL /* Unknown, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR2",                1, 0, 20, 1, 0 },
                 { "DDR2 VTT",            2, 0, 10, 1, 0 },
@@ -451,7 +454,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX3 FAN",           37, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0018, "unknown", {
+        { 0x0018, NULL /* Unknown, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR2",                1, 0, 20, 1, 0 },
                 { "DDR2 VTT",            2, 0, 10, 1, 0 },
@@ -478,7 +481,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX3 Fan",           36, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x0019, "unknown", {
+        { 0x0019, NULL /* Unknown, need DMI string */, {
                 { "CPU Core",            7, 0, 10, 1, 0 },
                 { "DDR2",               13, 0, 20, 1, 0 },
                 { "DDR2 VTT",           14, 0, 10, 1, 0 },
@@ -505,7 +508,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX3 FAN",           36, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x001A, "Abit IP35 Pro", {
+        { 0x001A, "IP35 Pro(Intel P35-ICH9R)", {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR2",                1, 0, 20, 1, 0 },
                 { "DDR2 VTT",            2, 0, 10, 1, 0 },
@@ -533,7 +536,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX4 Fan",           37, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x001B, "unknown", {
+        { 0x001B, NULL /* Unknown, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR3",                1, 0, 20, 1, 0 },
                 { "DDR3 VTT",            2, 0, 10, 1, 0 },
@@ -560,7 +563,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
                 { "AUX3 Fan",           36, 2, 60, 1, 0 },
                 { NULL, 0, 0, 0, 0, 0 } }
         },
-        { 0x001C, "unknown", {
+        { 0x001C, NULL /* Unknown, need DMI string */, {
                 { "CPU Core",            0, 0, 10, 1, 0 },
                 { "DDR2",                1, 0, 20, 1, 0 },
                 { "DDR2 VTT",            2, 0, 10, 1, 0 },
@@ -935,9 +938,18 @@ static int __devinit abituguru3_probe(struct platform_device *pdev)
                 goto abituguru3_probe_error;
         }
         data->sensors = abituguru3_motherboards[i].sensors;
+
         printk(KERN_INFO ABIT_UGURU3_NAME ": found Abit uGuru3, motherboard "
-                "ID: %04X (%s)\n", (unsigned int)id,
-                abituguru3_motherboards[i].name);
+                "ID: %04X\n", (unsigned int)id);
+
+#ifdef CONFIG_DMI
+        if (!abituguru3_motherboards[i].dmi_name) {
+                printk(KERN_WARNING ABIT_UGURU3_NAME ": this motherboard was "
+                        "not detected using DMI. Please send the output of "
+                        "\"dmidecode\" to the abituguru3 maintainer"
+                        "(see MAINTAINERS)\n");
+        }
+#endif
 
         /* Fill the sysfs attr array */
         sysfs_attr_i = 0;
@@ -1109,6 +1121,46 @@ static struct platform_driver abituguru3_driver = {
         .resume = abituguru3_resume
 };
 
+#ifdef CONFIG_DMI
+
+static int __init abituguru3_dmi_detect(void)
+{
+        const char *board_vendor, *board_name;
+        int i, err = (force) ? 1 : -ENODEV;
+
+        board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
+        if (!board_vendor || strcmp(board_vendor, "http://www.abit.com.tw/"))
+                return err;
+
+        board_name = dmi_get_system_info(DMI_BOARD_NAME);
+        if (!board_name)
+                return err;
+
+        for (i = 0; abituguru3_motherboards[i].id; i++) {
+                const char *dmi_name = abituguru3_motherboards[i].dmi_name;
+                if (dmi_name && !strcmp(dmi_name, board_name))
+                        break;
+        }
+
+        if (!abituguru3_motherboards[i].id)
+                return 1;
+
+        return 0;
+}
+
+#else /* !CONFIG_DMI */
+
+static inline int abituguru3_dmi_detect(void)
+{
+        return -ENODEV;
+}
+
+#endif /* CONFIG_DMI */
+
+/* FIXME: Manual detection should die eventually; we need to collect stable
+ *        DMI model names first before we can rely entirely on CONFIG_DMI.
+ */
+
 static int __init abituguru3_detect(void)
 {
         /* See if there is an uguru3 there. An idle uGuru3 will hold 0x00 or
@@ -1119,7 +1171,7 @@ static int __init abituguru3_detect(void)
         if (((data_val == 0x00) || (data_val == 0x08)) &&
                         ((cmd_val == 0xAC) || (cmd_val == 0x05) ||
                          (cmd_val == 0x55)))
-                return ABIT_UGURU3_BASE;
+                return 0;
 
         ABIT_UGURU3_DEBUG("no Abit uGuru3 found, data = 0x%02X, cmd = "
                 "0x%02X\n", (unsigned int)data_val, (unsigned int)cmd_val);
@@ -1127,7 +1179,7 @@ static int __init abituguru3_detect(void)
         if (force) {
                 printk(KERN_INFO ABIT_UGURU3_NAME ": Assuming Abit uGuru3 is "
                                 "present because of \"force\" parameter\n");
-                return ABIT_UGURU3_BASE;
+                return 0;
         }
 
         /* No uGuru3 found */
@@ -1138,27 +1190,29 @@ static struct platform_device *abituguru3_pdev;
 
 static int __init abituguru3_init(void)
 {
-        int address, err;
         struct resource res = { .flags = IORESOURCE_IO };
-
-#ifdef CONFIG_DMI
-        const char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
-
-        /* safety check, refuse to load on non Abit motherboards */
-        if (!force && (!board_vendor ||
-                        strcmp(board_vendor, "http://www.abit.com.tw/")))
-                return -ENODEV;
-#endif
-
-        address = abituguru3_detect();
-        if (address < 0)
-                return address;
+        int err;
+
+        /* Attempt DMI detection first */
+        err = abituguru3_dmi_detect();
+        if (err < 0)
+                return err;
+
+        /* Fall back to manual detection if there was no exact
+         * board name match, or force was specified.
+         */
+        if (err > 0) {
+                err = abituguru3_detect();
+                if (err)
+                        return err;
+        }
 
         err = platform_driver_register(&abituguru3_driver);
         if (err)
                 goto exit;
 
-        abituguru3_pdev = platform_device_alloc(ABIT_UGURU3_NAME, address);
+        abituguru3_pdev = platform_device_alloc(ABIT_UGURU3_NAME,
+                                                ABIT_UGURU3_BASE);
         if (!abituguru3_pdev) {
                 printk(KERN_ERR ABIT_UGURU3_NAME
                         ": Device allocation failed\n");
@@ -1166,8 +1220,8 @@ static int __init abituguru3_init(void)
                 goto exit_driver_unregister;
         }
 
-        res.start = address;
-        res.end = address + ABIT_UGURU3_REGION_LENGTH - 1;
+        res.start = ABIT_UGURU3_BASE;
+        res.end = ABIT_UGURU3_BASE + ABIT_UGURU3_REGION_LENGTH - 1;
         res.name = ABIT_UGURU3_NAME;
 
         err = platform_device_add_resources(abituguru3_pdev, &res, 1);
diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c
index ce8d94fbfd7e..bfda8c80ef24 100644
--- a/drivers/hwmon/ad7414.c
+++ b/drivers/hwmon/ad7414.c
@@ -69,7 +69,7 @@ static inline int ad7414_write(struct i2c_client *client, u8 reg, u8 value)
         return i2c_smbus_write_byte_data(client, reg, value);
 }
 
-struct ad7414_data *ad7414_update_device(struct device *dev)
+static struct ad7414_data *ad7414_update_device(struct device *dev)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct ad7414_data *data = i2c_get_clientdata(client);
diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c
new file mode 100644
index 000000000000..242294db3db6
--- /dev/null
+++ b/drivers/hwmon/adcxx.c
@@ -0,0 +1,329 @@
+/*
+ * adcxx.c
+ *
+ * The adcxx4s is an AD converter family from National Semiconductor (NS).
+ *
+ * Copyright (c) 2008 Marc Pignat <marc.pignat@hevs.ch>
+ *
+ * The adcxx4s communicates with a host processor via an SPI/Microwire Bus
+ * interface. This driver supports the whole family of devices with name
+ * ADC<bb><c>S<sss>, where
+ * * bb is the resolution in number of bits (8, 10, 12)
+ * * c is the number of channels (1, 2, 4, 8)
+ * * sss is the maximum conversion speed (021 for 200 kSPS, 051 for 500 kSPS
+ *   and 101 for 1 MSPS)
+ *
+ * Complete datasheets are available at National's website here:
+ * http://www.national.com/ds/DC/ADC<bb><c>S<sss>.pdf
+ *
+ * Handling of 8, 10 and 12 bits converters are the same, the
+ * unavailable bits are 0 :)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/sysfs.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/mutex.h>
+#include <linux/spi/spi.h>
+
+#define DRVNAME         "adcxx"
+
+struct adcxx {
+        struct device *hwmon_dev;
+        struct mutex lock;
+        u32 channels;
+        u32 reference; /* in millivolts */
+};
+
+/* sysfs hook function */
+static ssize_t adcxx_read(struct device *dev,
+                struct device_attribute *devattr, char *buf)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adcxx *adc = dev_get_drvdata(&spi->dev);
+        u8 tx_buf[2] = { attr->index << 3 }; /* other bits are don't care */
+        u8 rx_buf[2];
+        int status;
+        int value;
+
+        if (mutex_lock_interruptible(&adc->lock))
+                return -ERESTARTSYS;
+
+        status = spi_write_then_read(spi, tx_buf, sizeof(tx_buf),
+                                        rx_buf, sizeof(rx_buf));
+        if (status < 0) {
+                dev_warn(dev, "spi_write_then_read failed with status %d\n",
+                                status);
+                goto out;
+        }
+
+        value = (rx_buf[0] << 8) + rx_buf[1];
+        dev_dbg(dev, "raw value = 0x%x\n", value);
+
+        value = value * adc->reference >> 12;
+        status = sprintf(buf, "%d\n", value);
+out:
+        mutex_unlock(&adc->lock);
+        return status;
+}
+
+static ssize_t adcxx_show_min(struct device *dev,
+                struct device_attribute *devattr, char *buf)
+{
+        /* The minimum reference is 0 for this chip family */
+        return sprintf(buf, "0\n");
+}
+
+static ssize_t adcxx_show_max(struct device *dev,
+                struct device_attribute *devattr, char *buf)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct adcxx *adc = dev_get_drvdata(&spi->dev);
+        u32 reference;
+
+        if (mutex_lock_interruptible(&adc->lock))
+                return -ERESTARTSYS;
+
+        reference = adc->reference;
+
+        mutex_unlock(&adc->lock);
+
+        return sprintf(buf, "%d\n", reference);
+}
+
+static ssize_t adcxx_set_max(struct device *dev,
+        struct device_attribute *devattr, const char *buf, size_t count)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct adcxx *adc = dev_get_drvdata(&spi->dev);
+        unsigned long value;
+
+        if (strict_strtoul(buf, 10, &value))
+                return -EINVAL;
+
+        if (mutex_lock_interruptible(&adc->lock))
+                return -ERESTARTSYS;
+
+        adc->reference = value;
+
+        mutex_unlock(&adc->lock);
+
+        return count;
+}
+
+static ssize_t adcxx_show_name(struct device *dev, struct device_attribute
+                              *devattr, char *buf)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct adcxx *adc = dev_get_drvdata(&spi->dev);
+
+        return sprintf(buf, "adcxx%ds\n", adc->channels);
+}
+
+static struct sensor_device_attribute ad_input[] = {
+        SENSOR_ATTR(name, S_IRUGO, adcxx_show_name, NULL, 0),
+        SENSOR_ATTR(in_min, S_IRUGO, adcxx_show_min, NULL, 0),
+        SENSOR_ATTR(in_max, S_IWUSR | S_IRUGO, adcxx_show_max,
+                                        adcxx_set_max, 0),
+        SENSOR_ATTR(in0_input, S_IRUGO, adcxx_read, NULL, 0),
+        SENSOR_ATTR(in1_input, S_IRUGO, adcxx_read, NULL, 1),
+        SENSOR_ATTR(in2_input, S_IRUGO, adcxx_read, NULL, 2),
+        SENSOR_ATTR(in3_input, S_IRUGO, adcxx_read, NULL, 3),
+        SENSOR_ATTR(in4_input, S_IRUGO, adcxx_read, NULL, 4),
+        SENSOR_ATTR(in5_input, S_IRUGO, adcxx_read, NULL, 5),
+        SENSOR_ATTR(in6_input, S_IRUGO, adcxx_read, NULL, 6),
+        SENSOR_ATTR(in7_input, S_IRUGO, adcxx_read, NULL, 7),
+};
+
+/*----------------------------------------------------------------------*/
+
+static int __devinit adcxx_probe(struct spi_device *spi, int channels)
+{
+        struct adcxx *adc;
+        int status;
+        int i;
+
+        adc = kzalloc(sizeof *adc, GFP_KERNEL);
+        if (!adc)
+                return -ENOMEM;
+
+        /* set a default value for the reference */
+        adc->reference = 3300;
+        adc->channels = channels;
+        mutex_init(&adc->lock);
+
+        mutex_lock(&adc->lock);
+
+        dev_set_drvdata(&spi->dev, adc);
+
+        for (i = 0; i < 3 + adc->channels; i++) {
+                status = device_create_file(&spi->dev, &ad_input[i].dev_attr);
+                if (status) {
+                        dev_err(&spi->dev, "device_create_file failed.\n");
+                        goto out_err;
+                }
+        }
+
+        adc->hwmon_dev = hwmon_device_register(&spi->dev);
+        if (IS_ERR(adc->hwmon_dev)) {
+                dev_err(&spi->dev, "hwmon_device_register failed.\n");
+                status = PTR_ERR(adc->hwmon_dev);
+                goto out_err;
+        }
+
+        mutex_unlock(&adc->lock);
+        return 0;
+
+out_err:
+        for (i--; i >= 0; i--)
+                device_remove_file(&spi->dev, &ad_input[i].dev_attr);
+
+        dev_set_drvdata(&spi->dev, NULL);
+        mutex_unlock(&adc->lock);
+        kfree(adc);
+        return status;
+}
+
+static int __devinit adcxx1s_probe(struct spi_device *spi)
+{
+        return adcxx_probe(spi, 1);
+}
+
+static int __devinit adcxx2s_probe(struct spi_device *spi)
+{
+        return adcxx_probe(spi, 2);
+}
+
+static int __devinit adcxx4s_probe(struct spi_device *spi)
+{
+        return adcxx_probe(spi, 4);
+}
+
+static int __devinit adcxx8s_probe(struct spi_device *spi)
+{
+        return adcxx_probe(spi, 8);
+}
+
+static int __devexit adcxx_remove(struct spi_device *spi)
+{
+        struct adcxx *adc = dev_get_drvdata(&spi->dev);
+        int i;
+
+        mutex_lock(&adc->lock);
+        hwmon_device_unregister(adc->hwmon_dev);
+        for (i = 0; i < 3 + adc->channels; i++)
+                device_remove_file(&spi->dev, &ad_input[i].dev_attr);
+
+        dev_set_drvdata(&spi->dev, NULL);
+        mutex_unlock(&adc->lock);
+        kfree(adc);
+
+        return 0;
+}
+
+static struct spi_driver adcxx1s_driver = {
+        .driver = {
+                .name   = "adcxx1s",
+                .owner  = THIS_MODULE,
+        },
+        .probe  = adcxx1s_probe,
+        .remove = __devexit_p(adcxx_remove),
+};
+
+static struct spi_driver adcxx2s_driver = {
+        .driver = {
+                .name   = "adcxx2s",
+                .owner  = THIS_MODULE,
+        },
+        .probe  = adcxx2s_probe,
+        .remove = __devexit_p(adcxx_remove),
+};
+
+static struct spi_driver adcxx4s_driver = {
+        .driver = {
+                .name   = "adcxx4s",
+                .owner  = THIS_MODULE,
+        },
+        .probe  = adcxx4s_probe,
+        .remove = __devexit_p(adcxx_remove),
+};
+
+static struct spi_driver adcxx8s_driver = {
+        .driver = {
+                .name   = "adcxx8s",
+                .owner  = THIS_MODULE,
+        },
+        .probe  = adcxx8s_probe,
+        .remove = __devexit_p(adcxx_remove),
+};
+
+static int __init init_adcxx(void)
+{
+        int status;
+        status = spi_register_driver(&adcxx1s_driver);
+        if (status)
+                goto reg_1_failed;
+
+        status = spi_register_driver(&adcxx2s_driver);
+        if (status)
+                goto reg_2_failed;
+
+        status = spi_register_driver(&adcxx4s_driver);
+        if (status)
+                goto reg_4_failed;
+
+        status = spi_register_driver(&adcxx8s_driver);
+        if (status)
+                goto reg_8_failed;
+
+        return status;
+
+reg_8_failed:
+        spi_unregister_driver(&adcxx4s_driver);
+reg_4_failed:
+        spi_unregister_driver(&adcxx2s_driver);
+reg_2_failed:
+        spi_unregister_driver(&adcxx1s_driver);
+reg_1_failed:
+        return status;
+}
+
+static void __exit exit_adcxx(void)
+{
+        spi_unregister_driver(&adcxx1s_driver);
+        spi_unregister_driver(&adcxx2s_driver);
+        spi_unregister_driver(&adcxx4s_driver);
+        spi_unregister_driver(&adcxx8s_driver);
+}
+
+module_init(init_adcxx);
+module_exit(exit_adcxx);
+
+MODULE_AUTHOR("Marc Pignat");
+MODULE_DESCRIPTION("National Semiconductor adcxx8sxxx Linux driver");
+MODULE_LICENSE("GPL");
+
+MODULE_ALIAS("adcxx1s");
+MODULE_ALIAS("adcxx2s");
+MODULE_ALIAS("adcxx4s");
+MODULE_ALIAS("adcxx8s");
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index aacc0c4b809c..b06b8e090a27 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -98,6 +98,12 @@ static const char* temperature_sensors_sets[][36] = {
           "TH1P", "TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S",
           "TM1P", "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", "TM8S", "TM9P",
           "TM9S", "TN0H", "TS0C", NULL },
+/* Set 5: iMac */
+        { "TC0D", "TA0P", "TG0P", "TG0D", "TG0H", "TH0P", "Tm0P", "TO0P",
+          "Tp0C", NULL },
+/* Set 6: Macbook3 set */
+        { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H",
+          "Th0S", "Th1H", NULL },
 };
 
 /* List of keys used to read/write fan speeds */
@@ -1223,6 +1229,10 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
         { .accelerometer = 0, .light = 0, .temperature_set = 3 },
 /* MacPro: temperature set 4 */
         { .accelerometer = 0, .light = 0, .temperature_set = 4 },
+/* iMac: temperature set 5 */
+        { .accelerometer = 0, .light = 0, .temperature_set = 5 },
+/* MacBook3: accelerometer and temperature set 6 */
+        { .accelerometer = 1, .light = 0, .temperature_set = 6 },
 };
 
 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1232,10 +1242,14 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },
                 (void*)&applesmc_dmi_data[0]},
-        { applesmc_dmi_match, "Apple MacBook", {
+        { applesmc_dmi_match, "Apple MacBook (v2)", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") },
                 (void*)&applesmc_dmi_data[1]},
+        { applesmc_dmi_match, "Apple MacBook (v3)", {
+          DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") },
+                (void*)&applesmc_dmi_data[6]},
         { applesmc_dmi_match, "Apple MacBook", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
@@ -1248,6 +1262,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
                 (void*)&applesmc_dmi_data[4]},
+        { applesmc_dmi_match, "Apple iMac", {
+          DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME,"iMac") },
+                (void*)&applesmc_dmi_data[5]},
         { .ident = NULL }
 };
 
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index d191118ba0cb..d6b490d3e36f 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -31,7 +31,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
-MODULE_VERSION("0.6.2");
+MODULE_VERSION("0.6.3");
 MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
 
 #define ATXP1_VID       0x00
@@ -289,16 +289,16 @@ static int atxp1_detect(struct i2c_client *new_client, int kind,
         if (!((i2c_smbus_read_byte_data(new_client, 0x3e) == 0) &&
              (i2c_smbus_read_byte_data(new_client, 0x3f) == 0) &&
              (i2c_smbus_read_byte_data(new_client, 0xfe) == 0) &&
-             (i2c_smbus_read_byte_data(new_client, 0xff) == 0) )) {
+             (i2c_smbus_read_byte_data(new_client, 0xff) == 0)))
+                return -ENODEV;
 
-                /* No vendor ID, now checking if registers 0x10,0x11 (non-existent)
-                 * showing the same as register 0x00 */
-                temp = i2c_smbus_read_byte_data(new_client, 0x00);
+        /* No vendor ID, now checking if registers 0x10,0x11 (non-existent)
+         * showing the same as register 0x00 */
+        temp = i2c_smbus_read_byte_data(new_client, 0x00);
 
-                if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &&
-                         (i2c_smbus_read_byte_data(new_client, 0x11) == temp) ))
-                        return -ENODEV;
-        }
+        if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &&
+              (i2c_smbus_read_byte_data(new_client, 0x11) == temp)))
+                return -ENODEV;
 
         /* Get VRM */
         temp = vid_which_vrm();
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 70239acecc8e..93c17223b527 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -413,10 +413,11 @@ static int __init coretemp_init(void)
         for_each_online_cpu(i) {
                 struct cpuinfo_x86 *c = &cpu_data(i);
 
-                /* check if family 6, models 0xe, 0xf, 0x16, 0x17 */
+                /* check if family 6, models 0xe, 0xf, 0x16, 0x17, 0x1A */
                 if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
                     !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
-                        (c->x86_model == 0x16) || (c->x86_model == 0x17))) {
+                        (c->x86_model == 0x16) || (c->x86_model == 0x17) ||
+                        (c->x86_model == 0x1A))) {
 
                         /* supported CPU not found, but report the unknown
                            family 6 CPU */
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
index 7b0a32c4dcfb..c54eff92be4a 100644
--- a/drivers/hwmon/hwmon-vid.c
+++ b/drivers/hwmon/hwmon-vid.c
@@ -37,13 +37,21 @@
  * For VRD 10.0 and up, "VRD x.y Design Guide",
  * available at http://developer.intel.com/.
  *
- * AMD NPT 0Fh (Athlon64 & Opteron), AMD Publication 32559,
+ * AMD Athlon 64 and AMD Opteron Processors, AMD Publication 26094,
+ * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/26094.PDF
+ * Table 74. VID Code Voltages
+ * This corresponds to an arbitrary VRM code of 24 in the functions below.
+ * These CPU models (K8 revision <= E) have 5 VID pins. See also:
+ * Revision Guide for AMD Athlon 64 and AMD Opteron Processors, AMD Publication 25759,
+ * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/25759.pdf
+ *
+ * AMD NPT Family 0Fh Processors, AMD Publication 32559,
  * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf
  * Table 71. VID Code Voltages
- * AMD Opteron processors don't follow the Intel specifications.
- * I'm going to "make up" 2.4 as the spec number for the Opterons.
- * No good reason just a mnemonic for the 24x Opteron processor
- * series.
+ * This corresponds to an arbitrary VRM code of 25 in the functions below.
+ * These CPU models (K8 revision >= F) have 6 VID pins. See also:
+ * Revision Guide for AMD NPT Family 0Fh Processors, AMD Publication 33610,
+ * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/33610.pdf
  *
  * The 17 specification is in fact Intel Mobile Voltage Positioning -
  * (IMVP-II). You can find more information in the datasheet of Max1718
@@ -95,7 +103,12 @@ int vid_from_reg(int val, u8 vrm)
                         return 0;
                 return((1600000 - (val - 2) * 6250 + 500) / 1000);
 
-        case 24:                /* AMD NPT 0Fh (Athlon64 & Opteron) */
+        case 24:                /* Athlon64 & Opteron */
+                val &= 0x1f;
+                if (val == 0x1f)
+                        return 0;
+                                /* fall through */
+        case 25:                /* AMD NPT 0Fh */
                 val &= 0x3f;
                 return (val < 32) ? 1550 - 25 * val
                         : 775 - (25 * (val - 31)) / 2;
@@ -157,11 +170,16 @@ struct vrm_model {
 
 #ifdef CONFIG_X86
 
-/* the stepping parameter is highest acceptable stepping for current line */
+/*
+ * The stepping parameter is highest acceptable stepping for current line.
+ * The model match must be exact for 4-bit values. For model values 0x10
+ * and above (extended model), all models below the parameter will match.
+ */
 
 static struct vrm_model vrm_models[] = {
         {X86_VENDOR_AMD, 0x6, ANY, ANY, 90},            /* Athlon Duron etc */
-        {X86_VENDOR_AMD, 0xF, ANY, ANY, 24},            /* Athlon 64, Opteron and above VRM 24 */
+        {X86_VENDOR_AMD, 0xF, 0x3F, ANY, 24},           /* Athlon 64, Opteron */
+        {X86_VENDOR_AMD, 0xF, ANY, ANY, 25},            /* NPT family 0Fh */
         {X86_VENDOR_INTEL, 0x6, 0x9, ANY, 13},          /* Pentium M (130 nm) */
         {X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85},          /* Tualatin */
         {X86_VENDOR_INTEL, 0x6, 0xD, ANY, 13},          /* Pentium M (90 nm) */
@@ -189,6 +207,8 @@ static u8 find_vrm(u8 eff_family, u8 eff_model, u8 eff_stepping, u8 vendor)
                 if (vrm_models[i].vendor==vendor)
                         if ((vrm_models[i].eff_family==eff_family)
                          && ((vrm_models[i].eff_model==eff_model) ||
+                             (vrm_models[i].eff_model >= 0x10 &&
+                              eff_model <= vrm_models[i].eff_model) ||
                              (vrm_models[i].eff_model==ANY)) &&
                              (eff_stepping <= vrm_models[i].eff_stepping))
                                 return vrm_models[i].vrm_type;
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c
index f9e2ed621f7b..2ede9388096b 100644
--- a/drivers/hwmon/i5k_amb.c
+++ b/drivers/hwmon/i5k_amb.c
@@ -81,6 +81,8 @@ static unsigned long amb_reg_temp(unsigned int amb)
 #define MAX_AMBS_PER_CHANNEL            16
 #define MAX_AMBS                        (MAX_MEM_CHANNELS * \
                                          MAX_AMBS_PER_CHANNEL)
+#define CHANNEL_SHIFT                   4
+#define DIMM_MASK                       0xF
 /*
  * Ugly hack: For some reason the highest bit is set if there
  * are _any_ DIMMs in the channel.  Attempting to read from
@@ -89,7 +91,7 @@ static unsigned long amb_reg_temp(unsigned int amb)
  * might prevent us from seeing the 16th DIMM in the channel.
  */
 #define REAL_MAX_AMBS_PER_CHANNEL       15
-#define KNOBS_PER_AMB                   5
+#define KNOBS_PER_AMB                   6
 
 static unsigned long amb_num_from_reg(unsigned int byte_num, unsigned int bit)
 {
@@ -238,6 +240,16 @@ static ssize_t show_amb_temp(struct device *dev,
                 500 * amb_read_byte(data, amb_reg_temp(attr->index)));
 }
 
+static ssize_t show_label(struct device *dev,
+                          struct device_attribute *devattr,
+                          char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+
+        return sprintf(buf, "Ch. %d DIMM %d\n", attr->index >> CHANNEL_SHIFT,
+                       attr->index & DIMM_MASK);
+}
+
 static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)
 {
         int i, j, k, d = 0;
@@ -268,6 +280,20 @@ static int __devinit i5k_amb_hwmon_init(struct platform_device *pdev)
                                 continue;
                         d++;
 
+                        /* sysfs label */
+                        iattr = data->attrs + data->num_attrs;
+                        snprintf(iattr->name, AMB_SYSFS_NAME_LEN,
+                                 "temp%d_label", d);
+                        iattr->s_attr.dev_attr.attr.name = iattr->name;
+                        iattr->s_attr.dev_attr.attr.mode = S_IRUGO;
+                        iattr->s_attr.dev_attr.show = show_label;
+                        iattr->s_attr.index = k;
+                        res = device_create_file(&pdev->dev,
+                                                 &iattr->s_attr.dev_attr);
+                        if (res)
+                                goto exit_remove;
+                        data->num_attrs++;
+
                         /* Temperature sysfs knob */
                         iattr = data->attrs + data->num_attrs;
                         snprintf(iattr->name, AMB_SYSFS_NAME_LEN,
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
index c9416e657487..0f70dc204105 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
@@ -1,6 +1,6 @@
 /*
- * A hwmon driver for the IBM Active Energy Manager temperature/power sensors
- * and capping functionality.
+ * A hwmon driver for the IBM System Director Active Energy Manager (AEM)
+ * temperature/power/energy sensors and capping functionality.
  * Copyright (C) 2008 IBM
  *
  * Author: Darrick J. Wong <djwong@us.ibm.com>
@@ -463,12 +463,18 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
 }
 
 /* Update AEM energy registers */
+static void update_aem_energy_one(struct aem_data *data, int which)
+{
+        aem_read_sensor(data, AEM_ENERGY_ELEMENT, which,
+                        &data->energy[which], 8);
+}
+
 static void update_aem_energy(struct aem_data *data)
 {
-        aem_read_sensor(data, AEM_ENERGY_ELEMENT, 0, &data->energy[0], 8);
+        update_aem_energy_one(data, 0);
         if (data->ver_major < 2)
                 return;
-        aem_read_sensor(data, AEM_ENERGY_ELEMENT, 1, &data->energy[1], 8);
+        update_aem_energy_one(data, 1);
 }
 
 /* Update all AEM1 sensors */
@@ -676,7 +682,8 @@ static int aem_find_aem2(struct aem_ipmi_data *data,
                 return -ETIMEDOUT;
 
         if (data->rx_result || data->rx_msg_len != sizeof(*fi_resp) ||
-            memcmp(&fi_resp->id, &system_x_id, sizeof(system_x_id)))
+            memcmp(&fi_resp->id, &system_x_id, sizeof(system_x_id)) ||
+            fi_resp->num_instances <= instance_num)
                 return -ENOENT;
 
         return 0;
@@ -849,7 +856,7 @@ static ssize_t aem_show_power(struct device *dev,
         struct timespec b, a;
 
         mutex_lock(&data->lock);
-        update_aem_energy(data);
+        update_aem_energy_one(data, attr->index);
         getnstimeofday(&b);
         before = data->energy[attr->index];
 
@@ -861,7 +868,7 @@ static ssize_t aem_show_power(struct device *dev,
                 return 0;
         }
 
-        update_aem_energy(data);
+        update_aem_energy_one(data, attr->index);
         getnstimeofday(&a);
         after = data->energy[attr->index];
         mutex_unlock(&data->lock);
@@ -880,7 +887,9 @@ static ssize_t aem_show_energy(struct device *dev,
 {
         struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct aem_data *a = dev_get_drvdata(dev);
-        a->update(a);
+        mutex_lock(&a->lock);
+        update_aem_energy_one(a, attr->index);
+        mutex_unlock(&a->lock);
 
         return sprintf(buf, "%llu\n",
                         (unsigned long long)a->energy[attr->index] * 1000);
@@ -1104,7 +1113,7 @@ static void __exit aem_exit(void)
 }
 
 MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
-MODULE_DESCRIPTION("IBM Active Energy Manager power/temp sensor driver");
+MODULE_DESCRIPTION("IBM AEM power/temp/energy sensor driver");
 MODULE_LICENSE("GPL");
 
 module_init(aem_init);
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 30cdb0956779..f1133081cc42 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -273,10 +273,10 @@ struct it87_data {
 static inline int has_16bit_fans(const struct it87_data *data)
 {
         /* IT8705F Datasheet 0.4.1, 3h == Version G.
-           IT8712F Datasheet 0.9.1, section 8.3.5 indicates 7h == Version I.
+           IT8712F Datasheet 0.9.1, section 8.3.5 indicates 8h == Version J.
            These are the first revisions with 16bit tachometer support. */
         return (data->type == it87 && data->revision >= 0x03)
-            || (data->type == it8712 && data->revision >= 0x07)
+            || (data->type == it8712 && data->revision >= 0x08)
             || data->type == it8716
             || data->type == it8718;
 }
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
index daa7d121483b..de21142d106c 100644
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
@@ -1055,9 +1055,10 @@ static int w83791d_probe(struct i2c_client *client,
 {
         struct w83791d_data *data;
         struct device *dev = &client->dev;
-        int i, val1, err;
+        int i, err;
 
 #ifdef DEBUG
+        int val1;
         val1 = w83791d_read(client, W83791D_REG_DID_VID4);
         dev_dbg(dev, "Device ID version: %d.%d (0x%02x)\n",
                         (val1 >> 5) & 0x07, (val1 >> 1) & 0x0f, val1);
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index c1adcdbf7979..9efb02137254 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -14,7 +14,6 @@
 */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/slab.h>
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 22f6d5c00d80..0e7b1c6724aa 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -180,7 +180,7 @@ static const struct i2c_algorithm i2c_powermac_algorithm = {
 };
 
 
-static int i2c_powermac_remove(struct platform_device *dev)
+static int __devexit i2c_powermac_remove(struct platform_device *dev)
 {
         struct i2c_adapter      *adapter = platform_get_drvdata(dev);
         struct pmac_i2c_bus     *bus = i2c_get_adapdata(adapter);
@@ -200,7 +200,7 @@ static int i2c_powermac_remove(struct platform_device *dev)
 }
 
 
-static int __devexit i2c_powermac_probe(struct platform_device *dev)
+static int __devinit i2c_powermac_probe(struct platform_device *dev)
 {
         struct pmac_i2c_bus *bus = dev->dev.platform_data;
         struct device_node *parent = NULL;
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/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 550853f79ae8..b346a687ab59 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -108,6 +108,9 @@ static int i2c_device_probe(struct device *dev)
         if (!driver->probe || !driver->id_table)
                 return -ENODEV;
         client->driver = driver;
+        if (!device_can_wakeup(&client->dev))
+                device_init_wakeup(&client->dev,
+                                        client->flags & I2C_CLIENT_WAKE);
         dev_dbg(dev, "probe\n");
 
         status = driver->probe(client, i2c_match_id(driver->id_table, client));
@@ -262,9 +265,8 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
         client->adapter = adap;
 
         client->dev.platform_data = info->platform_data;
-        device_init_wakeup(&client->dev, info->flags & I2C_CLIENT_WAKE);
 
-        client->flags = info->flags & ~I2C_CLIENT_WAKE;
+        client->flags = info->flags;
         client->addr = info->addr;
         client->irq = info->irq;
 
@@ -1188,8 +1190,8 @@ int i2c_probe(struct i2c_adapter *adapter,
                  && address_data->normal_i2c[0] == I2C_CLIENT_END)
                         return 0;
 
-                dev_warn(&adapter->dev, "SMBus Quick command not supported, "
-                         "can't probe for chips\n");
+                dev_dbg(&adapter->dev, "SMBus Quick command not supported, "
+                        "can't probe for chips\n");
                 return -EOPNOTSUPP;
         }
 
@@ -1350,6 +1352,10 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
                 }
         }
 
+        /* Stop here if the classes do not match */
+        if (!(adapter->class & driver->class))
+                goto exit_free;
+
         /* Stop here if we can't use SMBUS_QUICK */
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {
                 if (address_data->probe[0] == I2C_CLIENT_END
@@ -1362,10 +1368,6 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
                 goto exit_free;
         }
 
-        /* Stop here if the classes do not match */
-        if (!(adapter->class & driver->class))
-                goto exit_free;
-
         /* Probe entries are done second, and are not affected by ignore
            entries either */
         for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index af4491fa7e34..307d976c9b69 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -583,8 +583,10 @@ static int __init i2c_dev_init(void)
                 goto out;
 
         i2c_dev_class = class_create(THIS_MODULE, "i2c-dev");
-        if (IS_ERR(i2c_dev_class))
+        if (IS_ERR(i2c_dev_class)) {
+                res = PTR_ERR(i2c_dev_class);
                 goto out_unreg_chrdev;
+        }
 
         res = i2c_add_driver(&i2cdev_driver);
         if (res)
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index a34758d29516..8e93a797c93d 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -242,7 +242,7 @@ config BLK_DEV_IDEFLOPPY
           module will be called ide-floppy.
 
 config BLK_DEV_IDESCSI
-        tristate "SCSI emulation support"
+        tristate "SCSI emulation support (DEPRECATED)"
         depends on SCSI
         select IDE_ATAPI
         ---help---
@@ -255,20 +255,6 @@ config BLK_DEV_IDESCSI
           and will allow you to use a SCSI device driver instead of a native
           ATAPI driver.
 
-          This is useful if you have an ATAPI device for which no native
-          driver has been written (for example, an ATAPI PD-CD drive);
-          you can then use this emulation together with an appropriate SCSI
-          device driver. In order to do this, say Y here and to "SCSI support"
-          and "SCSI generic support", below. You must then provide the kernel
-          command line "hdx=ide-scsi" (try "man bootparam" or see the
-          documentation of your boot loader (lilo or loadlin) about how to
-          pass options to the kernel at boot time) for devices if you want the
-          native EIDE sub-drivers to skip over the native support, so that
-          this SCSI emulation can be used instead.
-
-          Note that this option does NOT allow you to attach SCSI devices to a
-          box that doesn't have a SCSI host adapter installed.
-
           If both this SCSI emulation and native ATAPI support are compiled
           into the kernel, the native support will be used.
 
@@ -306,6 +292,20 @@ config IDE_GENERIC
         tristate "generic/default IDE chipset support"
         depends on ALPHA || X86 || IA64 || M32R || MIPS
         help
+          This is the generic IDE driver.  This driver attaches to the
+          fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and
+          so on).  Please note that if this driver is built into the
+          kernel or loaded before other ATA (IDE or libata) drivers
+          and the controller is located at legacy ports, this driver
+          may grab those ports and thus can prevent the controller
+          specific driver from attaching.
+
+          Also, currently, IDE generic doesn't allow IRQ sharing
+          meaning that the IRQs it grabs won't be available to other
+          controllers sharing those IRQs which usually makes drivers
+          for those controllers fail.  Generally, it's not a good idea
+          to load IDE generic driver on modern systems.
+
           If unsure, say N.
 
 config BLK_DEV_PLATFORM
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c
index f788fa5a977b..4fd91dcf1dc2 100644
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
@@ -343,11 +343,10 @@ static struct ide_port_info __devinitdata palm_bk3710_port_info = {
         .mwdma_mask             = ATA_MWDMA2,
 };
 
-static int __devinit palm_bk3710_probe(struct platform_device *pdev)
+static int __init palm_bk3710_probe(struct platform_device *pdev)
 {
         struct clk *clk;
         struct resource *mem, *irq;
-        struct ide_host *host;
         unsigned long base, rate;
         int i, rc;
         hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
@@ -390,6 +389,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
                 hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i;
         hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;
         hw.irq = irq->start;
+        hw.dev = &pdev->dev;
         hw.chipset = ide_palm3710;
 
         palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 :
@@ -413,13 +413,11 @@ static struct platform_driver platform_bk_driver = {
                 .name = "palm_bk3710",
                 .owner = THIS_MODULE,
         },
-        .probe = palm_bk3710_probe,
-        .remove = NULL,
 };
 
 static int __init palm_bk3710_init(void)
 {
-        return platform_driver_register(&platform_bk_driver);
+        return platform_driver_probe(&platform_bk_driver, palm_bk3710_probe);
 }
 
 module_init(palm_bk3710_init);
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 89a112d513ad..49a8c589e346 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1272,9 +1272,9 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
  */
 static void msf_from_bcd(struct atapi_msf *msf)
 {
-        msf->minute = BCD2BIN(msf->minute);
-        msf->second = BCD2BIN(msf->second);
-        msf->frame  = BCD2BIN(msf->frame);
+        msf->minute = bcd2bin(msf->minute);
+        msf->second = bcd2bin(msf->second);
+        msf->frame  = bcd2bin(msf->frame);
 }
 
 int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
@@ -1415,8 +1415,8 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)
                 return stat;
 
         if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
-                toc->hdr.first_track = BCD2BIN(toc->hdr.first_track);
-                toc->hdr.last_track  = BCD2BIN(toc->hdr.last_track);
+                toc->hdr.first_track = bcd2bin(toc->hdr.first_track);
+                toc->hdr.last_track  = bcd2bin(toc->hdr.last_track);
         }
 
         ntracks = toc->hdr.last_track - toc->hdr.first_track + 1;
@@ -1456,8 +1456,8 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)
                         return stat;
 
                 if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
-                        toc->hdr.first_track = (u8)BIN2BCD(CDROM_LEADOUT);
-                        toc->hdr.last_track = (u8)BIN2BCD(CDROM_LEADOUT);
+                        toc->hdr.first_track = (u8)bin2bcd(CDROM_LEADOUT);
+                        toc->hdr.last_track = (u8)bin2bcd(CDROM_LEADOUT);
                 } else {
                         toc->hdr.first_track = CDROM_LEADOUT;
                         toc->hdr.last_track = CDROM_LEADOUT;
@@ -1470,14 +1470,14 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)
         toc->hdr.toc_length = be16_to_cpu(toc->hdr.toc_length);
 
         if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
-                toc->hdr.first_track = BCD2BIN(toc->hdr.first_track);
-                toc->hdr.last_track  = BCD2BIN(toc->hdr.last_track);
+                toc->hdr.first_track = bcd2bin(toc->hdr.first_track);
+                toc->hdr.last_track  = bcd2bin(toc->hdr.last_track);
         }
 
         for (i = 0; i <= ntracks; i++) {
                 if (drive->atapi_flags & IDE_AFLAG_TOCADDR_AS_BCD) {
                         if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD)
-                                toc->ent[i].track = BCD2BIN(toc->ent[i].track);
+                                toc->ent[i].track = bcd2bin(toc->ent[i].track);
                         msf_from_bcd(&toc->ent[i].addr.msf);
                 }
                 toc->ent[i].addr.lba = msf_to_lba(toc->ent[i].addr.msf.minute,
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 68b9cf0138b0..07ef88bd109b 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -445,20 +445,6 @@ static void idedisk_check_hpa(ide_drive_t *drive)
         }
 }
 
-/*
- * Compute drive->capacity, the full capacity of the drive
- * Called with drive->id != NULL.
- *
- * To compute capacity, this uses either of
- *
- *    1. CHS value set by user       (whatever user sets will be trusted)
- *    2. LBA value from target drive (require new ATA feature)
- *    3. LBA value from system BIOS  (new one is OK, old one may break)
- *    4. CHS value from system BIOS  (traditional style)
- *
- * in above order (i.e., if value of higher priority is available,
- * reset will be ignored).
- */
 static void init_idedisk_capacity(ide_drive_t *drive)
 {
         struct hd_driveid *id = drive->id;
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 1bce84b56630..3833189144ed 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2338,7 +2338,7 @@ static void idetape_get_inquiry_results(ide_drive_t *drive)
 {
         idetape_tape_t *tape = drive->driver_data;
         struct ide_atapi_pc pc;
-        char fw_rev[6], vendor_id[10], product_id[18];
+        char fw_rev[4], vendor_id[8], product_id[16];
 
         idetape_create_inquiry_cmd(&pc);
         if (idetape_queue_pc_tail(drive, &pc)) {
@@ -2350,11 +2350,11 @@ static void idetape_get_inquiry_results(ide_drive_t *drive)
         memcpy(product_id, &pc.buf[16], 16);
         memcpy(fw_rev, &pc.buf[32], 4);
 
-        ide_fixstring(vendor_id, 10, 0);
-        ide_fixstring(product_id, 18, 0);
-        ide_fixstring(fw_rev, 6, 0);
+        ide_fixstring(vendor_id, 8, 0);
+        ide_fixstring(product_id, 16, 0);
+        ide_fixstring(fw_rev, 4, 0);
 
-        printk(KERN_INFO "ide-tape: %s <-> %s: %s %s rev %s\n",
+        printk(KERN_INFO "ide-tape: %s <-> %s: %.8s %.16s rev %.4s\n",
                         drive->name, tape->name, vendor_id, product_id, fw_rev);
 }
 
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
index badf79fc9e3a..39c9ee995857 100644
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -107,6 +107,7 @@ static int __devinit swarm_ide_probe(struct device *dev)
 
         base = ioremap(offset, size);
 
+        memset(&hw, 0, sizeof(hw));
         for (i = 0; i <= 7; i++)
                 hw.io_ports_array[i] =
                                 (unsigned long)(base + ((0x1f0 + i) << 5));
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 40644b6f1c00..3187215e8f89 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -307,7 +307,7 @@ static struct pci_driver driver = {
         .name           = "AEC62xx_IDE",
         .id_table       = aec62xx_pci_tbl,
         .probe          = aec62xx_init_one,
-        .remove         = aec62xx_remove,
+        .remove         = __devexit_p(aec62xx_remove),
 };
 
 static int __init aec62xx_ide_init(void)
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index bfae2f882f48..e6d8ee88d56d 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -447,7 +447,7 @@ static struct pci_driver driver = {
         .name           = "Cypress_IDE",
         .id_table       = cy82c693_pci_tbl,
         .probe          = cy82c693_init_one,
-        .remove         = cy82c693_remove,
+        .remove         = __devexit_p(cy82c693_remove),
 };
 
 static int __init cy82c693_ide_init(void)
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 748793a413ab..c37ab1743819 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -613,6 +613,14 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)
         return 0;
 }
 
+static struct hpt_info *hpt3xx_get_info(struct device *dev)
+{
+        struct ide_host *host   = dev_get_drvdata(dev);
+        struct hpt_info *info   = (struct hpt_info *)host->host_priv;
+
+        return dev == host->dev[1] ? info + 1 : info;
+}
+
 /*
  * The Marvell bridge chips used on the HighPoint SATA cards do not seem
  * to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes...
@@ -621,9 +629,7 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)
 static u8 hpt3xx_udma_filter(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = to_pci_dev(hwif->dev);
-        struct ide_host *host   = pci_get_drvdata(dev);
-        struct hpt_info *info   = host->host_priv + (hwif->dev == host->dev[1]);
+        struct hpt_info *info   = hpt3xx_get_info(hwif->dev);
         u8 mask                 = hwif->ultra_mask;
 
         switch (info->chip_type) {
@@ -662,9 +668,7 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive)
 static u8 hpt3xx_mdma_filter(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = to_pci_dev(hwif->dev);
-        struct ide_host *host   = pci_get_drvdata(dev);
-        struct hpt_info *info   = host->host_priv + (hwif->dev == host->dev[1]);
+        struct hpt_info *info   = hpt3xx_get_info(hwif->dev);
 
         switch (info->chip_type) {
         case HPT372 :
@@ -700,8 +704,7 @@ static void hpt3xx_set_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif        = drive->hwif;
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
-        struct ide_host *host   = pci_get_drvdata(dev);
-        struct hpt_info *info   = host->host_priv + (hwif->dev == host->dev[1]);
+        struct hpt_info *info   = hpt3xx_get_info(hwif->dev);
         struct hpt_timings *t   = info->timings;
         u8  itr_addr            = 0x40 + (drive->dn * 4);
         u32 old_itr             = 0;
@@ -744,8 +747,7 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev  *dev    = to_pci_dev(hwif->dev);
-        struct ide_host *host   = pci_get_drvdata(dev);
-        struct hpt_info *info   = host->host_priv + (hwif->dev == host->dev[1]);
+        struct hpt_info *info   = hpt3xx_get_info(hwif->dev);
 
         if (drive->quirk_list) {
                 if (info->chip_type >= HPT370) {
@@ -973,8 +975,7 @@ static int __devinit hpt37x_calibrate_dpll(struct pci_dev *dev, u16 f_low, u16 f
 static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev)
 {
         unsigned long io_base   = pci_resource_start(dev, 4);
-        struct ide_host *host   = pci_get_drvdata(dev);
-        struct hpt_info *info   = host->host_priv + (&dev->dev == host->dev[1]);
+        struct hpt_info *info   = hpt3xx_get_info(&dev->dev);
         const char *name        = DRV_NAME;
         u8 pci_clk,  dpll_clk   = 0;    /* PCI and DPLL clock in MHz */
         u8 chip_type;
@@ -1217,8 +1218,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev)
 static u8 hpt3xx_cable_detect(ide_hwif_t *hwif)
 {
         struct pci_dev  *dev    = to_pci_dev(hwif->dev);
-        struct ide_host *host   = pci_get_drvdata(dev);
-        struct hpt_info *info   = host->host_priv + (hwif->dev == host->dev[1]);
+        struct hpt_info *info   = hpt3xx_get_info(hwif->dev);
         u8 chip_type            = info->chip_type;
         u8 scr1 = 0, ata66      = hwif->channel ? 0x01 : 0x02;
 
@@ -1262,8 +1262,7 @@ static u8 hpt3xx_cable_detect(ide_hwif_t *hwif)
 static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
 {
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
-        struct ide_host *host   = pci_get_drvdata(dev);
-        struct hpt_info *info   = host->host_priv + (hwif->dev == host->dev[1]);
+        struct hpt_info *info   = hpt3xx_get_info(hwif->dev);
         int serialize           = HPT_SERIALIZE_IO;
         u8  chip_type           = info->chip_type;
         u8  new_mcr, old_mcr    = 0;
@@ -1620,7 +1619,7 @@ static struct pci_driver driver = {
         .name           = "HPT366_IDE",
         .id_table       = hpt366_pci_tbl,
         .probe          = hpt366_init_one,
-        .remove         = hpt366_remove,
+        .remove         = __devexit_p(hpt366_remove),
 };
 
 static int __init hpt366_ide_init(void)
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index b6dc723de702..4a1508a707cc 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -686,7 +686,7 @@ static struct pci_driver driver = {
         .name           = "ITE821x IDE",
         .id_table       = it821x_pci_tbl,
         .probe          = it821x_init_one,
-        .remove         = it821x_remove,
+        .remove         = __devexit_p(it821x_remove),
 };
 
 static int __init it821x_ide_init(void)
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 0f609b72f470..d477da6b5858 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -566,7 +566,7 @@ static struct pci_driver driver = {
         .name           = "Promise_IDE",
         .id_table       = pdc202new_pci_tbl,
         .probe          = pdc202new_init_one,
-        .remove         = pdc202new_remove,
+        .remove         = __devexit_p(pdc202new_remove),
 };
 
 static int __init pdc202new_ide_init(void)
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 6cde48bba6f8..44cccd1e086a 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -954,7 +954,7 @@ static struct pci_driver driver = {
         .name = "SCC IDE",
         .id_table = scc_pci_tbl,
         .probe = scc_init_one,
-        .remove = scc_remove,
+        .remove = __devexit_p(scc_remove),
 };
 
 static int scc_ide_init(void)
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 42eef19a18f1..681306c9d79b 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -621,9 +621,9 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         if (!request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE,
             DRV_NAME)) {
                 printk(KERN_ERR
-                        "%s : %s -- ERROR, Addresses "
+                        "%s %s: -- ERROR, Addresses "
                         "0x%p to 0x%p ALREADY in use\n",
-                       __func__, DRV_NAME, (void *) cmd_phys_base,
+                       DRV_NAME, pci_name(dev), (void *)cmd_phys_base,
                        (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE);
                 return -ENOMEM;
         }
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 445ce6fbea33..db2b88a369ab 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -832,7 +832,7 @@ static struct pci_driver driver = {
         .name           = "SiI_IDE",
         .id_table       = siimage_pci_tbl,
         .probe          = siimage_init_one,
-        .remove         = siimage_remove,
+        .remove         = __devexit_p(siimage_remove),
 };
 
 static int __init siimage_ide_init(void)
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index e5a4b42b4e33..5efe21d6ef97 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -610,7 +610,7 @@ static struct pci_driver driver = {
         .name           = "SIS_IDE",
         .id_table       = sis5513_pci_tbl,
         .probe          = sis5513_init_one,
-        .remove         = sis5513_remove,
+        .remove         = __devexit_p(sis5513_remove),
 };
 
 static int __init sis5513_ide_init(void)
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 7fc88c375e5d..927277c54ec9 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -249,7 +249,7 @@ static struct pci_driver driver = {
         .name           = "TC86C001",
         .id_table       = tc86c001_pci_tbl,
         .probe          = tc86c001_init_one,
-        .remove         = tc86c001_remove,
+        .remove         = __devexit_p(tc86c001_remove),
 };
 
 static int __init tc86c001_ide_init(void)
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index a6b2cc83f293..94fb9ab3223f 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -491,7 +491,7 @@ static struct pci_driver driver = {
         .name           = "VIA_IDE",
         .id_table       = via_pci_tbl,
         .probe          = via_init_one,
-        .remove         = via_remove,
+        .remove         = __devexit_p(via_remove),
 };
 
 static int __init via_ide_init(void)
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 994a21e5a0aa..16240a789650 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -844,7 +844,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr
         ne->host = host;
         ne->nodeid = nodeid;
         ne->generation = generation;
-        ne->needs_probe = 1;
+        ne->needs_probe = true;
 
         ne->guid = guid;
         ne->guid_vendor_id = (guid >> 40) & 0xffffff;
@@ -1144,7 +1144,7 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent
         struct csr1212_keyval *kv, *vendor_name_kv = NULL;
         u8 last_key_id = 0;
 
-        ne->needs_probe = 0;
+        ne->needs_probe = false;
 
         csr1212_for_each_dir_entry(ne->csr, kv, ne->csr->root_kv, dentry) {
                 switch (kv->key.id) {
@@ -1295,7 +1295,7 @@ static void nodemgr_update_node(struct node_entry *ne, struct csr1212_csr *csr,
                 nodemgr_update_bus_options(ne);
 
                 /* Mark the node as new, so it gets re-probed */
-                ne->needs_probe = 1;
+                ne->needs_probe = true;
         } else {
                 /* old cache is valid, so update its generation */
                 struct nodemgr_csr_info *ci = ne->csr->private;
@@ -1566,57 +1566,60 @@ static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int ge
 struct probe_param {
         struct host_info *hi;
         int generation;
+        bool probe_now;
 };
 
-static int __nodemgr_node_probe(struct device *dev, void *data)
+static int node_probe(struct device *dev, void *data)
 {
-        struct probe_param *param = (struct probe_param *)data;
+        struct probe_param *p = data;
         struct node_entry *ne;
 
+        if (p->generation != get_hpsb_generation(p->hi->host))
+                return -EAGAIN;
+
         ne = container_of(dev, struct node_entry, node_dev);
-        if (!ne->needs_probe)
-                nodemgr_probe_ne(param->hi, ne, param->generation);
-        if (ne->needs_probe)
-                nodemgr_probe_ne(param->hi, ne, param->generation);
+        if (ne->needs_probe == p->probe_now)
+                nodemgr_probe_ne(p->hi, ne, p->generation);
         return 0;
 }
 
 static void nodemgr_node_probe(struct host_info *hi, int generation)
 {
-        struct hpsb_host *host = hi->host;
-        struct probe_param param;
+        struct probe_param p;
 
-        param.hi = hi;
-        param.generation = generation;
-        /* Do some processing of the nodes we've probed. This pulls them
+        p.hi = hi;
+        p.generation = generation;
+        /*
+         * Do some processing of the nodes we've probed. This pulls them
          * into the sysfs layer if needed, and can result in processing of
          * unit-directories, or just updating the node and it's
          * unit-directories.
          *
          * Run updates before probes. Usually, updates are time-critical
-         * while probes are time-consuming. (Well, those probes need some
-         * improvement...) */
-
-        class_for_each_device(&nodemgr_ne_class, NULL, &param,
-                              __nodemgr_node_probe);
-
-        /* If we had a bus reset while we were scanning the bus, it is
-         * possible that we did not probe all nodes.  In that case, we
-         * skip the clean up for now, since we could remove nodes that
-         * were still on the bus.  Another bus scan is pending which will
-         * do the clean up eventually.
+         * while probes are time-consuming.
          *
+         * Meanwhile, another bus reset may have happened. In this case we
+         * skip everything here and let the next bus scan handle it.
+         * Otherwise we may prematurely remove nodes which are still there.
+         */
+        p.probe_now = false;
+        if (class_for_each_device(&nodemgr_ne_class, NULL, &p, node_probe) != 0)
+                return;
+
+        p.probe_now = true;
+        if (class_for_each_device(&nodemgr_ne_class, NULL, &p, node_probe) != 0)
+                return;
+        /*
          * Now let's tell the bus to rescan our devices. This may seem
          * like overhead, but the driver-model core will only scan a
          * device for a driver when either the device is added, or when a
          * new driver is added. A bus reset is a good reason to rescan
          * devices that were there before.  For example, an sbp2 device
          * may become available for login, if the host that held it was
-         * just removed.  */
-
-        if (generation == get_hpsb_generation(host))
-                if (bus_rescan_devices(&ieee1394_bus_type))
-                        HPSB_DEBUG("bus_rescan_devices had an error");
+         * just removed.
+         */
+        if (bus_rescan_devices(&ieee1394_bus_type) != 0)
+                HPSB_DEBUG("bus_rescan_devices had an error");
 }
 
 static int nodemgr_send_resume_packet(struct hpsb_host *host)
diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h
index 919e92e2a955..6eb26465a84c 100644
--- a/drivers/ieee1394/nodemgr.h
+++ b/drivers/ieee1394/nodemgr.h
@@ -97,7 +97,7 @@ struct node_entry {
         struct hpsb_host *host;         /* Host this node is attached to */
         nodeid_t nodeid;                /* NodeID */
         struct bus_options busopt;      /* Bus Options */
-        int needs_probe;
+        bool needs_probe;
         unsigned int generation;        /* Synced with hpsb generation */
 
         /* The following is read from the config rom */
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 9cbf3154d243..1d6ad3435537 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -731,15 +731,26 @@ static int sbp2_update(struct unit_directory *ud)
 {
         struct sbp2_lu *lu = ud->device.driver_data;
 
-        if (sbp2_reconnect_device(lu)) {
-                /* Reconnect has failed. Perhaps we didn't reconnect fast
-                 * enough. Try a regular login, but first log out just in
-                 * case of any weirdness. */
+        if (sbp2_reconnect_device(lu) != 0) {
+                /*
+                 * Reconnect failed.  If another bus reset happened,
+                 * let nodemgr proceed and call sbp2_update again later
+                 * (or sbp2_remove if this node went away).
+                 */
+                if (!hpsb_node_entry_valid(lu->ne))
+                        return 0;
+                /*
+                 * Or the target rejected the reconnect because we weren't
+                 * fast enough.  Try a regular login, but first log out
+                 * just in case of any weirdness.
+                 */
                 sbp2_logout_device(lu);
 
-                if (sbp2_login_device(lu)) {
-                        /* Login failed too, just fail, and the backend
-                         * will call our sbp2_remove for us */
+                if (sbp2_login_device(lu) != 0) {
+                        if (!hpsb_node_entry_valid(lu->ne))
+                                return 0;
+
+                        /* Maybe another initiator won the login. */
                         SBP2_ERR("Failed to reconnect to sbp2 device!");
                         return -EBUSY;
                 }
diff --git a/drivers/infiniband/hw/ehca/ehca_tools.h b/drivers/infiniband/hw/ehca/ehca_tools.h
index ec950bf8c479..21f7d06f14ad 100644
--- a/drivers/infiniband/hw/ehca/ehca_tools.h
+++ b/drivers/infiniband/hw/ehca/ehca_tools.h
@@ -54,7 +54,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/vmalloc.h>
-#include <linux/version.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
 #include <linux/device.h>
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index 23faba9d21eb..8bb5170b4e41 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -31,7 +31,6 @@
  * SOFTWARE.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
diff --git a/drivers/infiniband/hw/ipath/ipath_iba7220.c b/drivers/infiniband/hw/ipath/ipath_iba7220.c
index d90f5e9a54fa..9839e20119bc 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba7220.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba7220.c
@@ -1720,7 +1720,7 @@ static void ipath_7220_put_tid(struct ipath_devdata *dd, u64 __iomem *tidptr,
                                  "not 2KB aligned!\n", pa);
                         return;
                 }
-                if (pa >= (1UL << IBA7220_TID_SZ_SHIFT)) {
+                if (chippa >= (1UL << IBA7220_TID_SZ_SHIFT)) {
                         ipath_dev_err(dd,
                                       "BUG: Physical page address 0x%lx "
                                       "larger than supported\n", pa);
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c
index 36aa242c487c..729446f56aab 100644
--- a/drivers/infiniband/hw/ipath/ipath_ud.c
+++ b/drivers/infiniband/hw/ipath/ipath_ud.c
@@ -267,6 +267,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)
         u16 lrh0;
         u16 lid;
         int ret = 0;
+        int next_cur;
 
         spin_lock_irqsave(&qp->s_lock, flags);
 
@@ -290,8 +291,9 @@ int ipath_make_ud_req(struct ipath_qp *qp)
                 goto bail;
 
         wqe = get_swqe_ptr(qp, qp->s_cur);
-        if (++qp->s_cur >= qp->s_size)
-                qp->s_cur = 0;
+        next_cur = qp->s_cur + 1;
+        if (next_cur >= qp->s_size)
+                next_cur = 0;
 
         /* Construct the header. */
         ah_attr = &to_iah(wqe->wr.wr.ud.ah)->attr;
@@ -315,6 +317,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)
                                 qp->s_flags |= IPATH_S_WAIT_DMA;
                                 goto bail;
                         }
+                        qp->s_cur = next_cur;
                         spin_unlock_irqrestore(&qp->s_lock, flags);
                         ipath_ud_loopback(qp, wqe);
                         spin_lock_irqsave(&qp->s_lock, flags);
@@ -323,6 +326,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)
                 }
         }
 
+        qp->s_cur = next_cur;
         extra_bytes = -wqe->length & 3;
         nwords = (wqe->length + extra_bytes) >> 2;
 
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index a4cdb465cd1d..87f5c5a87b98 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -204,6 +204,8 @@ struct ib_mr *mlx4_ib_alloc_fast_reg_mr(struct ib_pd *pd,
         if (err)
                 goto err_mr;
 
+        mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key;
+
         return &mr->ibmr;
 
 err_mr:
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index f29dbb767e87..9559248f265b 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1342,6 +1342,12 @@ static __be32 convert_access(int acc)
 static void set_fmr_seg(struct mlx4_wqe_fmr_seg *fseg, struct ib_send_wr *wr)
 {
         struct mlx4_ib_fast_reg_page_list *mfrpl = to_mfrpl(wr->wr.fast_reg.page_list);
+        int i;
+
+        for (i = 0; i < wr->wr.fast_reg.page_list_len; ++i)
+                wr->wr.fast_reg.page_list->page_list[i] =
+                        cpu_to_be64(wr->wr.fast_reg.page_list->page_list[i] |
+                                    MLX4_MTT_FLAG_PRESENT);
 
         fseg->flags             = convert_access(wr->wr.fast_reg.access_flags);
         fseg->mem_key           = cpu_to_be32(wr->wr.fast_reg.rkey);
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index 39bd897b40c6..8eb7ae96974d 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -43,7 +43,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/workqueue.h>
 #include <linux/slab.h>
-#include <linux/version.h>
 #include <asm/io.h>
 #include <linux/crc32c.h>
 
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 9f0b964b2c99..499d3cf83e1f 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1956,13 +1956,6 @@ static int mini_cm_reject(struct nes_cm_core *cm_core,
                 return ret;
         cleanup_retrans_entry(cm_node);
         cm_node->state = NES_CM_STATE_CLOSED;
-        ret = send_fin(cm_node, NULL);
-
-        if (cm_node->accept_pend) {
-                BUG_ON(!cm_node->listener);
-                atomic_dec(&cm_node->listener->pend_accepts_cnt);
-                BUG_ON(atomic_read(&cm_node->listener->pend_accepts_cnt) < 0);
-        }
 
         ret = send_reset(cm_node, NULL);
         return ret;
@@ -2383,6 +2376,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
                         atomic_inc(&cm_disconnects);
                         cm_event.event = IW_CM_EVENT_DISCONNECT;
                         if (last_ae == NES_AEQE_AEID_LLP_CONNECTION_RESET) {
+                                issued_disconnect_reset = 1;
                                 cm_event.status = IW_CM_EVENT_STATUS_RESET;
                                 nes_debug(NES_DBG_CM, "Generating a CM "
                                         "Disconnect Event (status reset) for "
@@ -2508,7 +2502,6 @@ static int nes_disconnect(struct nes_qp *nesqp, int abrupt)
                 nes_debug(NES_DBG_CM, "Call close API\n");
 
                 g_cm_core->api->close(g_cm_core, nesqp->cm_node);
-                nesqp->cm_node = NULL;
         }
 
         return ret;
@@ -2837,6 +2830,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
         cm_node->apbvt_set = 1;
         nesqp->cm_node = cm_node;
         cm_node->nesqp = nesqp;
+        nes_add_ref(&nesqp->ibqp);
 
         return 0;
 }
@@ -3167,7 +3161,6 @@ static void cm_event_connect_error(struct nes_cm_event *event)
         if (ret)
                 printk(KERN_ERR "%s[%u] OFA CM event_handler returned, "
                         "ret=%d\n", __func__, __LINE__, ret);
-        nes_rem_ref(&nesqp->ibqp);
         cm_id->rem_ref(cm_id);
 
         rem_ref_cm_node(event->cm_node->cm_core, event->cm_node);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index b0ffc9abe8c0..05eb41b8ab63 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -293,6 +293,7 @@ struct ipoib_dev_priv {
 
         struct delayed_work pkey_poll_task;
         struct delayed_work mcast_task;
+        struct work_struct carrier_on_task;
         struct work_struct flush_light;
         struct work_struct flush_normal;
         struct work_struct flush_heavy;
@@ -464,6 +465,7 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port);
 void ipoib_dev_cleanup(struct net_device *dev);
 
 void ipoib_mcast_join_task(struct work_struct *work);
+void ipoib_mcast_carrier_on_task(struct work_struct *work);
 void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb);
 
 void ipoib_mcast_restart_task(struct work_struct *work);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index f51201b17bfd..e9ca3cb57d52 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -156,14 +156,8 @@ static int ipoib_stop(struct net_device *dev)
 
         netif_stop_queue(dev);
 
-        /*
-         * Now flush workqueue to make sure a scheduled task doesn't
-         * bring our internal state back up.
-         */
-        flush_workqueue(ipoib_workqueue);
-
-        ipoib_ib_dev_down(dev, 1);
-        ipoib_ib_dev_stop(dev, 1);
+        ipoib_ib_dev_down(dev, 0);
+        ipoib_ib_dev_stop(dev, 0);
 
         if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) {
                 struct ipoib_dev_priv *cpriv;
@@ -410,7 +404,7 @@ static void path_rec_completion(int status,
         struct net_device *dev = path->dev;
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_ah *ah = NULL;
-        struct ipoib_ah *old_ah;
+        struct ipoib_ah *old_ah = NULL;
         struct ipoib_neigh *neigh, *tn;
         struct sk_buff_head skqueue;
         struct sk_buff *skb;
@@ -434,12 +428,12 @@ static void path_rec_completion(int status,
 
         spin_lock_irqsave(&priv->lock, flags);
 
-        old_ah   = path->ah;
-        path->ah = ah;
-
         if (ah) {
                 path->pathrec = *pathrec;
 
+                old_ah   = path->ah;
+                path->ah = ah;
+
                 ipoib_dbg(priv, "created address handle %p for LID 0x%04x, SL %d\n",
                           ah, be16_to_cpu(pathrec->dlid), pathrec->sl);
 
@@ -1081,6 +1075,7 @@ static void ipoib_setup(struct net_device *dev)
 
         INIT_DELAYED_WORK(&priv->pkey_poll_task, ipoib_pkey_poll);
         INIT_DELAYED_WORK(&priv->mcast_task,   ipoib_mcast_join_task);
+        INIT_WORK(&priv->carrier_on_task, ipoib_mcast_carrier_on_task);
         INIT_WORK(&priv->flush_light,   ipoib_ib_dev_flush_light);
         INIT_WORK(&priv->flush_normal,   ipoib_ib_dev_flush_normal);
         INIT_WORK(&priv->flush_heavy,   ipoib_ib_dev_flush_heavy);
@@ -1314,7 +1309,7 @@ sysfs_failed:
 
 register_failed:
         ib_unregister_event_handler(&priv->event_handler);
-        flush_scheduled_work();
+        flush_workqueue(ipoib_workqueue);
 
 event_failed:
         ipoib_dev_cleanup(priv->dev);
@@ -1373,7 +1368,12 @@ static void ipoib_remove_one(struct ib_device *device)
 
         list_for_each_entry_safe(priv, tmp, dev_list, list) {
                 ib_unregister_event_handler(&priv->event_handler);
-                flush_scheduled_work();
+
+                rtnl_lock();
+                dev_change_flags(priv->dev, priv->dev->flags & ~IFF_UP);
+                rtnl_unlock();
+
+                flush_workqueue(ipoib_workqueue);
 
                 unregister_netdev(priv->dev);
                 ipoib_dev_cleanup(priv->dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 8950e9546f4e..aae28620a6e5 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -366,6 +366,21 @@ static int ipoib_mcast_sendonly_join(struct ipoib_mcast *mcast)
         return ret;
 }
 
+void ipoib_mcast_carrier_on_task(struct work_struct *work)
+{
+        struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv,
+                                                   carrier_on_task);
+
+        /*
+         * Take rtnl_lock to avoid racing with ipoib_stop() and
+         * turning the carrier back on while a device is being
+         * removed.
+         */
+        rtnl_lock();
+        netif_carrier_on(priv->dev);
+        rtnl_unlock();
+}
+
 static int ipoib_mcast_join_complete(int status,
                                      struct ib_sa_multicast *multicast)
 {
@@ -392,8 +407,12 @@ static int ipoib_mcast_join_complete(int status,
                                            &priv->mcast_task, 0);
                 mutex_unlock(&mcast_mutex);
 
+                /*
+                 * Defer carrier on work to ipoib_workqueue to avoid a
+                 * deadlock on rtnl_lock here.
+                 */
                 if (mcast == priv->broadcast)
-                        netif_carrier_on(dev);
+                        queue_work(ipoib_workqueue, &priv->carrier_on_task);
 
                 return 0;
         }
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 63462ecca147..26ff6214a81f 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -33,7 +33,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 
 #include "iscsi_iser.h"
 
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 2d65411f6763..3524bef62be6 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -647,6 +647,47 @@ static int str_to_user(const char *str, unsigned int maxlen, void __user *p)
         return copy_to_user(p, str, len) ? -EFAULT : len;
 }
 
+#define OLD_KEY_MAX     0x1ff
+static int handle_eviocgbit(struct input_dev *dev, unsigned int cmd, void __user *p, int compat_mode)
+{
+        static unsigned long keymax_warn_time;
+        unsigned long *bits;
+        int len;
+
+        switch (_IOC_NR(cmd) & EV_MAX) {
+
+        case      0: bits = dev->evbit;  len = EV_MAX;  break;
+        case EV_KEY: bits = dev->keybit; len = KEY_MAX; break;
+        case EV_REL: bits = dev->relbit; len = REL_MAX; break;
+        case EV_ABS: bits = dev->absbit; len = ABS_MAX; break;
+        case EV_MSC: bits = dev->mscbit; len = MSC_MAX; break;
+        case EV_LED: bits = dev->ledbit; len = LED_MAX; break;
+        case EV_SND: bits = dev->sndbit; len = SND_MAX; break;
+        case EV_FF:  bits = dev->ffbit;  len = FF_MAX;  break;
+        case EV_SW:  bits = dev->swbit;  len = SW_MAX;  break;
+        default: return -EINVAL;
+        }
+
+        /*
+         * Work around bugs in userspace programs that like to do
+         * EVIOCGBIT(EV_KEY, KEY_MAX) and not realize that 'len'
+         * should be in bytes, not in bits.
+         */
+        if ((_IOC_NR(cmd) & EV_MAX) == EV_KEY && _IOC_SIZE(cmd) == OLD_KEY_MAX) {
+                len = OLD_KEY_MAX;
+                if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000))
+                        printk(KERN_WARNING
+                                "evdev.c(EVIOCGBIT): Suspicious buffer size %u, "
+                                "limiting output to %zu bytes. See "
+                                "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n",
+                                OLD_KEY_MAX,
+                                BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long));
+        }
+
+        return bits_to_user(bits, len, _IOC_SIZE(cmd), p, compat_mode);
+}
+#undef OLD_KEY_MAX
+
 static long evdev_do_ioctl(struct file *file, unsigned int cmd,
                            void __user *p, int compat_mode)
 {
@@ -733,26 +774,8 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
 
                 if (_IOC_DIR(cmd) == _IOC_READ) {
 
-                        if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0, 0))) {
-
-                                unsigned long *bits;
-                                int len;
-
-                                switch (_IOC_NR(cmd) & EV_MAX) {
-
-                                case      0: bits = dev->evbit;  len = EV_MAX;  break;
-                                case EV_KEY: bits = dev->keybit; len = KEY_MAX; break;
-                                case EV_REL: bits = dev->relbit; len = REL_MAX; break;
-                                case EV_ABS: bits = dev->absbit; len = ABS_MAX; break;
-                                case EV_MSC: bits = dev->mscbit; len = MSC_MAX; break;
-                                case EV_LED: bits = dev->ledbit; len = LED_MAX; break;
-                                case EV_SND: bits = dev->sndbit; len = SND_MAX; break;
-                                case EV_FF:  bits = dev->ffbit;  len = FF_MAX;  break;
-                                case EV_SW:  bits = dev->swbit;  len = SW_MAX;  break;
-                                default: return -EINVAL;
-                                }
-                                return bits_to_user(bits, len, _IOC_SIZE(cmd), p, compat_mode);
-                        }
+                        if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0, 0)))
+                                return handle_eviocgbit(dev, cmd, p, compat_mode);
 
                         if (_IOC_NR(cmd) == _IOC_NR(EVIOCGKEY(0)))
                                 return bits_to_user(dev->key, KEY_MAX, _IOC_SIZE(cmd),
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 87d3e7eabffd..6791be81eb29 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -127,6 +127,7 @@ static const struct xpad_device {
         { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
         { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
         { 0x0c12, 0x8802, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0c12, 0x880a, "Pelican Eclipse PL-2023", MAP_DPAD_TO_AXES, XTYPE_XBOX },
         { 0x0c12, 0x8810, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
         { 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", MAP_DPAD_TO_AXES, XTYPE_XBOX },
         { 0x0e4c, 0x1097, "Radica Gamester Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
index 54ed8e2e1c02..e348cfccc17a 100644
--- a/drivers/input/keyboard/bf54x-keys.c
+++ b/drivers/input/keyboard/bf54x-keys.c
@@ -29,7 +29,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 
 #include <linux/init.h>
 #include <linux/fs.h>
@@ -44,7 +43,7 @@
 #include <linux/input.h>
 
 #include <asm/portmux.h>
-#include <asm/mach/bf54x_keys.h>
+#include <mach/bf54x_keys.h>
 
 #define DRV_NAME        "bf54x-keys"
 #define TIME_SCALE      100     /* 100 ns */
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index be58730e636a..ec96b369dd7a 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 
 #include <linux/init.h>
 #include <linux/fs.h>
@@ -118,6 +117,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
                 unsigned int type = button->type ?: EV_KEY;
 
                 bdata->input = input;
+                bdata->button = button;
                 setup_timer(&bdata->timer,
                             gpio_check_button, (unsigned long)bdata);
 
@@ -256,7 +256,7 @@ static int gpio_keys_resume(struct platform_device *pdev)
 #define gpio_keys_resume        NULL
 #endif
 
-struct platform_driver gpio_keys_device_driver = {
+static struct platform_driver gpio_keys_device_driver = {
         .probe          = gpio_keys_probe,
         .remove         = __devexit_p(gpio_keys_remove),
         .suspend        = gpio_keys_suspend,
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index 6a1f48b76e32..2adf9cb265da 100644
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -148,6 +148,9 @@ static int __devexit cobalt_buttons_remove(struct platform_device *pdev)
         return 0;
 }
 
+MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");
+MODULE_DESCRIPTION("Cobalt button interface driver");
+MODULE_LICENSE("GPL");
 /* work with hotplug and coldplug */
 MODULE_ALIAS("platform:Cobalt buttons");
 
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 7bbea097cda2..f996546fc443 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -130,6 +130,29 @@ config MOUSE_APPLETOUCH
           To compile this driver as a module, choose M here: the
           module will be called appletouch.
 
+config MOUSE_BCM5974
+        tristate "Apple USB BCM5974 Multitouch trackpad support"
+        depends on USB_ARCH_HAS_HCD
+        select USB
+        help
+          Say Y here if you have an Apple USB BCM5974 Multitouch
+          trackpad.
+
+          The BCM5974 is the multitouch trackpad found in the Macbook
+          Air (JAN2008) and Macbook Pro Penryn (FEB2008) laptops.
+
+          It is also found in the IPhone (2007) and Ipod Touch (2008).
+
+          This driver provides multitouch functionality together with
+          the synaptics X11 driver.
+
+          The interface is currently identical to the appletouch interface,
+          for further information, see
+          <file:Documentation/input/appletouch.txt>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bcm5974.
+
 config MOUSE_INPORT
         tristate "InPort/MS/ATIXL busmouse"
         depends on ISA
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
index 9e6e36330820..d4d202516090 100644
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -6,6 +6,7 @@
 
 obj-$(CONFIG_MOUSE_AMIGA)       += amimouse.o
 obj-$(CONFIG_MOUSE_APPLETOUCH)  += appletouch.o
+obj-$(CONFIG_MOUSE_BCM5974)     += bcm5974.o
 obj-$(CONFIG_MOUSE_ATARI)       += atarimouse.o
 obj-$(CONFIG_MOUSE_RISCPC)      += rpcmouse.o
 obj-$(CONFIG_MOUSE_INPORT)      += inport.o
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
new file mode 100644
index 000000000000..2998a6ac9ae4
--- /dev/null
+++ b/drivers/input/mouse/bcm5974.c
@@ -0,0 +1,726 @@
+/*
+ * Apple USB BCM5974 (Macbook Air and Penryn Macbook Pro) multitouch driver
+ *
+ * Copyright (C) 2008      Henrik Rydberg (rydberg@euromail.se)
+ *
+ * The USB initialization and package decoding was made by
+ * Scott Shawcroft as part of the touchd user-space driver project:
+ * Copyright (C) 2008      Scott Shawcroft (scott.shawcroft@gmail.com)
+ *
+ * The BCM5974 driver is based on the appletouch driver:
+ * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com)
+ * Copyright (C) 2005      Johannes Berg (johannes@sipsolutions.net)
+ * Copyright (C) 2005      Stelian Pop (stelian@popies.net)
+ * Copyright (C) 2005      Frank Arnold (frank@scirocco-5v-turbo.de)
+ * Copyright (C) 2005      Peter Osterlund (petero2@telia.com)
+ * Copyright (C) 2005      Michael Hanselmann (linux-kernel@hansmi.ch)
+ * Copyright (C) 2006      Nicolas Boichat (nicolas@boichat.ch)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/usb/input.h>
+#include <linux/hid.h>
+#include <linux/mutex.h>
+
+#define USB_VENDOR_ID_APPLE             0x05ac
+
+/* MacbookAir, aka wellspring */
+#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI     0x0223
+#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO      0x0224
+#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS      0x0225
+/* MacbookProPenryn, aka wellspring2 */
+#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI    0x0230
+#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO     0x0231
+#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS     0x0232
+
+#define BCM5974_DEVICE(prod) {                                  \
+        .match_flags = (USB_DEVICE_ID_MATCH_DEVICE |            \
+                        USB_DEVICE_ID_MATCH_INT_CLASS |         \
+                        USB_DEVICE_ID_MATCH_INT_PROTOCOL),      \
+        .idVendor = USB_VENDOR_ID_APPLE,                        \
+        .idProduct = (prod),                                    \
+        .bInterfaceClass = USB_INTERFACE_CLASS_HID,             \
+        .bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE      \
+}
+
+/* table of devices that work with this driver */
+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),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_JIS),
+        /* MacbookProPenryn */
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),
+        /* Terminating entry */
+        {}
+};
+MODULE_DEVICE_TABLE(usb, bcm5974_table);
+
+MODULE_AUTHOR("Henrik Rydberg");
+MODULE_DESCRIPTION("Apple USB BCM5974 multitouch driver");
+MODULE_LICENSE("GPL");
+
+#define dprintk(level, format, a...)\
+        { if (debug >= level) printk(KERN_DEBUG format, ##a); }
+
+static int debug = 1;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Activate debugging output");
+
+/* button data structure */
+struct bt_data {
+        u8 unknown1;            /* constant */
+        u8 button;              /* left button */
+        u8 rel_x;               /* relative x coordinate */
+        u8 rel_y;               /* relative y coordinate */
+};
+
+/* trackpad header structure */
+struct tp_header {
+        u8 unknown1[16];        /* constants, timers, etc */
+        u8 fingers;             /* number of fingers on trackpad */
+        u8 unknown2[9];         /* constants, timers, etc */
+};
+
+/* trackpad finger structure */
+struct tp_finger {
+        __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 */
+        __le16 rel_y;           /* relative y coodinate */
+        __le16 size_major;      /* finger size, major axis? */
+        __le16 size_minor;      /* finger size, minor axis? */
+        __le16 orientation;     /* 16384 when point, else 15 bit angle */
+        __le16 force_major;     /* trackpad force, major axis? */
+        __le16 force_minor;     /* trackpad force, minor axis? */
+        __le16 unused[3];       /* zeros */
+        __le16 multi;           /* one finger: varies, more fingers: constant */
+};
+
+/* trackpad data structure, empirically at least ten fingers */
+struct tp_data {
+        struct tp_header header;
+        struct tp_finger finger[16];
+};
+
+/* device-specific parameters */
+struct bcm5974_param {
+        int dim;                /* logical dimension */
+        int fuzz;               /* logical noise value */
+        int devmin;             /* device minimum reading */
+        int devmax;             /* device maximum reading */
+};
+
+/* device-specific configuration */
+struct bcm5974_config {
+        int ansi, iso, jis;     /* the product id of this device */
+        int bt_ep;              /* the endpoint of the button interface */
+        int bt_datalen;         /* data length of the button interface */
+        int tp_ep;              /* the endpoint of the trackpad interface */
+        int tp_datalen;         /* data length of the trackpad interface */
+        struct bcm5974_param p; /* finger pressure limits */
+        struct bcm5974_param w; /* finger width limits */
+        struct bcm5974_param x; /* horizontal limits */
+        struct bcm5974_param y; /* vertical limits */
+};
+
+/* logical device structure */
+struct bcm5974 {
+        char phys[64];
+        struct usb_device *udev;        /* usb device */
+        struct usb_interface *intf;     /* our interface */
+        struct input_dev *input;        /* input dev */
+        struct bcm5974_config cfg;      /* device configuration */
+        struct mutex pm_mutex;          /* serialize access to open/suspend */
+        int opened;                     /* 1: opened, 0: closed */
+        struct urb *bt_urb;             /* button usb request block */
+        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 */
+#define DIM_PRESSURE    256             /* maximum finger pressure */
+#define DIM_WIDTH       16              /* maximum finger width */
+#define DIM_X           1280            /* maximum trackpad x value */
+#define DIM_Y           800             /* maximum trackpad y value */
+
+/* logical signal quality */
+#define SN_PRESSURE     45              /* pressure signal-to-noise ratio */
+#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[] = {
+        {
+                USB_DEVICE_ID_APPLE_WELLSPRING_ANSI,
+                USB_DEVICE_ID_APPLE_WELLSPRING_ISO,
+                USB_DEVICE_ID_APPLE_WELLSPRING_JIS,
+                0x84, sizeof(struct bt_data),
+                0x81, sizeof(struct tp_data),
+                { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 },
+                { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
+                { DIM_X, DIM_X / SN_COORD, -4824, 5342 },
+                { DIM_Y, DIM_Y / SN_COORD, -172, 5820 }
+        },
+        {
+                USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI,
+                USB_DEVICE_ID_APPLE_WELLSPRING2_ISO,
+                USB_DEVICE_ID_APPLE_WELLSPRING2_JIS,
+                0x84, sizeof(struct bt_data),
+                0x81, sizeof(struct tp_data),
+                { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 },
+                { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
+                { DIM_X, DIM_X / SN_COORD, -4824, 4824 },
+                { DIM_Y, DIM_Y / SN_COORD, -172, 4290 }
+        },
+        {}
+};
+
+/* return the device-specific configuration by device */
+static const struct bcm5974_config *bcm5974_get_config(struct usb_device *udev)
+{
+        u16 id = le16_to_cpu(udev->descriptor.idProduct);
+        const struct bcm5974_config *cfg;
+
+        for (cfg = bcm5974_config_table; cfg->ansi; ++cfg)
+                if (cfg->ansi == id || cfg->iso == id || cfg->jis == id)
+                        return cfg;
+
+        return bcm5974_config_table;
+}
+
+/* convert 16-bit little endian to signed integer */
+static inline int raw2int(__le16 x)
+{
+        return (signed short)le16_to_cpu(x);
+}
+
+/* scale device data to logical dimensions (asserts devmin < devmax) */
+static inline int int2scale(const struct bcm5974_param *p, int x)
+{
+        return x * p->dim / (p->devmax - p->devmin);
+}
+
+/* all logical value ranges are [0,dim). */
+static inline int int2bound(const struct bcm5974_param *p, int x)
+{
+        int s = int2scale(p, x);
+
+        return clamp_val(s, 0, p->dim - 1);
+}
+
+/* setup which logical events to report */
+static void setup_events_to_report(struct input_dev *input_dev,
+                                   const struct bcm5974_config *cfg)
+{
+        __set_bit(EV_ABS, input_dev->evbit);
+
+        input_set_abs_params(input_dev, ABS_PRESSURE,
+                                0, cfg->p.dim, cfg->p.fuzz, 0);
+        input_set_abs_params(input_dev, ABS_TOOL_WIDTH,
+                                0, cfg->w.dim, cfg->w.fuzz, 0);
+        input_set_abs_params(input_dev, ABS_X,
+                                0, cfg->x.dim, cfg->x.fuzz, 0);
+        input_set_abs_params(input_dev, ABS_Y,
+                                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);
+        __set_bit(BTN_LEFT, input_dev->keybit);
+}
+
+/* report button data as logical button state */
+static int report_bt_state(struct bcm5974 *dev, int size)
+{
+        if (size != sizeof(struct bt_data))
+                return -EIO;
+
+        input_report_key(dev->input, BTN_LEFT, dev->bt_data->button);
+        input_sync(dev->input);
+
+        return 0;
+}
+
+/* report trackpad data as logical trackpad state */
+static int report_tp_state(struct bcm5974 *dev, int size)
+{
+        const struct bcm5974_config *c = &dev->cfg;
+        const struct tp_finger *f = dev->tp_data->finger;
+        struct input_dev *input = dev->input;
+        const int fingers = (size - 26) / 28;
+        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) {
+                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: 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);
+        }
+
+        /* 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++;
+                }
+        }
+
+        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_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);
+
+        return 0;
+}
+
+/* Wellspring initialization constants */
+#define BCM5974_WELLSPRING_MODE_READ_REQUEST_ID         1
+#define BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID        9
+#define BCM5974_WELLSPRING_MODE_REQUEST_VALUE           0x300
+#define BCM5974_WELLSPRING_MODE_REQUEST_INDEX           0
+#define BCM5974_WELLSPRING_MODE_VENDOR_VALUE            0x01
+#define BCM5974_WELLSPRING_MODE_NORMAL_VALUE            0x08
+
+static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
+{
+        char *data = kmalloc(8, GFP_KERNEL);
+        int retval = 0, size;
+
+        if (!data) {
+                err("bcm5974: out of memory");
+                retval = -ENOMEM;
+                goto out;
+        }
+
+        /* read configuration */
+        size = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
+                        BCM5974_WELLSPRING_MODE_READ_REQUEST_ID,
+                        USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
+                        BCM5974_WELLSPRING_MODE_REQUEST_VALUE,
+                        BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
+
+        if (size != 8) {
+                err("bcm5974: could not read from device");
+                retval = -EIO;
+                goto out;
+        }
+
+        /* apply the mode switch */
+        data[0] = on ?
+                BCM5974_WELLSPRING_MODE_VENDOR_VALUE :
+                BCM5974_WELLSPRING_MODE_NORMAL_VALUE;
+
+        /* write configuration */
+        size = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
+                        BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID,
+                        USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
+                        BCM5974_WELLSPRING_MODE_REQUEST_VALUE,
+                        BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
+
+        if (size != 8) {
+                err("bcm5974: could not write to device");
+                retval = -EIO;
+                goto out;
+        }
+
+        dprintk(2, "bcm5974: switched to %s mode.\n",
+                on ? "wellspring" : "normal");
+
+ out:
+        kfree(data);
+        return retval;
+}
+
+static void bcm5974_irq_button(struct urb *urb)
+{
+        struct bcm5974 *dev = urb->context;
+        int error;
+
+        switch (urb->status) {
+        case 0:
+                break;
+        case -EOVERFLOW:
+        case -ECONNRESET:
+        case -ENOENT:
+        case -ESHUTDOWN:
+                dbg("bcm5974: button urb shutting down: %d", urb->status);
+                return;
+        default:
+                dbg("bcm5974: button urb status: %d", urb->status);
+                goto exit;
+        }
+
+        if (report_bt_state(dev, dev->bt_urb->actual_length))
+                dprintk(1, "bcm5974: bad button package, length: %d\n",
+                        dev->bt_urb->actual_length);
+
+exit:
+        error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC);
+        if (error)
+                err("bcm5974: button urb failed: %d", error);
+}
+
+static void bcm5974_irq_trackpad(struct urb *urb)
+{
+        struct bcm5974 *dev = urb->context;
+        int error;
+
+        switch (urb->status) {
+        case 0:
+                break;
+        case -EOVERFLOW:
+        case -ECONNRESET:
+        case -ENOENT:
+        case -ESHUTDOWN:
+                dbg("bcm5974: trackpad urb shutting down: %d", urb->status);
+                return;
+        default:
+                dbg("bcm5974: trackpad urb status: %d", urb->status);
+                goto exit;
+        }
+
+        /* control response ignored */
+        if (dev->tp_urb->actual_length == 2)
+                goto exit;
+
+        if (report_tp_state(dev, dev->tp_urb->actual_length))
+                dprintk(1, "bcm5974: bad trackpad package, length: %d\n",
+                        dev->tp_urb->actual_length);
+
+exit:
+        error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC);
+        if (error)
+                err("bcm5974: trackpad urb failed: %d", error);
+}
+
+/*
+ * The Wellspring trackpad, like many recent Apple trackpads, share
+ * the usb device with the keyboard. Since keyboards are usually
+ * handled by the HID system, the device ends up being handled by two
+ * modules. Setting up the device therefore becomes slightly
+ * complicated. To enable multitouch features, a mode switch is
+ * required, which is usually applied via the control interface of the
+ * device.  It can be argued where this switch should take place. In
+ * some drivers, like appletouch, the switch is made during
+ * probe. However, the hid module may also alter the state of the
+ * device, resulting in trackpad malfunction under certain
+ * circumstances. To get around this problem, there is at least one
+ * example that utilizes the USB_QUIRK_RESET_RESUME quirk in order to
+ * recieve a reset_resume request rather than the normal resume.
+ * Since the implementation of reset_resume is equal to mode switch
+ * plus start_traffic, it seems easier to always do the switch when
+ * starting traffic on the device.
+ */
+static int bcm5974_start_traffic(struct bcm5974 *dev)
+{
+        if (bcm5974_wellspring_mode(dev, true)) {
+                dprintk(1, "bcm5974: mode switch failed\n");
+                goto error;
+        }
+
+        if (usb_submit_urb(dev->bt_urb, GFP_KERNEL))
+                goto error;
+
+        if (usb_submit_urb(dev->tp_urb, GFP_KERNEL))
+                goto err_kill_bt;
+
+        return 0;
+
+err_kill_bt:
+        usb_kill_urb(dev->bt_urb);
+error:
+        return -EIO;
+}
+
+static void bcm5974_pause_traffic(struct bcm5974 *dev)
+{
+        usb_kill_urb(dev->tp_urb);
+        usb_kill_urb(dev->bt_urb);
+        bcm5974_wellspring_mode(dev, false);
+}
+
+/*
+ * The code below implements open/close and manual suspend/resume.
+ * All functions may be called in random order.
+ *
+ * Opening a suspended device fails with EACCES - permission denied.
+ *
+ * Failing a resume leaves the device resumed but closed.
+ */
+static int bcm5974_open(struct input_dev *input)
+{
+        struct bcm5974 *dev = input_get_drvdata(input);
+        int error;
+
+        error = usb_autopm_get_interface(dev->intf);
+        if (error)
+                return error;
+
+        mutex_lock(&dev->pm_mutex);
+
+        error = bcm5974_start_traffic(dev);
+        if (!error)
+                dev->opened = 1;
+
+        mutex_unlock(&dev->pm_mutex);
+
+        if (error)
+                usb_autopm_put_interface(dev->intf);
+
+        return error;
+}
+
+static void bcm5974_close(struct input_dev *input)
+{
+        struct bcm5974 *dev = input_get_drvdata(input);
+
+        mutex_lock(&dev->pm_mutex);
+
+        bcm5974_pause_traffic(dev);
+        dev->opened = 0;
+
+        mutex_unlock(&dev->pm_mutex);
+
+        usb_autopm_put_interface(dev->intf);
+}
+
+static int bcm5974_suspend(struct usb_interface *iface, pm_message_t message)
+{
+        struct bcm5974 *dev = usb_get_intfdata(iface);
+
+        mutex_lock(&dev->pm_mutex);
+
+        if (dev->opened)
+                bcm5974_pause_traffic(dev);
+
+        mutex_unlock(&dev->pm_mutex);
+
+        return 0;
+}
+
+static int bcm5974_resume(struct usb_interface *iface)
+{
+        struct bcm5974 *dev = usb_get_intfdata(iface);
+        int error = 0;
+
+        mutex_lock(&dev->pm_mutex);
+
+        if (dev->opened)
+                error = bcm5974_start_traffic(dev);
+
+        mutex_unlock(&dev->pm_mutex);
+
+        return error;
+}
+
+static int bcm5974_probe(struct usb_interface *iface,
+                         const struct usb_device_id *id)
+{
+        struct usb_device *udev = interface_to_usbdev(iface);
+        const struct bcm5974_config *cfg;
+        struct bcm5974 *dev;
+        struct input_dev *input_dev;
+        int error = -ENOMEM;
+
+        /* find the product index */
+        cfg = bcm5974_get_config(udev);
+
+        /* allocate memory for our device state and initialize it */
+        dev = kzalloc(sizeof(struct bcm5974), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!dev || !input_dev) {
+                err("bcm5974: out of memory");
+                goto err_free_devs;
+        }
+
+        dev->udev = udev;
+        dev->intf = iface;
+        dev->input = input_dev;
+        dev->cfg = *cfg;
+        mutex_init(&dev->pm_mutex);
+
+        /* setup urbs */
+        dev->bt_urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!dev->bt_urb)
+                goto err_free_devs;
+
+        dev->tp_urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!dev->tp_urb)
+                goto err_free_bt_urb;
+
+        dev->bt_data = usb_buffer_alloc(dev->udev,
+                                        dev->cfg.bt_datalen, GFP_KERNEL,
+                                        &dev->bt_urb->transfer_dma);
+        if (!dev->bt_data)
+                goto err_free_urb;
+
+        dev->tp_data = usb_buffer_alloc(dev->udev,
+                                        dev->cfg.tp_datalen, GFP_KERNEL,
+                                        &dev->tp_urb->transfer_dma);
+        if (!dev->tp_data)
+                goto err_free_bt_buffer;
+
+        usb_fill_int_urb(dev->bt_urb, udev,
+                         usb_rcvintpipe(udev, cfg->bt_ep),
+                         dev->bt_data, dev->cfg.bt_datalen,
+                         bcm5974_irq_button, dev, 1);
+
+        usb_fill_int_urb(dev->tp_urb, udev,
+                         usb_rcvintpipe(udev, cfg->tp_ep),
+                         dev->tp_data, dev->cfg.tp_datalen,
+                         bcm5974_irq_trackpad, dev, 1);
+
+        /* create bcm5974 device */
+        usb_make_path(udev, dev->phys, sizeof(dev->phys));
+        strlcat(dev->phys, "/input0", sizeof(dev->phys));
+
+        input_dev->name = "bcm5974";
+        input_dev->phys = dev->phys;
+        usb_to_input_id(dev->udev, &input_dev->id);
+        input_dev->dev.parent = &iface->dev;
+
+        input_set_drvdata(input_dev, dev);
+
+        input_dev->open = bcm5974_open;
+        input_dev->close = bcm5974_close;
+
+        setup_events_to_report(input_dev, cfg);
+
+        error = input_register_device(dev->input);
+        if (error)
+                goto err_free_buffer;
+
+        /* save our data pointer in this interface device */
+        usb_set_intfdata(iface, dev);
+
+        return 0;
+
+err_free_buffer:
+        usb_buffer_free(dev->udev, dev->cfg.tp_datalen,
+                dev->tp_data, dev->tp_urb->transfer_dma);
+err_free_bt_buffer:
+        usb_buffer_free(dev->udev, dev->cfg.bt_datalen,
+                dev->bt_data, dev->bt_urb->transfer_dma);
+err_free_urb:
+        usb_free_urb(dev->tp_urb);
+err_free_bt_urb:
+        usb_free_urb(dev->bt_urb);
+err_free_devs:
+        usb_set_intfdata(iface, NULL);
+        input_free_device(input_dev);
+        kfree(dev);
+        return error;
+}
+
+static void bcm5974_disconnect(struct usb_interface *iface)
+{
+        struct bcm5974 *dev = usb_get_intfdata(iface);
+
+        usb_set_intfdata(iface, NULL);
+
+        input_unregister_device(dev->input);
+        usb_buffer_free(dev->udev, dev->cfg.tp_datalen,
+                        dev->tp_data, dev->tp_urb->transfer_dma);
+        usb_buffer_free(dev->udev, dev->cfg.bt_datalen,
+                        dev->bt_data, dev->bt_urb->transfer_dma);
+        usb_free_urb(dev->tp_urb);
+        usb_free_urb(dev->bt_urb);
+        kfree(dev);
+}
+
+static struct usb_driver bcm5974_driver = {
+        .name                   = "bcm5974",
+        .probe                  = bcm5974_probe,
+        .disconnect             = bcm5974_disconnect,
+        .suspend                = bcm5974_suspend,
+        .resume                 = bcm5974_resume,
+        .reset_resume           = bcm5974_resume,
+        .id_table               = bcm5974_table,
+        .supports_autosuspend   = 1,
+};
+
+static int __init bcm5974_init(void)
+{
+        return usb_register(&bcm5974_driver);
+}
+
+static void __exit bcm5974_exit(void)
+{
+        usb_deregister(&bcm5974_driver);
+}
+
+module_init(bcm5974_init);
+module_exit(bcm5974_exit);
+
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c
index 339290184871..72cf5e33790e 100644
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/input-polldev.h>
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index fe732a574ec2..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"),
                 },
         },
         {
@@ -394,6 +394,13 @@ static struct dmi_system_id __initdata i8042_dmi_dritek_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"),
                 },
         },
+        {
+                .ident = "Acer TravelMate 4280",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index 0ed044d5e685..765007899d9a 100644
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -269,8 +269,8 @@ static int xps2_setup(struct device *dev, struct resource *regs_res,
          * we have the PS2 in a good state */
         out_be32(drvdata->base_address + XPS2_SRST_OFFSET, XPS2_SRST_RESET);
 
-        dev_info(dev, "Xilinx PS2 at 0x%08X mapped to 0x%08X, irq=%d\n",
-                drvdata->phys_addr, (u32)drvdata->base_address, drvdata->irq);
+        dev_info(dev, "Xilinx PS2 at 0x%08X mapped to 0x%p, irq=%d\n",
+                drvdata->phys_addr, drvdata->base_address, drvdata->irq);
 
         serio = &drvdata->serio;
         serio->id.type = SERIO_8042;
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
index b9b7a98bc5a5..7df0228e836e 100644
--- a/drivers/input/tablet/gtco.c
+++ b/drivers/input/tablet/gtco.c
@@ -64,7 +64,6 @@ Scott Hill shill@gtcocalcomp.com
 #include <asm/byteorder.h>
 
 
-#include <linux/version.h>
 #include <linux/usb/input.h>
 
 /* Version with a Major number of 2 is for kernel inclusion only. */
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 6e60a97a234c..25287e80e236 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -249,29 +249,26 @@ config TOUCHSCREEN_WM97XX
 config TOUCHSCREEN_WM9705
         bool "WM9705 Touchscreen interface support"
         depends on TOUCHSCREEN_WM97XX
+        default y
         help
-          Say Y here if you have a Wolfson Microelectronics WM9705
-          touchscreen controller connected to your system.
-
-          If unsure, say N.
+          Say Y here to enable support for the Wolfson Microelectronics
+          WM9705 touchscreen controller.
 
 config TOUCHSCREEN_WM9712
         bool "WM9712 Touchscreen interface support"
         depends on TOUCHSCREEN_WM97XX
+        default y
         help
-          Say Y here if you have a Wolfson Microelectronics WM9712
-          touchscreen controller connected to your system.
-
-          If unsure, say N.
+          Say Y here to enable support for the Wolfson Microelectronics
+          WM9712 touchscreen controller.
 
 config TOUCHSCREEN_WM9713
         bool "WM9713 Touchscreen interface support"
         depends on TOUCHSCREEN_WM97XX
+        default y
         help
-          Say Y here if you have a Wolfson Microelectronics WM9713 touchscreen
-          controller connected to your system.
-
-          If unsure, say N.
+          Say Y here to enable support for the Wolfson Microelectronics
+          WM9713 touchscreen controller.
 
 config TOUCHSCREEN_WM97XX_MAINSTONE
         tristate "WM97xx Mainstone accelerated touch"
diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c
index bf44f9d68342..c8b7e8a45c4d 100644
--- a/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
@@ -119,8 +119,8 @@ static int __devinit jornada720_ts_probe(struct platform_device *pdev)
         input_dev->id.bustype = BUS_HOST;
         input_dev->dev.parent = &pdev->dev;
 
-        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-        input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
         input_set_abs_params(input_dev, ABS_X, 270, 3900, 0, 0);
         input_set_abs_params(input_dev, ABS_Y, 180, 3700, 0, 0);
 
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index 283f93a0cee2..37a555f37306 100644
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -25,7 +25,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c
index c1cd99d58981..504ca11749a1 100644
--- a/drivers/input/touchscreen/migor_ts.c
+++ b/drivers/input/touchscreen/migor_ts.c
@@ -173,7 +173,7 @@ static int migor_ts_probe(struct i2c_client *client,
         input_set_abs_params(input, ABS_X, 95, 955, 0, 0);
         input_set_abs_params(input, ABS_Y, 85, 935, 0, 0);
 
-        input->name = client->driver_name;
+        input->name = client->name;
         input->id.bustype = BUS_I2C;
         input->dev.parent = &client->dev;
 
@@ -192,7 +192,7 @@ static int migor_ts_probe(struct i2c_client *client,
                 goto err1;
 
         error = request_irq(priv->irq, migor_ts_isr, IRQF_TRIGGER_LOW,
-                            client->driver_name, priv);
+                            client->name, priv);
         if (error) {
                 dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
                 goto err2;
@@ -224,12 +224,19 @@ static int migor_ts_remove(struct i2c_client *client)
         return 0;
 }
 
+static const struct i2c_device_id migor_ts_id[] = {
+        { "migor_ts", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, migor_ts);
+
 static struct i2c_driver migor_ts_driver = {
         .driver = {
                 .name = "migor_ts",
         },
         .probe = migor_ts_probe,
         .remove = migor_ts_remove,
+        .id_table = migor_ts_id,
 };
 
 static int __init migor_ts_init(void)
diff --git a/drivers/input/touchscreen/wm9705.c b/drivers/input/touchscreen/wm9705.c
index 978e1a13ffc7..372efbc694ff 100644
--- a/drivers/input/touchscreen/wm9705.c
+++ b/drivers/input/touchscreen/wm9705.c
@@ -17,7 +17,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/input.h>
 #include <linux/delay.h>
diff --git a/drivers/input/touchscreen/wm9712.c b/drivers/input/touchscreen/wm9712.c
index 4c5d85a249ae..c8bb1e7335fc 100644
--- a/drivers/input/touchscreen/wm9712.c
+++ b/drivers/input/touchscreen/wm9712.c
@@ -17,7 +17,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/input.h>
 #include <linux/delay.h>
diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c
index 838458792ea0..781ee83547e6 100644
--- a/drivers/input/touchscreen/wm9713.c
+++ b/drivers/input/touchscreen/wm9713.c
@@ -17,7 +17,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/input.h>
 #include <linux/delay.h>
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index cdc24ad314e0..d589ab0e3adc 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -37,7 +37,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c
index be0e12144b8b..34935155c1c0 100644
--- a/drivers/leds/leds-fsg.c
+++ b/drivers/leds/leds-fsg.c
@@ -161,6 +161,16 @@ static int fsg_led_probe(struct platform_device *pdev)
 {
         int ret;
 
+        /* Map the LED chip select address space */
+        latch_address = (unsigned short *) ioremap(IXP4XX_EXP_BUS_BASE(2), 512);
+        if (!latch_address) {
+                ret = -ENOMEM;
+                goto failremap;
+        }
+
+        latch_value = 0xffff;
+        *latch_address = latch_value;
+
         ret = led_classdev_register(&pdev->dev, &fsg_wlan_led);
         if (ret < 0)
                 goto failwlan;
@@ -185,20 +195,8 @@ static int fsg_led_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto failring;
 
-        /* Map the LED chip select address space */
-        latch_address = (unsigned short *) ioremap(IXP4XX_EXP_BUS_BASE(2), 512);
-        if (!latch_address) {
-                ret = -ENOMEM;
-                goto failremap;
-        }
-
-        latch_value = 0xffff;
-        *latch_address = latch_value;
-
         return ret;
 
- failremap:
-        led_classdev_unregister(&fsg_ring_led);
  failring:
         led_classdev_unregister(&fsg_sync_led);
  failsync:
@@ -210,14 +208,14 @@ static int fsg_led_probe(struct platform_device *pdev)
  failwan:
         led_classdev_unregister(&fsg_wlan_led);
  failwlan:
+        iounmap(latch_address);
+ failremap:
 
         return ret;
 }
 
 static int fsg_led_remove(struct platform_device *pdev)
 {
-        iounmap(latch_address);
-
         led_classdev_unregister(&fsg_wlan_led);
         led_classdev_unregister(&fsg_wan_led);
         led_classdev_unregister(&fsg_sata_led);
@@ -225,6 +223,8 @@ static int fsg_led_remove(struct platform_device *pdev)
         led_classdev_unregister(&fsg_sync_led);
         led_classdev_unregister(&fsg_ring_led);
 
+        iounmap(latch_address);
+
         return 0;
 }
 
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index 146c06972863..f508729123b5 100644
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
@@ -248,11 +248,10 @@ static int __devinit pca955x_probe(struct i2c_client *client,
                                         const struct i2c_device_id *id)
 {
         struct pca955x_led *pca955x;
-        int i;
-        int err = -ENODEV;
         struct pca955x_chipdef *chip;
         struct i2c_adapter *adapter;
         struct led_platform_data *pdata;
+        int i, err;
 
         chip = &pca955x_chipdefs[id->driver_data];
         adapter = to_i2c_adapter(client->dev.parent);
@@ -282,43 +281,41 @@ static int __devinit pca955x_probe(struct i2c_client *client,
                 }
         }
 
+        pca955x = kzalloc(sizeof(*pca955x) * chip->bits, GFP_KERNEL);
+        if (!pca955x)
+                return -ENOMEM;
+
+        i2c_set_clientdata(client, pca955x);
+
         for (i = 0; i < chip->bits; i++) {
-                pca955x = kzalloc(sizeof(struct pca955x_led), GFP_KERNEL);
-                if (!pca955x) {
-                        err = -ENOMEM;
-                        goto exit;
-                }
+                pca955x[i].chipdef = chip;
+                pca955x[i].client = client;
+                pca955x[i].led_num = i;
 
-                pca955x->chipdef = chip;
-                pca955x->client = client;
-                pca955x->led_num = i;
                 /* Platform data can specify LED names and default triggers */
                 if (pdata) {
                         if (pdata->leds[i].name)
-                                snprintf(pca955x->name, 32, "pca955x:%s",
-                                                        pdata->leds[i].name);
+                                snprintf(pca955x[i].name,
+                                         sizeof(pca955x[i].name), "pca955x:%s",
+                                         pdata->leds[i].name);
                         if (pdata->leds[i].default_trigger)
-                                pca955x->led_cdev.default_trigger =
+                                pca955x[i].led_cdev.default_trigger =
                                         pdata->leds[i].default_trigger;
                 } else {
-                        snprintf(pca955x->name, 32, "pca955x:%d", i);
+                        snprintf(pca955x[i].name, sizeof(pca955x[i].name),
+                                 "pca955x:%d", i);
                 }
-                spin_lock_init(&pca955x->lock);
 
-                pca955x->led_cdev.name = pca955x->name;
-                pca955x->led_cdev.brightness_set =
-                                pca955x_led_set;
+                spin_lock_init(&pca955x[i].lock);
 
-                /*
-                 * Client data is a pointer to the _first_ pca955x_led
-                 * struct
-                 */
-                if (i == 0)
-                        i2c_set_clientdata(client, pca955x);
+                pca955x[i].led_cdev.name = pca955x[i].name;
+                pca955x[i].led_cdev.brightness_set = pca955x_led_set;
 
-                INIT_WORK(&(pca955x->work), pca955x_led_work);
+                INIT_WORK(&pca955x[i].work, pca955x_led_work);
 
-                led_classdev_register(&client->dev, &(pca955x->led_cdev));
+                err = led_classdev_register(&client->dev, &pca955x[i].led_cdev);
+                if (err < 0)
+                        goto exit;
         }
 
         /* Turn off LEDs */
@@ -336,23 +333,32 @@ static int __devinit pca955x_probe(struct i2c_client *client,
         pca955x_write_psc(client, 1, 0);
 
         return 0;
+
 exit:
+        while (i--) {
+                led_classdev_unregister(&pca955x[i].led_cdev);
+                cancel_work_sync(&pca955x[i].work);
+        }
+
+        kfree(pca955x);
+        i2c_set_clientdata(client, NULL);
+
         return err;
 }
 
 static int __devexit pca955x_remove(struct i2c_client *client)
 {
         struct pca955x_led *pca955x = i2c_get_clientdata(client);
-        int leds = pca955x->chipdef->bits;
         int i;
 
-        for (i = 0; i < leds; i++) {
-                led_classdev_unregister(&(pca955x->led_cdev));
-                cancel_work_sync(&(pca955x->work));
-                kfree(pca955x);
-                pca955x = pca955x + 1;
+        for (i = 0; i < pca955x->chipdef->bits; i++) {
+                led_classdev_unregister(&pca955x[i].led_cdev);
+                cancel_work_sync(&pca955x[i].work);
         }
 
+        kfree(pca955x);
+        i2c_set_clientdata(client, NULL);
+
         return 0;
 }
 
diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c
index 37344aaee22f..a661bbdae3d6 100644
--- a/drivers/lguest/lguest_device.c
+++ b/drivers/lguest/lguest_device.c
@@ -98,6 +98,10 @@ static u32 lg_get_features(struct virtio_device *vdev)
         return features;
 }
 
+/* The virtio core takes the features the Host offers, and copies the
+ * ones supported by the driver into the vdev->features array.  Once
+ * that's all sorted out, this routine is called so we can tell the
+ * Host which features we understand and accept. */
 static void lg_finalize_features(struct virtio_device *vdev)
 {
         unsigned int i, bits;
@@ -108,6 +112,10 @@ static void lg_finalize_features(struct virtio_device *vdev)
         /* Give virtio_ring a chance to accept features. */
         vring_transport_features(vdev);
 
+        /* The vdev->feature array is a Linux bitmask: this isn't the
+         * same as a the simple array of bits used by lguest devices
+         * for features.  So we do this slow, manual conversion which is
+         * completely general. */
         memset(out_features, 0, desc->feature_len);
         bits = min_t(unsigned, desc->feature_len, sizeof(vdev->features)) * 8;
         for (i = 0; i < bits; i++) {
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 7e65bad522cb..ac89a5deaca2 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -238,15 +238,47 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde
 
 }
 
+static mdk_rdev_t *next_active_rdev(mdk_rdev_t *rdev, mddev_t *mddev)
+{
+        /* Iterate the disks of an mddev, using rcu to protect access to the
+         * linked list, and raising the refcount of devices we return to ensure
+         * they don't disappear while in use.
+         * As devices are only added or removed when raid_disk is < 0 and
+         * nr_pending is 0 and In_sync is clear, the entries we return will
+         * still be in the same position on the list when we re-enter
+         * list_for_each_continue_rcu.
+         */
+        struct list_head *pos;
+        rcu_read_lock();
+        if (rdev == NULL)
+                /* start at the beginning */
+                pos = &mddev->disks;
+        else {
+                /* release the previous rdev and start from there. */
+                rdev_dec_pending(rdev, mddev);
+                pos = &rdev->same_set;
+        }
+        list_for_each_continue_rcu(pos, &mddev->disks) {
+                rdev = list_entry(pos, mdk_rdev_t, same_set);
+                if (rdev->raid_disk >= 0 &&
+                    test_bit(In_sync, &rdev->flags) &&
+                    !test_bit(Faulty, &rdev->flags)) {
+                        /* this is a usable devices */
+                        atomic_inc(&rdev->nr_pending);
+                        rcu_read_unlock();
+                        return rdev;
+                }
+        }
+        rcu_read_unlock();
+        return NULL;
+}
+
 static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
 {
-        mdk_rdev_t *rdev;
+        mdk_rdev_t *rdev = NULL;
         mddev_t *mddev = bitmap->mddev;
 
-        rcu_read_lock();
-        rdev_for_each_rcu(rdev, mddev)
-                if (test_bit(In_sync, &rdev->flags)
-                    && !test_bit(Faulty, &rdev->flags)) {
+        while ((rdev = next_active_rdev(rdev, mddev)) != NULL) {
                         int size = PAGE_SIZE;
                         if (page->index == bitmap->file_pages-1)
                                 size = roundup(bitmap->last_page_size,
@@ -281,8 +313,7 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
                                        + page->index * (PAGE_SIZE/512),
                                        size,
                                        page);
-                }
-        rcu_read_unlock();
+        }
 
         if (wait)
                 md_super_wait(mddev);
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 71dd65aa31b6..c2fcf28b4c70 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -63,6 +63,7 @@ struct multipath {
 
         const char *hw_handler_name;
         struct work_struct activate_path;
+        struct pgpath *pgpath_to_activate;
         unsigned nr_priority_groups;
         struct list_head priority_groups;
         unsigned pg_init_required;      /* pg_init needs calling? */
@@ -146,6 +147,7 @@ static struct priority_group *alloc_priority_group(void)
 
 static void free_pgpaths(struct list_head *pgpaths, struct dm_target *ti)
 {
+        unsigned long flags;
         struct pgpath *pgpath, *tmp;
         struct multipath *m = ti->private;
 
@@ -154,6 +156,10 @@ static void free_pgpaths(struct list_head *pgpaths, struct dm_target *ti)
                 if (m->hw_handler_name)
                         scsi_dh_detach(bdev_get_queue(pgpath->path.dev->bdev));
                 dm_put_device(ti, pgpath->path.dev);
+                spin_lock_irqsave(&m->lock, flags);
+                if (m->pgpath_to_activate == pgpath)
+                        m->pgpath_to_activate = NULL;
+                spin_unlock_irqrestore(&m->lock, flags);
                 free_pgpath(pgpath);
         }
 }
@@ -421,6 +427,7 @@ static void process_queued_ios(struct work_struct *work)
                 __choose_pgpath(m);
 
         pgpath = m->current_pgpath;
+        m->pgpath_to_activate = m->current_pgpath;
 
         if ((pgpath && !m->queue_io) ||
             (!pgpath && !m->queue_if_no_path))
@@ -1093,8 +1100,15 @@ static void activate_path(struct work_struct *work)
         int ret;
         struct multipath *m =
                 container_of(work, struct multipath, activate_path);
-        struct dm_path *path = &m->current_pgpath->path;
+        struct dm_path *path;
+        unsigned long flags;
 
+        spin_lock_irqsave(&m->lock, flags);
+        path = &m->pgpath_to_activate->path;
+        m->pgpath_to_activate = NULL;
+        spin_unlock_irqrestore(&m->lock, flags);
+        if (!path)
+                return;
         ret = scsi_dh_activate(bdev_get_queue(path->dev->bdev));
         pg_init_done(path, ret);
 }
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index bca448e11878..ace998ce59f6 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -837,12 +837,14 @@ static int dm_merge_bvec(struct request_queue *q,
         struct dm_table *map = dm_get_table(md);
         struct dm_target *ti;
         sector_t max_sectors;
-        int max_size;
+        int max_size = 0;
 
         if (unlikely(!map))
-                return 0;
+                goto out;
 
         ti = dm_table_find_target(map, bvm->bi_sector);
+        if (!dm_target_is_valid(ti))
+                goto out_table;
 
         /*
          * Find maximum amount of I/O that won't need splitting
@@ -861,14 +863,16 @@ static int dm_merge_bvec(struct request_queue *q,
         if (max_size && ti->type->merge)
                 max_size = ti->type->merge(ti, bvm, biovec, max_size);
 
+out_table:
+        dm_table_put(map);
+
+out:
         /*
          * Always allow an entire first page
          */
         if (max_size <= biovec->bv_len && !(bvm->bi_size >> SECTOR_SHIFT))
                 max_size = biovec->bv_len;
 
-        dm_table_put(map);
-
         return max_size;
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index c7aae66c6f9b..deeac4b44173 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2393,6 +2393,8 @@ static void analyze_sbs(mddev_t * mddev)
 
 }
 
+static void md_safemode_timeout(unsigned long data);
+
 static ssize_t
 safe_delay_show(mddev_t *mddev, char *page)
 {
@@ -2432,9 +2434,12 @@ safe_delay_store(mddev_t *mddev, const char *cbuf, size_t len)
         if (msec == 0)
                 mddev->safemode_delay = 0;
         else {
+                unsigned long old_delay = mddev->safemode_delay;
                 mddev->safemode_delay = (msec*HZ)/1000;
                 if (mddev->safemode_delay == 0)
                         mddev->safemode_delay = 1;
+                if (mddev->safemode_delay < old_delay)
+                        md_safemode_timeout((unsigned long)mddev);
         }
         return len;
 }
@@ -3836,8 +3841,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
 
                 del_timer_sync(&mddev->safemode_timer);
 
-                invalidate_partition(disk, 0);
-
                 switch(mode) {
                 case 1: /* readonly */
                         err  = -ENXIO;
@@ -4634,6 +4637,11 @@ static int update_size(mddev_t *mddev, sector_t num_sectors)
          */
         if (mddev->sync_thread)
                 return -EBUSY;
+        if (mddev->bitmap)
+                /* Sorry, cannot grow a bitmap yet, just remove it,
+                 * grow, and re-add.
+                 */
+                return -EBUSY;
         rdev_for_each(rdev, tmp, mddev) {
                 sector_t avail;
                 avail = rdev->size * 2;
@@ -5753,7 +5761,11 @@ void md_do_sync(mddev_t *mddev)
                                          * time 'round when curr_resync == 2
                                          */
                                         continue;
-                                prepare_to_wait(&resync_wait, &wq, TASK_UNINTERRUPTIBLE);
+                                /* We need to wait 'interruptible' so as not to
+                                 * contribute to the load average, and not to
+                                 * be caught by 'softlockup'
+                                 */
+                                prepare_to_wait(&resync_wait, &wq, TASK_INTERRUPTIBLE);
                                 if (!kthread_should_stop() &&
                                     mddev2->curr_resync >= mddev->curr_resync) {
                                         printk(KERN_INFO "md: delaying %s of %s"
@@ -5761,6 +5773,8 @@ void md_do_sync(mddev_t *mddev)
                                                " share one or more physical units)\n",
                                                desc, mdname(mddev), mdname(mddev2));
                                         mddev_put(mddev2);
+                                        if (signal_pending(current))
+                                                flush_signals(current);
                                         schedule();
                                         finish_wait(&resync_wait, &wq);
                                         goto try_again;
@@ -5993,7 +6007,7 @@ static int remove_and_add_spares(mddev_t *mddev)
                         }
                 }
 
-        if (mddev->degraded) {
+        if (mddev->degraded && ! mddev->ro) {
                 rdev_for_each(rdev, rtmp, mddev) {
                         if (rdev->raid_disk >= 0 &&
                             !test_bit(In_sync, &rdev->flags) &&
@@ -6067,6 +6081,8 @@ void md_check_recovery(mddev_t *mddev)
                 flush_signals(current);
         }
 
+        if (mddev->ro && !test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))
+                return;
         if ( ! (
                 (mddev->flags && !mddev->external) ||
                 test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) ||
@@ -6080,6 +6096,15 @@ void md_check_recovery(mddev_t *mddev)
         if (mddev_trylock(mddev)) {
                 int spares = 0;
 
+                if (mddev->ro) {
+                        /* Only thing we do on a ro array is remove
+                         * failed devices.
+                         */
+                        remove_and_add_spares(mddev);
+                        clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
+                        goto unlock;
+                }
+
                 if (!mddev->external) {
                         int did_change = 0;
                         spin_lock_irq(&mddev->write_lock);
@@ -6117,7 +6142,8 @@ void md_check_recovery(mddev_t *mddev)
                         /* resync has finished, collect result */
                         md_unregister_thread(mddev->sync_thread);
                         mddev->sync_thread = NULL;
-                        if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
+                        if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery) &&
+                            !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) {
                                 /* success...*/
                                 /* activate any spares */
                                 if (mddev->pers->spare_active(mddev))
@@ -6169,6 +6195,7 @@ void md_check_recovery(mddev_t *mddev)
                 } else if ((spares = remove_and_add_spares(mddev))) {
                         clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
                         clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
+                        clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);
                         set_bit(MD_RECOVERY_RECOVER, &mddev->recovery);
                 } else if (mddev->recovery_cp < MaxSector) {
                         set_bit(MD_RECOVERY_SYNC, &mddev->recovery);
@@ -6232,7 +6259,11 @@ static int md_notify_reboot(struct notifier_block *this,
 
                 for_each_mddev(mddev, tmp)
                         if (mddev_trylock(mddev)) {
-                                do_md_stop (mddev, 1, 0);
+                                /* Force a switch to readonly even array
+                                 * appears to still be in use.  Hence
+                                 * the '100'.
+                                 */
+                                do_md_stop (mddev, 1, 100);
                                 mddev_unlock(mddev);
                         }
                 /*
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index d41bebb6da0f..e34cd0e62473 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -76,11 +76,13 @@ static void r10bio_pool_free(void *r10_bio, void *data)
         kfree(r10_bio);
 }
 
+/* Maximum size of each resync request */
 #define RESYNC_BLOCK_SIZE (64*1024)
-//#define RESYNC_BLOCK_SIZE PAGE_SIZE
-#define RESYNC_SECTORS (RESYNC_BLOCK_SIZE >> 9)
 #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE)
-#define RESYNC_WINDOW (2048*1024)
+/* amount of memory to reserve for resync requests */
+#define RESYNC_WINDOW (1024*1024)
+/* maximum number of concurrent requests, memory permitting */
+#define RESYNC_DEPTH (32*1024*1024/RESYNC_BLOCK_SIZE)
 
 /*
  * When performing a resync, we need to read and compare, so
@@ -690,7 +692,6 @@ static int flush_pending_writes(conf_t *conf)
  *    there is no normal IO happeing.  It must arrange to call
  *    lower_barrier when the particular background IO completes.
  */
-#define RESYNC_DEPTH 32
 
 static void raise_barrier(conf_t *conf, int force)
 {
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 40e939675657..224de022e7c5 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -2568,10 +2568,10 @@ static bool handle_stripe5(struct stripe_head *sh)
                 if (dev->written)
                         s.written++;
                 rdev = rcu_dereference(conf->disks[i].rdev);
-                if (rdev && unlikely(test_bit(Blocked, &rdev->flags))) {
+                if (blocked_rdev == NULL &&
+                    rdev && unlikely(test_bit(Blocked, &rdev->flags))) {
                         blocked_rdev = rdev;
                         atomic_inc(&rdev->nr_pending);
-                        break;
                 }
                 if (!rdev || !test_bit(In_sync, &rdev->flags)) {
                         /* The ReadError flag will just be confusing now */
@@ -2588,8 +2588,14 @@ static bool handle_stripe5(struct stripe_head *sh)
         rcu_read_unlock();
 
         if (unlikely(blocked_rdev)) {
-                set_bit(STRIPE_HANDLE, &sh->state);
-                goto unlock;
+                if (s.syncing || s.expanding || s.expanded ||
+                    s.to_write || s.written) {
+                        set_bit(STRIPE_HANDLE, &sh->state);
+                        goto unlock;
+                }
+                /* There is nothing for the blocked_rdev to block */
+                rdev_dec_pending(blocked_rdev, conf->mddev);
+                blocked_rdev = NULL;
         }
 
         if (s.to_fill && !test_bit(STRIPE_BIOFILL_RUN, &sh->state)) {
@@ -2832,10 +2838,10 @@ static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page)
                 if (dev->written)
                         s.written++;
                 rdev = rcu_dereference(conf->disks[i].rdev);
-                if (rdev && unlikely(test_bit(Blocked, &rdev->flags))) {
+                if (blocked_rdev == NULL &&
+                    rdev && unlikely(test_bit(Blocked, &rdev->flags))) {
                         blocked_rdev = rdev;
                         atomic_inc(&rdev->nr_pending);
-                        break;
                 }
                 if (!rdev || !test_bit(In_sync, &rdev->flags)) {
                         /* The ReadError flag will just be confusing now */
@@ -2853,9 +2859,16 @@ static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page)
         rcu_read_unlock();
 
         if (unlikely(blocked_rdev)) {
-                set_bit(STRIPE_HANDLE, &sh->state);
-                goto unlock;
+                if (s.syncing || s.expanding || s.expanded ||
+                    s.to_write || s.written) {
+                        set_bit(STRIPE_HANDLE, &sh->state);
+                        goto unlock;
+                }
+                /* There is nothing for the blocked_rdev to block */
+                rdev_dec_pending(blocked_rdev, conf->mddev);
+                blocked_rdev = NULL;
         }
+
         pr_debug("locked=%d uptodate=%d to_read=%d"
                " to_write=%d failed=%d failed_num=%d,%d\n",
                s.locked, s.uptodate, s.to_read, s.to_write, s.failed,
@@ -4446,6 +4459,9 @@ static int raid5_check_reshape(mddev_t *mddev)
                 return -EINVAL; /* Cannot shrink array or change level yet */
         if (mddev->delta_disks == 0)
                 return 0; /* nothing to do */
+        if (mddev->bitmap)
+                /* Cannot grow a bitmap yet */
+                return -EBUSY;
 
         /* Can only proceed if there are plenty of stripe_heads.
          * We need a minimum of one full stripe,, and for sensible progress
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/Kconfig b/drivers/media/video/Kconfig
index ecbfa1b39b70..3e9e0dcd217e 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -968,7 +968,7 @@ config VIDEO_PXA27x
 
 config VIDEO_SH_MOBILE_CEU
         tristate "SuperH Mobile CEU Interface driver"
-        depends on VIDEO_DEV
+        depends on VIDEO_DEV && HAS_DMA
         select SOC_CAMERA
         select VIDEOBUF_DMA_CONTIG
         ---help---
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/dabusb.c b/drivers/media/video/dabusb.c
index 48f4b92a8f8b..79faedf58521 100644
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -403,6 +403,7 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname)
         ret = request_firmware(&fw, "dabusb/bitstream.bin", &s->usbdev->dev);
         if (ret) {
                 err("Failed to load \"dabusb/bitstream.bin\": %d\n", ret);
+                kfree(b);
                 return ret;
         }
 
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/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index a38005008a20..cea46906408e 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -185,7 +185,7 @@ static void memstick_free(struct device *dev)
 }
 
 static struct class memstick_host_class = {
-        .name       = "memstick_host",
+        .name        = "memstick_host",
         .dev_release = memstick_free
 };
 
@@ -264,7 +264,7 @@ EXPORT_SYMBOL(memstick_new_req);
  * @sg - TPC argument
  */
 void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc,
-                          struct scatterlist *sg)
+                          const struct scatterlist *sg)
 {
         mrq->tpc = tpc;
         if (tpc & 8)
@@ -294,7 +294,7 @@ EXPORT_SYMBOL(memstick_init_req_sg);
  * user supplied buffer.
  */
 void memstick_init_req(struct memstick_request *mrq, unsigned char tpc,
-                       void *buf, size_t length)
+                       const void *buf, size_t length)
 {
         mrq->tpc = tpc;
         if (tpc & 8)
@@ -439,7 +439,7 @@ static void memstick_check(struct work_struct *work)
         if (!host->card) {
                 if (memstick_power_on(host))
                         goto out_power_off;
-        } else
+        } else if (host->card->stop)
                 host->card->stop(host->card);
 
         card = memstick_alloc_card(host);
@@ -458,7 +458,7 @@ static void memstick_check(struct work_struct *work)
                             || !(host->card->check(host->card))) {
                                 device_unregister(&host->card->dev);
                                 host->card = NULL;
-                        } else
+                        } else if (host->card->start)
                                 host->card->start(host->card);
                 }
 
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 44b1817f2f2f..d2d2318dafa4 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -30,6 +30,8 @@ module_param(major, int, 0644);
 #define MSPRO_BLOCK_SIGNATURE        0xa5c3
 #define MSPRO_BLOCK_MAX_ATTRIBUTES   41
 
+#define MSPRO_BLOCK_PART_SHIFT 3
+
 enum {
         MSPRO_BLOCK_ID_SYSINFO         = 0x10,
         MSPRO_BLOCK_ID_MODELNAME       = 0x15,
@@ -195,7 +197,7 @@ static int mspro_block_bd_open(struct inode *inode, struct file *filp)
 static int mspro_block_disk_release(struct gendisk *disk)
 {
         struct mspro_block_data *msb = disk->private_data;
-        int disk_id = disk->first_minor >> MEMSTICK_PART_SHIFT;
+        int disk_id = disk->first_minor >> MSPRO_BLOCK_PART_SHIFT;
 
         mutex_lock(&mspro_block_disk_lock);
 
@@ -877,6 +879,7 @@ static int mspro_block_switch_interface(struct memstick_dev *card)
         struct mspro_block_data *msb = memstick_get_drvdata(card);
         int rc = 0;
 
+try_again:
         if (msb->caps & MEMSTICK_CAP_PAR4)
                 rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR4);
         else
@@ -930,6 +933,18 @@ static int mspro_block_switch_interface(struct memstick_dev *card)
                 rc = memstick_set_rw_addr(card);
                 if (!rc)
                         rc = mspro_block_set_interface(card, msb->system);
+
+                if (!rc) {
+                        msleep(150);
+                        rc = mspro_block_wait_for_ced(card);
+                        if (rc)
+                                return rc;
+
+                        if (msb->caps & MEMSTICK_CAP_PAR8) {
+                                msb->caps &= ~MEMSTICK_CAP_PAR8;
+                                goto try_again;
+                        }
+                }
         }
         return rc;
 }
@@ -1117,14 +1132,16 @@ static int mspro_block_init_card(struct memstick_dev *card)
                 return -EIO;
 
         msb->caps = host->caps;
-        rc = mspro_block_switch_interface(card);
+
+        msleep(150);
+        rc = mspro_block_wait_for_ced(card);
         if (rc)
                 return rc;
 
-        msleep(200);
-        rc = mspro_block_wait_for_ced(card);
+        rc = mspro_block_switch_interface(card);
         if (rc)
                 return rc;
+
         dev_dbg(&card->dev, "card activated\n");
         if (msb->system != MEMSTICK_SYS_SERIAL)
                 msb->caps |= MEMSTICK_CAP_AUTO_GET_INT;
@@ -1192,12 +1209,12 @@ static int mspro_block_init_disk(struct memstick_dev *card)
         if (rc)
                 return rc;
 
-        if ((disk_id << MEMSTICK_PART_SHIFT) > 255) {
+        if ((disk_id << MSPRO_BLOCK_PART_SHIFT) > 255) {
                 rc = -ENOSPC;
                 goto out_release_id;
         }
 
-        msb->disk = alloc_disk(1 << MEMSTICK_PART_SHIFT);
+        msb->disk = alloc_disk(1 << MSPRO_BLOCK_PART_SHIFT);
         if (!msb->disk) {
                 rc = -ENOMEM;
                 goto out_release_id;
@@ -1220,7 +1237,7 @@ static int mspro_block_init_disk(struct memstick_dev *card)
                                    MSPRO_BLOCK_MAX_PAGES * msb->page_size);
 
         msb->disk->major = major;
-        msb->disk->first_minor = disk_id << MEMSTICK_PART_SHIFT;
+        msb->disk->first_minor = disk_id << MSPRO_BLOCK_PART_SHIFT;
         msb->disk->fops = &ms_block_bdops;
         msb->usage_count = 1;
         msb->disk->private_data = msb;
@@ -1416,7 +1433,7 @@ out_unlock:
 
 static struct memstick_device_id mspro_block_id_tbl[] = {
         {MEMSTICK_MATCH_ALL, MEMSTICK_TYPE_PRO, MEMSTICK_CATEGORY_STORAGE_DUO,
-         MEMSTICK_CLASS_GENERIC_DUO},
+         MEMSTICK_CLASS_DUO},
         {}
 };
 
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index 3485c63d20b0..2fb95a5b72eb 100644
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -81,6 +81,8 @@ struct jmb38x_ms {
 #define TPC_CODE_SZ_MASK       0x00000700
 #define TPC_DATA_SZ_MASK       0x00000007
 
+#define HOST_CONTROL_TDELAY_EN 0x00040000
+#define HOST_CONTROL_HW_OC_P   0x00010000
 #define HOST_CONTROL_RESET_REQ 0x00008000
 #define HOST_CONTROL_REI       0x00004000
 #define HOST_CONTROL_LED       0x00000400
@@ -88,6 +90,7 @@ struct jmb38x_ms {
 #define HOST_CONTROL_RESET     0x00000100
 #define HOST_CONTROL_POWER_EN  0x00000080
 #define HOST_CONTROL_CLOCK_EN  0x00000040
+#define HOST_CONTROL_REO       0x00000008
 #define HOST_CONTROL_IF_SHIFT  4
 
 #define HOST_CONTROL_IF_SERIAL 0x0
@@ -133,11 +136,15 @@ struct jmb38x_ms {
 #define PAD_PU_PD_ON_MS_SOCK1 0x0f0f0000
 
 #define CLOCK_CONTROL_40MHZ   0x00000001
-#define CLOCK_CONTROL_50MHZ   0x00000002
+#define CLOCK_CONTROL_50MHZ   0x0000000a
 #define CLOCK_CONTROL_60MHZ   0x00000008
 #define CLOCK_CONTROL_62_5MHZ 0x0000000c
 #define CLOCK_CONTROL_OFF     0x00000000
 
+#define PCI_CTL_CLOCK_DLY_ADDR   0x000000b0
+#define PCI_CTL_CLOCK_DLY_MASK_A 0x00000f00
+#define PCI_CTL_CLOCK_DLY_MASK_B 0x0000f000
+
 enum {
         CMD_READY    = 0x01,
         FIFO_READY   = 0x02,
@@ -367,8 +374,7 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)
                 return host->req->error;
         }
 
-        dev_dbg(&msh->dev, "control %08x\n",
-                readl(host->addr + HOST_CONTROL));
+        dev_dbg(&msh->dev, "control %08x\n", readl(host->addr + HOST_CONTROL));
         dev_dbg(&msh->dev, "status %08x\n", readl(host->addr + INT_STATUS));
         dev_dbg(&msh->dev, "hstatus %08x\n", readl(host->addr + STATUS));
 
@@ -637,7 +643,7 @@ static int jmb38x_ms_reset(struct jmb38x_ms_host *host)
                 ndelay(20);
         }
         dev_dbg(&host->chip->pdev->dev, "reset_req timeout\n");
-        return -EIO;
+        /* return -EIO; */
 
 reset_next:
         writel(HOST_CONTROL_RESET | HOST_CONTROL_CLOCK_EN
@@ -680,7 +686,9 @@ static int jmb38x_ms_set_param(struct memstick_host *msh,
 
                         host_ctl = 7;
                         host_ctl |= HOST_CONTROL_POWER_EN
-                                 | HOST_CONTROL_CLOCK_EN;
+                                    | HOST_CONTROL_CLOCK_EN
+                                    | HOST_CONTROL_HW_OC_P
+                                    | HOST_CONTROL_TDELAY_EN;
                         writel(host_ctl, host->addr + HOST_CONTROL);
 
                         writel(host->id ? PAD_PU_PD_ON_MS_SOCK1
@@ -704,33 +712,40 @@ static int jmb38x_ms_set_param(struct memstick_host *msh,
                 break;
         case MEMSTICK_INTERFACE:
                 host_ctl &= ~(3 << HOST_CONTROL_IF_SHIFT);
+                pci_read_config_dword(host->chip->pdev,
+                                      PCI_CTL_CLOCK_DLY_ADDR,
+                                      &clock_delay);
+                clock_delay &= host->id ? ~PCI_CTL_CLOCK_DLY_MASK_B
+                                        : ~PCI_CTL_CLOCK_DLY_MASK_A;
 
                 if (value == MEMSTICK_SERIAL) {
                         host_ctl &= ~HOST_CONTROL_FAST_CLK;
+                        host_ctl &= ~HOST_CONTROL_REO;
                         host_ctl |= HOST_CONTROL_IF_SERIAL
                                     << HOST_CONTROL_IF_SHIFT;
                         host_ctl |= HOST_CONTROL_REI;
                         clock_ctl = CLOCK_CONTROL_40MHZ;
-                        clock_delay = 0;
                 } else if (value == MEMSTICK_PAR4) {
-                        host_ctl |= HOST_CONTROL_FAST_CLK;
+                        host_ctl |= HOST_CONTROL_FAST_CLK | HOST_CONTROL_REO;
                         host_ctl |= HOST_CONTROL_IF_PAR4
                                     << HOST_CONTROL_IF_SHIFT;
                         host_ctl &= ~HOST_CONTROL_REI;
                         clock_ctl = CLOCK_CONTROL_40MHZ;
-                        clock_delay = 4;
+                        clock_delay |= host->id ? (4 << 12) : (4 << 8);
                 } else if (value == MEMSTICK_PAR8) {
                         host_ctl |= HOST_CONTROL_FAST_CLK;
                         host_ctl |= HOST_CONTROL_IF_PAR8
                                     << HOST_CONTROL_IF_SHIFT;
-                        host_ctl &= ~HOST_CONTROL_REI;
-                        clock_ctl = CLOCK_CONTROL_60MHZ;
-                        clock_delay = 0;
+                        host_ctl &= ~(HOST_CONTROL_REI | HOST_CONTROL_REO);
+                        clock_ctl = CLOCK_CONTROL_50MHZ;
                 } else
                         return -EINVAL;
+
                 writel(host_ctl, host->addr + HOST_CONTROL);
                 writel(clock_ctl, host->addr + CLOCK_CONTROL);
-                writel(clock_delay, host->addr + CLOCK_DELAY);
+                pci_write_config_dword(host->chip->pdev,
+                                       PCI_CTL_CLOCK_DLY_ADDR,
+                                       clock_delay);
                 break;
         };
         return 0;
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 10c44d3fe01a..68dc8d9eb24e 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -21,7 +21,7 @@ config MFD_SM501
 
 config MFD_SM501_GPIO
         bool "Export GPIO via GPIO layer"
-        depends on MFD_SM501 && HAVE_GPIO_LIB
+        depends on MFD_SM501 && GPIOLIB
          ---help---
          This option uses the gpio library layer to export the 64 GPIO
          lines on the SM501. The platform data is used to supply the
@@ -29,7 +29,7 @@ config MFD_SM501_GPIO
 
 config MFD_ASIC3
         bool "Support for Compaq ASIC3"
-        depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM
+        depends on GENERIC_HARDIRQS && GPIOLIB && ARM
          ---help---
           This driver supports the ASIC3 multifunction chip found on many
           PDAs (mainly iPAQ and HTC based ones)
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index c6408a62d95e..ba5aa2008273 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -16,7 +16,6 @@
  *
  */
 
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
@@ -313,7 +312,6 @@ static int __init asic3_irq_probe(struct platform_device *pdev)
         struct asic3 *asic = platform_get_drvdata(pdev);
         unsigned long clksel = 0;
         unsigned int irq, irq_base;
-        int map_size;
         int ret;
 
         ret = platform_get_irq(pdev, 0);
@@ -535,6 +533,7 @@ static int __init asic3_probe(struct platform_device *pdev)
         struct asic3 *asic;
         struct resource *mem;
         unsigned long clksel;
+        int map_size;
         int ret = 0;
 
         asic = kzalloc(sizeof(struct asic3), GFP_KERNEL);
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index e7a3fe508dff..d8b0d326e452 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -192,6 +192,9 @@ static struct quirk_entry *quirks;
 
 static void set_quirks(void)
 {
+        if (!interface)
+                return;
+
         if (quirks->mailled)
                 interface->capability |= ACER_CAP_MAILLED;
 
@@ -803,11 +806,30 @@ static acpi_status get_u32(u32 *value, u32 cap)
 
 static acpi_status set_u32(u32 value, u32 cap)
 {
+        acpi_status status;
+
         if (interface->capability & cap) {
                 switch (interface->type) {
                 case ACER_AMW0:
                         return AMW0_set_u32(value, cap, interface);
                 case ACER_AMW0_V2:
+                        if (cap == ACER_CAP_MAILLED)
+                                return AMW0_set_u32(value, cap, interface);
+
+                        /*
+                         * On some models, some WMID methods don't toggle
+                         * properly. For those cases, we want to run the AMW0
+                         * method afterwards to be certain we've really toggled
+                         * the device state.
+                         */
+                        if (cap == ACER_CAP_WIRELESS ||
+                                cap == ACER_CAP_BLUETOOTH) {
+                                status = WMID_set_u32(value, cap, interface);
+                                if (ACPI_FAILURE(status))
+                                        return status;
+
+                                return AMW0_set_u32(value, cap, interface);
+                        }
                 case ACER_WMID:
                         return WMID_set_u32(value, cap, interface);
                 default:
@@ -1167,7 +1189,7 @@ static int create_debugfs(void)
         return 0;
 
 error_debugfs:
-                remove_debugfs();
+        remove_debugfs();
         return -ENOMEM;
 }
 
@@ -1218,6 +1240,8 @@ static int __init acer_wmi_init(void)
                 return -ENODEV;
         }
 
+        set_quirks();
+
         if (platform_driver_register(&acer_platform_driver)) {
                 printk(ACER_ERR "Unable to register platform driver.\n");
                 goto error_platform_register;
@@ -1248,6 +1272,7 @@ error_platform_register:
 static void __exit acer_wmi_exit(void)
 {
         remove_sysfs(acer_platform_device);
+        remove_debugfs();
         platform_device_del(acer_platform_device);
         platform_driver_unregister(&acer_platform_driver);
 
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c
index 9e8d79e7e9f4..facdb9893c84 100644
--- a/drivers/misc/eeepc-laptop.c
+++ b/drivers/misc/eeepc-laptop.c
@@ -553,9 +553,9 @@ static void eeepc_hwmon_exit(void)
         hwmon = eeepc_hwmon_device;
         if (!hwmon)
                 return ;
-        hwmon_device_unregister(hwmon);
         sysfs_remove_group(&hwmon->kobj,
                            &hwmon_attribute_group);
+        hwmon_device_unregister(hwmon);
         eeepc_hwmon_device = NULL;
 }
 
diff --git a/drivers/misc/eeprom_93cx6.c b/drivers/misc/eeprom_93cx6.c
index ea55654e5948..15b1780025c8 100644
--- a/drivers/misc/eeprom_93cx6.c
+++ b/drivers/misc/eeprom_93cx6.c
@@ -26,7 +26,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/eeprom_93cx6.h>
 
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/hp-wmi.c b/drivers/misc/hp-wmi.c
index 1dbcbcb323a2..6d407c2a4f91 100644
--- a/drivers/misc/hp-wmi.c
+++ b/drivers/misc/hp-wmi.c
@@ -49,6 +49,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4");
 #define HPWMI_ALS_QUERY 0x3
 #define HPWMI_DOCK_QUERY 0x4
 #define HPWMI_WIRELESS_QUERY 0x5
+#define HPWMI_HOTKEY_QUERY 0xc
 
 static int __init hp_wmi_bios_setup(struct platform_device *device);
 static int __exit hp_wmi_bios_remove(struct platform_device *device);
@@ -69,7 +70,7 @@ struct bios_return {
 
 struct key_entry {
         char type;              /* See KE_* below */
-        u8 code;
+        u16 code;
         u16 keycode;
 };
 
@@ -79,7 +80,9 @@ static struct key_entry hp_wmi_keymap[] = {
         {KE_SW, 0x01, SW_DOCK},
         {KE_KEY, 0x02, KEY_BRIGHTNESSUP},
         {KE_KEY, 0x03, KEY_BRIGHTNESSDOWN},
-        {KE_KEY, 0x04, KEY_HELP},
+        {KE_KEY, 0x20e6, KEY_PROG1},
+        {KE_KEY, 0x2142, KEY_MEDIA},
+        {KE_KEY, 0x231b, KEY_HELP},
         {KE_END, 0}
 };
 
@@ -177,9 +180,9 @@ static int hp_wmi_wifi_state(void)
         int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
 
         if (wireless & 0x100)
-                return 1;
+                return RFKILL_STATE_UNBLOCKED;
         else
-                return 0;
+                return RFKILL_STATE_SOFT_BLOCKED;
 }
 
 static int hp_wmi_bluetooth_state(void)
@@ -187,9 +190,9 @@ static int hp_wmi_bluetooth_state(void)
         int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
 
         if (wireless & 0x10000)
-                return 1;
+                return RFKILL_STATE_UNBLOCKED;
         else
-                return 0;
+                return RFKILL_STATE_SOFT_BLOCKED;
 }
 
 static int hp_wmi_wwan_state(void)
@@ -197,9 +200,9 @@ static int hp_wmi_wwan_state(void)
         int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
 
         if (wireless & 0x1000000)
-                return 1;
+                return RFKILL_STATE_UNBLOCKED;
         else
-                return 0;
+                return RFKILL_STATE_SOFT_BLOCKED;
 }
 
 static ssize_t show_display(struct device *dev, struct device_attribute *attr,
@@ -318,6 +321,9 @@ void hp_wmi_notify(u32 value, void *context)
 
         if (obj && obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 8) {
                 int eventcode = *((u8 *) obj->buffer.pointer);
+                if (eventcode == 0x4)
+                        eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0,
+                                                         0);
                 key = hp_wmi_get_entry_by_scancode(eventcode);
                 if (key) {
                         switch (key->type) {
@@ -338,12 +344,14 @@ void hp_wmi_notify(u32 value, void *context)
                         }
                 } else if (eventcode == 0x5) {
                         if (wifi_rfkill)
-                                wifi_rfkill->state = hp_wmi_wifi_state();
+                                rfkill_force_state(wifi_rfkill,
+                                                   hp_wmi_wifi_state());
                         if (bluetooth_rfkill)
-                                bluetooth_rfkill->state =
-                                    hp_wmi_bluetooth_state();
+                                rfkill_force_state(bluetooth_rfkill,
+                                                   hp_wmi_bluetooth_state());
                         if (wwan_rfkill)
-                                wwan_rfkill->state = hp_wmi_wwan_state();
+                                rfkill_force_state(wwan_rfkill,
+                                                   hp_wmi_wwan_state());
                 } else
                         printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
                                eventcode);
@@ -398,6 +406,7 @@ static void cleanup_sysfs(struct platform_device *device)
 static int __init hp_wmi_bios_setup(struct platform_device *device)
 {
         int err;
+        int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
 
         err = device_create_file(&device->dev, &dev_attr_display);
         if (err)
@@ -412,28 +421,33 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
         if (err)
                 goto add_sysfs_error;
 
-        wifi_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WLAN);
-        wifi_rfkill->name = "hp-wifi";
-        wifi_rfkill->state = hp_wmi_wifi_state();
-        wifi_rfkill->toggle_radio = hp_wmi_wifi_set;
-        wifi_rfkill->user_claim_unsupported = 1;
-
-        bluetooth_rfkill = rfkill_allocate(&device->dev,
-                                           RFKILL_TYPE_BLUETOOTH);
-        bluetooth_rfkill->name = "hp-bluetooth";
-        bluetooth_rfkill->state = hp_wmi_bluetooth_state();
-        bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set;
-        bluetooth_rfkill->user_claim_unsupported = 1;
-
-        wwan_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WIMAX);
-        wwan_rfkill->name = "hp-wwan";
-        wwan_rfkill->state = hp_wmi_wwan_state();
-        wwan_rfkill->toggle_radio = hp_wmi_wwan_set;
-        wwan_rfkill->user_claim_unsupported = 1;
-
-        rfkill_register(wifi_rfkill);
-        rfkill_register(bluetooth_rfkill);
-        rfkill_register(wwan_rfkill);
+        if (wireless & 0x1) {
+                wifi_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WLAN);
+                wifi_rfkill->name = "hp-wifi";
+                wifi_rfkill->state = hp_wmi_wifi_state();
+                wifi_rfkill->toggle_radio = hp_wmi_wifi_set;
+                wifi_rfkill->user_claim_unsupported = 1;
+                rfkill_register(wifi_rfkill);
+        }
+
+        if (wireless & 0x2) {
+                bluetooth_rfkill = rfkill_allocate(&device->dev,
+                                                   RFKILL_TYPE_BLUETOOTH);
+                bluetooth_rfkill->name = "hp-bluetooth";
+                bluetooth_rfkill->state = hp_wmi_bluetooth_state();
+                bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set;
+                bluetooth_rfkill->user_claim_unsupported = 1;
+                rfkill_register(bluetooth_rfkill);
+        }
+
+        if (wireless & 0x4) {
+                wwan_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WWAN);
+                wwan_rfkill->name = "hp-wwan";
+                wwan_rfkill->state = hp_wmi_wwan_state();
+                wwan_rfkill->toggle_radio = hp_wmi_wwan_set;
+                wwan_rfkill->user_claim_unsupported = 1;
+                rfkill_register(wwan_rfkill);
+        }
 
         return 0;
 add_sysfs_error:
@@ -445,9 +459,12 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device)
 {
         cleanup_sysfs(device);
 
-        rfkill_unregister(wifi_rfkill);
-        rfkill_unregister(bluetooth_rfkill);
-        rfkill_unregister(wwan_rfkill);
+        if (wifi_rfkill)
+                rfkill_unregister(wifi_rfkill);
+        if (bluetooth_rfkill)
+                rfkill_unregister(bluetooth_rfkill);
+        if (wwan_rfkill)
+                rfkill_unregister(wwan_rfkill);
 
         return 0;
 }
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 23c91f5f6b61..d61cee796efd 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -445,6 +445,9 @@ static void __exit gru_exit(void)
         int order = get_order(sizeof(struct gru_state) *
                               GRU_CHIPLETS_PER_BLADE);
 
+        if (!IS_UV())
+                return;
+
         for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++)
                 free_irq(IRQ_GRU + i, NULL);
 
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..ebc8b9d77613 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;
@@ -613,14 +615,19 @@ static struct mmc_driver mmc_driver = {
 
 static int __init mmc_blk_init(void)
 {
-        int res = -ENOMEM;
+        int res;
 
         res = register_blkdev(MMC_BLOCK_MAJOR, "mmc");
         if (res)
                 goto out;
 
-        return mmc_register_driver(&mmc_driver);
+        res = mmc_register_driver(&mmc_driver);
+        if (res)
+                goto out2;
 
+        return 0;
+ out2:
+        unregister_blkdev(MMC_BLOCK_MAJOR, "mmc");
  out:
         return res;
 }
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index f26b01d811ae..b92b172074ee 100644
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -1040,7 +1040,7 @@ static const struct mmc_test_case mmc_test_cases[] = {
 
 };
 
-static struct mutex mmc_test_lock;
+static DEFINE_MUTEX(mmc_test_lock);
 
 static void mmc_test_run(struct mmc_test_card *test, int testcase)
 {
@@ -1171,8 +1171,6 @@ static int mmc_test_probe(struct mmc_card *card)
         if ((card->type != MMC_TYPE_MMC) && (card->type != MMC_TYPE_SD))
                 return -ENODEV;
 
-        mutex_init(&mmc_test_lock);
-
         ret = device_create_file(&card->dev, &dev_attr_test);
         if (ret)
                 return ret;
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 6915f40ac8ab..1f8b5b36222c 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -621,12 +621,21 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command
                                 if (cpu_is_at91sam9260 () || cpu_is_at91sam9263())
                                         if (host->total_length < 12)
                                                 host->total_length = 12;
-                                host->buffer = dma_alloc_coherent(NULL,
-                                                host->total_length,
-                                                &host->physical_address, GFP_KERNEL);
+
+                                host->buffer = kmalloc(host->total_length, GFP_KERNEL);
+                                if (!host->buffer) {
+                                        pr_debug("Can't alloc tx buffer\n");
+                                        cmd->error = -ENOMEM;
+                                        mmc_request_done(host->mmc, host->request);
+                                        return;
+                                }
 
                                 at91_mci_sg_to_dma(host, data);
 
+                                host->physical_address = dma_map_single(NULL,
+                                                host->buffer, host->total_length,
+                                                DMA_TO_DEVICE);
+
                                 pr_debug("Transmitting %d bytes\n", host->total_length);
 
                                 at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address);
@@ -694,7 +703,10 @@ static void at91_mci_completed_command(struct at91mci_host *host, unsigned int s
         cmd->resp[3] = at91_mci_read(host, AT91_MCI_RSPR(3));
 
         if (host->buffer) {
-                dma_free_coherent(NULL, host->total_length, host->buffer, host->physical_address);
+                dma_unmap_single(NULL,
+                                host->physical_address, host->total_length,
+                                DMA_TO_DEVICE);
+                kfree(host->buffer);
                 host->buffer = NULL;
         }
 
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 0bd06f5bd62f..917035e16da4 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -195,7 +195,9 @@ static int atmci_regs_show(struct seq_file *s, void *v)
 
         /* Grab a more or less consistent snapshot */
         spin_lock_irq(&host->mmc->lock);
+        clk_enable(host->mck);
         memcpy_fromio(buf, host->regs, MCI_REGS_SIZE);
+        clk_disable(host->mck);
         spin_unlock_irq(&host->mmc->lock);
 
         seq_printf(s, "MR:\t0x%08x%s%s CLKDIV=%u\n",
@@ -216,6 +218,8 @@ static int atmci_regs_show(struct seq_file *s, void *v)
         atmci_show_status_reg(s, "SR", buf[MCI_SR / 4]);
         atmci_show_status_reg(s, "IMR", buf[MCI_IMR / 4]);
 
+        kfree(buf);
+
         return 0;
 }
 
@@ -237,7 +241,6 @@ static void atmci_init_debugfs(struct atmel_mci *host)
         struct mmc_host *mmc;
         struct dentry   *root;
         struct dentry   *node;
-        struct resource *res;
 
         mmc = host->mmc;
         root = mmc->debugfs_root;
@@ -251,9 +254,6 @@ static void atmci_init_debugfs(struct atmel_mci *host)
         if (!node)
                 goto err;
 
-        res = platform_get_resource(host->pdev, IORESOURCE_MEM, 0);
-        node->d_inode->i_size = res->end - res->start + 1;
-
         node = debugfs_create_file("req", S_IRUSR, root, host, &atmci_req_fops);
         if (!node)
                 goto err;
@@ -1059,6 +1059,10 @@ static int __init atmci_probe(struct platform_device *pdev)
                         host->present = !gpio_get_value(host->detect_pin);
                 }
         }
+
+        if (!gpio_is_valid(host->detect_pin))
+                mmc->caps |= MMC_CAP_NEEDS_POLL;
+
         if (gpio_is_valid(host->wp_pin)) {
                 if (gpio_request(host->wp_pin, "mmc_wp")) {
                         dev_dbg(&mmc->class_dev, "no WP pin available\n");
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 7c994e1ae276..ae16d845d746 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -595,8 +595,9 @@ static irqreturn_t s3cmci_irq_cd(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch, void *buf_id,
-                              int size, enum s3c2410_dma_buffresult result)
+static void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch,
+                                     void *buf_id, int size,
+                                     enum s3c2410_dma_buffresult result)
 {
         struct s3cmci_host *host = buf_id;
         unsigned long iflags;
@@ -740,8 +741,8 @@ request_done:
         mmc_request_done(host->mmc, mrq);
 }
 
-
-void s3cmci_dma_setup(struct s3cmci_host *host, enum s3c2410_dmasrc source)
+static void s3cmci_dma_setup(struct s3cmci_host *host,
+                             enum s3c2410_dmasrc source)
 {
         static enum s3c2410_dmasrc last_source = -1;
         static int setup_ok;
@@ -1003,8 +1004,9 @@ static void s3cmci_send_request(struct mmc_host *mmc)
         enable_irq(host->irq);
 }
 
-static int s3cmci_card_present(struct s3cmci_host *host)
+static int s3cmci_card_present(struct mmc_host *mmc)
 {
+        struct s3cmci_host *host = mmc_priv(mmc);
         struct s3c24xx_mci_pdata *pdata = host->pdata;
         int ret;
 
@@ -1023,7 +1025,7 @@ static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
         host->cmd_is_stop = 0;
         host->mrq = mrq;
 
-        if (s3cmci_card_present(host) == 0) {
+        if (s3cmci_card_present(mmc) == 0) {
                 dbg(host, dbg_err, "%s: no medium present\n", __func__);
                 host->mrq->cmd->error = -ENOMEDIUM;
                 mmc_request_done(mmc, mrq);
@@ -1138,6 +1140,7 @@ static struct mmc_host_ops s3cmci_ops = {
         .request        = s3cmci_request,
         .set_ios        = s3cmci_set_ios,
         .get_ro         = s3cmci_get_ro,
+        .get_cd         = s3cmci_card_present,
 };
 
 static struct s3c24xx_mci_pdata s3cmci_def_pdata = {
@@ -1206,7 +1209,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev, int is2440)
         }
 
         host->base = ioremap(host->mem->start, RESSIZE(host->mem));
-        if (host->base == 0) {
+        if (!host->base) {
                 dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
                 ret = -EINVAL;
                 goto probe_free_mem_region;
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c
index f99e9f721629..1df44d966bdb 100644
--- a/drivers/mmc/host/sdricoh_cs.c
+++ b/drivers/mmc/host/sdricoh_cs.c
@@ -29,7 +29,6 @@
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/scatterlist.h>
-#include <linux/version.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 9e647a06054f..ba2b4240a86a 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -159,10 +159,10 @@ static inline void tmio_mmc_kunmap_atomic(struct tmio_mmc_host *host,
 #define STATUS_TO_TEXT(a) \
         do { \
                 if (status & TMIO_STAT_##a) \
-                        printf(#a); \
+                        printk(#a); \
         } while (0)
 
-void debug_status(u32 status)
+void pr_debug_status(u32 status)
 {
         printk(KERN_DEBUG "status: %08x = ", status);
         STATUS_TO_TEXT(CARD_REMOVE);
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 948b86f35ef4..d1eec7d3243f 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -6,7 +6,6 @@
 
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index effaf7cdefab..1a6feb4474de 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -9,7 +9,6 @@
 
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c
index aa64a4752781..bbbcdd4c8d13 100644
--- a/drivers/mtd/maps/esb2rom.c
+++ b/drivers/mtd/maps/esb2rom.c
@@ -12,7 +12,6 @@
 
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index d2f331876e4c..e00d424e6575 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -410,16 +410,20 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
 
         case MEMGETREGIONINFO:
         {
-                struct region_info_user ur;
+                uint32_t ur_idx;
+                struct mtd_erase_region_info *kr;
+                struct region_info_user *ur = (struct region_info_user *) argp;
 
-                if (copy_from_user(&ur, argp, sizeof(struct region_info_user)))
+                if (get_user(ur_idx, &(ur->regionindex)))
                         return -EFAULT;
 
-                if (ur.regionindex >= mtd->numeraseregions)
-                        return -EINVAL;
-                if (copy_to_user(argp, &(mtd->eraseregions[ur.regionindex]),
-                                sizeof(struct mtd_erase_region_info)))
+                kr = &(mtd->eraseregions[ur_idx]);
+
+                if (put_user(kr->offset, &(ur->offset))
+                    || put_user(kr->erasesize, &(ur->erasesize))
+                    || put_user(kr->numblocks, &(ur->numblocks)))
                         return -EFAULT;
+
                 break;
         }
 
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 761946ea45b1..92c334ff4508 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -16,7 +16,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
-#include <linux/version.h>
 #include <asm/io.h>
 
 #include <asm/mach-au1x00/au1xxx.h>
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 64002488c6ee..917cf8d3ae95 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -19,7 +19,7 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 #include <mach/hardware.h>
-#include <asm/plat-orion/orion_nand.h>
+#include <plat/orion_nand.h>
 
 #ifdef CONFIG_MTD_CMDLINE_PARTS
 static const char *part_probes[] = { "cmdlinepart", NULL };
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/Kconfig b/drivers/net/Kconfig
index 4b4cb2bf4f11..4a11296a9514 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -822,14 +822,14 @@ config ULTRA32
           will be called smc-ultra32.
 
 config BFIN_MAC
-        tristate "Blackfin 527/536/537 on-chip mac support"
-        depends on NET_ETHERNET && (BF527 || BF537 || BF536)
+        tristate "Blackfin on-chip MAC support"
+        depends on NET_ETHERNET && (BF526 || BF527 || BF536 || BF537)
         select CRC32
         select MII
         select PHYLIB
         select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
         help
-          This is the driver for blackfin on-chip mac device. Say Y if you want it
+          This is the driver for Blackfin on-chip mac device. Say Y if you want it
           compiled into the kernel. This driver is also available as a module
           ( = code which can be inserted in and removed from the running kernel
           whenever you want). The module will be called bfin_mac.
@@ -1172,7 +1172,7 @@ config ETH16I
 
 config NE2000
         tristate "NE2000/NE1000 support"
-        depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938
+        depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX
         select CRC32
         ---help---
           If you have a network (Ethernet) card of this type, say Y and read
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index e4483de84e7f..66de80b64b92 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -52,7 +52,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 020771bfb603..e2d702b8b2e4 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -551,7 +551,7 @@ static int eth_poll(struct napi_struct *napi, int budget)
                 if ((skb = netdev_alloc_skb(dev, RX_BUFF_SIZE))) {
                         phys = dma_map_single(&dev->dev, skb->data,
                                               RX_BUFF_SIZE, DMA_FROM_DEVICE);
-                        if (dma_mapping_error(phys)) {
+                        if (dma_mapping_error(&dev->dev, phys)) {
                                 dev_kfree_skb(skb);
                                 skb = NULL;
                         }
@@ -698,7 +698,7 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif
 
         phys = dma_map_single(&dev->dev, mem, bytes, DMA_TO_DEVICE);
-        if (dma_mapping_error(phys)) {
+        if (dma_mapping_error(&dev->dev, phys)) {
 #ifdef __ARMEB__
                 dev_kfree_skb(skb);
 #else
@@ -883,7 +883,7 @@ static int init_queues(struct port *port)
                 desc->buf_len = MAX_MRU;
                 desc->data = dma_map_single(&port->netdev->dev, data,
                                             RX_BUFF_SIZE, DMA_FROM_DEVICE);
-                if (dma_mapping_error(desc->data)) {
+                if (dma_mapping_error(&port->netdev->dev, desc->data)) {
                         free_buffer(buff);
                         return -EIO;
                 }
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c
index cdc3b85b10b9..619c6583e1aa 100644
--- a/drivers/net/atl1e/atl1e_ethtool.c
+++ b/drivers/net/atl1e/atl1e_ethtool.c
@@ -355,7 +355,7 @@ static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
         struct atl1e_adapter *adapter = netdev_priv(netdev);
 
         if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE |
-                            WAKE_MCAST | WAKE_BCAST | WAKE_MCAST))
+                            WAKE_UCAST | WAKE_MCAST | WAKE_BCAST))
                 return -EOPNOTSUPP;
         /* these settings will always override what we currently have */
         adapter->wol = 0;
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 82d7be1655d3..7685b995ff9b 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -2232,10 +2232,11 @@ static int atl1e_resume(struct pci_dev *pdev)
 
         AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0);
 
-        if (netif_running(netdev))
+        if (netif_running(netdev)) {
                 err = atl1e_request_irq(adapter);
                 if (err)
                         return err;
+        }
 
         atl1e_reset_hw(&adapter->hw);
 
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index e6a7bb79d4df..e23ce77712f1 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -3022,7 +3022,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         netdev->features = NETIF_F_HW_CSUM;
         netdev->features |= NETIF_F_SG;
         netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
-        netdev->features |= NETIF_F_TSO;
         netdev->features |= NETIF_F_LLTX;
 
         /*
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index cb8be490e5ae..5ee1b0557a02 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -807,7 +807,7 @@ err_out:
 static int au1000_init(struct net_device *dev)
 {
         struct au1000_private *aup = (struct au1000_private *) dev->priv;
-        u32 flags;
+        unsigned long flags;
         int i;
         u32 control;
 
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index 0b4adf4a0f7d..a886a4b9f7e5 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -554,7 +554,7 @@ static int ax_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
         spin_lock_irqsave(&ax->mii_lock, flags);
         mii_ethtool_gset(&ax->mii, cmd);
-        spin_lock_irqsave(&ax->mii_lock, flags);
+        spin_unlock_irqrestore(&ax->mii_lock, flags);
 
         return 0;
 }
@@ -567,7 +567,7 @@ static int ax_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
         spin_lock_irqsave(&ax->mii_lock, flags);
         rc = mii_ethtool_sset(&ax->mii, cmd);
-        spin_lock_irqsave(&ax->mii_lock, flags);
+        spin_unlock_irqrestore(&ax->mii_lock, flags);
 
         return rc;
 }
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 5ebde67d4297..2486a656f12d 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -35,8 +35,8 @@
 #include <linux/time.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
-#ifdef NETIF_F_HW_VLAN_TX
 #include <linux/if_vlan.h>
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define BCM_VLAN 1
 #endif
 #include <net/ip.h>
@@ -57,8 +57,8 @@
 
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.7.9"
-#define DRV_MODULE_RELDATE      "July 18, 2008"
+#define DRV_MODULE_VERSION      "1.8.0"
+#define DRV_MODULE_RELDATE      "Aug 14, 2008"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -2876,6 +2876,8 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
                 struct sw_bd *rx_buf;
                 struct sk_buff *skb;
                 dma_addr_t dma_addr;
+                u16 vtag = 0;
+                int hw_vlan __maybe_unused = 0;
 
                 sw_ring_cons = RX_RING_IDX(sw_cons);
                 sw_ring_prod = RX_RING_IDX(sw_prod);
@@ -2919,7 +2921,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
                 if (len <= bp->rx_copy_thresh) {
                         struct sk_buff *new_skb;
 
-                        new_skb = netdev_alloc_skb(bp->dev, len + 2);
+                        new_skb = netdev_alloc_skb(bp->dev, len + 6);
                         if (new_skb == NULL) {
                                 bnx2_reuse_rx_skb(bp, rxr, skb, sw_ring_cons,
                                                   sw_ring_prod);
@@ -2928,9 +2930,9 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
 
                         /* aligned copy */
                         skb_copy_from_linear_data_offset(skb,
-                                                         BNX2_RX_OFFSET - 2,
-                                      new_skb->data, len + 2);
-                        skb_reserve(new_skb, 2);
+                                                         BNX2_RX_OFFSET - 6,
+                                      new_skb->data, len + 6);
+                        skb_reserve(new_skb, 6);
                         skb_put(new_skb, len);
 
                         bnx2_reuse_rx_skb(bp, rxr, skb,
@@ -2941,6 +2943,25 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
                            dma_addr, (sw_ring_cons << 16) | sw_ring_prod)))
                         goto next_rx;
 
+                if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) &&
+                    !(bp->rx_mode & BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG)) {
+                        vtag = rx_hdr->l2_fhdr_vlan_tag;
+#ifdef BCM_VLAN
+                        if (bp->vlgrp)
+                                hw_vlan = 1;
+                        else
+#endif
+                        {
+                                struct vlan_ethhdr *ve = (struct vlan_ethhdr *)
+                                        __skb_push(skb, 4);
+
+                                memmove(ve, skb->data + 4, ETH_ALEN * 2);
+                                ve->h_vlan_proto = htons(ETH_P_8021Q);
+                                ve->h_vlan_TCI = htons(vtag);
+                                len += 4;
+                        }
+                }
+
                 skb->protocol = eth_type_trans(skb, bp->dev);
 
                 if ((len > (bp->dev->mtu + ETH_HLEN)) &&
@@ -2962,10 +2983,8 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
                 }
 
 #ifdef BCM_VLAN
-                if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) && bp->vlgrp) {
-                        vlan_hwaccel_receive_skb(skb, bp->vlgrp,
-                                rx_hdr->l2_fhdr_vlan_tag);
-                }
+                if (hw_vlan)
+                        vlan_hwaccel_receive_skb(skb, bp->vlgrp, vtag);
                 else
 #endif
                         netif_receive_skb(skb);
@@ -3237,10 +3256,10 @@ bnx2_set_rx_mode(struct net_device *dev)
                                   BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG);
         sort_mode = 1 | BNX2_RPM_SORT_USER0_BC_EN;
 #ifdef BCM_VLAN
-        if (!bp->vlgrp && !(bp->flags & BNX2_FLAG_ASF_ENABLE))
+        if (!bp->vlgrp && (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN))
                 rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;
 #else
-        if (!(bp->flags & BNX2_FLAG_ASF_ENABLE))
+        if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN)
                 rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;
 #endif
         if (dev->flags & IFF_PROMISC) {
@@ -5963,10 +5982,12 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM;
         }
 
+#ifdef BCM_VLAN
         if (bp->vlgrp && vlan_tx_tag_present(skb)) {
                 vlan_tag_flags |=
                         (TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16));
         }
+#endif
         if ((mss = skb_shinfo(skb)->gso_size)) {
                 u32 tcp_opt_len, ip_tcp_len;
                 struct iphdr *iph;
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index c3c579f98ed0..dfacd31f7ed0 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6597,7 +6597,7 @@ struct flash_spec {
 
 struct bnx2_irq {
         irq_handler_t   handler;
-        u16             vector;
+        unsigned int    vector;
         u8              requested;
         char            name[16];
 };
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index b468f904c7f8..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))
@@ -271,7 +273,7 @@ struct bnx2x_fastpath {
                          (fp->tx_pkt_prod != fp->tx_pkt_cons))
 
 #define BNX2X_HAS_RX_WORK(fp) \
-                        (fp->rx_comp_cons != le16_to_cpu(*fp->rx_cons_sb))
+                        (fp->rx_comp_cons != rx_cons_sb)
 
 #define BNX2X_HAS_WORK(fp)      (BNX2X_HAS_RX_WORK(fp) || BNX2X_HAS_TX_WORK(fp))
 
@@ -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_link.c b/drivers/net/bnx2x_link.c
index 8b92c6ad0759..4ce7fe9c5251 100644
--- a/drivers/net/bnx2x_link.c
+++ b/drivers/net/bnx2x_link.c
@@ -21,7 +21,6 @@
 #include <linux/delay.h>
 #include <linux/ethtool.h>
 #include <linux/mutex.h>
-#include <linux/version.h>
 
 #include "bnx2x_reg.h"
 #include "bnx2x_fw_defs.h"
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 3e7dc171cdf1..a8eb3c4a47c8 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -44,7 +44,6 @@
 #include <net/ip.h>
 #include <net/tcp.h>
 #include <net/checksum.h>
-#include <linux/version.h>
 #include <net/ip6_checksum.h>
 #include <linux/workqueue.h>
 #include <linux/crc32.h>
@@ -60,8 +59,8 @@
 #include "bnx2x.h"
 #include "bnx2x_init.h"
 
-#define DRV_MODULE_VERSION      "1.45.17"
-#define DRV_MODULE_RELDATE      "2008/08/13"
+#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 */
@@ -1028,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);
@@ -1170,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) */
@@ -1277,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 */
@@ -1521,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);
@@ -1718,8 +1717,8 @@ static int bnx2x_acquire_hw_lock(struct bnx2x *bp, u32 resource)
                 return -EEXIST;
         }
 
-        /* Try for 1 second every 5ms */
-        for (cnt = 0; cnt < 200; cnt++) {
+        /* Try for 5 second every 5ms */
+        for (cnt = 0; cnt < 1000; cnt++) {
                 /* Try to acquire the lock */
                 REG_WR(bp, hw_lock_control_reg + 4, resource_bit);
                 lock_status = REG_RD(bp, hw_lock_control_reg);
@@ -2551,6 +2550,7 @@ static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
                 BNX2X_ERR("SPIO5 hw attention\n");
 
                 switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) {
+                case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G:
                 case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:
                         /* Fan failure attention */
 
@@ -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 =
@@ -4606,6 +4606,17 @@ static void bnx2x_init_internal_common(struct bnx2x *bp)
 {
         int i;
 
+        if (bp->flags & TPA_ENABLE_FLAG) {
+                struct tstorm_eth_tpa_exist tpa = {0};
+
+                tpa.tpa_exist = 1;
+
+                REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET,
+                       ((u32 *)&tpa)[0]);
+                REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET + 4,
+                       ((u32 *)&tpa)[1]);
+        }
+
         /* Zero this manually as its initialization is
            currently missing in the initTool */
         for (i = 0; i < (USTORM_AGG_DATA_SIZE >> 2); i++)
@@ -4706,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) {
@@ -5338,6 +5349,7 @@ static int bnx2x_init_common(struct bnx2x *bp)
         }
 
         switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) {
+        case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G:
         case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:
                 /* Fan failure is indicated by SPIO 5 */
                 bnx2x_set_spio(bp, MISC_REGISTERS_SPIO_5,
@@ -5364,17 +5376,6 @@ static int bnx2x_init_common(struct bnx2x *bp)
 
         enable_blocks_attention(bp);
 
-        if (bp->flags & TPA_ENABLE_FLAG) {
-                struct tstorm_eth_tpa_exist tmp = {0};
-
-                tmp.tpa_exist = 1;
-
-                REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET,
-                       ((u32 *)&tmp)[0]);
-                REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET + 4,
-                       ((u32 *)&tmp)[1]);
-        }
-
         if (!BP_NOMCP(bp)) {
                 bnx2x_acquire_phy_lock(bp);
                 bnx2x_common_init_phy(bp, bp->common.shmem_base);
@@ -5532,6 +5533,7 @@ static int bnx2x_init_port(struct bnx2x *bp)
         /* Port DMAE comes here */
 
         switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) {
+        case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G:
         case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:
                 /* add SPIO 5 to group 0 */
                 val = REG_RD(bp, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0);
@@ -5938,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;
@@ -6056,6 +6058,44 @@ static int bnx2x_req_irq(struct bnx2x *bp)
         return rc;
 }
 
+static void bnx2x_napi_enable(struct bnx2x *bp)
+{
+        int i;
+
+        for_each_queue(bp, i)
+                napi_enable(&bnx2x_fp(bp, i, napi));
+}
+
+static void bnx2x_napi_disable(struct bnx2x *bp)
+{
+        int i;
+
+        for_each_queue(bp, i)
+                napi_disable(&bnx2x_fp(bp, i, napi));
+}
+
+static void bnx2x_netif_start(struct bnx2x *bp)
+{
+        if (atomic_dec_and_test(&bp->intr_sem)) {
+                if (netif_running(bp->dev)) {
+                        if (bp->state == BNX2X_STATE_OPEN)
+                                netif_wake_queue(bp->dev);
+                        bnx2x_napi_enable(bp);
+                        bnx2x_int_enable(bp);
+                }
+        }
+}
+
+static void bnx2x_netif_stop(struct bnx2x *bp)
+{
+        bnx2x_int_disable_sync(bp);
+        if (netif_running(bp->dev)) {
+                bnx2x_napi_disable(bp);
+                netif_tx_disable(bp->dev);
+                bp->dev->trans_start = jiffies; /* prevent tx timeout */
+        }
+}
+
 /*
  * Init service functions
  */
@@ -6339,7 +6379,7 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
         rc = bnx2x_init_hw(bp, load_code);
         if (rc) {
                 BNX2X_ERR("HW init failed, aborting\n");
-                goto load_error;
+                goto load_int_disable;
         }
 
         /* Setup NIC internals and enable interrupts */
@@ -6351,7 +6391,7 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 if (!load_code) {
                         BNX2X_ERR("MCP response failure, aborting\n");
                         rc = -EBUSY;
-                        goto load_int_disable;
+                        goto load_rings_free;
                 }
         }
 
@@ -6361,8 +6401,7 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 
         /* Enable Rx interrupt handling before sending the ramrod
            as it's completed on Rx FP queue */
-        for_each_queue(bp, i)
-                napi_enable(&bnx2x_fp(bp, i, napi));
+        bnx2x_napi_enable(bp);
 
         /* Enable interrupt handling */
         atomic_set(&bp->intr_sem, 0);
@@ -6370,7 +6409,7 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
         rc = bnx2x_setup_leading(bp);
         if (rc) {
                 BNX2X_ERR("Setup leading failed!\n");
-                goto load_stop_netif;
+                goto load_netif_stop;
         }
 
         if (CHIP_IS_E1H(bp))
@@ -6383,7 +6422,7 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 for_each_nondefault_queue(bp, i) {
                         rc = bnx2x_setup_multi(bp, i);
                         if (rc)
-                                goto load_stop_netif;
+                                goto load_netif_stop;
                 }
 
         if (CHIP_IS_E1(bp))
@@ -6428,20 +6467,17 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 
         return 0;
 
-load_stop_netif:
+load_netif_stop:
+        bnx2x_napi_disable(bp);
+load_rings_free:
+        /* Free SKBs, SGEs, TPA pool and driver internals */
+        bnx2x_free_skbs(bp);
         for_each_queue(bp, i)
-                napi_disable(&bnx2x_fp(bp, i, napi));
-
+                bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
 load_int_disable:
         bnx2x_int_disable_sync(bp);
-
         /* Release IRQs */
         bnx2x_free_irq(bp);
-
-        /* Free SKBs, SGEs, TPA pool and driver internals */
-        bnx2x_free_skbs(bp);
-        for_each_queue(bp, i)
-                bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
 load_error:
         bnx2x_free_mem(bp);
 
@@ -6456,7 +6492,7 @@ static int bnx2x_stop_multi(struct bnx2x *bp, int index)
 
         /* halt the connection */
         bp->fp[index].state = BNX2X_FP_STATE_HALTING;
-        bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, index, 0, 0, 0);
+        bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, index, 0, index, 0);
 
         /* Wait for completion */
         rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, index,
@@ -6614,11 +6650,9 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
         bp->rx_mode = BNX2X_RX_MODE_NONE;
         bnx2x_set_storm_rx_mode(bp);
 
-        if (netif_running(bp->dev)) {
-                netif_tx_disable(bp->dev);
-                bp->dev->trans_start = jiffies; /* prevent tx timeout */
-        }
-
+        bnx2x_netif_stop(bp);
+        if (!netif_running(bp->dev))
+                bnx2x_napi_disable(bp);
         del_timer_sync(&bp->timer);
         SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb,
                  (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq));
@@ -6632,9 +6666,7 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
                 smp_rmb();
                 while (BNX2X_HAS_TX_WORK(fp)) {
 
-                        if (!netif_running(bp->dev))
-                                bnx2x_tx_int(fp, 1000);
-
+                        bnx2x_tx_int(fp, 1000);
                         if (!cnt) {
                                 BNX2X_ERR("timeout waiting for queue[%d]\n",
                                           i);
@@ -6650,46 +6682,12 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
                         smp_rmb();
                 }
         }
-
         /* Give HW time to discard old tx messages */
         msleep(1);
 
-        for_each_queue(bp, i)
-                napi_disable(&bnx2x_fp(bp, i, napi));
-        /* Disable interrupts after Tx and Rx are disabled on stack level */
-        bnx2x_int_disable_sync(bp);
-
         /* Release IRQs */
         bnx2x_free_irq(bp);
 
-        if (unload_mode == UNLOAD_NORMAL)
-                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;
-
-        else if (bp->flags & NO_WOL_FLAG) {
-                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP;
-                if (CHIP_IS_E1H(bp))
-                        REG_WR(bp, MISC_REG_E1HMF_MODE, 0);
-
-        } else if (bp->wol) {
-                u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
-                u8 *mac_addr = bp->dev->dev_addr;
-                u32 val;
-                /* The mac address is written to entries 1-4 to
-                   preserve entry 0 which is used by the PMF */
-                u8 entry = (BP_E1HVN(bp) + 1)*8;
-
-                val = (mac_addr[0] << 8) | mac_addr[1];
-                EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH + entry, val);
-
-                val = (mac_addr[2] << 24) | (mac_addr[3] << 16) |
-                      (mac_addr[4] << 8) | mac_addr[5];
-                EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH + entry + 4, val);
-
-                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_EN;
-
-        } else
-                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;
-
         if (CHIP_IS_E1(bp)) {
                 struct mac_configuration_cmd *config =
                                                 bnx2x_sp(bp, mcast_config);
@@ -6712,14 +6710,41 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
                               U64_LO(bnx2x_sp_mapping(bp, mcast_config)), 0);
 
         } else { /* E1H */
+                REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0);
+
                 bnx2x_set_mac_addr_e1h(bp, 0);
 
                 for (i = 0; i < MC_HASH_SIZE; i++)
                         REG_WR(bp, MC_HASH_OFFSET(bp, i), 0);
         }
 
-        if (CHIP_IS_E1H(bp))
-                REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0);
+        if (unload_mode == UNLOAD_NORMAL)
+                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;
+
+        else if (bp->flags & NO_WOL_FLAG) {
+                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP;
+                if (CHIP_IS_E1H(bp))
+                        REG_WR(bp, MISC_REG_E1HMF_MODE, 0);
+
+        } else if (bp->wol) {
+                u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
+                u8 *mac_addr = bp->dev->dev_addr;
+                u32 val;
+                /* The mac address is written to entries 1-4 to
+                   preserve entry 0 which is used by the PMF */
+                u8 entry = (BP_E1HVN(bp) + 1)*8;
+
+                val = (mac_addr[0] << 8) | mac_addr[1];
+                EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH + entry, val);
+
+                val = (mac_addr[2] << 24) | (mac_addr[3] << 16) |
+                      (mac_addr[4] << 8) | mac_addr[5];
+                EMAC_WR(bp, EMAC_REG_EMAC_MAC_MATCH + entry + 4, val);
+
+                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_EN;
+
+        } else
+                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;
 
         /* Close multi and leading connections
            Completions for ramrods are collected in a synchronous way */
@@ -6822,6 +6847,10 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp)
                  */
                 bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_UNDI);
                 val = REG_RD(bp, DORQ_REG_NORM_CID_OFST);
+                if (val == 0x7)
+                        REG_WR(bp, DORQ_REG_NORM_CID_OFST, 0);
+                bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_UNDI);
+
                 if (val == 0x7) {
                         u32 reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;
                         /* save our func */
@@ -6899,7 +6928,6 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp)
                                (SHMEM_RD(bp, func_mb[bp->func].drv_mb_header) &
                                 DRV_MSG_SEQ_NUMBER_MASK);
                 }
-                bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_UNDI);
         }
 }
 
@@ -8618,34 +8646,6 @@ test_mem_exit:
         return rc;
 }
 
-static void bnx2x_netif_start(struct bnx2x *bp)
-{
-        int i;
-
-        if (atomic_dec_and_test(&bp->intr_sem)) {
-                if (netif_running(bp->dev)) {
-                        bnx2x_int_enable(bp);
-                        for_each_queue(bp, i)
-                                napi_enable(&bnx2x_fp(bp, i, napi));
-                        if (bp->state == BNX2X_STATE_OPEN)
-                                netif_wake_queue(bp->dev);
-                }
-        }
-}
-
-static void bnx2x_netif_stop(struct bnx2x *bp)
-{
-        int i;
-
-        if (netif_running(bp->dev)) {
-                netif_tx_disable(bp->dev);
-                bp->dev->trans_start = jiffies; /* prevent tx timeout */
-                for_each_queue(bp, i)
-                        napi_disable(&bnx2x_fp(bp, i, napi));
-        }
-        bnx2x_int_disable_sync(bp);
-}
-
 static void bnx2x_wait_for_link(struct bnx2x *bp, u8 link_up)
 {
         int cnt = 1000;
@@ -9251,6 +9251,7 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)
                                                  napi);
         struct bnx2x *bp = fp->bp;
         int work_done = 0;
+        u16 rx_cons_sb;
 
 #ifdef BNX2X_STOP_ON_ERROR
         if (unlikely(bp->panic))
@@ -9266,10 +9267,16 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)
         if (BNX2X_HAS_TX_WORK(fp))
                 bnx2x_tx_int(fp, budget);
 
+        rx_cons_sb = le16_to_cpu(*fp->rx_cons_sb);
+        if ((rx_cons_sb & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)
+                rx_cons_sb++;
         if (BNX2X_HAS_RX_WORK(fp))
                 work_done = bnx2x_rx_int(fp, budget);
 
         rmb(); /* BNX2X_HAS_WORK() reads the status block */
+        rx_cons_sb = le16_to_cpu(*fp->rx_cons_sb);
+        if ((rx_cons_sb & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)
+                rx_cons_sb++;
 
         /* must not complete if we consumed full budget */
         if ((work_done < budget) && !BNX2X_HAS_WORK(fp)) {
@@ -9485,8 +9492,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
         fp_index = (smp_processor_id() % bp->num_queues);
         fp = &bp->fp[fp_index];
 
-        if (unlikely(bnx2x_tx_avail(bp->fp) <
-                                        (skb_shinfo(skb)->nr_frags + 3))) {
+        if (unlikely(bnx2x_tx_avail(fp) < (skb_shinfo(skb)->nr_frags + 3))) {
                 bp->eth_stats.driver_xoff++,
                 netif_stop_queue(dev);
                 BNX2X_ERR("BUG! Tx ring full when queue awake!\n");
@@ -9549,7 +9555,6 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 tx_bd->vlan = cpu_to_le16(pkt_prod);
 
         if (xmit_type) {
-
                 /* turn on parsing and get a BD */
                 bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
                 pbd = (void *)&fp->tx_desc_ring[bd_prod];
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index a7800e559090..ec6b0af3d46b 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -26,7 +26,6 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 19d32a227be1..5cf78d612c45 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1838,7 +1838,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
                 if ((le16_to_cpu(rfd->command) & cb_el) &&
                     (RU_RUNNING == nic->ru_running))
 
-                        if (readb(&nic->csr->scb.status) & rus_no_res)
+                        if (ioread8(&nic->csr->scb.status) & rus_no_res)
                                 nic->ru_running = RU_SUSPENDED;
                 return -ENODATA;
         }
@@ -1861,7 +1861,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
         if ((le16_to_cpu(rfd->command) & cb_el) &&
             (RU_RUNNING == nic->ru_running)) {
 
-            if (readb(&nic->csr->scb.status) & rus_no_res)
+            if (ioread8(&nic->csr->scb.status) & rus_no_res)
                 nic->ru_running = RU_SUSPENDED;
         }
 
@@ -2738,9 +2738,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                 nic->flags |= wol_magic;
 
         /* ack any pending wake events, disable PME */
-        err = pci_enable_wake(pdev, 0, 0);
-        if (err)
-                DPRINTK(PROBE, ERR, "Error clearing wake event\n");
+        pci_pme_active(pdev, false);
 
         strcpy(netdev->name, "eth%d");
         if((err = register_netdev(netdev))) {
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 9d6edf3e73f9..d04eef53571e 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -144,6 +144,8 @@ static s32 e1000_host_if_read_cookie(struct e1000_hw *hw, u8 *buffer);
 static u8 e1000_calculate_mng_checksum(char *buffer, u32 length);
 static s32 e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, u16 duplex);
 static s32 e1000_configure_kmrn_for_1000(struct e1000_hw *hw);
+static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
+static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 
 /* IGP cable length table */
 static const
@@ -168,6 +170,8 @@ u16 e1000_igp_2_cable_length_table[IGP02E1000_AGC_LENGTH_TABLE_SIZE] =
       83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,
       104, 109, 114, 118, 121, 124};
 
+static DEFINE_SPINLOCK(e1000_eeprom_lock);
+
 /******************************************************************************
  * Set the phy type member in the hw struct.
  *
@@ -4904,6 +4908,15 @@ static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw)
  *****************************************************************************/
 s32 e1000_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 {
+    s32 ret;
+    spin_lock(&e1000_eeprom_lock);
+    ret = e1000_do_read_eeprom(hw, offset, words, data);
+    spin_unlock(&e1000_eeprom_lock);
+    return ret;
+}
+
+static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
     u32 i = 0;
 
@@ -5236,6 +5249,16 @@ s32 e1000_update_eeprom_checksum(struct e1000_hw *hw)
  *****************************************************************************/
 s32 e1000_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 {
+    s32 ret;
+    spin_lock(&e1000_eeprom_lock);
+    ret = e1000_do_write_eeprom(hw, offset, words, data);
+    spin_unlock(&e1000_eeprom_lock);
+    return ret;
+}
+
+
+static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
     struct e1000_eeprom_info *eeprom = &hw->eeprom;
     s32 status = 0;
 
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index b9f90a5d3d4d..213437d13154 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -208,7 +208,7 @@ struct e1000_option {
                 } r;
                 struct { /* list_option info */
                         int nr;
-                        struct e1000_opt_list { int i; char *str; } *p;
+                        const struct e1000_opt_list { int i; char *str; } *p;
                 } l;
         } arg;
 };
@@ -242,7 +242,7 @@ static int __devinit e1000_validate_option(unsigned int *value,
                 break;
         case list_option: {
                 int i;
-                struct e1000_opt_list *ent;
+                const struct e1000_opt_list *ent;
 
                 for (i = 0; i < opt->arg.l.nr; i++) {
                         ent = &opt->arg.l.p[i];
@@ -279,7 +279,9 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter);
 
 void __devinit e1000_check_options(struct e1000_adapter *adapter)
 {
+        struct e1000_option opt;
         int bd = adapter->bd_number;
+
         if (bd >= E1000_MAX_NIC) {
                 DPRINTK(PROBE, NOTICE,
                        "Warning: no configuration for board #%i\n", bd);
@@ -287,19 +289,21 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
         }
 
         { /* Transmit Descriptor Count */
-                struct e1000_option opt = {
+                struct e1000_tx_ring *tx_ring = adapter->tx_ring;
+                int i;
+                e1000_mac_type mac_type = adapter->hw.mac_type;
+
+                opt = (struct e1000_option) {
                         .type = range_option,
                         .name = "Transmit Descriptors",
                         .err  = "using default of "
                                 __MODULE_STRING(E1000_DEFAULT_TXD),
                         .def  = E1000_DEFAULT_TXD,
-                        .arg  = { .r = { .min = E1000_MIN_TXD }}
+                        .arg  = { .r = {
+                                .min = E1000_MIN_TXD,
+                                .max = mac_type < e1000_82544 ? E1000_MAX_TXD : E1000_MAX_82544_TXD
+                                }}
                 };
-                struct e1000_tx_ring *tx_ring = adapter->tx_ring;
-                int i;
-                e1000_mac_type mac_type = adapter->hw.mac_type;
-                opt.arg.r.max = mac_type < e1000_82544 ?
-                        E1000_MAX_TXD : E1000_MAX_82544_TXD;
 
                 if (num_TxDescriptors > bd) {
                         tx_ring->count = TxDescriptors[bd];
@@ -313,19 +317,21 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                         tx_ring[i].count = tx_ring->count;
         }
         { /* Receive Descriptor Count */
-                struct e1000_option opt = {
+                struct e1000_rx_ring *rx_ring = adapter->rx_ring;
+                int i;
+                e1000_mac_type mac_type = adapter->hw.mac_type;
+
+                opt = (struct e1000_option) {
                         .type = range_option,
                         .name = "Receive Descriptors",
                         .err  = "using default of "
                                 __MODULE_STRING(E1000_DEFAULT_RXD),
                         .def  = E1000_DEFAULT_RXD,
-                        .arg  = { .r = { .min = E1000_MIN_RXD }}
+                        .arg  = { .r = {
+                                .min = E1000_MIN_RXD,
+                                .max = mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD
+                        }}
                 };
-                struct e1000_rx_ring *rx_ring = adapter->rx_ring;
-                int i;
-                e1000_mac_type mac_type = adapter->hw.mac_type;
-                opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
-                        E1000_MAX_82544_RXD;
 
                 if (num_RxDescriptors > bd) {
                         rx_ring->count = RxDescriptors[bd];
@@ -339,7 +345,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                         rx_ring[i].count = rx_ring->count;
         }
         { /* Checksum Offload Enable/Disable */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = enable_option,
                         .name = "Checksum Offload",
                         .err  = "defaulting to Enabled",
@@ -363,7 +369,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                          { E1000_FC_FULL,    "Flow Control Enabled" },
                          { E1000_FC_DEFAULT, "Flow Control Hardware Default" }};
 
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = list_option,
                         .name = "Flow Control",
                         .err  = "reading default settings from EEPROM",
@@ -381,7 +387,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Transmit Interrupt Delay */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = range_option,
                         .name = "Transmit Interrupt Delay",
                         .err  = "using default of " __MODULE_STRING(DEFAULT_TIDV),
@@ -399,7 +405,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Transmit Absolute Interrupt Delay */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = range_option,
                         .name = "Transmit Absolute Interrupt Delay",
                         .err  = "using default of " __MODULE_STRING(DEFAULT_TADV),
@@ -417,7 +423,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Receive Interrupt Delay */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = range_option,
                         .name = "Receive Interrupt Delay",
                         .err  = "using default of " __MODULE_STRING(DEFAULT_RDTR),
@@ -435,7 +441,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Receive Absolute Interrupt Delay */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = range_option,
                         .name = "Receive Absolute Interrupt Delay",
                         .err  = "using default of " __MODULE_STRING(DEFAULT_RADV),
@@ -453,7 +459,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Interrupt Throttling Rate */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = range_option,
                         .name = "Interrupt Throttling Rate (ints/sec)",
                         .err  = "using default of " __MODULE_STRING(DEFAULT_ITR),
@@ -497,7 +503,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Smart Power Down */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = enable_option,
                         .name = "PHY Smart Power Down",
                         .err  = "defaulting to Disabled",
@@ -513,7 +519,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Kumeran Lock Loss Workaround */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = enable_option,
                         .name = "Kumeran Lock Loss Workaround",
                         .err  = "defaulting to Enabled",
@@ -578,16 +584,18 @@ static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter)
 
 static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
 {
+        struct e1000_option opt;
         unsigned int speed, dplx, an;
         int bd = adapter->bd_number;
 
         { /* Speed */
-                struct e1000_opt_list speed_list[] = {{          0, "" },
-                                                      {   SPEED_10, "" },
-                                                      {  SPEED_100, "" },
-                                                      { SPEED_1000, "" }};
+                static const struct e1000_opt_list speed_list[] = {
+                        {          0, "" },
+                        {   SPEED_10, "" },
+                        {  SPEED_100, "" },
+                        { SPEED_1000, "" }};
 
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = list_option,
                         .name = "Speed",
                         .err  = "parameter ignored",
@@ -604,11 +612,12 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Duplex */
-                struct e1000_opt_list dplx_list[] = {{           0, "" },
-                                                     { HALF_DUPLEX, "" },
-                                                     { FULL_DUPLEX, "" }};
+                static const struct e1000_opt_list dplx_list[] = {
+                        {           0, "" },
+                        { HALF_DUPLEX, "" },
+                        { FULL_DUPLEX, "" }};
 
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = list_option,
                         .name = "Duplex",
                         .err  = "parameter ignored",
@@ -637,7 +646,7 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
                        "parameter ignored\n");
                 adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT;
         } else { /* Autoneg */
-                struct e1000_opt_list an_list[] =
+                static const struct e1000_opt_list an_list[] =
                         #define AA "AutoNeg advertising "
                         {{ 0x01, AA "10/HD" },
                          { 0x02, AA "10/FD" },
@@ -671,7 +680,7 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
                          { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" },
                          { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }};
 
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                         .type = list_option,
                         .name = "AutoNeg",
                         .err  = "parameter ignored",
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
index f823b8ba5785..14b0e6cd3b8d 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/e1000e/defines.h
@@ -389,7 +389,7 @@
 
 /* Interrupt Cause Set */
 #define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
+#define E1000_ICS_RXSEQ     E1000_ICR_RXSEQ     /* Rx sequence error */
 #define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* Rx desc min. threshold */
 
 /* Transmit Descriptor Control */
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index cf57050d99d8..5ea6b60fa377 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -257,7 +257,6 @@ struct e1000_adapter {
         struct net_device *netdev;
         struct pci_dev *pdev;
         struct net_device_stats net_stats;
-        spinlock_t stats_lock;      /* prevent concurrent stats updates */
 
         /* structs defined in e1000_hw.h */
         struct e1000_hw hw;
@@ -284,6 +283,8 @@ struct e1000_adapter {
         unsigned long led_status;
 
         unsigned int flags;
+        struct work_struct downshift_task;
+        struct work_struct update_phy_task;
 };
 
 struct e1000_info {
@@ -305,6 +306,7 @@ struct e1000_info {
 #define FLAG_HAS_CTRLEXT_ON_LOAD          (1 << 5)
 #define FLAG_HAS_SWSM_ON_LOAD             (1 << 6)
 #define FLAG_HAS_JUMBO_FRAMES             (1 << 7)
+#define FLAG_READ_ONLY_NVM                (1 << 8)
 #define FLAG_IS_ICH                       (1 << 9)
 #define FLAG_HAS_SMART_POWER_DOWN         (1 << 11)
 #define FLAG_IS_QUAD_PORT_A               (1 << 12)
@@ -326,6 +328,7 @@ struct e1000_info {
 #define FLAG_RX_CSUM_ENABLED              (1 << 28)
 #define FLAG_TSO_FORCE                    (1 << 29)
 #define FLAG_RX_RESTART_NOW               (1 << 30)
+#define FLAG_MSI_TEST_FAILED              (1 << 31)
 
 #define E1000_RX_DESC_PS(R, i)      \
         (&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
@@ -384,6 +387,7 @@ extern bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw);
 extern bool e1000e_get_laa_state_82571(struct e1000_hw *hw);
 extern void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state);
 
+extern void e1000e_write_protect_nvm_ich8lan(struct e1000_hw *hw);
 extern void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
                                                  bool state);
 extern void e1000e_igp3_phy_powerdown_workaround_ich8lan(struct e1000_hw *hw);
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index cf9679f2b7c4..33a3ff17b5d0 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -177,7 +177,7 @@ static u32 e1000_get_link(struct net_device *netdev)
         u32 status;
         
         status = er32(STATUS);
-        return (status & E1000_STATUS_LU);
+        return (status & E1000_STATUS_LU) ? 1 : 0;
 }
 
 static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
@@ -432,6 +432,10 @@ static void e1000_get_regs(struct net_device *netdev,
         regs_buff[11] = er32(TIDV);
 
         regs_buff[12] = adapter->hw.phy.type;  /* PHY type (IGP=1, M88=0) */
+
+        /* ethtool doesn't use anything past this point, so all this
+         * code is likely legacy junk for apps that may or may not
+         * exist */
         if (hw->phy.type == e1000_phy_m88) {
                 e1e_rphy(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
                 regs_buff[13] = (u32)phy_data; /* cable length */
@@ -447,7 +451,7 @@ static void e1000_get_regs(struct net_device *netdev,
                 regs_buff[22] = adapter->phy_stats.receive_errors;
                 regs_buff[23] = regs_buff[13]; /* mdix mode */
         }
-        regs_buff[21] = adapter->phy_stats.idle_errors;  /* phy idle errors */
+        regs_buff[21] = 0; /* was idle_errors */
         e1e_rphy(hw, PHY_1000T_STATUS, &phy_data);
         regs_buff[24] = (u32)phy_data;  /* phy local receiver status */
         regs_buff[25] = regs_buff[24];  /* phy remote receiver status */
@@ -529,6 +533,9 @@ static int e1000_set_eeprom(struct net_device *netdev,
         if (eeprom->magic != (adapter->pdev->vendor | (adapter->pdev->device << 16)))
                 return -EFAULT;
 
+        if (adapter->flags & FLAG_READ_ONLY_NVM)
+                return -EINVAL;
+
         max_len = hw->nvm.word_size * 2;
 
         first_word = eeprom->offset >> 1;
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 9e38452a738c..bcd2bc477af2 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -58,6 +58,7 @@
 #define ICH_FLASH_HSFCTL                0x0006
 #define ICH_FLASH_FADDR                 0x0008
 #define ICH_FLASH_FDATA0                0x0010
+#define ICH_FLASH_PR0                   0x0074
 
 #define ICH_FLASH_READ_COMMAND_TIMEOUT  500
 #define ICH_FLASH_WRITE_COMMAND_TIMEOUT 500
@@ -150,6 +151,19 @@ union ich8_hws_flash_regacc {
         u16 regval;
 };
 
+/* ICH Flash Protected Region */
+union ich8_flash_protected_range {
+        struct ich8_pr {
+                u32 base:13;     /* 0:12 Protected Range Base */
+                u32 reserved1:2; /* 13:14 Reserved */
+                u32 rpe:1;       /* 15 Read Protection Enable */
+                u32 limit:13;    /* 16:28 Protected Range Limit */
+                u32 reserved2:2; /* 29:30 Reserved */
+                u32 wpe:1;       /* 31 Write Protection Enable */
+        } range;
+        u32 regval;
+};
+
 static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw);
 static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw);
 static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw);
@@ -366,6 +380,9 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
         return 0;
 }
 
+static DEFINE_MUTEX(nvm_mutex);
+static pid_t nvm_owner = -1;
+
 /**
  *  e1000_acquire_swflag_ich8lan - Acquire software control flag
  *  @hw: pointer to the HW structure
@@ -379,6 +396,15 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
         u32 extcnf_ctrl;
         u32 timeout = PHY_CFG_TIMEOUT;
 
+        might_sleep();
+
+        if (!mutex_trylock(&nvm_mutex)) {
+                WARN(1, KERN_ERR "e1000e mutex contention. Owned by pid %d\n",
+                     nvm_owner);
+                mutex_lock(&nvm_mutex);
+        }
+        nvm_owner = current->pid;
+
         while (timeout) {
                 extcnf_ctrl = er32(EXTCNF_CTRL);
                 extcnf_ctrl |= E1000_EXTCNF_CTRL_SWFLAG;
@@ -393,6 +419,8 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
 
         if (!timeout) {
                 hw_dbg(hw, "FW or HW has locked the resource for too long.\n");
+                nvm_owner = -1;
+                mutex_unlock(&nvm_mutex);
                 return -E1000_ERR_CONFIG;
         }
 
@@ -414,6 +442,9 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw)
         extcnf_ctrl = er32(EXTCNF_CTRL);
         extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
         ew32(EXTCNF_CTRL, extcnf_ctrl);
+
+        nvm_owner = -1;
+        mutex_unlock(&nvm_mutex);
 }
 
 /**
@@ -1284,6 +1315,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
          * programming failed.
          */
         if (ret_val) {
+                /* Possibly read-only, see e1000e_write_protect_nvm_ich8lan() */
                 hw_dbg(hw, "Flash commit failed.\n");
                 e1000_release_swflag_ich8lan(hw);
                 return ret_val;
@@ -1374,6 +1406,49 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
 }
 
 /**
+ *  e1000e_write_protect_nvm_ich8lan - Make the NVM read-only
+ *  @hw: pointer to the HW structure
+ *
+ *  To prevent malicious write/erase of the NVM, set it to be read-only
+ *  so that the hardware ignores all write/erase cycles of the NVM via
+ *  the flash control registers.  The shadow-ram copy of the NVM will
+ *  still be updated, however any updates to this copy will not stick
+ *  across driver reloads.
+ **/
+void e1000e_write_protect_nvm_ich8lan(struct e1000_hw *hw)
+{
+        union ich8_flash_protected_range pr0;
+        union ich8_hws_flash_status hsfsts;
+        u32 gfpreg;
+        s32 ret_val;
+
+        ret_val = e1000_acquire_swflag_ich8lan(hw);
+        if (ret_val)
+                return;
+
+        gfpreg = er32flash(ICH_FLASH_GFPREG);
+
+        /* Write-protect GbE Sector of NVM */
+        pr0.regval = er32flash(ICH_FLASH_PR0);
+        pr0.range.base = gfpreg & FLASH_GFPREG_BASE_MASK;
+        pr0.range.limit = ((gfpreg >> 16) & FLASH_GFPREG_BASE_MASK);
+        pr0.range.wpe = true;
+        ew32flash(ICH_FLASH_PR0, pr0.regval);
+
+        /*
+         * Lock down a subset of GbE Flash Control Registers, e.g.
+         * PR0 to prevent the write-protection from being lifted.
+         * Once FLOCKDN is set, the registers protected by it cannot
+         * be written until FLOCKDN is cleared by a hardware reset.
+         */
+        hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
+        hsfsts.hsf_status.flockdn = true;
+        ew32flash(ICH_FLASH_HSFSTS, hsfsts.regval);
+
+        e1000_release_swflag_ich8lan(hw);
+}
+
+/**
  *  e1000_write_flash_data_ich8lan - Writes bytes to the NVM
  *  @hw: pointer to the HW structure
  *  @offset: The offset (in bytes) of the byte/word to read.
@@ -1720,6 +1795,9 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
         ew32(CTRL, (ctrl | E1000_CTRL_RST));
         msleep(20);
 
+        /* release the swflag because it is not reset by hardware reset */
+        e1000_release_swflag_ich8lan(hw);
+
         ret_val = e1000e_get_auto_rd_done(hw);
         if (ret_val) {
                 /*
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 05b0b2f9c54b..b81c4237b5d3 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -47,7 +47,7 @@
 
 #include "e1000.h"
 
-#define DRV_VERSION "0.3.3.3-k2"
+#define DRV_VERSION "0.3.3.3-k6"
 char e1000e_driver_name[] = "e1000e";
 const char e1000e_driver_version[] = DRV_VERSION;
 
@@ -510,9 +510,12 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
                             netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
                         if (new_skb) {
                                 skb_reserve(new_skb, NET_IP_ALIGN);
-                                memcpy(new_skb->data - NET_IP_ALIGN,
-                                       skb->data - NET_IP_ALIGN,
-                                       length + NET_IP_ALIGN);
+                                skb_copy_to_linear_data_offset(new_skb,
+                                                               -NET_IP_ALIGN,
+                                                               (skb->data -
+                                                                NET_IP_ALIGN),
+                                                               (length +
+                                                                NET_IP_ALIGN));
                                 /* save the skb in buffer_info as good */
                                 buffer_info->skb = skb;
                                 skb = new_skb;
@@ -1112,6 +1115,14 @@ static void e1000_clean_rx_ring(struct e1000_adapter *adapter)
         writel(0, adapter->hw.hw_addr + rx_ring->tail);
 }
 
+static void e1000e_downshift_workaround(struct work_struct *work)
+{
+        struct e1000_adapter *adapter = container_of(work,
+                                        struct e1000_adapter, downshift_task);
+
+        e1000e_gig_downshift_workaround_ich8lan(&adapter->hw);
+}
+
 /**
  * e1000_intr_msi - Interrupt Handler
  * @irq: interrupt number
@@ -1136,7 +1147,7 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)
                  */
                 if ((adapter->flags & FLAG_LSC_GIG_SPEED_DROP) &&
                     (!(er32(STATUS) & E1000_STATUS_LU)))
-                        e1000e_gig_downshift_workaround_ich8lan(hw);
+                        schedule_work(&adapter->downshift_task);
 
                 /*
                  * 80003ES2LAN workaround-- For packet buffer work-around on
@@ -1202,7 +1213,7 @@ static irqreturn_t e1000_intr(int irq, void *data)
                  */
                 if ((adapter->flags & FLAG_LSC_GIG_SPEED_DROP) &&
                     (!(er32(STATUS) & E1000_STATUS_LU)))
-                        e1000e_gig_downshift_workaround_ich8lan(hw);
+                        schedule_work(&adapter->downshift_task);
 
                 /*
                  * 80003ES2LAN workaround--
@@ -1233,26 +1244,36 @@ static irqreturn_t e1000_intr(int irq, void *data)
         return IRQ_HANDLED;
 }
 
+/**
+ * e1000_request_irq - initialize interrupts
+ *
+ * Attempts to configure interrupts using the best available
+ * capabilities of the hardware and kernel.
+ **/
 static int e1000_request_irq(struct e1000_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
-        irq_handler_t handler = e1000_intr;
         int irq_flags = IRQF_SHARED;
         int err;
 
-        if (!pci_enable_msi(adapter->pdev)) {
-                adapter->flags |= FLAG_MSI_ENABLED;
-                handler = e1000_intr_msi;
-                irq_flags = 0;
+        if (!(adapter->flags & FLAG_MSI_TEST_FAILED)) {
+                err = pci_enable_msi(adapter->pdev);
+                if (!err) {
+                        adapter->flags |= FLAG_MSI_ENABLED;
+                        irq_flags = 0;
+                }
         }
 
-        err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
-                          netdev);
+        err = request_irq(adapter->pdev->irq,
+                          ((adapter->flags & FLAG_MSI_ENABLED) ?
+                                &e1000_intr_msi : &e1000_intr),
+                          irq_flags, netdev->name, netdev);
         if (err) {
-                e_err("Unable to allocate %s interrupt (return: %d)\n",
-                      adapter->flags & FLAG_MSI_ENABLED ? "MSI":"INTx", err);
-                if (adapter->flags & FLAG_MSI_ENABLED)
+                if (adapter->flags & FLAG_MSI_ENABLED) {
                         pci_disable_msi(adapter->pdev);
+                        adapter->flags &= ~FLAG_MSI_ENABLED;
+                }
+                e_err("Unable to allocate interrupt, Error: %d\n", err);
         }
 
         return err;
@@ -2579,8 +2600,6 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
         /* Explicitly disable IRQ since the NIC can be in any state. */
         e1000_irq_disable(adapter);
 
-        spin_lock_init(&adapter->stats_lock);
-
         set_bit(__E1000_DOWN, &adapter->state);
         return 0;
 
@@ -2592,6 +2611,135 @@ err:
 }
 
 /**
+ * e1000_intr_msi_test - Interrupt Handler
+ * @irq: interrupt number
+ * @data: pointer to a network interface device structure
+ **/
+static irqreturn_t e1000_intr_msi_test(int irq, void *data)
+{
+        struct net_device *netdev = data;
+        struct e1000_adapter *adapter = netdev_priv(netdev);
+        struct e1000_hw *hw = &adapter->hw;
+        u32 icr = er32(ICR);
+
+        e_dbg("%s: icr is %08X\n", netdev->name, icr);
+        if (icr & E1000_ICR_RXSEQ) {
+                adapter->flags &= ~FLAG_MSI_TEST_FAILED;
+                wmb();
+        }
+
+        return IRQ_HANDLED;
+}
+
+/**
+ * e1000_test_msi_interrupt - Returns 0 for successful test
+ * @adapter: board private struct
+ *
+ * code flow taken from tg3.c
+ **/
+static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
+{
+        struct net_device *netdev = adapter->netdev;
+        struct e1000_hw *hw = &adapter->hw;
+        int err;
+
+        /* poll_enable hasn't been called yet, so don't need disable */
+        /* clear any pending events */
+        er32(ICR);
+
+        /* free the real vector and request a test handler */
+        e1000_free_irq(adapter);
+
+        /* Assume that the test fails, if it succeeds then the test
+         * MSI irq handler will unset this flag */
+        adapter->flags |= FLAG_MSI_TEST_FAILED;
+
+        err = pci_enable_msi(adapter->pdev);
+        if (err)
+                goto msi_test_failed;
+
+        err = request_irq(adapter->pdev->irq, &e1000_intr_msi_test, 0,
+                          netdev->name, netdev);
+        if (err) {
+                pci_disable_msi(adapter->pdev);
+                goto msi_test_failed;
+        }
+
+        wmb();
+
+        e1000_irq_enable(adapter);
+
+        /* fire an unusual interrupt on the test handler */
+        ew32(ICS, E1000_ICS_RXSEQ);
+        e1e_flush();
+        msleep(50);
+
+        e1000_irq_disable(adapter);
+
+        rmb();
+
+        if (adapter->flags & FLAG_MSI_TEST_FAILED) {
+                err = -EIO;
+                e_info("MSI interrupt test failed!\n");
+        }
+
+        free_irq(adapter->pdev->irq, netdev);
+        pci_disable_msi(adapter->pdev);
+
+        if (err == -EIO)
+                goto msi_test_failed;
+
+        /* okay so the test worked, restore settings */
+        e_dbg("%s: MSI interrupt test succeeded!\n", netdev->name);
+msi_test_failed:
+        /* restore the original vector, even if it failed */
+        e1000_request_irq(adapter);
+        return err;
+}
+
+/**
+ * e1000_test_msi - Returns 0 if MSI test succeeds or INTx mode is restored
+ * @adapter: board private struct
+ *
+ * code flow taken from tg3.c, called with e1000 interrupts disabled.
+ **/
+static int e1000_test_msi(struct e1000_adapter *adapter)
+{
+        int err;
+        u16 pci_cmd;
+
+        if (!(adapter->flags & FLAG_MSI_ENABLED))
+                return 0;
+
+        /* disable SERR in case the MSI write causes a master abort */
+        pci_read_config_word(adapter->pdev, PCI_COMMAND, &pci_cmd);
+        pci_write_config_word(adapter->pdev, PCI_COMMAND,
+                              pci_cmd & ~PCI_COMMAND_SERR);
+
+        err = e1000_test_msi_interrupt(adapter);
+
+        /* restore previous setting of command word */
+        pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd);
+
+        /* success ! */
+        if (!err)
+                return 0;
+
+        /* EIO means MSI test failed */
+        if (err != -EIO)
+                return err;
+
+        /* back to INTx mode */
+        e_warn("MSI interrupt test failed, using legacy interrupt.\n");
+
+        e1000_free_irq(adapter);
+
+        err = e1000_request_irq(adapter);
+
+        return err;
+}
+
+/**
  * e1000_open - Called when a network interface is made active
  * @netdev: network interface device structure
  *
@@ -2649,6 +2797,19 @@ static int e1000_open(struct net_device *netdev)
         if (err)
                 goto err_req_irq;
 
+        /*
+         * Work around PCIe errata with MSI interrupts causing some chipsets to
+         * ignore e1000e MSI messages, which means we need to test our MSI
+         * interrupt now
+         */
+        {
+                err = e1000_test_msi(adapter);
+                if (err) {
+                        e_err("Interrupt allocation failed\n");
+                        goto err_req_irq;
+                }
+        }
+
         /* From here on the code is the same as e1000e_up() */
         clear_bit(__E1000_DOWN, &adapter->state);
 
@@ -2757,6 +2918,21 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
         return 0;
 }
 
+/**
+ * e1000e_update_phy_task - work thread to update phy
+ * @work: pointer to our work struct
+ *
+ * this worker thread exists because we must acquire a
+ * semaphore to read the phy, which we could msleep while
+ * waiting for it, and we can't msleep in a timer.
+ **/
+static void e1000e_update_phy_task(struct work_struct *work)
+{
+        struct e1000_adapter *adapter = container_of(work,
+                                        struct e1000_adapter, update_phy_task);
+        e1000_get_phy_info(&adapter->hw);
+}
+
 /*
  * Need to wait a few seconds after link up to get diagnostic information from
  * the phy
@@ -2764,7 +2940,7 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
 static void e1000_update_phy_info(unsigned long data)
 {
         struct e1000_adapter *adapter = (struct e1000_adapter *) data;
-        e1000_get_phy_info(&adapter->hw);
+        schedule_work(&adapter->update_phy_task);
 }
 
 /**
@@ -2775,10 +2951,6 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         struct pci_dev *pdev = adapter->pdev;
-        unsigned long irq_flags;
-        u16 phy_tmp;
-
-#define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
 
         /*
          * Prevent stats update while adapter is being reset, or if the pci
@@ -2789,14 +2961,6 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
         if (pci_channel_offline(pdev))
                 return;
 
-        spin_lock_irqsave(&adapter->stats_lock, irq_flags);
-
-        /*
-         * these counters are modified from e1000_adjust_tbi_stats,
-         * called from the interrupt context, so they must only
-         * be written while holding adapter->stats_lock
-         */
-
         adapter->stats.crcerrs += er32(CRCERRS);
         adapter->stats.gprc += er32(GPRC);
         adapter->stats.gorc += er32(GORCL);
@@ -2867,21 +3031,10 @@ void e1000e_update_stats(struct e1000_adapter *adapter)
 
         /* Tx Dropped needs to be maintained elsewhere */
 
-        /* Phy Stats */
-        if (hw->phy.media_type == e1000_media_type_copper) {
-                if ((adapter->link_speed == SPEED_1000) &&
-                   (!e1e_rphy(hw, PHY_1000T_STATUS, &phy_tmp))) {
-                        phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK;
-                        adapter->phy_stats.idle_errors += phy_tmp;
-                }
-        }
-
         /* Management Stats */
         adapter->stats.mgptc += er32(MGTPTC);
         adapter->stats.mgprc += er32(MGTPRC);
         adapter->stats.mgpdc += er32(MGTPDC);
-
-        spin_unlock_irqrestore(&adapter->stats_lock, irq_flags);
 }
 
 /**
@@ -2893,10 +3046,6 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter)
         struct e1000_hw *hw = &adapter->hw;
         struct e1000_phy_regs *phy = &adapter->phy_regs;
         int ret_val;
-        unsigned long irq_flags;
-
-
-        spin_lock_irqsave(&adapter->stats_lock, irq_flags);
 
         if ((er32(STATUS) & E1000_STATUS_LU) &&
             (adapter->hw.phy.media_type == e1000_media_type_copper)) {
@@ -2927,8 +3076,6 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter)
                 phy->stat1000 = 0;
                 phy->estatus = (ESTATUS_1000_TFULL | ESTATUS_1000_THALF);
         }
-
-        spin_unlock_irqrestore(&adapter->stats_lock, irq_flags);
 }
 
 static void e1000_print_link_info(struct e1000_adapter *adapter)
@@ -3055,7 +3202,7 @@ static void e1000_watchdog_task(struct work_struct *work)
                         case SPEED_10:
                                 txb2b = 0;
                                 netdev->tx_queue_len = 10;
-                                adapter->tx_timeout_factor = 14;
+                                adapter->tx_timeout_factor = 16;
                                 break;
                         case SPEED_100:
                                 txb2b = 0;
@@ -3721,7 +3868,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
         struct e1000_adapter *adapter = netdev_priv(netdev);
         int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
 
-        if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||
+        if ((new_mtu < ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN) ||
             (max_frame > MAX_JUMBO_FRAME_SIZE)) {
                 e_err("Invalid MTU setting\n");
                 return -EINVAL;
@@ -4312,6 +4459,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
         adapter->bd_number = cards_found++;
 
+        e1000e_check_options(adapter);
+
         /* setup adapter struct */
         err = e1000_sw_init(adapter);
         if (err)
@@ -4327,6 +4476,10 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         if (err)
                 goto err_hw_init;
 
+        if ((adapter->flags & FLAG_IS_ICH) &&
+            (adapter->flags & FLAG_READ_ONLY_NVM))
+                e1000e_write_protect_nvm_ich8lan(&adapter->hw);
+
         hw->mac.ops.get_bus_info(&adapter->hw);
 
         adapter->hw.phy.autoneg_wait_to_complete = 0;
@@ -4417,8 +4570,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 
         INIT_WORK(&adapter->reset_task, e1000_reset_task);
         INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
-
-        e1000e_check_options(adapter);
+        INIT_WORK(&adapter->downshift_task, e1000e_downshift_workaround);
+        INIT_WORK(&adapter->update_phy_task, e1000e_update_phy_task);
 
         /* Initialize link parameters. User can change them with ethtool */
         adapter->hw.mac.autoneg = 1;
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
index 8effc3107f9a..d91dbf7ba434 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -133,6 +133,15 @@ E1000_PARAM(SmartPowerDownEnable, "Enable PHY smart power down");
  */
 E1000_PARAM(KumeranLockLoss, "Enable Kumeran lock loss workaround");
 
+/*
+ * Write Protect NVM
+ *
+ * Valid Range: 0, 1
+ *
+ * Default Value: 1 (enabled)
+ */
+E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lead to corrupted NVM]");
+
 struct e1000_option {
         enum { enable_option, range_option, list_option } type;
         const char *name;
@@ -324,14 +333,27 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                                 adapter->itr = 20000;
                                 break;
                         default:
-                                e1000_validate_option(&adapter->itr, &opt,
-                                        adapter);
                                 /*
-                                 * save the setting, because the dynamic bits
-                                 * change itr. clear the lower two bits
-                                 * because they are used as control
+                                 * Save the setting, because the dynamic bits
+                                 * change itr.
                                  */
-                                adapter->itr_setting = adapter->itr & ~3;
+                                if (e1000_validate_option(&adapter->itr, &opt,
+                                                          adapter) &&
+                                    (adapter->itr == 3)) {
+                                        /*
+                                         * In case of invalid user value,
+                                         * default to conservative mode.
+                                         */
+                                        adapter->itr_setting = adapter->itr;
+                                        adapter->itr = 20000;
+                                } else {
+                                        /*
+                                         * Clear the lower two bits because
+                                         * they are used as control.
+                                         */
+                                        adapter->itr_setting =
+                                                adapter->itr & ~3;
+                                }
                                 break;
                         }
                 } else {
@@ -375,4 +397,25 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                                                                        opt.def);
                 }
         }
+        { /* Write-protect NVM */
+                const struct e1000_option opt = {
+                        .type = enable_option,
+                        .name = "Write-protect NVM",
+                        .err  = "defaulting to Enabled",
+                        .def  = OPTION_ENABLED
+                };
+
+                if (adapter->flags & FLAG_IS_ICH) {
+                        if (num_WriteProtectNVM > bd) {
+                                unsigned int write_protect_nvm = WriteProtectNVM[bd];
+                                e1000_validate_option(&write_protect_nvm, &opt,
+                                                      adapter);
+                                if (write_protect_nvm)
+                                        adapter->flags |= FLAG_READ_ONLY_NVM;
+                        } else {
+                                if (opt.def)
+                                        adapter->flags |= FLAG_READ_ONLY_NVM;
+                        }
+                }
+        }
 }
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 053971e5fc94..eeb55ed2152d 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5522,7 +5522,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         if (id->driver_data & DEV_HAS_CHECKSUM) {
                 np->rx_csum = 1;
                 np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK;
-                dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;
+                dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
                 dev->features |= NETIF_F_TSO;
         }
 
@@ -5643,6 +5643,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 dev->dev_addr[4] = (np->orig_mac[0] >>  8) & 0xff;
                 dev->dev_addr[5] = (np->orig_mac[0] >>  0) & 0xff;
                 writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll);
+                printk(KERN_DEBUG "nv_probe: set workaround bit for reversed mac addr\n");
         }
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
@@ -5835,7 +5836,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
 
         dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n",
                    dev->features & NETIF_F_HIGHDMA ? "highdma " : "",
-                   dev->features & (NETIF_F_HW_CSUM | NETIF_F_SG) ?
+                   dev->features & (NETIF_F_IP_CSUM | NETIF_F_SG) ?
                         "csum " : "",
                    dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ?
                         "vlan " : "",
@@ -5890,14 +5891,12 @@ static void nv_restore_phy(struct net_device *dev)
         }
 }
 
-static void __devexit nv_remove(struct pci_dev *pci_dev)
+static void nv_restore_mac_addr(struct pci_dev *pci_dev)
 {
         struct net_device *dev = pci_get_drvdata(pci_dev);
         struct fe_priv *np = netdev_priv(dev);
         u8 __iomem *base = get_hwbase(dev);
 
-        unregister_netdev(dev);
-
         /* special op: write back the misordered MAC address - otherwise
          * the next nv_probe would see a wrong address.
          */
@@ -5905,6 +5904,15 @@ static void __devexit nv_remove(struct pci_dev *pci_dev)
         writel(np->orig_mac[1], base + NvRegMacAddrB);
         writel(readl(base + NvRegTransmitPoll) & ~NVREG_TRANSMITPOLL_MAC_ADDR_REV,
                base + NvRegTransmitPoll);
+}
+
+static void __devexit nv_remove(struct pci_dev *pci_dev)
+{
+        struct net_device *dev = pci_get_drvdata(pci_dev);
+
+        unregister_netdev(dev);
+
+        nv_restore_mac_addr(pci_dev);
 
         /* restore any phy related changes */
         nv_restore_phy(dev);
@@ -5975,10 +5983,14 @@ 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);
+        nv_restore_mac_addr(pdev);
+
         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/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 9a51ec8293cc..9d461825bf4c 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -792,6 +792,10 @@ static int fs_enet_open(struct net_device *dev)
         int r;
         int err;
 
+        /* to initialize the fep->cur_rx,... */
+        /* not doing this, will cause a crash in fs_enet_rx_napi */
+        fs_init_bds(fep->ndev);
+
         if (fep->fpi->use_napi)
                 napi_enable(&fep->napi);
 
@@ -1167,6 +1171,10 @@ static struct of_device_id fs_enet_match[] = {
                 .compatible = "fsl,cpm1-scc-enet",
                 .data = (void *)&fs_scc_ops,
         },
+        {
+                .compatible = "fsl,cpm2-scc-enet",
+                .data = (void *)&fs_scc_ops,
+        },
 #endif
 #ifdef CONFIG_FS_ENET_HAS_FCC
         {
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 029b3c7ef29c..22f50dd8b277 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -47,7 +47,6 @@
 #include "fs_enet.h"
 
 /*************************************************/
-
 #if defined(CONFIG_CPM1)
 /* for a 8xx __raw_xxx's are sufficient */
 #define __fs_out32(addr, x)     __raw_writel(x, addr)
@@ -62,6 +61,8 @@
 #define __fs_out16(addr, x)     out_be16(addr, x)
 #define __fs_in32(addr) in_be32(addr)
 #define __fs_in16(addr) in_be16(addr)
+#define __fs_out8(addr, x)      out_8(addr, x)
+#define __fs_in8(addr)  in_8(addr)
 #endif
 
 /* write, read, set bits, clear bits */
@@ -262,8 +263,13 @@ static void restart(struct net_device *dev)
 
         /* Initialize function code registers for big-endian.
          */
+#ifndef CONFIG_NOT_COHERENT_CACHE
+        W8(ep, sen_genscc.scc_rfcr, SCC_EB | SCC_GBL);
+        W8(ep, sen_genscc.scc_tfcr, SCC_EB | SCC_GBL);
+#else
         W8(ep, sen_genscc.scc_rfcr, SCC_EB);
         W8(ep, sen_genscc.scc_tfcr, SCC_EB);
+#endif
 
         /* Set maximum bytes per receive buffer.
          * This appears to be an Ethernet frame size, not the buffer
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index ca6cf6ecb37b..4320a983a588 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -105,6 +105,7 @@ const char gfar_driver_version[] = "1.3";
 
 static int gfar_enet_open(struct net_device *dev);
 static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);
+static void gfar_reset_task(struct work_struct *work);
 static void gfar_timeout(struct net_device *dev);
 static int gfar_close(struct net_device *dev);
 struct sk_buff *gfar_new_skb(struct net_device *dev);
@@ -134,9 +135,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int l
 static void gfar_vlan_rx_register(struct net_device *netdev,
                                 struct vlan_group *grp);
 void gfar_halt(struct net_device *dev);
-#ifdef CONFIG_PM
 static void gfar_halt_nodisable(struct net_device *dev);
-#endif
 void gfar_start(struct net_device *dev);
 static void gfar_clear_exact_match(struct net_device *dev);
 static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr);
@@ -211,6 +210,7 @@ static int gfar_probe(struct platform_device *pdev)
         spin_lock_init(&priv->txlock);
         spin_lock_init(&priv->rxlock);
         spin_lock_init(&priv->bflock);
+        INIT_WORK(&priv->reset_task, gfar_reset_task);
 
         platform_set_drvdata(pdev, dev);
 
@@ -631,7 +631,6 @@ static void init_registers(struct net_device *dev)
 }
 
 
-#ifdef CONFIG_PM
 /* Halt the receive and transmit queues */
 static void gfar_halt_nodisable(struct net_device *dev)
 {
@@ -657,7 +656,6 @@ static void gfar_halt_nodisable(struct net_device *dev)
                         cpu_relax();
         }
 }
-#endif
 
 /* Halt the receive and transmit queues */
 void gfar_halt(struct net_device *dev)
@@ -666,6 +664,8 @@ void gfar_halt(struct net_device *dev)
         struct gfar __iomem *regs = priv->regs;
         u32 tempval;
 
+        gfar_halt_nodisable(dev);
+
         /* Disable Rx and Tx */
         tempval = gfar_read(&regs->maccfg1);
         tempval &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN);
@@ -1214,6 +1214,7 @@ static int gfar_close(struct net_device *dev)
 
         napi_disable(&priv->napi);
 
+        cancel_work_sync(&priv->reset_task);
         stop_gfar(dev);
 
         /* Disconnect from the PHY */
@@ -1328,13 +1329,16 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
-/* gfar_timeout gets called when a packet has not been
+/* gfar_reset_task gets scheduled when a packet has not been
  * transmitted after a set amount of time.
  * For now, assume that clearing out all the structures, and
- * starting over will fix the problem. */
-static void gfar_timeout(struct net_device *dev)
+ * starting over will fix the problem.
+ */
+static void gfar_reset_task(struct work_struct *work)
 {
-        dev->stats.tx_errors++;
+        struct gfar_private *priv = container_of(work, struct gfar_private,
+                        reset_task);
+        struct net_device *dev = priv->dev;
 
         if (dev->flags & IFF_UP) {
                 stop_gfar(dev);
@@ -1344,6 +1348,14 @@ static void gfar_timeout(struct net_device *dev)
         netif_tx_schedule_all(dev);
 }
 
+static void gfar_timeout(struct net_device *dev)
+{
+        struct gfar_private *priv = netdev_priv(dev);
+
+        dev->stats.tx_errors++;
+        schedule_work(&priv->reset_task);
+}
+
 /* Interrupt Handler for Transmit complete */
 static int gfar_clean_tx_ring(struct net_device *dev)
 {
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index d59df98bd636..f46e9b63af13 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -756,6 +756,7 @@ struct gfar_private {
 
         uint32_t msg_enable;
 
+        struct work_struct reset_task;
         /* Network Statistics */
         struct gfar_extra_stats extra_stats;
 };
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c
index 5116f68e01b9..782c20170082 100644
--- a/drivers/net/gianfar_sysfs.c
+++ b/drivers/net/gianfar_sysfs.c
@@ -33,7 +33,6 @@
 
 #include <asm/uaccess.h>
 #include <linux/module.h>
-#include <linux/version.h>
 
 #include "gianfar.h"
 
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index 8239939554bc..fbbd3e660c27 100644
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -139,7 +139,7 @@ static int __init do_hpp_probe(struct net_device *dev)
 #ifndef MODULE
 struct net_device * __init hp_plus_probe(int unit)
 {
-        struct net_device *dev = alloc_ei_netdev();
+        struct net_device *dev = alloc_eip_netdev();
         int err;
 
         if (!dev)
@@ -284,7 +284,7 @@ hpp_open(struct net_device *dev)
         int option_reg;
         int retval;
 
-        if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) {
+        if ((retval = request_irq(dev->irq, eip_interrupt, 0, dev->name, dev))) {
             return retval;
         }
 
@@ -302,7 +302,7 @@ hpp_open(struct net_device *dev)
         /* Select the operational page. */
         outw(Perf_Page, ioaddr + HP_PAGING);
 
-        ei_open(dev);
+        eip_open(dev);
         return 0;
 }
 
@@ -313,7 +313,7 @@ hpp_close(struct net_device *dev)
         int option_reg = inw(ioaddr + HPP_OPTION);
 
         free_irq(dev->irq, dev);
-        ei_close(dev);
+        eip_close(dev);
         outw((option_reg & ~EnableIRQ) | MemDisable | NICReset | ChipReset,
                  ioaddr + HPP_OPTION);
 
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 2e720f26ca83..ccd9d9058f6d 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -663,9 +663,6 @@ static int emac_configure(struct emac_instance *dev)
         if (emac_phy_gpcs(dev->phy.mode))
                 emac_mii_reset_phy(&dev->phy);
 
-        /* Required for Pause packet support in EMAC */
-        dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1);
-
         return 0;
 }
 
@@ -1150,6 +1147,9 @@ static int emac_open(struct net_device *ndev)
         } else
                 netif_carrier_on(dev->ndev);
 
+        /* Required for Pause packet support in EMAC */
+        dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1);
+
         emac_configure(dev);
         mal_poll_add(dev->mal, &dev->commac);
         mal_enable_tx_channel(dev->mal, dev->mal_tx_chan);
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index a03fe1fb61ca..c2d57f836088 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -904,8 +904,6 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
         unsigned long data_dma_addr;
 
         desc.fields.flags_len = IBMVETH_BUF_VALID | skb->len;
-        data_dma_addr = dma_map_single(&adapter->vdev->dev, skb->data,
-                                       skb->len, DMA_TO_DEVICE);
 
         if (skb->ip_summed == CHECKSUM_PARTIAL &&
             ip_hdr(skb)->protocol != IPPROTO_TCP && skb_checksum_help(skb)) {
@@ -924,6 +922,8 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                 buf[1] = 0;
         }
 
+        data_dma_addr = dma_map_single(&adapter->vdev->dev, skb->data,
+                                       skb->len, DMA_TO_DEVICE);
         if (dma_mapping_error(&adapter->vdev->dev, data_dma_addr)) {
                 if (!firmware_has_feature(FW_FEATURE_CMO))
                         ibmveth_error_printk("tx: unable to map xmit buffer\n");
@@ -932,6 +932,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                 desc.fields.address = adapter->bounce_buffer_dma;
                 tx_map_failed++;
                 used_bounce = 1;
+                wmb();
         } else
                 desc.fields.address = data_dma_addr;
 
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index bb823acc7443..f5e2e7235fcb 100644
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -87,7 +87,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
         case E1000_DEV_ID_82576:
         case E1000_DEV_ID_82576_FIBER:
         case E1000_DEV_ID_82576_SERDES:
-        case E1000_DEV_ID_82576_QUAD_COPPER:
                 mac->type = e1000_82576;
                 break;
         default:
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index a65ccc3095c3..99504a600a80 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -41,7 +41,6 @@ struct e1000_hw;
 #define E1000_DEV_ID_82576                    0x10C9
 #define E1000_DEV_ID_82576_FIBER              0x10E6
 #define E1000_DEV_ID_82576_SERDES             0x10E7
-#define E1000_DEV_ID_82576_QUAD_COPPER        0x10E8
 #define E1000_DEV_ID_82575EB_COPPER           0x10A7
 #define E1000_DEV_ID_82575EB_FIBER_SERDES     0x10A9
 #define E1000_DEV_ID_82575GB_QUAD_COPPER      0x10D6
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
index 11aee1309951..58906c984be9 100644
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/igb/igb_ethtool.c
@@ -373,13 +373,17 @@ static void igb_get_regs(struct net_device *netdev,
         regs_buff[12] = rd32(E1000_EECD);
 
         /* Interrupt */
-        regs_buff[13] = rd32(E1000_EICR);
+        /* Reading EICS for EICR because they read the
+         * same but EICS does not clear on read */
+        regs_buff[13] = rd32(E1000_EICS);
         regs_buff[14] = rd32(E1000_EICS);
         regs_buff[15] = rd32(E1000_EIMS);
         regs_buff[16] = rd32(E1000_EIMC);
         regs_buff[17] = rd32(E1000_EIAC);
         regs_buff[18] = rd32(E1000_EIAM);
-        regs_buff[19] = rd32(E1000_ICR);
+        /* Reading ICS for ICR because they read the
+         * same but ICS does not clear on read */
+        regs_buff[19] = rd32(E1000_ICS);
         regs_buff[20] = rd32(E1000_ICS);
         regs_buff[21] = rd32(E1000_IMS);
         regs_buff[22] = rd32(E1000_IMC);
@@ -1746,15 +1750,6 @@ static int igb_wol_exclusion(struct igb_adapter *adapter,
                 /* return success for non excluded adapter ports */
                 retval = 0;
                 break;
-        case E1000_DEV_ID_82576_QUAD_COPPER:
-                /* quad port adapters only support WoL on port A */
-                if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) {
-                        wol->supported = 0;
-                        break;
-                }
-                /* return success for non excluded adapter ports */
-                retval = 0;
-                break;
         default:
                 /* dual port cards only support WoL on port A from now on
                  * unless it was enabled in the eeprom for port B
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 8f66e15ec8d6..634c4c9d87be 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -61,7 +61,6 @@ static struct pci_device_id igb_pci_tbl[] = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 },
-        { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 },
@@ -521,7 +520,7 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter)
                               adapter->msix_entries,
                               numvecs);
         if (err == 0)
-                return;
+                goto out;
 
         igb_reset_interrupt_capability(adapter);
 
@@ -531,7 +530,7 @@ msi_only:
         adapter->num_tx_queues = 1;
         if (!pci_enable_msi(adapter->pdev))
                 adapter->flags |= IGB_FLAG_HAS_MSI;
-
+out:
         /* Notify the stack of the (possibly) reduced Tx Queue count. */
         adapter->netdev->real_num_tx_queues = adapter->num_tx_queues;
         return;
@@ -1217,16 +1216,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1)
                         adapter->eeprom_wol = 0;
                 break;
-        case E1000_DEV_ID_82576_QUAD_COPPER:
-                /* if quad port adapter, disable WoL on all but port A */
-                if (global_quad_port_a != 0)
-                        adapter->eeprom_wol = 0;
-                else
-                        adapter->flags |= IGB_FLAG_QUAD_PORT_A;
-                /* Reset for multiple quad port adapters */
-                if (++global_quad_port_a == 4)
-                        global_quad_port_a = 0;
-                break;
         }
 
         /* initialize the wol settings based on the eeprom settings */
@@ -2290,7 +2279,9 @@ static void igb_watchdog_task(struct work_struct *work)
         struct igb_ring *tx_ring = adapter->tx_ring;
         struct e1000_mac_info *mac = &adapter->hw.mac;
         u32 link;
+        u32 eics = 0;
         s32 ret_val;
+        int i;
 
         if ((netif_carrier_ok(netdev)) &&
             (rd32(E1000_STATUS) & E1000_STATUS_LU))
@@ -2392,7 +2383,13 @@ link_up:
         }
 
         /* Cause software interrupt to ensure rx ring is cleaned */
-        wr32(E1000_ICS, E1000_ICS_RXDMT0);
+        if (adapter->msix_entries) {
+                for (i = 0; i < adapter->num_rx_queues; i++)
+                        eics |= adapter->rx_ring[i].eims_value;
+                wr32(E1000_EICS, eics);
+        } else {
+                wr32(E1000_ICS, E1000_ICS_RXDMT0);
+        }
 
         /* Force detection of hung controller every watchdog period */
         tx_ring->detect_tx_hung = true;
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h
index e0e718ab4c2e..dd9318f19497 100644
--- a/drivers/net/ipg.h
+++ b/drivers/net/ipg.h
@@ -7,7 +7,6 @@
 #ifndef __LINUX_IPG_H
 #define __LINUX_IPG_H
 
-#include <linux/version.h>
 #include <linux/module.h>
 
 #include <linux/kernel.h>
@@ -21,7 +20,6 @@
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
-#include <linux/version.h>
 #include <asm/bitops.h>
 
 /*
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index 2f38e847e2cd..f96358b641af 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -190,6 +190,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)
         case IXGBE_DEV_ID_82598AF_DUAL_PORT:
         case IXGBE_DEV_ID_82598AF_SINGLE_PORT:
         case IXGBE_DEV_ID_82598EB_CX4:
+        case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:
                 media_type = ixgbe_media_type_fiber;
                 break;
         case IXGBE_DEV_ID_82598AT_DUAL_PORT:
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index e5f3da8468cc..a417be7f8be5 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -48,7 +48,7 @@ char ixgbe_driver_name[] = "ixgbe";
 static const char ixgbe_driver_string[] =
         "Intel(R) 10 Gigabit PCI Express Network Driver";
 
-#define DRV_VERSION "1.3.18-k2"
+#define DRV_VERSION "1.3.18-k4"
 const char ixgbe_driver_version[] = DRV_VERSION;
 static const char ixgbe_copyright[] =
          "Copyright (c) 1999-2007 Intel Corporation.";
@@ -72,6 +72,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = {
          board_82598 },
         {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4),
          board_82598 },
+        {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT),
+         board_82598 },
 
         /* required last entry */
         {0, }
@@ -1634,16 +1636,17 @@ static void ixgbe_set_multi(struct net_device *netdev)
         struct ixgbe_hw *hw = &adapter->hw;
         struct dev_mc_list *mc_ptr;
         u8 *mta_list;
-        u32 fctrl;
+        u32 fctrl, vlnctrl;
         int i;
 
         /* Check for Promiscuous and All Multicast modes */
 
         fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
+        vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
 
         if (netdev->flags & IFF_PROMISC) {
                 fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
-                fctrl &= ~IXGBE_VLNCTRL_VFE;
+                vlnctrl &= ~IXGBE_VLNCTRL_VFE;
         } else {
                 if (netdev->flags & IFF_ALLMULTI) {
                         fctrl |= IXGBE_FCTRL_MPE;
@@ -1651,10 +1654,11 @@ static void ixgbe_set_multi(struct net_device *netdev)
                 } else {
                         fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE);
                 }
-                fctrl |= IXGBE_VLNCTRL_VFE;
+                vlnctrl |= IXGBE_VLNCTRL_VFE;
         }
 
         IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
+        IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
 
         if (netdev->mc_count) {
                 mta_list = kcalloc(netdev->mc_count, ETH_ALEN, GFP_ATOMIC);
@@ -2300,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/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index 1ad7cb9c25a8..c0282a223df3 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -39,6 +39,7 @@
 #define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7
 #define IXGBE_DEV_ID_82598AT_DUAL_PORT   0x10C8
 #define IXGBE_DEV_ID_82598EB_CX4         0x10DD
+#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC
 
 /* General Registers */
 #define IXGBE_CTRL      0x00000
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 49f6bc036a92..3b43bfd85a0f 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -64,68 +64,6 @@ struct pcpu_lstats {
         unsigned long bytes;
 };
 
-/* KISS: just allocate small chunks and copy bits.
- *
- * So, in fact, this is documentation, explaining what we expect
- * of largesending device modulo TCP checksum, which is ignored for loopback.
- */
-
-#ifdef LOOPBACK_TSO
-static void emulate_large_send_offload(struct sk_buff *skb)
-{
-        struct iphdr *iph = ip_hdr(skb);
-        struct tcphdr *th = (struct tcphdr *)(skb_network_header(skb) +
-                                              (iph->ihl * 4));
-        unsigned int doffset = (iph->ihl + th->doff) * 4;
-        unsigned int mtu = skb_shinfo(skb)->gso_size + doffset;
-        unsigned int offset = 0;
-        u32 seq = ntohl(th->seq);
-        u16 id  = ntohs(iph->id);
-
-        while (offset + doffset < skb->len) {
-                unsigned int frag_size = min(mtu, skb->len - offset) - doffset;
-                struct sk_buff *nskb = alloc_skb(mtu + 32, GFP_ATOMIC);
-
-                if (!nskb)
-                        break;
-                skb_reserve(nskb, 32);
-                skb_set_mac_header(nskb, -ETH_HLEN);
-                skb_reset_network_header(nskb);
-                iph = ip_hdr(nskb);
-                skb_copy_to_linear_data(nskb, skb_network_header(skb),
-                                        doffset);
-                if (skb_copy_bits(skb,
-                                  doffset + offset,
-                                  nskb->data + doffset,
-                                  frag_size))
-                        BUG();
-                skb_put(nskb, doffset + frag_size);
-                nskb->ip_summed = CHECKSUM_UNNECESSARY;
-                nskb->dev = skb->dev;
-                nskb->priority = skb->priority;
-                nskb->protocol = skb->protocol;
-                nskb->dst = dst_clone(skb->dst);
-                memcpy(nskb->cb, skb->cb, sizeof(skb->cb));
-                nskb->pkt_type = skb->pkt_type;
-
-                th = (struct tcphdr *)(skb_network_header(nskb) + iph->ihl * 4);
-                iph->tot_len = htons(frag_size + doffset);
-                iph->id = htons(id);
-                iph->check = 0;
-                iph->check = ip_fast_csum((unsigned char *) iph, iph->ihl);
-                th->seq = htonl(seq);
-                if (offset + doffset + frag_size < skb->len)
-                        th->fin = th->psh = 0;
-                netif_rx(nskb);
-                offset += frag_size;
-                seq += frag_size;
-                id++;
-        }
-
-        dev_kfree_skb(skb);
-}
-#endif /* LOOPBACK_TSO */
-
 /*
  * The higher levels take care of making this non-reentrant (it's
  * called with bh's disabled).
@@ -137,9 +75,6 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
         skb_orphan(skb);
 
         skb->protocol = eth_type_trans(skb,dev);
-#ifndef LOOPBACK_MUST_CHECKSUM
-        skb->ip_summed = CHECKSUM_UNNECESSARY;
-#endif
 
 #ifdef LOOPBACK_TSO
         if (skb_is_gso(skb)) {
@@ -234,9 +169,7 @@ static void loopback_setup(struct net_device *dev)
         dev->type               = ARPHRD_LOOPBACK;      /* 0x0001*/
         dev->flags              = IFF_LOOPBACK;
         dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST
-#ifdef LOOPBACK_TSO
                 | NETIF_F_TSO
-#endif
                 | NETIF_F_NO_CSUM
                 | NETIF_F_HIGHDMA
                 | NETIF_F_LLTX
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c
index 62071d9c4a55..d1dd5b48dbd1 100644
--- a/drivers/net/mlx4/mr.c
+++ b/drivers/net/mlx4/mr.c
@@ -67,11 +67,10 @@ struct mlx4_mpt_entry {
 #define MLX4_MPT_FLAG_PHYSICAL      (1 <<  9)
 #define MLX4_MPT_FLAG_REGION        (1 <<  8)
 
-#define MLX4_MPT_PD_FLAG_FAST_REG   (1 << 26)
+#define MLX4_MPT_PD_FLAG_FAST_REG   (1 << 27)
+#define MLX4_MPT_PD_FLAG_RAE        (1 << 28)
 #define MLX4_MPT_PD_FLAG_EN_INV     (3 << 24)
 
-#define MLX4_MTT_FLAG_PRESENT           1
-
 #define MLX4_MPT_STATUS_SW              0xF0
 #define MLX4_MPT_STATUS_HW              0x00
 
@@ -348,7 +347,10 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)
         if (mr->mtt.order >= 0 && mr->mtt.page_shift == 0) {
                 /* fast register MR in free state */
                 mpt_entry->flags    |= cpu_to_be32(MLX4_MPT_FLAG_FREE);
-                mpt_entry->pd_flags |= cpu_to_be32(MLX4_MPT_PD_FLAG_FAST_REG);
+                mpt_entry->pd_flags |= cpu_to_be32(MLX4_MPT_PD_FLAG_FAST_REG |
+                                                   MLX4_MPT_PD_FLAG_RAE);
+                mpt_entry->mtt_sz    = cpu_to_be32((1 << mr->mtt.order) *
+                                                   MLX4_MTT_ENTRY_PER_SEG);
         } else {
                 mpt_entry->flags    |= cpu_to_be32(MLX4_MPT_FLAG_SW_OWNS);
         }
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 46819af3b062..0a18b9e96da1 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -55,7 +55,7 @@
 #include <asm/system.h>
 
 static char mv643xx_eth_driver_name[] = "mv643xx_eth";
-static char mv643xx_eth_driver_version[] = "1.2";
+static char mv643xx_eth_driver_version[] = "1.3";
 
 #define MV643XX_ETH_CHECKSUM_OFFLOAD_TX
 #define MV643XX_ETH_NAPI
@@ -474,11 +474,19 @@ static void rxq_refill(struct rx_queue *rxq)
                 /*
                  * Reserve 2+14 bytes for an ethernet header (the
                  * hardware automatically prepends 2 bytes of dummy
-                 * data to each received packet), 4 bytes for a VLAN
-                 * header, and 4 bytes for the trailing FCS -- 24
-                 * bytes total.
+                 * data to each received packet), 16 bytes for up to
+                 * four VLAN tags, and 4 bytes for the trailing FCS
+                 * -- 36 bytes total.
                  */
-                skb_size = mp->dev->mtu + 24;
+                skb_size = mp->dev->mtu + 36;
+
+                /*
+                 * Make sure that the skb size is a multiple of 8
+                 * bytes, as the lower three bits of the receive
+                 * descriptor's buffer size field are ignored by
+                 * the hardware.
+                 */
+                skb_size = (skb_size + 7) & ~7;
 
                 skb = dev_alloc_skb(skb_size + dma_get_cache_alignment() - 1);
                 if (skb == NULL)
@@ -509,10 +517,8 @@ static void rxq_refill(struct rx_queue *rxq)
                 skb_reserve(skb, 2);
         }
 
-        if (rxq->rx_desc_count != rxq->rx_ring_size) {
-                rxq->rx_oom.expires = jiffies + (HZ / 10);
-                add_timer(&rxq->rx_oom);
-        }
+        if (rxq->rx_desc_count != rxq->rx_ring_size)
+                mod_timer(&rxq->rx_oom, jiffies + (HZ / 10));
 
         spin_unlock_irqrestore(&mp->lock, flags);
 }
@@ -529,7 +535,7 @@ static int rxq_process(struct rx_queue *rxq, int budget)
         int rx;
 
         rx = 0;
-        while (rx < budget) {
+        while (rx < budget && rxq->rx_desc_count) {
                 struct rx_desc *rx_desc;
                 unsigned int cmd_sts;
                 struct sk_buff *skb;
@@ -554,7 +560,7 @@ static int rxq_process(struct rx_queue *rxq, int budget)
                 spin_unlock_irqrestore(&mp->lock, flags);
 
                 dma_unmap_single(NULL, rx_desc->buf_ptr + 2,
-                                 mp->dev->mtu + 24, DMA_FROM_DEVICE);
+                                 rx_desc->buf_size, DMA_FROM_DEVICE);
                 rxq->rx_desc_count--;
                 rx++;
 
@@ -636,9 +642,9 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
                                 txq_reclaim(mp->txq + i, 0);
 
                 if (netif_carrier_ok(mp->dev)) {
-                        spin_lock(&mp->lock);
+                        spin_lock_irq(&mp->lock);
                         __txq_maybe_wake(mp->txq + mp->txq_primary);
-                        spin_unlock(&mp->lock);
+                        spin_unlock_irq(&mp->lock);
                 }
         }
 #endif
@@ -650,8 +656,6 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
 
         if (rx < budget) {
                 netif_rx_complete(mp->dev, napi);
-                wrl(mp, INT_CAUSE(mp->port_num), 0);
-                wrl(mp, INT_CAUSE_EXT(mp->port_num), 0);
                 wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_EXT);
         }
 
@@ -1796,6 +1800,7 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
          */
 #ifdef MV643XX_ETH_NAPI
         if (int_cause & INT_RX) {
+                wrl(mp, INT_CAUSE(mp->port_num), ~(int_cause & INT_RX));
                 wrl(mp, INT_MASK(mp->port_num), 0x00000000);
                 rdl(mp, INT_MASK(mp->port_num));
 
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index f1de38f8b742..d6524db321af 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -56,7 +56,6 @@
 #include <linux/ethtool.h>
 #include <linux/firmware.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 #include <linux/timer.h>
 #include <linux/vmalloc.h>
 #include <linux/crc32.h>
@@ -76,7 +75,7 @@
 #include "myri10ge_mcp.h"
 #include "myri10ge_mcp_gen_header.h"
 
-#define MYRI10GE_VERSION_STR "1.3.99-1.347"
+#define MYRI10GE_VERSION_STR "1.4.3-1.358"
 
 MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
 MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -3548,7 +3547,11 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp)
 
         /* try to load the slice aware rss firmware */
         old_fw = mgp->fw_name;
-        if (old_fw == myri10ge_fw_aligned)
+        if (myri10ge_fw_name != NULL) {
+                dev_info(&mgp->pdev->dev, "overriding rss firmware to %s\n",
+                         myri10ge_fw_name);
+                mgp->fw_name = myri10ge_fw_name;
+        } else if (old_fw == myri10ge_fw_aligned)
                 mgp->fw_name = myri10ge_fw_rss_aligned;
         else
                 mgp->fw_name = myri10ge_fw_rss_unaligned;
diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index 42443d697423..fa3ceca4e15c 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -118,7 +118,7 @@ bad_clone_list[] __initdata = {
     {"E-LAN100", "E-LAN200", {0x00, 0x00, 0x5d}}, /* Broken ne1000 clones */
     {"PCM-4823", "PCM-4823", {0x00, 0xc0, 0x6c}}, /* Broken Advantech MoBo */
     {"REALTEK", "RTL8019", {0x00, 0x00, 0xe8}}, /* no-name with Realtek chip */
-#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)
+#ifdef CONFIG_MACH_TX49XX
     {"RBHMA4X00-RTL8019", "RBHMA4X00/RTL8019", {0x00, 0x60, 0x0a}},  /* Toshiba built-in */
 #endif
     {"LCS-8834", "LCS-8836", {0x04, 0x04, 0x37}}, /* ShinyNet (SET) */
@@ -142,7 +142,7 @@ bad_clone_list[] __initdata = {
 #if defined(CONFIG_PLAT_MAPPI)
 #  define DCR_VAL 0x4b
 #elif defined(CONFIG_PLAT_OAKS32R)  || \
-   defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)
+   defined(CONFIG_MACH_TX49XX)
 #  define DCR_VAL 0x48          /* 8-bit mode */
 #else
 #  define DCR_VAL 0x49
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 93a7b9b668d5..244ab49c4337 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -45,7 +45,6 @@
 #include <linux/in.h>
 #include <linux/tcp.h>
 #include <linux/skbuff.h>
-#include <linux/version.h>
 
 #include <linux/ethtool.h>
 #include <linux/mii.h>
@@ -66,8 +65,8 @@
 
 #define _NETXEN_NIC_LINUX_MAJOR 4
 #define _NETXEN_NIC_LINUX_MINOR 0
-#define _NETXEN_NIC_LINUX_SUBVERSION 0
-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.0"
+#define _NETXEN_NIC_LINUX_SUBVERSION 11
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.11"
 
 #define NETXEN_VERSION_CODE(a, b, c)    (((a) << 16) + ((b) << 8) + (c))
 
@@ -1615,7 +1614,8 @@ dma_watchdog_wakeup(struct netxen_adapter *adapter)
 
 
 int netxen_is_flash_supported(struct netxen_adapter *adapter);
-int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 mac[]);
+int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac);
+int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac);
 extern void netxen_change_ringparam(struct netxen_adapter *adapter);
 extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr,
                                 int *valp);
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 4ad3e0844b99..b974ca0fc530 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -38,7 +38,6 @@
 #include <asm/io.h>
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
-#include <linux/version.h>
 
 #include "netxen_nic.h"
 #include "netxen_nic_hw.h"
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index e8e8d73f6ed7..e80f9e3e5973 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -32,8 +32,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
-
 #include <linux/spinlock.h>
 #include <asm/irq.h>
 #include <linux/init.h>
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 9aa20f961618..84978f80f396 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -733,31 +733,56 @@ static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,
         return 0;
 }
 
-int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 mac[])
+int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac)
 {
-        __le32 *pmac = (__le32 *) & mac[0];
+        __le32 *pmac = (__le32 *) mac;
+        u32 offset;
 
-        if (netxen_get_flash_block(adapter,
-                                   NETXEN_USER_START +
-                                   offsetof(struct netxen_new_user_info,
-                                            mac_addr),
-                                   FLASH_NUM_PORTS * sizeof(u64), pmac) == -1) {
+        offset = NETXEN_USER_START +
+                offsetof(struct netxen_new_user_info, mac_addr) +
+                adapter->portnum * sizeof(u64);
+
+        if (netxen_get_flash_block(adapter, offset, sizeof(u64), pmac) == -1)
                 return -1;
-        }
+
         if (*mac == cpu_to_le64(~0ULL)) {
+
+                offset = NETXEN_USER_START_OLD +
+                        offsetof(struct netxen_user_old_info, mac_addr) +
+                        adapter->portnum * sizeof(u64);
+
                 if (netxen_get_flash_block(adapter,
-                                           NETXEN_USER_START_OLD +
-                                           offsetof(struct netxen_user_old_info,
-                                                    mac_addr),
-                                           FLASH_NUM_PORTS * sizeof(u64),
-                                           pmac) == -1)
+                                        offset, sizeof(u64), pmac) == -1)
                         return -1;
+
                 if (*mac == cpu_to_le64(~0ULL))
                         return -1;
         }
         return 0;
 }
 
+int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac)
+{
+        uint32_t crbaddr, mac_hi, mac_lo;
+        int pci_func = adapter->ahw.pci_func;
+
+        crbaddr = CRB_MAC_BLOCK_START +
+                (4 * ((pci_func/2) * 3)) + (4 * (pci_func & 1));
+
+        adapter->hw_read_wx(adapter, crbaddr, &mac_lo, 4);
+        adapter->hw_read_wx(adapter, crbaddr+4, &mac_hi, 4);
+
+        mac_hi = cpu_to_le32(mac_hi);
+        mac_lo = cpu_to_le32(mac_lo);
+
+        if (pci_func & 1)
+                *mac = ((mac_lo >> 16) | ((u64)mac_hi << 16));
+        else
+                *mac = ((mac_lo) | ((u64)mac_hi << 32));
+
+        return 0;
+}
+
 #define CRB_WIN_LOCK_TIMEOUT 100000000
 
 static int crb_win_lock(struct netxen_adapter *adapter)
@@ -2183,10 +2208,10 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)
         if (adapter->portnum == 0) {
                 get_brd_name_by_type(board_info->board_type, brd_name);
 
-                printk("NetXen %s Board S/N %s  Chip id 0x%x\n",
-                                brd_name, serial_num, board_info->chip_id);
-                printk("NetXen Firmware version %d.%d.%d\n", fw_major,
-                                fw_minor, fw_build);
+                printk(KERN_INFO "NetXen %s Board S/N %s  Chip rev 0x%x\n",
+                                brd_name, serial_num, adapter->ahw.revision_id);
+                printk(KERN_INFO "NetXen Firmware version %d.%d.%d\n",
+                                fw_major, fw_minor, fw_build);
         }
 
         if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) <
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 519fc860e17e..5bba675d0504 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1079,10 +1079,12 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter)
 
 void netxen_free_adapter_offload(struct netxen_adapter *adapter)
 {
-        int i;
+        int i = 100;
+
+        if (!adapter->dummy_dma.addr)
+                return;
 
-        if (adapter->dummy_dma.addr) {
-                i = 100;
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                 do {
                         if (dma_watchdog_shutdown_request(adapter) == 1)
                                 break;
@@ -1090,17 +1092,17 @@ void netxen_free_adapter_offload(struct netxen_adapter *adapter)
                         if (dma_watchdog_shutdown_poll_result(adapter) == 1)
                                 break;
                 } while (--i);
+        }
 
-                if (i) {
-                        pci_free_consistent(adapter->pdev,
-                                    NETXEN_HOST_DUMMY_DMA_SIZE,
-                                    adapter->dummy_dma.addr,
-                                    adapter->dummy_dma.phys_addr);
-                        adapter->dummy_dma.addr = NULL;
-                } else {
-                        printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n",
-                                        adapter->netdev->name);
-                }
+        if (i) {
+                pci_free_consistent(adapter->pdev,
+                            NETXEN_HOST_DUMMY_DMA_SIZE,
+                            adapter->dummy_dma.addr,
+                            adapter->dummy_dma.phys_addr);
+                adapter->dummy_dma.addr = NULL;
+        } else {
+                printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n",
+                                adapter->netdev->name);
         }
 }
 
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 7615c715e66e..008fd6618a5f 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -149,76 +149,18 @@ static uint32_t msi_tgt_status[8] = {
 
 static struct netxen_legacy_intr_set legacy_intr[] = NX_LEGACY_INTR_CONFIG;
 
-static void netxen_nic_disable_int(struct netxen_adapter *adapter)
+static inline void netxen_nic_disable_int(struct netxen_adapter *adapter)
 {
-        u32 mask = 0x7ff;
-        int retries = 32;
-        int pci_fn = adapter->ahw.pci_func;
-
-        if (adapter->msi_mode != MSI_MODE_MULTIFUNC)
-                adapter->pci_write_normalize(adapter,
-                                adapter->crb_intr_mask, 0);
-
-        if (adapter->intr_scheme != -1 &&
-            adapter->intr_scheme != INTR_SCHEME_PERPORT)
-                adapter->pci_write_immediate(adapter, ISR_INT_MASK, mask);
-
-        if (!NETXEN_IS_MSI_FAMILY(adapter)) {
-                do {
-                        adapter->pci_write_immediate(adapter,
-                                        adapter->legacy_intr.tgt_status_reg,
-                                        0xffffffff);
-                        mask = adapter->pci_read_immediate(adapter,
-                                        ISR_INT_VECTOR);
-                        if (!(mask & 0x80))
-                                break;
-                        udelay(10);
-                } while (--retries);
-
-                if (!retries) {
-                        printk(KERN_NOTICE "%s: Failed to disable interrupt\n",
-                                        netxen_nic_driver_name);
-                }
-        } else {
-                if (adapter->msi_mode == MSI_MODE_MULTIFUNC) {
-                        adapter->pci_write_immediate(adapter,
-                                        msi_tgt_status[pci_fn], 0xffffffff);
-                }
-        }
+        adapter->pci_write_normalize(adapter, adapter->crb_intr_mask, 0);
 }
 
-static void netxen_nic_enable_int(struct netxen_adapter *adapter)
+static inline void netxen_nic_enable_int(struct netxen_adapter *adapter)
 {
-        u32 mask;
-
-        if (adapter->intr_scheme != -1 &&
-                adapter->intr_scheme != INTR_SCHEME_PERPORT) {
-                switch (adapter->ahw.board_type) {
-                case NETXEN_NIC_GBE:
-                        mask  =  0x77b;
-                        break;
-                case NETXEN_NIC_XGBE:
-                        mask  =  0x77f;
-                        break;
-                default:
-                        mask  =  0x7ff;
-                        break;
-                }
-
-                adapter->pci_write_immediate(adapter, ISR_INT_MASK, mask);
-        }
-
         adapter->pci_write_normalize(adapter, adapter->crb_intr_mask, 0x1);
 
-        if (!NETXEN_IS_MSI_FAMILY(adapter)) {
-                mask = 0xbff;
-                if (adapter->intr_scheme == INTR_SCHEME_PERPORT)
-                        adapter->pci_write_immediate(adapter,
-                                adapter->legacy_intr.tgt_mask_reg, mask);
-                else
-                        adapter->pci_write_normalize(adapter,
-                                        CRB_INT_VECTOR, 0);
-        }
+        if (!NETXEN_IS_MSI_FAMILY(adapter))
+                adapter->pci_write_immediate(adapter,
+                                adapter->legacy_intr.tgt_mask_reg, 0xfbff);
 }
 
 static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id)
@@ -417,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,
@@ -501,6 +433,44 @@ static void netxen_init_msix_entries(struct netxen_adapter *adapter)
                 adapter->msix_entries[i].entry = i;
 }
 
+static int
+netxen_read_mac_addr(struct netxen_adapter *adapter)
+{
+        int i;
+        unsigned char *p;
+        __le64 mac_addr;
+        DECLARE_MAC_BUF(mac);
+        struct net_device *netdev = adapter->netdev;
+        struct pci_dev *pdev = adapter->pdev;
+
+        if (netxen_is_flash_supported(adapter) != 0)
+                return -EIO;
+
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+                if (netxen_p3_get_mac_addr(adapter, &mac_addr) != 0)
+                        return -EIO;
+        } else {
+                if (netxen_get_flash_mac_addr(adapter, &mac_addr) != 0)
+                        return -EIO;
+        }
+
+        p = (unsigned char *)&mac_addr;
+        for (i = 0; i < 6; i++)
+                netdev->dev_addr[i] = *(p + 5 - i);
+
+        memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
+
+        /* set station address */
+
+        if (!is_valid_ether_addr(netdev->perm_addr)) {
+                dev_warn(&pdev->dev, "Bad MAC address %s.\n",
+                                print_mac(mac, netdev->dev_addr));
+        } else
+                adapter->macaddr_set(adapter, netdev->dev_addr);
+
+        return 0;
+}
+
 /*
  * netxen_nic_probe()
  *
@@ -529,10 +499,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         unsigned long mem_base, mem_len, db_base, db_len, pci_len0 = 0;
         int i = 0, err;
         int first_driver, first_boot;
-        __le64 mac_addr[FLASH_NUM_PORTS + 1];
         u32 val;
         int pci_func_id = PCI_FUNC(pdev->devfn);
-        DECLARE_MAC_BUF(mac);
         struct netxen_legacy_intr_set *legacy_intrp;
         uint8_t revision_id;
 
@@ -545,6 +513,13 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 return -ENODEV;
         }
 
+        if (pdev->revision >= NX_P3_A0 && pdev->revision < NX_P3_B1) {
+                printk(KERN_WARNING "NetXen chip revisions between 0x%x-0x%x"
+                                "will not be enabled.\n",
+                                NX_P3_A0, NX_P3_B1);
+                return -ENODEV;
+        }
+
         if ((err = pci_enable_device(pdev)))
                 return err;
 
@@ -898,34 +873,14 @@ request_msi:
                 goto err_out_disable_msi;
 
         init_timer(&adapter->watchdog_timer);
-        adapter->ahw.linkup = 0;
         adapter->watchdog_timer.function = &netxen_watchdog;
         adapter->watchdog_timer.data = (unsigned long)adapter;
         INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
         INIT_WORK(&adapter->tx_timeout_task, netxen_tx_timeout_task);
 
-        if (netxen_is_flash_supported(adapter) == 0 &&
-                        netxen_get_flash_mac_addr(adapter, mac_addr) == 0) {
-                unsigned char *p;
-
-                p = (unsigned char *)&mac_addr[adapter->portnum];
-                netdev->dev_addr[0] = *(p + 5);
-                netdev->dev_addr[1] = *(p + 4);
-                netdev->dev_addr[2] = *(p + 3);
-                netdev->dev_addr[3] = *(p + 2);
-                netdev->dev_addr[4] = *(p + 1);
-                netdev->dev_addr[5] = *(p + 0);
-
-                memcpy(netdev->perm_addr, netdev->dev_addr,
-                        netdev->addr_len);
-                if (!is_valid_ether_addr(netdev->perm_addr)) {
-                        printk(KERN_ERR "%s: Bad MAC address %s.\n",
-                                        netxen_nic_driver_name,
-                                        print_mac(mac, netdev->dev_addr));
-                } else {
-                        adapter->macaddr_set(adapter, netdev->dev_addr);
-                }
-        }
+        err = netxen_read_mac_addr(adapter);
+        if (err)
+                dev_warn(&pdev->dev, "failed to read mac addr\n");
 
         netif_carrier_off(netdev);
         netif_stop_queue(netdev);
@@ -1000,6 +955,7 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 
         if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
                 netxen_free_hw_resources(adapter);
+                netxen_release_rx_buffers(adapter);
                 netxen_free_sw_resources(adapter);
         }
 
@@ -1069,6 +1025,15 @@ static int netxen_nic_open(struct net_device *netdev)
                         goto err_out_free_sw;
                 }
 
+                if ((adapter->msi_mode != MSI_MODE_MULTIFUNC) ||
+                        (adapter->intr_scheme != INTR_SCHEME_PERPORT)) {
+                        printk(KERN_ERR "%s: Firmware interrupt scheme is "
+                                        "incompatible with driver\n",
+                                        netdev->name);
+                        adapter->driver_mismatch = 1;
+                        goto err_out_free_hw;
+                }
+
                 if (adapter->fw_major < 4) {
                         adapter->crb_addr_cmd_producer =
                                 crb_cmd_producer[adapter->portnum];
@@ -1094,7 +1059,7 @@ static int netxen_nic_open(struct net_device *netdev)
                                   flags, netdev->name, adapter);
                 if (err) {
                         printk(KERN_ERR "request_irq failed with: %d\n", err);
-                        goto err_out_free_hw;
+                        goto err_out_free_rxbuf;
                 }
 
                 adapter->is_up = NETXEN_ADAPTER_UP_MAGIC;
@@ -1116,6 +1081,7 @@ static int netxen_nic_open(struct net_device *netdev)
         if (adapter->set_mtu)
                 adapter->set_mtu(adapter, netdev->mtu);
 
+        adapter->ahw.linkup = 0;
         mod_timer(&adapter->watchdog_timer, jiffies);
 
         napi_enable(&adapter->napi);
@@ -1127,6 +1093,8 @@ static int netxen_nic_open(struct net_device *netdev)
 
 err_out_free_irq:
         free_irq(adapter->irq, adapter);
+err_out_free_rxbuf:
+        netxen_release_rx_buffers(adapter);
 err_out_free_hw:
         netxen_free_hw_resources(adapter);
 err_out_free_sw:
@@ -1152,10 +1120,8 @@ static int netxen_nic_close(struct net_device *netdev)
 
         netxen_release_tx_buffers(adapter);
 
-        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
-                FLUSH_SCHEDULED_WORK();
-                del_timer_sync(&adapter->watchdog_timer);
-        }
+        FLUSH_SCHEDULED_WORK();
+        del_timer_sync(&adapter->watchdog_timer);
 
         return 0;
 }
@@ -1458,7 +1424,8 @@ void netxen_watchdog_task(struct work_struct *work)
 
         netxen_nic_handle_phy_intr(adapter);
 
-        mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
+        if (netif_running(adapter->netdev))
+                mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
 }
 
 static void netxen_tx_timeout(struct net_device *netdev)
@@ -1518,18 +1485,9 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
         return stats;
 }
 
-static inline void
-netxen_handle_int(struct netxen_adapter *adapter)
-{
-        netxen_nic_disable_int(adapter);
-        napi_schedule(&adapter->napi);
-}
-
 static irqreturn_t netxen_intr(int irq, void *data)
 {
         struct netxen_adapter *adapter = data;
-        u32 our_int = 0;
-
         u32 status = 0;
 
         status = adapter->pci_read_immediate(adapter, ISR_INT_VECTOR);
@@ -1544,22 +1502,32 @@ static irqreturn_t netxen_intr(int irq, void *data)
                 if (!ISR_LEGACY_INT_TRIGGERED(status))
                         return IRQ_NONE;
 
-        } else if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
+        } else {
+                unsigned long our_int = 0;
 
                 our_int = adapter->pci_read_normalize(adapter, CRB_INT_VECTOR);
+
                 /* not our interrupt */
-                if ((our_int & (0x80 << adapter->portnum)) == 0)
+                if (!test_and_clear_bit((7 + adapter->portnum), &our_int))
                         return IRQ_NONE;
 
-                if (adapter->intr_scheme == INTR_SCHEME_PERPORT) {
-                        /* claim interrupt */
-                        adapter->pci_write_normalize(adapter,
-                                CRB_INT_VECTOR,
-                                our_int & ~((u32)(0x80 << adapter->portnum)));
-                }
+                /* claim interrupt */
+                adapter->pci_write_normalize(adapter,
+                                CRB_INT_VECTOR, (our_int & 0xffffffff));
         }
 
-        netxen_handle_int(adapter);
+        /* clear interrupt */
+        if (adapter->fw_major < 4)
+                netxen_nic_disable_int(adapter);
+
+        adapter->pci_write_immediate(adapter,
+                        adapter->legacy_intr.tgt_status_reg,
+                        0xffffffff);
+        /* read twice to ensure write is flushed */
+        adapter->pci_read_immediate(adapter, ISR_INT_VECTOR);
+        adapter->pci_read_immediate(adapter, ISR_INT_VECTOR);
+
+        napi_schedule(&adapter->napi);
 
         return IRQ_HANDLED;
 }
@@ -1568,7 +1536,11 @@ static irqreturn_t netxen_msi_intr(int irq, void *data)
 {
         struct netxen_adapter *adapter = data;
 
-        netxen_handle_int(adapter);
+        /* clear interrupt */
+        adapter->pci_write_immediate(adapter,
+                        msi_tgt_status[adapter->ahw.pci_func], 0xffffffff);
+
+        napi_schedule(&adapter->napi);
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/net/netxen/netxen_nic_phan_reg.h b/drivers/net/netxen/netxen_nic_phan_reg.h
index 83e5ee57bfef..b293adcc95ab 100644
--- a/drivers/net/netxen/netxen_nic_phan_reg.h
+++ b/drivers/net/netxen/netxen_nic_phan_reg.h
@@ -125,6 +125,8 @@
 #define CRB_SW_INT_MASK_2          NETXEN_NIC_REG(0x1e4)
 #define CRB_SW_INT_MASK_3          NETXEN_NIC_REG(0x1e8)
 
+#define CRB_MAC_BLOCK_START        NETXEN_CAM_RAM(0x1c0)
+
 /*
  * capabilities register, can be used to selectively enable/disable features
  * for backward compability
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index e4765b713aba..e3be81eba8a4 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -5984,6 +5984,56 @@ static void niu_netif_start(struct niu *np)
         niu_enable_interrupts(np, 1);
 }
 
+static void niu_reset_buffers(struct niu *np)
+{
+        int i, j, k, err;
+
+        if (np->rx_rings) {
+                for (i = 0; i < np->num_rx_rings; i++) {
+                        struct rx_ring_info *rp = &np->rx_rings[i];
+
+                        for (j = 0, k = 0; j < MAX_RBR_RING_SIZE; j++) {
+                                struct page *page;
+
+                                page = rp->rxhash[j];
+                                while (page) {
+                                        struct page *next =
+                                                (struct page *) page->mapping;
+                                        u64 base = page->index;
+                                        base = base >> RBR_DESCR_ADDR_SHIFT;
+                                        rp->rbr[k++] = cpu_to_le32(base);
+                                        page = next;
+                                }
+                        }
+                        for (; k < MAX_RBR_RING_SIZE; k++) {
+                                err = niu_rbr_add_page(np, rp, GFP_ATOMIC, k);
+                                if (unlikely(err))
+                                        break;
+                        }
+
+                        rp->rbr_index = rp->rbr_table_size - 1;
+                        rp->rcr_index = 0;
+                        rp->rbr_pending = 0;
+                        rp->rbr_refill_pending = 0;
+                }
+        }
+        if (np->tx_rings) {
+                for (i = 0; i < np->num_tx_rings; i++) {
+                        struct tx_ring_info *rp = &np->tx_rings[i];
+
+                        for (j = 0; j < MAX_TX_RING_SIZE; j++) {
+                                if (rp->tx_buffs[j].skb)
+                                        (void) release_tx_packet(np, rp, j);
+                        }
+
+                        rp->pending = MAX_TX_RING_SIZE;
+                        rp->prod = 0;
+                        rp->cons = 0;
+                        rp->wrap_bit = 0;
+                }
+        }
+}
+
 static void niu_reset_task(struct work_struct *work)
 {
         struct niu *np = container_of(work, struct niu, reset_task);
@@ -6006,6 +6056,12 @@ static void niu_reset_task(struct work_struct *work)
 
         niu_stop_hw(np);
 
+        spin_unlock_irqrestore(&np->lock, flags);
+
+        niu_reset_buffers(np);
+
+        spin_lock_irqsave(&np->lock, flags);
+
         err = niu_init_hw(np);
         if (!err) {
                 np->timer.expires = jiffies + HZ;
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/ppp_mppe.c b/drivers/net/ppp_mppe.c
index b35d79449500..88f03c9e9403 100644
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
@@ -46,7 +46,6 @@
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/slab.h>
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index f9298827a76c..ff175e8f36b2 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -61,7 +61,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/string.h>
 #include <linux/list.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 6531ff565c54..5d86281d9363 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -24,7 +24,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/moduleparam.h>
 #include <linux/string.h>
 #include <linux/timer.h>
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index a3e3895e5032..0f6f9747d255 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2792,7 +2792,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
                                         pkt_size, PCI_DMA_FROMDEVICE);
                                 rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
                         } else {
-                                pci_unmap_single(pdev, addr, pkt_size,
+                                pci_unmap_single(pdev, addr, tp->rx_buf_sz,
                                                  PCI_DMA_FROMDEVICE);
                                 tp->Rx_skbuff[entry] = NULL;
                         }
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 25e62cf58d3a..1c370e6aa641 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -20,7 +20,6 @@
  *  the file called "COPYING".
  */
 
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c
index 889f98724610..a85efcfd9d0e 100644
--- a/drivers/net/skfp/ess.c
+++ b/drivers/net/skfp/ess.c
@@ -510,7 +510,7 @@ static void ess_send_response(struct s_smc *smc, struct smt_header *sm,
         chg->path.para.p_type = SMT_P320B ;
         chg->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ;
         chg->path.mib_index = SBAPATHINDEX ;
-        chg->path.path_pad = (u_short)NULL ;
+        chg->path.path_pad = 0;
         chg->path.path_index = PRIMARY_RING ;
 
         /* set P320F */
@@ -606,7 +606,7 @@ static void ess_send_alc_req(struct s_smc *smc)
         req->path.para.p_type = SMT_P320B ;
         req->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ;
         req->path.mib_index = SBAPATHINDEX ;
-        req->path.path_pad = (u_short)NULL ;
+        req->path.path_pad = 0;
         req->path.path_index = PRIMARY_RING ;
 
         /* set P0017 */
@@ -636,7 +636,7 @@ static void ess_send_alc_req(struct s_smc *smc)
         /* set P19 */
         req->a_addr.para.p_type = SMT_P0019 ;
         req->a_addr.para.p_len = sizeof(struct smt_p_0019) - PARA_LEN ;
-        req->a_addr.sba_pad = (u_short)NULL ;
+        req->a_addr.sba_pad = 0;
         req->a_addr.alloc_addr = null_addr ;
 
         /* set P1A */
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 7d29edcd40b4..e24b25ca1c69 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -24,7 +24,6 @@
 
 #include <linux/crc32.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/dma-mapping.h>
@@ -666,11 +665,16 @@ static void sky2_phy_power_down(struct sky2_hw *hw, unsigned port)
 
         if (hw->chip_id != CHIP_ID_YUKON_EC) {
                 if (hw->chip_id == CHIP_ID_YUKON_EC_U) {
-                        ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);
+                        /* select page 2 to access MAC control register */
+                        gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 2);
 
+                        ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);
                         /* enable Power Down */
                         ctrl |= PHY_M_PC_POW_D_ENA;
                         gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl);
+
+                        /* set page register back to 0 */
+                        gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 0);
                 }
 
                 /* set IEEE compatible Power Down Mode (dev. #4.99) */
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 2040965d7724..24768c10cadb 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2255,7 +2255,7 @@ static int smc_drv_remove(struct platform_device *pdev)
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");
         if (!res)
-                platform_get_resource(pdev, IORESOURCE_MEM, 0);
+                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(res->start, SMC_IO_EXTENT);
 
         free_netdev(ndev);
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index c66dfc9ec1ec..7db48f1cd949 100644
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -27,7 +27,6 @@
 #include <linux/sched.h>
 #include <linux/tty.h>
 #include <linux/if_vlan.h>
-#include <linux/version.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index d2439b85a790..71d2c5cfdad9 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -66,8 +66,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.93"
-#define DRV_MODULE_RELDATE      "May 22, 2008"
+#define DRV_MODULE_VERSION      "3.94"
+#define DRV_MODULE_RELDATE      "August 14, 2008"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -536,6 +536,7 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)
                 return 0;
 
         switch (locknum) {
+                case TG3_APE_LOCK_GRC:
                 case TG3_APE_LOCK_MEM:
                         break;
                 default:
@@ -573,6 +574,7 @@ static void tg3_ape_unlock(struct tg3 *tp, int locknum)
                 return;
 
         switch (locknum) {
+                case TG3_APE_LOCK_GRC:
                 case TG3_APE_LOCK_MEM:
                         break;
                 default:
@@ -1018,15 +1020,43 @@ static void tg3_mdio_fini(struct tg3 *tp)
 }
 
 /* tp->lock is held. */
+static inline void tg3_generate_fw_event(struct tg3 *tp)
+{
+        u32 val;
+
+        val = tr32(GRC_RX_CPU_EVENT);
+        val |= GRC_RX_CPU_DRIVER_EVENT;
+        tw32_f(GRC_RX_CPU_EVENT, val);
+
+        tp->last_event_jiffies = jiffies;
+}
+
+#define TG3_FW_EVENT_TIMEOUT_USEC 2500
+
+/* tp->lock is held. */
 static void tg3_wait_for_event_ack(struct tg3 *tp)
 {
         int i;
+        unsigned int delay_cnt;
+        long time_remain;
+
+        /* If enough time has passed, no wait is necessary. */
+        time_remain = (long)(tp->last_event_jiffies + 1 +
+                      usecs_to_jiffies(TG3_FW_EVENT_TIMEOUT_USEC)) -
+                      (long)jiffies;
+        if (time_remain < 0)
+                return;
 
-        /* Wait for up to 2.5 milliseconds */
-        for (i = 0; i < 250000; i++) {
+        /* Check if we can shorten the wait time. */
+        delay_cnt = jiffies_to_usecs(time_remain);
+        if (delay_cnt > TG3_FW_EVENT_TIMEOUT_USEC)
+                delay_cnt = TG3_FW_EVENT_TIMEOUT_USEC;
+        delay_cnt = (delay_cnt >> 3) + 1;
+
+        for (i = 0; i < delay_cnt; i++) {
                 if (!(tr32(GRC_RX_CPU_EVENT) & GRC_RX_CPU_DRIVER_EVENT))
                         break;
-                udelay(10);
+                udelay(8);
         }
 }
 
@@ -1075,9 +1105,7 @@ static void tg3_ump_link_report(struct tg3 *tp)
                 val = 0;
         tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX + 12, val);
 
-        val = tr32(GRC_RX_CPU_EVENT);
-        val |= GRC_RX_CPU_DRIVER_EVENT;
-        tw32_f(GRC_RX_CPU_EVENT, val);
+        tg3_generate_fw_event(tp);
 }
 
 static void tg3_link_report(struct tg3 *tp)
@@ -2124,6 +2152,13 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
                      (tp->tg3_flags & TG3_FLAG_WOL_ENABLE))
                         mac_mode |= MAC_MODE_MAGIC_PKT_ENABLE;
 
+                if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) {
+                        mac_mode |= tp->mac_mode &
+                                    (MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN);
+                        if (mac_mode & MAC_MODE_APE_TX_EN)
+                                mac_mode |= MAC_MODE_TDE_ENABLE;
+                }
+
                 tw32_f(MAC_MODE, mac_mode);
                 udelay(100);
 
@@ -5493,7 +5528,7 @@ static void tg3_ape_send_event(struct tg3 *tp, u32 event)
                 return;
 
         apedata = tg3_ape_read32(tp, TG3_APE_FW_STATUS);
-        if (apedata != APE_FW_STATUS_READY)
+        if (!(apedata & APE_FW_STATUS_READY))
                 return;
 
         /* Wait for up to 1 millisecond for APE to service previous event. */
@@ -5760,6 +5795,8 @@ static int tg3_chip_reset(struct tg3 *tp)
 
         tg3_mdio_stop(tp);
 
+        tg3_ape_lock(tp, TG3_APE_LOCK_GRC);
+
         /* No matching tg3_nvram_unlock() after this because
          * chip reset below will undo the nvram lock.
          */
@@ -5908,12 +5945,19 @@ static int tg3_chip_reset(struct tg3 *tp)
         } else if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES) {
                 tp->mac_mode = MAC_MODE_PORT_MODE_GMII;
                 tw32_f(MAC_MODE, tp->mac_mode);
+        } else if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) {
+                tp->mac_mode &= (MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN);
+                if (tp->mac_mode & MAC_MODE_APE_TX_EN)
+                        tp->mac_mode |= MAC_MODE_TDE_ENABLE;
+                tw32_f(MAC_MODE, tp->mac_mode);
         } else
                 tw32_f(MAC_MODE, 0);
         udelay(40);
 
         tg3_mdio_start(tp);
 
+        tg3_ape_unlock(tp, TG3_APE_LOCK_GRC);
+
         err = tg3_poll_fw(tp);
         if (err)
                 return err;
@@ -5935,6 +5979,7 @@ static int tg3_chip_reset(struct tg3 *tp)
                 tg3_read_mem(tp, NIC_SRAM_DATA_CFG, &nic_cfg);
                 if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) {
                         tp->tg3_flags |= TG3_FLAG_ENABLE_ASF;
+                        tp->last_event_jiffies = jiffies;
                         if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
                                 tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
                 }
@@ -5948,15 +5993,12 @@ static void tg3_stop_fw(struct tg3 *tp)
 {
         if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
            !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)) {
-                u32 val;
-
                 /* Wait for RX cpu to ACK the previous event. */
                 tg3_wait_for_event_ack(tp);
 
                 tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW);
-                val = tr32(GRC_RX_CPU_EVENT);
-                val |= GRC_RX_CPU_DRIVER_EVENT;
-                tw32(GRC_RX_CPU_EVENT, val);
+
+                tg3_generate_fw_event(tp);
 
                 /* Wait for RX cpu to ACK this event. */
                 tg3_wait_for_event_ack(tp);
@@ -7406,7 +7448,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                 udelay(10);
         }
 
-        tp->mac_mode = MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE |
+        if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)
+                tp->mac_mode &= MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN;
+        else
+                tp->mac_mode = 0;
+        tp->mac_mode |= MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE |
                 MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE | MAC_MODE_FHDE_ENABLE;
         if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) &&
             !(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) &&
@@ -7840,9 +7886,8 @@ static void tg3_timer(unsigned long __opaque)
          * resets.
          */
         if (!--tp->asf_counter) {
-                if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
-                        u32 val;
-
+                if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
+                    !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)) {
                         tg3_wait_for_event_ack(tp);
 
                         tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX,
@@ -7850,9 +7895,8 @@ static void tg3_timer(unsigned long __opaque)
                         tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);
                         /* 5 seconds timeout */
                         tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);
-                        val = tr32(GRC_RX_CPU_EVENT);
-                        val |= GRC_RX_CPU_DRIVER_EVENT;
-                        tw32_f(GRC_RX_CPU_EVENT, val);
+
+                        tg3_generate_fw_event(tp);
                 }
                 tp->asf_counter = tp->asf_multiplier;
         }
@@ -8422,6 +8466,11 @@ static inline unsigned long get_stat64(tg3_stat64_t *val)
         return ret;
 }
 
+static inline u64 get_estat64(tg3_stat64_t *val)
+{
+       return ((u64)val->high << 32) | ((u64)val->low);
+}
+
 static unsigned long calc_crc_errors(struct tg3 *tp)
 {
         struct tg3_hw_stats *hw_stats = tp->hw_stats;
@@ -8450,7 +8499,7 @@ static unsigned long calc_crc_errors(struct tg3 *tp)
 
 #define ESTAT_ADD(member) \
         estats->member =        old_estats->member + \
-                                get_stat64(&hw_stats->member)
+                                get_estat64(&hw_stats->member)
 
 static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp)
 {
@@ -12416,6 +12465,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                                        tp->misc_host_ctrl);
         }
 
+        /* Preserve the APE MAC_MODE bits */
+        if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)
+                tp->mac_mode = tr32(MAC_MODE) |
+                               MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN;
+        else
+                tp->mac_mode = TG3_DEF_MAC_MODE;
+
         /* these are limited to 10/100 only */
         if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 &&
              (grc_misc_cfg == 0x8000 || grc_misc_cfg == 0x4000)) ||
@@ -13275,7 +13331,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         tp->pdev = pdev;
         tp->dev = dev;
         tp->pm_cap = pm_cap;
-        tp->mac_mode = TG3_DEF_MAC_MODE;
         tp->rx_mode = TG3_DEF_RX_MODE;
         tp->tx_mode = TG3_DEF_TX_MODE;
 
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index df07842172b7..f5b8cab8d4b5 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -325,6 +325,8 @@
 #define  MAC_MODE_TDE_ENABLE             0x00200000
 #define  MAC_MODE_RDE_ENABLE             0x00400000
 #define  MAC_MODE_FHDE_ENABLE            0x00800000
+#define  MAC_MODE_APE_RX_EN              0x08000000
+#define  MAC_MODE_APE_TX_EN              0x10000000
 #define MAC_STATUS                      0x00000404
 #define  MAC_STATUS_PCS_SYNCED           0x00000001
 #define  MAC_STATUS_SIGNAL_DET           0x00000002
@@ -1889,6 +1891,7 @@
 #define  APE_EVENT_STATUS_EVENT_PENDING  0x80000000
 
 /* APE convenience enumerations. */
+#define TG3_APE_LOCK_GRC                1
 #define TG3_APE_LOCK_MEM                4
 
 #define TG3_EEPROM_SB_F1R2_MBA_OFF      0x10
@@ -2429,7 +2432,10 @@ struct tg3 {
         struct tg3_ethtool_stats        estats;
         struct tg3_ethtool_stats        estats_prev;
 
+        union {
         unsigned long                   phy_crc_errors;
+        unsigned long                   last_event_jiffies;
+        };
 
         u32                             rx_offset;
         u32                             tg3_flags;
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 85246ed7cb9c..ec871f646766 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -360,8 +360,8 @@ TLan_GetSKB( const struct tlan_list_tag *tag)
 {
         unsigned long addr;
 
-        addr = tag->buffer[8].address;
-        addr |= (tag->buffer[9].address << 16) << 16;
+        addr = tag->buffer[9].address;
+        addr |= (tag->buffer[8].address << 16) << 16;
         return (struct sk_buff *) addr;
 }
 
@@ -1984,7 +1984,6 @@ static void TLan_ResetLists( struct net_device *dev )
         TLanList        *list;
         dma_addr_t      list_phys;
         struct sk_buff  *skb;
-        void            *t = NULL;
 
         priv->txHead = 0;
         priv->txTail = 0;
@@ -2022,7 +2021,8 @@ static void TLan_ResetLists( struct net_device *dev )
                         }
 
                         skb_reserve( skb, NET_IP_ALIGN );
-                        list->buffer[0].address = pci_map_single(priv->pciDev, t,
+                        list->buffer[0].address = pci_map_single(priv->pciDev,
+                                                                 skb->data,
                                                                  TLAN_MAX_FRAME_SIZE,
                                                                  PCI_DMA_FROMDEVICE);
                         TLan_StoreSKB(list, skb);
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 47d84cd28097..59d1673f9387 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -119,7 +119,6 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
-#include <linux/version.h>
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
 
diff --git a/drivers/net/tokenring/lanstreamer.h b/drivers/net/tokenring/lanstreamer.h
index e7bb3494afc7..13ccee6449c1 100644
--- a/drivers/net/tokenring/lanstreamer.h
+++ b/drivers/net/tokenring/lanstreamer.h
@@ -60,8 +60,6 @@
  *
  */
 
-#include <linux/version.h>
-
 /* MAX_INTR - the maximum number of times we can loop
  * inside the interrupt function before returning
  * control to the OS (maximum value is 256)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e6bbc639c2d0..6daea0c91862 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -358,6 +358,66 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait)
         return mask;
 }
 
+/* prepad is the amount to reserve at front.  len is length after that.
+ * linear is a hint as to how much to copy (usually headers). */
+static struct sk_buff *tun_alloc_skb(size_t prepad, size_t len, size_t linear,
+                                     gfp_t gfp)
+{
+        struct sk_buff *skb;
+        unsigned int i;
+
+        skb = alloc_skb(prepad + len, gfp|__GFP_NOWARN);
+        if (skb) {
+                skb_reserve(skb, prepad);
+                skb_put(skb, len);
+                return skb;
+        }
+
+        /* Under a page?  Don't bother with paged skb. */
+        if (prepad + len < PAGE_SIZE)
+                return NULL;
+
+        /* Start with a normal skb, and add pages. */
+        skb = alloc_skb(prepad + linear, gfp);
+        if (!skb)
+                return NULL;
+
+        skb_reserve(skb, prepad);
+        skb_put(skb, linear);
+
+        len -= linear;
+
+        for (i = 0; i < MAX_SKB_FRAGS; i++) {
+                skb_frag_t *f = &skb_shinfo(skb)->frags[i];
+
+                f->page = alloc_page(gfp|__GFP_ZERO);
+                if (!f->page)
+                        break;
+
+                f->page_offset = 0;
+                f->size = PAGE_SIZE;
+
+                skb->data_len += PAGE_SIZE;
+                skb->len += PAGE_SIZE;
+                skb->truesize += PAGE_SIZE;
+                skb_shinfo(skb)->nr_frags++;
+
+                if (len < PAGE_SIZE) {
+                        len = 0;
+                        break;
+                }
+                len -= PAGE_SIZE;
+        }
+
+        /* Too large, or alloc fail? */
+        if (unlikely(len)) {
+                kfree_skb(skb);
+                skb = NULL;
+        }
+
+        return skb;
+}
+
 /* Get packet from user space buffer */
 static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv, size_t count)
 {
@@ -391,14 +451,12 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv,
                         return -EINVAL;
         }
 
-        if (!(skb = alloc_skb(len + align, GFP_KERNEL))) {
+        if (!(skb = tun_alloc_skb(align, len, gso.hdr_len, GFP_KERNEL))) {
                 tun->dev->stats.rx_dropped++;
                 return -ENOMEM;
         }
 
-        if (align)
-                skb_reserve(skb, align);
-        if (memcpy_fromiovec(skb_put(skb, len), iv, len)) {
+        if (skb_copy_datagram_from_iovec(skb, 0, iv, len)) {
                 tun->dev->stats.rx_dropped++;
                 kfree_skb(skb);
                 return -EFAULT;
@@ -748,6 +806,36 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
         return err;
 }
 
+static int tun_get_iff(struct net *net, struct file *file, struct ifreq *ifr)
+{
+        struct tun_struct *tun = file->private_data;
+
+        if (!tun)
+                return -EBADFD;
+
+        DBG(KERN_INFO "%s: tun_get_iff\n", tun->dev->name);
+
+        strcpy(ifr->ifr_name, tun->dev->name);
+
+        ifr->ifr_flags = 0;
+
+        if (ifr->ifr_flags & TUN_TUN_DEV)
+                ifr->ifr_flags |= IFF_TUN;
+        else
+                ifr->ifr_flags |= IFF_TAP;
+
+        if (tun->flags & TUN_NO_PI)
+                ifr->ifr_flags |= IFF_NO_PI;
+
+        if (tun->flags & TUN_ONE_QUEUE)
+                ifr->ifr_flags |= IFF_ONE_QUEUE;
+
+        if (tun->flags & TUN_VNET_HDR)
+                ifr->ifr_flags |= IFF_VNET_HDR;
+
+        return 0;
+}
+
 /* This is like a cut-down ethtool ops, except done via tun fd so no
  * privs required. */
 static int set_offload(struct net_device *dev, unsigned long arg)
@@ -833,6 +921,15 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
         DBG(KERN_INFO "%s: tun_chr_ioctl cmd %d\n", tun->dev->name, cmd);
 
         switch (cmd) {
+        case TUNGETIFF:
+                ret = tun_get_iff(current->nsproxy->net_ns, file, &ifr);
+                if (ret)
+                        return ret;
+
+                if (copy_to_user(argp, &ifr, sizeof(ifr)))
+                        return -EFAULT;
+                break;
+
         case TUNSETNOCSUM:
                 /* Disable/Enable checksum */
                 if (arg)
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 8549f1159a30..734ce0977f02 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -128,7 +128,6 @@ static const int multicast_filter_limit = 32;
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/in6.h>
-#include <linux/version.h>
 #include <linux/dma-mapping.h>
 
 #include "typhoon.h"
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 68e198bd538b..0973b6e37024 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -154,17 +154,6 @@ config USB_NET_AX8817X
           This driver creates an interface named "ethX", where X depends on
           what other networking devices you have in use.
 
-config USB_HSO
-        tristate "Option USB High Speed Mobile Devices"
-        depends on USB && RFKILL
-        default n
-        help
-          Choose this option if you have an Option HSDPA/HSUPA card.
-          These cards support downlink speeds of 7.2Mbps or greater.
-
-          To compile this driver as a module, choose M here: the
-          module will be called hso.
-
 config USB_NET_CDCETHER
         tristate "CDC Ethernet support (smart devices such as cable modems)"
         depends on USB_USBNET
@@ -337,5 +326,15 @@ config USB_NET_ZAURUS
           really need this non-conformant variant of CDC Ethernet (or in
           some cases CDC MDLM) protocol, not "g_ether".
 
+config USB_HSO
+        tristate "Option USB High Speed Mobile Devices"
+        depends on USB && RFKILL
+        default n
+        help
+          Choose this option if you have an Option HSDPA/HSUPA card.
+          These cards support downlink speeds of 7.2Mbps or greater.
+
+          To compile this driver as a module, choose M here: the
+          module will be called hso.
 
 endmenu
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 031d07b105af..6e42b5a8c22b 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -102,8 +102,12 @@
 
 #define MAX_RX_URBS                     2
 
-#define get_serial_by_tty(x)    \
-        (x ? (struct hso_serial *)x->driver_data : NULL)
+static inline struct hso_serial *get_serial_by_tty(struct tty_struct *tty)
+{
+        if (tty)
+                return tty->driver_data;
+        return NULL;
+}
 
 /*****************************************************************************/
 /* Debugging functions                                                       */
@@ -294,24 +298,25 @@ static int hso_get_activity(struct hso_device *hso_dev);
 
 /* #define DEBUG */
 
-#define dev2net(x) (x->port_data.dev_net)
-#define dev2ser(x) (x->port_data.dev_serial)
+static inline struct hso_net *dev2net(struct hso_device *hso_dev)
+{
+        return hso_dev->port_data.dev_net;
+}
+
+static inline struct hso_serial *dev2ser(struct hso_device *hso_dev)
+{
+        return hso_dev->port_data.dev_serial;
+}
 
 /* Debugging functions */
 #ifdef DEBUG
 static void dbg_dump(int line_count, const char *func_name, unsigned char *buf,
                      unsigned int len)
 {
-        u8 i = 0;
+        static char name[255];
 
-        printk(KERN_DEBUG "[%d:%s]: len %d", line_count, func_name, len);
-
-        for (i = 0; i < len; i++) {
-                if (!(i % 16))
-                        printk("\n    0x%03x:  ", i);
-                printk("%02x ", (unsigned char)buf[i]);
-        }
-        printk("\n");
+        sprintf(name, "hso[%d:%s]", line_count, func_name);
+        print_hex_dump_bytes(name, DUMP_PREFIX_NONE, buf, len);
 }
 
 #define DUMP(buf_, len_)        \
@@ -392,7 +397,7 @@ static const struct usb_device_id hso_ids[] = {
         {default_port_device(0x0af0, 0xc031)},  /* Icon-Edge */
         {icon321_port_device(0x0af0, 0xd013)},  /* Module HSxPA */
         {icon321_port_device(0x0af0, 0xd031)},  /* Icon-321 */
-        {default_port_device(0x0af0, 0xd033)},  /* Icon-322 */
+        {icon321_port_device(0x0af0, 0xd033)},  /* Icon-322 */
         {USB_DEVICE(0x0af0, 0x7301)},           /* GE40x */
         {USB_DEVICE(0x0af0, 0x7361)},           /* GE40x */
         {USB_DEVICE(0x0af0, 0x7401)},           /* GI 0401 */
@@ -528,13 +533,12 @@ static struct hso_serial *get_serial_by_shared_int_and_type(
 
 static struct hso_serial *get_serial_by_index(unsigned index)
 {
-        struct hso_serial *serial;
+        struct hso_serial *serial = NULL;
         unsigned long flags;
 
-        if (!serial_table[index])
-                return NULL;
         spin_lock_irqsave(&serial_table_lock, flags);
-        serial = dev2ser(serial_table[index]);
+        if (serial_table[index])
+                serial = dev2ser(serial_table[index]);
         spin_unlock_irqrestore(&serial_table_lock, flags);
 
         return serial;
@@ -561,6 +565,7 @@ static int get_free_serial_index(void)
 static void set_serial_by_index(unsigned index, struct hso_serial *serial)
 {
         unsigned long flags;
+
         spin_lock_irqsave(&serial_table_lock, flags);
         if (serial)
                 serial_table[index] = serial->parent;
@@ -569,7 +574,7 @@ static void set_serial_by_index(unsigned index, struct hso_serial *serial)
         spin_unlock_irqrestore(&serial_table_lock, flags);
 }
 
-/* log a meaningfull explanation of an USB status */
+/* log a meaningful explanation of an USB status */
 static void log_usb_status(int status, const char *function)
 {
         char *explanation;
@@ -1103,8 +1108,8 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
         /* reset the rts and dtr */
         /* do the actual close */
         serial->open_count--;
+        kref_put(&serial->parent->ref, hso_serial_ref_free);
         if (serial->open_count <= 0) {
-                kref_put(&serial->parent->ref, hso_serial_ref_free);
                 serial->open_count = 0;
                 if (serial->tty) {
                         serial->tty->driver_data = NULL;
@@ -1467,7 +1472,8 @@ static void hso_std_serial_write_bulk_callback(struct urb *urb)
                 return;
         }
         hso_put_activity(serial->parent);
-        tty_wakeup(serial->tty);
+        if (serial->tty)
+                tty_wakeup(serial->tty);
         hso_kick_transmit(serial);
 
         D1(" ");
@@ -1538,7 +1544,8 @@ static void ctrl_callback(struct urb *urb)
                         clear_bit(HSO_SERIAL_FLAG_RX_SENT, &serial->flags);
         } else {
                 hso_put_activity(serial->parent);
-                tty_wakeup(serial->tty);
+                if (serial->tty)
+                        tty_wakeup(serial->tty);
                 /* response to a write command */
                 hso_kick_transmit(serial);
         }
@@ -2606,6 +2613,7 @@ static int hso_resume(struct usb_interface *iface)
                                         "Transmitting lingering data\n");
                                 hso_net_start_xmit(hso_net->skb_tx_buf,
                                                    hso_net->net);
+                                hso_net->skb_tx_buf = NULL;
                         }
                         result = hso_start_net_device(network_table[i]);
                         if (result)
@@ -2652,7 +2660,7 @@ static void hso_free_interface(struct usb_interface *interface)
                         hso_stop_net_device(network_table[i]);
                         cancel_work_sync(&network_table[i]->async_put_intf);
                         cancel_work_sync(&network_table[i]->async_get_intf);
-                        if(rfk)
+                        if (rfk)
                                 rfkill_unregister(rfk);
                         hso_free_net_device(network_table[i]);
                 }
@@ -2723,7 +2731,7 @@ static int hso_mux_submit_intr_urb(struct hso_shared_int *shared_int,
 }
 
 /* operations setup of the serial interface */
-static struct tty_operations hso_serial_ops = {
+static const struct tty_operations hso_serial_ops = {
         .open = hso_serial_open,
         .close = hso_serial_close,
         .write = hso_serial_write,
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index c3d119f997f5..ca9d00c1194e 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -46,6 +46,10 @@
 
 #define MCS7830_VENDOR_ID       0x9710
 #define MCS7830_PRODUCT_ID      0x7830
+#define MCS7730_PRODUCT_ID      0x7730
+
+#define SITECOM_VENDOR_ID       0x0DF6
+#define LN_030_PRODUCT_ID       0x0021
 
 #define MCS7830_MII_ADVERTISE   (ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \
                                  ADVERTISE_100HALF | ADVERTISE_10FULL | \
@@ -442,6 +446,29 @@ static struct ethtool_ops mcs7830_ethtool_ops = {
         .nway_reset             = usbnet_nway_reset,
 };
 
+static int mcs7830_set_mac_address(struct net_device *netdev, void *p)
+{
+        int ret;
+        struct usbnet *dev = netdev_priv(netdev);
+        struct sockaddr *addr = p;
+
+        if (netif_running(netdev))
+                return -EBUSY;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EINVAL;
+
+        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+
+        ret = mcs7830_set_reg(dev, HIF_REG_ETHERNET_ADDR, ETH_ALEN,
+                        netdev->dev_addr);
+
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
 static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev)
 {
         struct net_device *net = dev->net;
@@ -455,6 +482,7 @@ static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev)
         net->ethtool_ops = &mcs7830_ethtool_ops;
         net->set_multicast_list = mcs7830_set_multicast;
         mcs7830_set_multicast(net);
+        net->set_mac_address = mcs7830_set_mac_address;
 
         /* reserve space for the status byte on rx */
         dev->rx_urb_size = ETH_FRAME_LEN + 1;
@@ -491,7 +519,16 @@ static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 }
 
 static const struct driver_info moschip_info = {
-        .description    = "MOSCHIP 7830 usb-NET adapter",
+        .description    = "MOSCHIP 7830/7730 usb-NET adapter",
+        .bind           = mcs7830_bind,
+        .rx_fixup       = mcs7830_rx_fixup,
+        .flags          = FLAG_ETHER,
+        .in             = 1,
+        .out            = 2,
+};
+
+static const struct driver_info sitecom_info = {
+        .description    = "Sitecom LN-30 usb-NET adapter",
         .bind           = mcs7830_bind,
         .rx_fixup       = mcs7830_rx_fixup,
         .flags          = FLAG_ETHER,
@@ -504,6 +541,14 @@ static const struct usb_device_id products[] = {
                 USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID),
                 .driver_info = (unsigned long) &moschip_info,
         },
+        {
+                USB_DEVICE(MCS7830_VENDOR_ID, MCS7730_PRODUCT_ID),
+                .driver_info = (unsigned long) &moschip_info,
+        },
+        {
+                USB_DEVICE(SITECOM_VENDOR_ID, LN_030_PRODUCT_ID),
+                .driver_info = (unsigned long) &sitecom_info,
+        },
         {},
 };
 MODULE_DEVICE_TABLE(usb, products);
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/wan/sbni.c b/drivers/net/wan/sbni.c
index e59255a155a9..6596cd0742b9 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -1317,7 +1317,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )
                 break;
 
         case  SIOCDEVRESINSTATS :
-                if( current->euid != 0 )        /* root only */
+                if (!capable(CAP_NET_ADMIN))
                         return  -EPERM;
                 memset( &nl->in_stats, 0, sizeof(struct sbni_in_stats) );
                 break;
@@ -1334,7 +1334,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )
                 break;
 
         case  SIOCDEVSHWSTATE :
-                if( current->euid != 0 )        /* root only */
+                if (!capable(CAP_NET_ADMIN))
                         return  -EPERM;
 
                 spin_lock( &nl->lock );
@@ -1355,7 +1355,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )
 #ifdef CONFIG_SBNI_MULTILINE
 
         case  SIOCDEVENSLAVE :
-                if( current->euid != 0 )        /* root only */
+                if (!capable(CAP_NET_ADMIN))
                         return  -EPERM;
 
                 if (copy_from_user( slave_name, ifr->ifr_data, sizeof slave_name ))
@@ -1370,7 +1370,7 @@ sbni_ioctl( struct net_device  *dev,  struct ifreq  *ifr,  int  cmd )
                 return  enslave( dev, slave_dev );
 
         case  SIOCDEVEMANSIPATE :
-                if( current->euid != 0 )        /* root only */
+                if (!capable(CAP_NET_ADMIN))
                         return  -EPERM;
 
                 return  emancipate( dev );
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index 6f9aa1643743..fa14255282af 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -337,7 +337,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
 #ifdef CONFIG_NET_POLL_CONTROLLER
         dev->poll_controller = ei_poll;
 #endif
-        NS8390p_init(dev, 0);
+        NS8390_init(dev, 0);
 
 #if 1
         /* Enable interrupt generation on softconfig cards -- M.U */
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 2028866f5995..0676c6d84383 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -40,7 +40,6 @@
  *
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/hardirq.h>
@@ -252,7 +251,7 @@ static inline void ath5k_txbuf_free(struct ath5k_softc *sc,
                 return;
         pci_unmap_single(sc->pdev, bf->skbaddr, bf->skb->len,
                         PCI_DMA_TODEVICE);
-        dev_kfree_skb(bf->skb);
+        dev_kfree_skb_any(bf->skb);
         bf->skb = NULL;
 }
 
@@ -467,6 +466,7 @@ ath5k_pci_probe(struct pci_dev *pdev,
         mutex_init(&sc->lock);
         spin_lock_init(&sc->rxbuflock);
         spin_lock_init(&sc->txbuflock);
+        spin_lock_init(&sc->block);
 
         /* Set private data */
         pci_set_drvdata(pdev, hw);
@@ -587,7 +587,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         ath5k_stop_hw(sc);
 
         free_irq(pdev->irq, sc);
-        pci_disable_msi(pdev);
         pci_save_state(pdev);
         pci_disable_device(pdev);
         pci_set_power_state(pdev, PCI_D3hot);
@@ -616,12 +615,10 @@ ath5k_pci_resume(struct pci_dev *pdev)
          */
         pci_write_config_byte(pdev, 0x41, 0);
 
-        pci_enable_msi(pdev);
-
         err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc);
         if (err) {
                 ATH5K_ERR(sc, "request_irq failed\n");
-                goto err_msi;
+                goto err_no_irq;
         }
 
         err = ath5k_init(sc);
@@ -642,8 +639,7 @@ ath5k_pci_resume(struct pci_dev *pdev)
         return 0;
 err_irq:
         free_irq(pdev->irq, sc);
-err_msi:
-        pci_disable_msi(pdev);
+err_no_irq:
         pci_disable_device(pdev);
         return err;
 }
@@ -2184,8 +2180,11 @@ ath5k_beacon_config(struct ath5k_softc *sc)
 
                 sc->imask |= AR5K_INT_SWBA;
 
-                if (ath5k_hw_hasveol(ah))
+                if (ath5k_hw_hasveol(ah)) {
+                        spin_lock(&sc->block);
                         ath5k_beacon_send(sc);
+                        spin_unlock(&sc->block);
+                }
         }
         /* TODO else AP */
 
@@ -2408,7 +2407,9 @@ ath5k_intr(int irq, void *dev_id)
                                                   TSF_TO_TU(tsf),
                                                   (unsigned long long) tsf);
                                 } else {
+                                        spin_lock(&sc->block);
                                         ath5k_beacon_send(sc);
+                                        spin_unlock(&sc->block);
                                 }
                         }
                         if (status & AR5K_INT_RXEOL) {
@@ -2750,6 +2751,11 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
                 ret = -EOPNOTSUPP;
                 goto end;
         }
+
+        /* Set to a reasonable value. Note that this will
+         * be set to mac80211's value at ath5k_config(). */
+        sc->bintval = 1000;
+
         ret = 0;
 end:
         mutex_unlock(&sc->lock);
@@ -2794,9 +2800,6 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         struct ath5k_hw *ah = sc->ah;
         int ret;
 
-        /* Set to a reasonable value. Note that this will
-         * be set to mac80211's value at ath5k_config(). */
-        sc->bintval = 1000;
         mutex_lock(&sc->lock);
         if (sc->vif != vif) {
                 ret = -EIO;
@@ -3055,6 +3058,7 @@ static int
 ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct ath5k_softc *sc = hw->priv;
+        unsigned long flags;
         int ret;
 
         ath5k_debug_dump_skb(sc, skb, "BC  ", 1);
@@ -3064,12 +3068,14 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
                 goto end;
         }
 
+        spin_lock_irqsave(&sc->block, flags);
         ath5k_txbuf_free(sc, sc->bbuf);
         sc->bbuf->skb = skb;
         ret = ath5k_beacon_setup(sc, sc->bbuf);
         if (ret)
                 sc->bbuf->skb = NULL;
-        else {
+        spin_unlock_irqrestore(&sc->block, flags);
+        if (!ret) {
                 ath5k_beacon_config(sc);
                 mmiowb();
         }
diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h
index d7e03e6b8271..7ec2f377d5c7 100644
--- a/drivers/net/wireless/ath5k/base.h
+++ b/drivers/net/wireless/ath5k/base.h
@@ -172,6 +172,7 @@ struct ath5k_softc {
         struct tasklet_struct   txtq;           /* tx intr tasklet */
         struct ath5k_led        tx_led;         /* tx led */
 
+        spinlock_t              block;          /* protects beacon */
         struct ath5k_buf        *bbuf;          /* beacon buffer */
         unsigned int            bhalq,          /* SW q for outgoing beacons */
                                 bmisscount,     /* missed beacon transmits */
diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c
index caf569401a34..00a0eaa08866 100644
--- a/drivers/net/wireless/ath9k/beacon.c
+++ b/drivers/net/wireless/ath9k/beacon.c
@@ -209,6 +209,7 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)
         unsigned int curlen;
         struct ath_txq *cabq;
         struct ath_txq *mcastq;
+        struct ieee80211_tx_info *info;
         avp = sc->sc_vaps[if_id];
 
         mcastq = &avp->av_mcastq;
@@ -232,6 +233,18 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)
          */
         curlen = skb->len;
 
+        info = IEEE80211_SKB_CB(skb);
+        if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
+                /*
+                 * TODO: make sure the seq# gets assigned properly (vs. other
+                 * TX frames)
+                 */
+                struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+                sc->seq_no += 0x10;
+                hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
+                hdr->seq_ctrl |= cpu_to_le16(sc->seq_no);
+        }
+
         /* XXX: spin_lock_bh should not be used here, but sparse bitches
          * otherwise. We should fix sparse :) */
         spin_lock_bh(&mcastq->axq_lock);
diff --git a/drivers/net/wireless/ath9k/core.c b/drivers/net/wireless/ath9k/core.c
index f6c45288d0e7..87e37bc39145 100644
--- a/drivers/net/wireless/ath9k/core.c
+++ b/drivers/net/wireless/ath9k/core.c
@@ -294,8 +294,6 @@ static int ath_stop(struct ath_softc *sc)
          * hardware is gone (invalid).
          */
 
-        if (!sc->sc_invalid)
-                ath9k_hw_set_interrupts(ah, 0);
         ath_draintxq(sc, false);
         if (!sc->sc_invalid) {
                 ath_stoprecv(sc);
@@ -797,6 +795,12 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan)
         if (ah->ah_caps.hw_caps & ATH9K_HW_CAP_HT)
                 sc->sc_imask |= ATH9K_INT_CST;
 
+        /* Note: We disable MIB interrupts for now as we don't yet
+         * handle processing ANI, otherwise you will get an interrupt
+         * storm after about 7 hours of usage making the system unusable
+         * with huge latency. Once we do have ANI processing included
+         * we can re-enable this interrupt. */
+#if 0
         /*
          * Enable MIB interrupts when there are hardware phy counters.
          * Note we only do this (at the moment) for station mode.
@@ -804,6 +808,7 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan)
         if (ath9k_hw_phycounters(ah) &&
             ((sc->sc_opmode == ATH9K_M_STA) || (sc->sc_opmode == ATH9K_M_IBSS)))
                 sc->sc_imask |= ATH9K_INT_MIB;
+#endif
         /*
          * Some hardware processes the TIM IE and fires an
          * interrupt when the TIM bit is set.  For hardware
@@ -1336,6 +1341,8 @@ void ath_deinit(struct ath_softc *sc)
 
         DPRINTF(sc, ATH_DBG_CONFIG, "%s\n", __func__);
 
+        tasklet_kill(&sc->intr_tq);
+        tasklet_kill(&sc->bcon_tasklet);
         ath_stop(sc);
         if (!sc->sc_invalid)
                 ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h
index 673b3d81133a..2f84093331ee 100644
--- a/drivers/net/wireless/ath9k/core.h
+++ b/drivers/net/wireless/ath9k/core.h
@@ -974,7 +974,6 @@ struct ath_softc {
         u32 sc_keymax;          /* size of key cache */
         DECLARE_BITMAP(sc_keymap, ATH_KEYMAX);  /* key use bit map */
         u8 sc_splitmic;         /* split TKIP MIC keys */
-        int sc_keytype;
 
         /* RX */
         struct list_head sc_rxbuf;
@@ -992,6 +991,7 @@ struct ath_softc {
         u32 sc_txintrperiod;    /* tx interrupt batching */
         int sc_haltype2q[ATH9K_WME_AC_VO+1]; /* HAL WME AC -> h/w qnum */
         u32 sc_ant_tx[8];       /* recent tx frames/antenna */
+        u16 seq_no; /* TX sequence number */
 
         /* Beacon */
         struct ath9k_tx_queue_info sc_beacon_qi;
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index bde162f128ab..6dbfed0b4149 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah,
 
         for (i = 0; i < 123; i++) {
                 if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
-                        if ((abs(cur_vit_mask - bin)) < 75)
+
+                        /* workaround for gcc bug #37014 */
+                        volatile int tmp = abs(cur_vit_mask - bin);
+
+                        if (tmp < 75)
                                 mask_amt = 1;
                         else
                                 mask_amt = 0;
@@ -7281,15 +7285,15 @@ ath9k_hw_set_keycache_entry(struct ath_hal *ah, u16 entry,
                 }
                 break;
         case ATH9K_CIPHER_WEP:
-                if (k->kv_len < 40 / NBBY) {
+                if (k->kv_len < LEN_WEP40) {
                         DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE,
                                  "%s: WEP key length %u too small\n",
                                  __func__, k->kv_len);
                         return false;
                 }
-                if (k->kv_len <= 40 / NBBY)
+                if (k->kv_len <= LEN_WEP40)
                         keyType = AR_KEYTABLE_TYPE_40;
-                else if (k->kv_len <= 104 / NBBY)
+                else if (k->kv_len <= LEN_WEP104)
                         keyType = AR_KEYTABLE_TYPE_104;
                 else
                         keyType = AR_KEYTABLE_TYPE_128;
@@ -7309,7 +7313,7 @@ ath9k_hw_set_keycache_entry(struct ath_hal *ah, u16 entry,
         key2 = get_unaligned_le32(k->kv_val + 6) ^ xorMask;
         key3 = (get_unaligned_le16(k->kv_val + 10) ^ xorMask) & 0xffff;
         key4 = get_unaligned_le32(k->kv_val + 12) ^ xorMask;
-        if (k->kv_len <= 104 / NBBY)
+        if (k->kv_len <= LEN_WEP104)
                 key4 &= 0xff;
 
         if (keyType == AR_KEYTABLE_TYPE_TKIP && ATH9K_IS_MIC_ENABLED(ah)) {
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 2888778040e4..acebdf1d20a8 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -206,7 +206,6 @@ static int ath_key_config(struct ath_softc *sc,
         if (!ret)
                 return -EIO;
 
-        sc->sc_keytype = hk.kv_type;
         return 0;
 }
 
@@ -368,6 +367,20 @@ static int ath9k_tx(struct ieee80211_hw *hw,
 {
         struct ath_softc *sc = hw->priv;
         int hdrlen, padsize;
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+
+        /*
+         * As a temporary workaround, assign seq# here; this will likely need
+         * to be cleaned up to work better with Beacon transmission and virtual
+         * BSSes.
+         */
+        if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
+                struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+                if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
+                        sc->seq_no += 0x10;
+                hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
+                hdr->seq_ctrl |= cpu_to_le16(sc->seq_no);
+        }
 
         /* Add the padding after the header if this is not already done */
         hdrlen = ieee80211_get_hdrlen_from_skb(skb);
@@ -756,13 +769,13 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
                         key->hw_key_idx = key->keyidx;
                         /* push IV and Michael MIC generation to stack */
                         key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
-                        key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
+                        if (key->alg == ALG_TKIP)
+                                key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
                 }
                 break;
         case DISABLE_KEY:
                 ath_key_delete(sc, key);
                 clear_bit(key->keyidx, sc->sc_keymap);
-                sc->sc_keytype = ATH9K_CIPHER_CLR;
                 break;
         default:
                 ret = -EINVAL;
@@ -1065,8 +1078,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;
 
@@ -1390,10 +1411,17 @@ static void ath_pci_remove(struct pci_dev *pdev)
 {
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct ath_softc *sc = hw->priv;
+        enum ath9k_int status;
 
-        if (pdev->irq)
+        if (pdev->irq) {
+                ath9k_hw_set_interrupts(sc->sc_ah, 0);
+                /* clear the ISR */
+                ath9k_hw_getisr(sc->sc_ah, &status);
+                sc->sc_invalid = 1;
                 free_irq(pdev->irq, sc);
+        }
         ath_detach(sc);
+
         pci_iounmap(pdev, sc->mem);
         pci_release_region(pdev, 0);
         pci_disable_device(pdev);
diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c
index 2fe806175c01..20ddb7acdb94 100644
--- a/drivers/net/wireless/ath9k/recv.c
+++ b/drivers/net/wireless/ath9k/recv.c
@@ -360,8 +360,9 @@ static void ath_rx_flush_tid(struct ath_softc *sc,
         struct ath_arx_tid *rxtid, int drop)
 {
         struct ath_rxbuf *rxbuf;
+        unsigned long flag;
 
-        spin_lock_bh(&rxtid->tidlock);
+        spin_lock_irqsave(&rxtid->tidlock, flag);
         while (rxtid->baw_head != rxtid->baw_tail) {
                 rxbuf = rxtid->rxbuf + rxtid->baw_head;
                 if (!rxbuf->rx_wbuf) {
@@ -382,7 +383,7 @@ static void ath_rx_flush_tid(struct ath_softc *sc,
                 INCR(rxtid->baw_head, ATH_TID_MAX_BUFS);
                 INCR(rxtid->seq_next, IEEE80211_SEQ_MAX);
         }
-        spin_unlock_bh(&rxtid->tidlock);
+        spin_unlock_irqrestore(&rxtid->tidlock, flag);
 }
 
 static struct sk_buff *ath_rxbuf_alloc(struct ath_softc *sc,
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index 157f830ee6b8..8b332e11a656 100644
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -315,11 +315,11 @@ static int ath_tx_prepare(struct ath_softc *sc,
                 txctl->keyix = tx_info->control.hw_key->hw_key_idx;
                 txctl->frmlen += tx_info->control.icv_len;
 
-                if (sc->sc_keytype == ATH9K_CIPHER_WEP)
+                if (tx_info->control.hw_key->alg == ALG_WEP)
                         txctl->keytype = ATH9K_KEY_TYPE_WEP;
-                else if (sc->sc_keytype == ATH9K_CIPHER_TKIP)
+                else if (tx_info->control.hw_key->alg == ALG_TKIP)
                         txctl->keytype = ATH9K_KEY_TYPE_TKIP;
-                else if (sc->sc_keytype == ATH9K_CIPHER_AES_CCM)
+                else if (tx_info->control.hw_key->alg == ALG_CCMP)
                         txctl->keytype = ATH9K_KEY_TYPE_AES;
         }
 
@@ -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/atmel.c b/drivers/net/wireless/atmel.c
index bd35bb0a1480..bd65c485098c 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1304,7 +1304,7 @@ EXPORT_SYMBOL(atmel_open);
 int atmel_open(struct net_device *dev)
 {
         struct atmel_private *priv = netdev_priv(dev);
-        int i, channel;
+        int i, channel, err;
 
         /* any scheduled timer is no longer needed and might screw things up.. */
         del_timer_sync(&priv->management_timer);
@@ -1328,8 +1328,9 @@ int atmel_open(struct net_device *dev)
         priv->site_survey_state = SITE_SURVEY_IDLE;
         priv->station_is_associated = 0;
 
-        if (!reset_atmel_card(dev))
-                return -EAGAIN;
+        err = reset_atmel_card(dev);
+        if (err)
+                return err;
 
         if (priv->config_reg_domain) {
                 priv->reg_domain = priv->config_reg_domain;
@@ -3061,12 +3062,20 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
         }
 
         if (status == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) {
-                /* Do opensystem first, then try sharedkey */
+                /* Flip back and forth between WEP auth modes until the max
+                 * authentication tries has been exceeded.
+                 */
                 if (system == WLAN_AUTH_OPEN) {
                         priv->CurrentAuthentTransactionSeqNum = 0x001;
                         priv->exclude_unencrypted = 1;
                         send_authentication_request(priv, WLAN_AUTH_SHARED_KEY, NULL, 0);
                         return;
+                } else if (   system == WLAN_AUTH_SHARED_KEY
+                           && priv->wep_is_on) {
+                        priv->CurrentAuthentTransactionSeqNum = 0x001;
+                        priv->exclude_unencrypted = 0;
+                        send_authentication_request(priv, WLAN_AUTH_OPEN, NULL, 0);
+                        return;
                 } else if (priv->connect_to_any_BSS) {
                         int bss_index;
 
@@ -3580,12 +3589,12 @@ static int atmel_wakeup_firmware(struct atmel_private *priv)
 
         if (i == 0) {
                 printk(KERN_ALERT "%s: MAC failed to boot.\n", priv->dev->name);
-                return 0;
+                return -EIO;
         }
 
         if ((priv->host_info_base = atmel_read16(priv->dev, MR2)) == 0xffff) {
                 printk(KERN_ALERT "%s: card missing.\n", priv->dev->name);
-                return 0;
+                return -ENODEV;
         }
 
         /* now check for completion of MAC initialization through
@@ -3609,19 +3618,19 @@ static int atmel_wakeup_firmware(struct atmel_private *priv)
         if (i == 0) {
                 printk(KERN_ALERT "%s: MAC failed to initialise.\n",
                                 priv->dev->name);
-                return 0;
+                return -EIO;
         }
 
         /* Check for MAC_INIT_OK only on the register that the MAC_INIT_OK was set */
         if ((mr3 & MAC_INIT_COMPLETE) &&
             !(atmel_read16(priv->dev, MR3) & MAC_INIT_OK)) {
                 printk(KERN_ALERT "%s: MAC failed MR3 self-test.\n", priv->dev->name);
-                return 0;
+                return -EIO;
         }
         if ((mr1 & MAC_INIT_COMPLETE) &&
             !(atmel_read16(priv->dev, MR1) & MAC_INIT_OK)) {
                 printk(KERN_ALERT "%s: MAC failed MR1 self-test.\n", priv->dev->name);
-                return 0;
+                return -EIO;
         }
 
         atmel_copy_to_host(priv->dev, (unsigned char *)iface,
@@ -3642,7 +3651,7 @@ static int atmel_wakeup_firmware(struct atmel_private *priv)
         iface->func_ctrl = le16_to_cpu(iface->func_ctrl);
         iface->mac_status = le16_to_cpu(iface->mac_status);
 
-        return 1;
+        return 0;
 }
 
 /* determine type of memory and MAC address */
@@ -3693,7 +3702,7 @@ static int probe_atmel_card(struct net_device *dev)
                 /* Standard firmware in flash, boot it up and ask
                    for the Mac Address */
                 priv->card_type = CARD_TYPE_SPI_FLASH;
-                if (atmel_wakeup_firmware(priv)) {
+                if (atmel_wakeup_firmware(priv) == 0) {
                         atmel_get_mib(priv, Mac_Address_Mib_Type, 0, dev->dev_addr, 6);
 
                         /* got address, now squash it again until the network
@@ -3835,6 +3844,7 @@ static int reset_atmel_card(struct net_device *dev)
         struct atmel_private *priv = netdev_priv(dev);
         u8 configuration;
         int old_state = priv->station_state;
+        int err = 0;
 
         /* data to add to the firmware names, in priority order
            this implemenents firmware versioning */
@@ -3868,11 +3878,12 @@ static int reset_atmel_card(struct net_device *dev)
                                                dev->name);
                                         strcpy(priv->firmware_id, "atmel_at76c502.bin");
                                 }
-                                if (request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev) != 0) {
+                                err = request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev);
+                                if (err != 0) {
                                         printk(KERN_ALERT
                                                "%s: firmware %s is missing, cannot continue.\n",
                                                dev->name, priv->firmware_id);
-                                        return 0;
+                                        return err;
                                 }
                         } else {
                                 int fw_index = 0;
@@ -3901,7 +3912,7 @@ static int reset_atmel_card(struct net_device *dev)
                                                "%s: firmware %s is missing, cannot start.\n",
                                                dev->name, priv->firmware_id);
                                         priv->firmware_id[0] = '\0';
-                                        return 0;
+                                        return -ENOENT;
                                 }
                         }
 
@@ -3926,8 +3937,9 @@ static int reset_atmel_card(struct net_device *dev)
                         release_firmware(fw_entry);
         }
 
-        if (!atmel_wakeup_firmware(priv))
-                return 0;
+        err = atmel_wakeup_firmware(priv);
+        if (err != 0)
+                return err;
 
         /* Check the version and set the correct flag for wpa stuff,
            old and new firmware is incompatible.
@@ -3968,10 +3980,9 @@ static int reset_atmel_card(struct net_device *dev)
         if (!priv->radio_on_broken) {
                 if (atmel_send_command_wait(priv, CMD_EnableRadio, NULL, 0) ==
                     CMD_STATUS_REJECTED_RADIO_OFF) {
-                        printk(KERN_INFO
-                               "%s: cannot turn the radio on. (Hey radio, you're beautiful!)\n",
+                        printk(KERN_INFO "%s: cannot turn the radio on.\n",
                                dev->name);
-                        return 0;
+                        return -EIO;
                 }
         }
 
@@ -4006,7 +4017,7 @@ static int reset_atmel_card(struct net_device *dev)
                 wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
         }
 
-        return 1;
+        return 0;
 }
 
 static void atmel_send_command(struct atmel_private *priv, int command,
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 3bf3a869361f..7205a936ec74 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -33,7 +33,6 @@
 #include <linux/moduleparam.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
-#include <linux/version.h>
 #include <linux/firmware.h>
 #include <linux/wireless.h>
 #include <linux/workqueue.h>
@@ -4615,7 +4614,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus)
         if (bus->bustype == SSB_BUSTYPE_PCI) {
                 pdev = bus->host_pci;
                 if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) ||
+                    IS_PDEV(pdev, BROADCOM, 0x4320,    DELL, 0x0003) ||
                     IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) ||
+                    IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0014) ||
                     IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013))
                         bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST;
         }
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index fec5645944a4..34ae125d5384 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -43,23 +43,6 @@ static bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
         return 0;
 }
 
-/* Update the rfkill state */
-static void b43_rfkill_update_state(struct b43_wldev *dev)
-{
-        struct b43_rfkill *rfk = &(dev->wl->rfkill);
-
-        if (!dev->radio_hw_enable) {
-                rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;
-                return;
-        }
-
-        if (!dev->phy.radio_on)
-                rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;
-        else
-                rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
-
-}
-
 /* The poll callback for the hardware button. */
 static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
 {
@@ -77,7 +60,6 @@ static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
         if (unlikely(enabled != dev->radio_hw_enable)) {
                 dev->radio_hw_enable = enabled;
                 report_change = 1;
-                b43_rfkill_update_state(dev);
                 b43info(wl, "Radio hardware status changed to %s\n",
                         enabled ? "ENABLED" : "DISABLED");
         }
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 2541c81932f0..1cb77db5c292 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -34,7 +34,6 @@
 #include <linux/moduleparam.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
-#include <linux/version.h>
 #include <linux/firmware.h>
 #include <linux/wireless.h>
 #include <linux/workqueue.h>
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c
index 476add97e974..b32bf6a94f19 100644
--- a/drivers/net/wireless/b43legacy/rfkill.c
+++ b/drivers/net/wireless/b43legacy/rfkill.c
@@ -44,23 +44,6 @@ static bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)
         return 0;
 }
 
-/* Update the rfkill state */
-static void b43legacy_rfkill_update_state(struct b43legacy_wldev *dev)
-{
-        struct b43legacy_rfkill *rfk = &(dev->wl->rfkill);
-
-        if (!dev->radio_hw_enable) {
-                rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;
-                return;
-        }
-
-        if (!dev->phy.radio_on)
-                rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;
-        else
-                rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
-
-}
-
 /* The poll callback for the hardware button. */
 static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev)
 {
@@ -78,7 +61,6 @@ static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev)
         if (unlikely(enabled != dev->radio_hw_enable)) {
                 dev->radio_hw_enable = enabled;
                 report_change = 1;
-                b43legacy_rfkill_update_state(dev);
                 b43legacyinfo(wl, "Radio hardware status changed to %s\n",
                         enabled ? "ENABLED" : "DISABLED");
         }
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index c6f886ec08a3..19a401c4a0dc 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -157,7 +157,6 @@ that only one external action is invoked at a time.
 #include <linux/stringify.h>
 #include <linux/tcp.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/time.h>
 #include <linux/firmware.h>
 #include <linux/acpi.h>
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 36e8d2f6e7b4..dcce3542d5a7 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -31,7 +31,6 @@
 ******************************************************************************/
 
 #include "ipw2200.h"
-#include <linux/version.h>
 
 
 #ifndef KBUILD_EXTMOD
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-led.c b/drivers/net/wireless/iwlwifi/iwl-3945-led.c
index d3336966b6b5..705c65bed9fd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-led.c
@@ -27,7 +27,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index b3931f6135a4..3f51f3635344 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -26,7 +26,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 22bb26985c2e..23fed3298962 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -26,7 +26,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
@@ -475,8 +474,8 @@ static void iwl4965_apm_stop(struct iwl_priv *priv)
         iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);
 
         udelay(10);
-
-        iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+        /* clear "init complete"  move adapter D0A* --> D0U state */
+        iwl_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
         spin_unlock_irqrestore(&priv->lock, flags);
 }
 
@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel,
 
         s = iwl4965_get_sub_band(priv, channel);
         if (s >= EEPROM_TX_POWER_BANDS) {
-                IWL_ERROR("Tx Power can not find channel %d ", channel);
+                IWL_ERROR("Tx Power can not find channel %d\n", channel);
                 return -1;
         }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index f3d139b663e6..b08036a9d894 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -25,7 +25,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
@@ -146,7 +145,8 @@ static void iwl5000_apm_stop(struct iwl_priv *priv)
 
         udelay(10);
 
-        iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+        /* clear "init complete"  move adapter D0A* --> D0U state */
+        iwl_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
 
         spin_unlock_irqrestore(&priv->lock, flags);
 }
@@ -578,14 +578,11 @@ static int iwl5000_load_section(struct iwl_priv *priv,
                 FH_TFDIB_CTRL0_REG(FH_SRVC_CHNL),
                 phy_addr & FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK);
 
-        /* FIME: write the MSB of the phy_addr in CTRL1
-         * iwl_write_direct32(priv,
-                IWL_FH_TFDIB_CTRL1_REG(IWL_FH_SRVC_CHNL),
-                ((phy_addr & MSB_MSK)
-                        << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_count);
-         */
         iwl_write_direct32(priv,
-                FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL), byte_cnt);
+                FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL),
+                (iwl_get_dma_hi_address(phy_addr)
+                        << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_cnt);
+
         iwl_write_direct32(priv,
                 FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL),
                 1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM |
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 ed09e48b1b61..e01f048a02dd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -29,7 +29,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
@@ -182,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 */
@@ -208,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;
 
@@ -264,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);
@@ -588,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;
@@ -2191,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:
@@ -2603,6 +2602,7 @@ static int iwl4965_mac_start(struct ieee80211_hw *hw)
 {
         struct iwl_priv *priv = hw->priv;
         int ret;
+        u16 pci_cmd;
 
         IWL_DEBUG_MAC80211("enter\n");
 
@@ -2613,6 +2613,13 @@ static int iwl4965_mac_start(struct ieee80211_hw *hw)
         pci_restore_state(priv->pci_dev);
         pci_enable_msi(priv->pci_dev);
 
+        /* enable interrupts if needed: hw bug w/a */
+        pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd);
+        if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
+                pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
+                pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd);
+        }
+
         ret = request_irq(priv->pci_dev->irq, iwl4965_isr, IRQF_SHARED,
                           DRV_NAME, priv);
         if (ret) {
@@ -3581,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);
@@ -4365,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 9bd61809129f..80f2f84defa8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -28,7 +28,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <net/mac80211.h>
 
 struct iwl_priv; /* FIXME: remove */
@@ -593,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,
@@ -705,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;
 }
 
 /**
@@ -742,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-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index bce53830b301..37155755efc5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -63,7 +63,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 
 #include <net/mac80211.h>
@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv *priv)
 {
         u32 gp = iwl_read32(priv, CSR_EEPROM_GP);
         if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
-                IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp);
+                IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp);
                 return -ENOENT;
         }
         return 0;
@@ -227,7 +226,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)
 
         ret = priv->cfg->ops->lib->eeprom_ops.verify_signature(priv);
         if (ret < 0) {
-                IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp);
+                IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp);
                 ret = -ENOENT;
                 goto err;
         }
@@ -254,7 +253,7 @@ int iwl_eeprom_init(struct iwl_priv *priv)
                 }
 
                 if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {
-                        IWL_ERROR("Time out reading EEPROM[%d]", addr);
+                        IWL_ERROR("Time out reading EEPROM[%d]\n", addr);
                         ret = -ETIMEDOUT;
                         goto done;
                 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 944642450d3d..cd11c0ca2991 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -287,6 +287,7 @@
 
 #define FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE       (0x01000000)
 
+#define FH_MEM_TFDIB_REG1_ADDR_BITSHIFT 28
 
 /**
  * Transmit DMA Channel Control/Status Registers (TCSR)
diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
index 6512834bb916..2eb03eea1908 100644
--- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c
+++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
@@ -28,7 +28,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <net/mac80211.h>
 
 #include "iwl-dev.h" /* FIXME: remove */
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index cb11c4a4d691..4eee1b163cd2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -27,7 +27,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index 028e3053c0ca..a099c9e30e55 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -29,7 +29,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
index e5e5846e9f25..5d642298f04c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
@@ -27,7 +27,6 @@
  *****************************************************************************/
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 
 #include <net/mac80211.h>
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-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 60a6e0106036..6283a3a707f5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index,
         case WLAN_HT_CAP_MIMO_PS_DISABLED:
                 break;
         default:
-                IWL_WARNING("Invalid MIMO PS mode %d", mimo_ps_mode);
+                IWL_WARNING("Invalid MIMO PS mode %d\n", mimo_ps_mode);
                 break;
         }
 
@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
                 return priv->hw_params.bcast_sta_id;
 
         default:
-                IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode);
+                IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode);
                 return priv->hw_params.bcast_sta_id;
         }
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 4108c7c8f00f..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).
@@ -426,19 +425,16 @@ static int iwl_tx_queue_init(struct iwl_priv *priv,
                                 continue;
                 }
 
-                txq->cmd[i] = kmalloc(len, GFP_KERNEL | GFP_DMA);
+                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
@@ -493,7 +500,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv)
         /* Alloc keep-warm buffer */
         ret = iwl_kw_alloc(priv);
         if (ret) {
-                IWL_ERROR("Keep Warm allocation failed");
+                IWL_ERROR("Keep Warm allocation failed\n");
                 goto error_kw;
         }
         spin_lock_irqsave(&priv->lock, flags);
@@ -1463,7 +1470,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,
         u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn);
 
         if (scd_flow >= priv->hw_params.max_txq_num) {
-                IWL_ERROR("BUG_ON scd_flow is bigger than number of queues");
+                IWL_ERROR("BUG_ON scd_flow is bigger than number of queues\n");
                 return;
         }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 444847ab1b5a..b775d5bab668 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -29,7 +29,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)
         BUILD_BUG_ON(sizeof(priv->eeprom) != IWL_EEPROM_IMAGE_SIZE);
 
         if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
-                IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x", gp);
+                IWL_ERROR("EEPROM not found, EEPROM_GP=0x%08x\n", gp);
                 return -ENOENT;
         }
 
@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)
                 }
 
                 if (!(r & CSR_EEPROM_REG_READ_VALID_MSK)) {
-                        IWL_ERROR("Time out reading EEPROM[%d]", addr);
+                        IWL_ERROR("Time out reading EEPROM[%d]\n", addr);
                         return -ETIMEDOUT;
                 }
                 e[addr / 2] = le16_to_cpu((__force __le16)(r >> 16));
@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h
                 return priv->hw_setting.bcast_sta_id;
 
         default:
-                IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode);
+                IWL_WARNING("Unknown mode of operation: %d\n", priv->iw_mode);
                 return priv->hw_setting.bcast_sta_id;
         }
 }
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 04d7a251e3f0..8941919001bb 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -595,7 +595,7 @@ static int if_cs_prog_helper(struct if_cs_card *card)
                 if (ret < 0) {
                         lbs_pr_err("can't download helper at 0x%x, ret %d\n",
                                 sent, ret);
-                        goto done;
+                        goto err_release;
                 }
 
                 if (count == 0)
@@ -604,9 +604,8 @@ static int if_cs_prog_helper(struct if_cs_card *card)
                 sent += count;
         }
 
+err_release:
         release_firmware(fw);
-        ret = 0;
-
 done:
         lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret);
         return ret;
@@ -676,14 +675,8 @@ static int if_cs_prog_real(struct if_cs_card *card)
         }
 
         ret = if_cs_poll_while_fw_download(card, IF_CS_SCRATCH, 0x5a);
-        if (ret < 0) {
+        if (ret < 0)
                 lbs_pr_err("firmware download failed\n");
-                goto err_release;
-        }
-
-        ret = 0;
-        goto done;
-
 
 err_release:
         release_firmware(fw);
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 1ebcafe7ca5f..36c004e15602 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -1970,6 +1970,9 @@ __orinoco_set_multicast_list(struct net_device *dev)
                         priv->promiscuous = promisc;
         }
 
+        /* If we're not in promiscuous mode, then we need to set the
+         * group address if either we want to multicast, or if we were
+         * multicasting and want to stop */
         if (! promisc && (mc_count || priv->mc_count) ) {
                 struct dev_mc_list *p = dev->mc_list;
                 struct hermes_multicast mclist;
@@ -1989,9 +1992,10 @@ __orinoco_set_multicast_list(struct net_device *dev)
                         printk(KERN_WARNING "%s: Multicast list is "
                                "longer than mc_count\n", dev->name);
 
-                err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFGROUPADDRESSES,
-                                       HERMES_BYTES_TO_RECLEN(priv->mc_count * ETH_ALEN),
-                                       &mclist);
+                err = hermes_write_ltv(hw, USER_BAP,
+                                   HERMES_RID_CNFGROUPADDRESSES,
+                                   HERMES_BYTES_TO_RECLEN(mc_count * ETH_ALEN),
+                                   &mclist);
                 if (err)
                         printk(KERN_ERR "%s: Error %d setting multicast list.\n",
                                dev->name, err);
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index 83cd85e1f847..29be3dc8ee09 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -413,12 +413,12 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
                         last_addr = range->end_addr;
                         __skb_unlink(entry, &priv->tx_queue);
                         memset(&info->status, 0, sizeof(info->status));
-                        priv->tx_stats[skb_get_queue_mapping(skb)].len--;
                         entry_hdr = (struct p54_control_hdr *) entry->data;
                         entry_data = (struct p54_tx_control_allocdata *) entry_hdr->data;
                         if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0)
                                 pad = entry_data->align[0];
 
+                        priv->tx_stats[entry_data->hw_queue - 4].len--;
                         if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {
                                 if (!(payload->status & 0x01))
                                         info->flags |= IEEE80211_TX_STAT_ACK;
@@ -557,6 +557,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
         struct p54_tx_control_allocdata *txhdr;
         size_t padding, len;
         u8 rate;
+        u8 cts_rate = 0x20;
 
         current_queue = &priv->tx_stats[skb_get_queue_mapping(skb)];
         if (unlikely(current_queue->len > current_queue->limit))
@@ -581,28 +582,28 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
         hdr->type = (info->flags & IEEE80211_TX_CTL_NO_ACK) ? 0 : cpu_to_le16(1);
         hdr->retry1 = hdr->retry2 = info->control.retry_limit;
 
-        memset(txhdr->wep_key, 0x0, 16);
-        txhdr->padding = 0;
-        txhdr->padding2 = 0;
-
         /* TODO: add support for alternate retry TX rates */
         rate = ieee80211_get_tx_rate(dev, info)->hw_value;
-        if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE)
+        if (info->flags & IEEE80211_TX_CTL_SHORT_PREAMBLE) {
                 rate |= 0x10;
-        if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS)
+                cts_rate |= 0x10;
+        }
+        if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) {
                 rate |= 0x40;
-        else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT)
+                cts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value;
+        } else if (info->flags & IEEE80211_TX_CTL_USE_CTS_PROTECT) {
                 rate |= 0x20;
+                cts_rate |= ieee80211_get_rts_cts_rate(dev, info)->hw_value;
+        }
         memset(txhdr->rateset, rate, 8);
-        txhdr->wep_key_present = 0;
-        txhdr->wep_key_len = 0;
-        txhdr->frame_type = cpu_to_le32(skb_get_queue_mapping(skb) + 4);
-        txhdr->magic4 = 0;
-        txhdr->antenna = (info->antenna_sel_tx == 0) ?
+        txhdr->key_type = 0;
+        txhdr->key_len = 0;
+        txhdr->hw_queue = skb_get_queue_mapping(skb) + 4;
+        txhdr->tx_antenna = (info->antenna_sel_tx == 0) ?
                 2 : info->antenna_sel_tx - 1;
         txhdr->output_power = 0x7f; // HW Maximum
-        txhdr->magic5 = (info->flags & IEEE80211_TX_CTL_NO_ACK) ?
-                0 : ((rate > 0x3) ? cpu_to_le32(0x33) : cpu_to_le32(0x23));
+        txhdr->cts_rate = (info->flags & IEEE80211_TX_CTL_NO_ACK) ?
+                          0 : cts_rate;
         if (padding)
                 txhdr->align[0] = padding;
 
@@ -836,10 +837,21 @@ static int p54_start(struct ieee80211_hw *dev)
         struct p54_common *priv = dev->priv;
         int err;
 
+        if (!priv->cached_vdcf) {
+                priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf)+
+                        priv->tx_hdr_len + sizeof(struct p54_control_hdr),
+                        GFP_KERNEL);
+
+                if (!priv->cached_vdcf)
+                        return -ENOMEM;
+        }
+
         err = priv->open(dev);
         if (!err)
                 priv->mode = IEEE80211_IF_TYPE_MNTR;
 
+        p54_init_vdcf(dev);
+
         return err;
 }
 
@@ -1019,15 +1031,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
         dev->extra_tx_headroom = sizeof(struct p54_control_hdr) + 4 +
                                  sizeof(struct p54_tx_control_allocdata);
 
-        priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf) +
-              priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_KERNEL);
-
-        if (!priv->cached_vdcf) {
-                ieee80211_free_hw(dev);
-                return NULL;
-        }
-
-        p54_init_vdcf(dev);
         mutex_init(&priv->conf_mutex);
 
         return dev;
diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h
index 2245fcce92dc..8db6c0e8e540 100644
--- a/drivers/net/wireless/p54/p54common.h
+++ b/drivers/net/wireless/p54/p54common.h
@@ -183,16 +183,16 @@ struct p54_frame_sent_hdr {
 
 struct p54_tx_control_allocdata {
         u8 rateset[8];
-        u16 padding;
-        u8 wep_key_present;
-        u8 wep_key_len;
-        u8 wep_key[16];
-        __le32 frame_type;
-        u32 padding2;
-        __le16 magic4;
-        u8 antenna;
+        u8 unalloc0[2];
+        u8 key_type;
+        u8 key_len;
+        u8 key[16];
+        u8 hw_queue;
+        u8 unalloc1[9];
+        u8 tx_antenna;
         u8 output_power;
-        __le32 magic5;
+        u8 cts_rate;
+        u8 unalloc2[3];
         u8 align[0];
 } __attribute__ ((packed));
 
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 815c095ef797..cbaca23a9453 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -109,7 +109,17 @@ static void p54u_rx_cb(struct urb *urb)
                 urb->context = skb;
                 skb_queue_tail(&priv->rx_queue, skb);
         } else {
+                if (!priv->hw_type)
+                        skb_push(skb, sizeof(struct net2280_tx_hdr));
+
+                skb_reset_tail_pointer(skb);
                 skb_trim(skb, 0);
+                if (urb->transfer_buffer != skb_tail_pointer(skb)) {
+                        /* this should not happen */
+                        WARN_ON(1);
+                        urb->transfer_buffer = skb_tail_pointer(skb);
+                }
+
                 skb_queue_tail(&priv->rx_queue, skb);
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index a4a8c57004db..ff78e52ce43c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -173,10 +173,10 @@ struct rxdone_entry_desc {
  *      frame transmission failed due to excessive retries.
  */
 enum txdone_entry_desc_flags {
-        TXDONE_UNKNOWN = 1 << 0,
-        TXDONE_SUCCESS = 1 << 1,
-        TXDONE_FAILURE = 1 << 2,
-        TXDONE_EXCESSIVE_RETRY = 1 << 3,
+        TXDONE_UNKNOWN,
+        TXDONE_SUCCESS,
+        TXDONE_FAILURE,
+        TXDONE_EXCESSIVE_RETRY,
 };
 
 /**
diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h
index 7e88ce5651b9..2ea7866abd5d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00reg.h
+++ b/drivers/net/wireless/rt2x00/rt2x00reg.h
@@ -136,7 +136,7 @@ struct rt2x00_field32 {
  */
 #define is_power_of_two(x)      ( !((x) & ((x)-1)) )
 #define low_bit_mask(x)         ( ((x)-1) & ~(x) )
-#define is_valid_mask(x)        is_power_of_two(1 + (x) + low_bit_mask(x))
+#define is_valid_mask(x)        is_power_of_two(1LU + (x) + low_bit_mask(x))
 
 /*
  * Macro's to find first set bit in a variable.
@@ -173,8 +173,7 @@ struct rt2x00_field32 {
  * does not exceed the given typelimit.
  */
 #define FIELD_CHECK(__mask, __type)                     \
-        BUILD_BUG_ON(!__builtin_constant_p(__mask) ||   \
-                     !(__mask) ||                       \
+        BUILD_BUG_ON(!(__mask) ||                       \
                      !is_valid_mask(__mask) ||          \
                      (__mask) != (__type)(__mask))      \
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 8d76bb2e0312..2050227ea530 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
          * (Only indirectly by looking at the failed TX counters
          * in the register).
          */
+        txdesc.flags = 0;
         if (!urb->status)
                 __set_bit(TXDONE_UNKNOWN, &txdesc.flags);
         else
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 57376fb993ed..ca5deb6244e6 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {
         /* Netgear */
         {USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187},
         {USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187},
+        {USB_DEVICE(0x0846, 0x4260), .driver_info = DEVICE_RTL8187B},
         /* HP */
         {USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187},
         /* Sitecom */
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index da8b7433e3a6..a60ae86bd5c9 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -58,6 +58,7 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x157e, 0x300a), .driver_info = DEVICE_ZD1211 },
+        { USB_DEVICE(0x0105, 0x145f), .driver_info = DEVICE_ZD1211 },
         /* ZD1211B */
         { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 8a1d93a2bb81..51e5214071da 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -57,6 +57,15 @@ static ssize_t devspec_show(struct device *dev,
         return sprintf(buf, "%s\n", ofdev->node->full_name);
 }
 
+static ssize_t name_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct of_device *ofdev;
+
+        ofdev = to_of_device(dev);
+        return sprintf(buf, "%s\n", ofdev->node->name);
+}
+
 static ssize_t modalias_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
@@ -71,6 +80,7 @@ static ssize_t modalias_show(struct device *dev,
 
 struct device_attribute of_platform_device_attrs[] = {
         __ATTR_RO(devspec),
+        __ATTR_RO(name),
         __ATTR_RO(modalias),
         __ATTR_NULL
 };
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 2450b3a393ff..7ba78e6d210e 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -38,8 +38,10 @@ void free_cpu_buffers(void)
 {
         int i;
  
-        for_each_online_cpu(i)
+        for_each_online_cpu(i) {
                 vfree(per_cpu(cpu_buffer, i).buffer);
+                per_cpu(cpu_buffer, i).buffer = NULL;
+        }
 }
 
 int alloc_cpu_buffers(void)
diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
index e7fbac529935..8d692a5c8e73 100644
--- a/drivers/oprofile/event_buffer.c
+++ b/drivers/oprofile/event_buffer.c
@@ -93,6 +93,8 @@ out:
 void free_event_buffer(void)
 {
         vfree(event_buffer);
+
+        event_buffer = NULL;
 }
 
  
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 93e37f0666ab..e17ef54f0efc 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -382,7 +382,7 @@ EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware);
 int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags)
 {
         acpi_status status;
-        acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev));
+        acpi_handle chandle, handle;
         struct pci_dev *pdev = dev;
         struct pci_bus *parent;
         struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -399,10 +399,25 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags)
          * Per PCI firmware specification, we should run the ACPI _OSC
          * method to get control of hotplug hardware before using it. If
          * an _OSC is missing, we look for an OSHP to do the same thing.
-         * To handle different BIOS behavior, we look for _OSC and OSHP
-         * within the scope of the hotplug controller and its parents,
+         * To handle different BIOS behavior, we look for _OSC on a root
+         * bridge preferentially (according to PCI fw spec). Later for
+         * OSHP within the scope of the hotplug controller and its parents,
          * upto the host bridge under which this controller exists.
          */
+        handle = acpi_find_root_bridge_handle(pdev);
+        if (handle) {
+                acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
+                dbg("Trying to get hotplug control for %s\n",
+                                (char *)string.pointer);
+                status = pci_osc_control_set(handle, flags);
+                if (ACPI_SUCCESS(status))
+                        goto got_one;
+                kfree(string.pointer);
+                string = (struct acpi_buffer){ ACPI_ALLOCATE_BUFFER, NULL };
+        }
+
+        pdev = dev;
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
         while (!handle) {
                 /*
                  * This hotplug controller was not listed in the ACPI name
@@ -427,15 +442,9 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags)
                 acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
                 dbg("Trying to get hotplug control for %s \n",
                     (char *)string.pointer);
-                status = pci_osc_control_set(handle, flags);
-                if (status == AE_NOT_FOUND)
-                        status = acpi_run_oshp(handle);
-                if (ACPI_SUCCESS(status)) {
-                        dbg("Gained control for hotplug HW for pci %s (%s)\n",
-                            pci_name(dev), (char *)string.pointer);
-                        kfree(string.pointer);
-                        return 0;
-                }
+                status = acpi_run_oshp(handle);
+                if (ACPI_SUCCESS(status))
+                        goto got_one;
                 if (acpi_root_bridge(handle))
                         break;
                 chandle = handle;
@@ -449,6 +458,11 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags)
 
         kfree(string.pointer);
         return -ENODEV;
+got_one:
+        dbg("Gained control for hotplug HW for pci %s (%s)\n", pci_name(dev),
+                        (char *)string.pointer);
+        kfree(string.pointer);
+        return 0;
 }
 EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware);
 
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 40337a06c18a..146ca9cd1567 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -320,15 +320,15 @@ static int disable_slot(struct hotplug_slot *slot)
                         return -ENODEV;
                 }
 
+                /* remove the device from the pci core */
+                pci_remove_bus_device(dev);
+
                 /* queue work item to blow away this sysfs entry and other
                  * parts.
                  */
                 INIT_WORK(&dslot->remove_work, remove_slot_worker);
                 queue_work(dummyphp_wq, &dslot->remove_work);
 
-                /* blow away this sysfs entry and other parts. */
-                remove_slot(dslot);
-
                 pci_dev_put(dev);
         }
         return 0;
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index e3a1e7e7dba2..9e6cec67e1cc 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -43,7 +43,6 @@ extern int pciehp_poll_mode;
 extern int pciehp_poll_time;
 extern int pciehp_debug;
 extern int pciehp_force;
-extern int pciehp_slot_with_bus;
 extern struct workqueue_struct *pciehp_wq;
 
 #define dbg(format, arg...)                                             \
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 3677495c4f91..4fd5355bc3b5 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -41,7 +41,6 @@ int pciehp_debug;
 int pciehp_poll_mode;
 int pciehp_poll_time;
 int pciehp_force;
-int pciehp_slot_with_bus;
 struct workqueue_struct *pciehp_wq;
 
 #define DRIVER_VERSION  "0.4"
@@ -56,12 +55,10 @@ module_param(pciehp_debug, bool, 0644);
 module_param(pciehp_poll_mode, bool, 0644);
 module_param(pciehp_poll_time, int, 0644);
 module_param(pciehp_force, bool, 0644);
-module_param(pciehp_slot_with_bus, bool, 0644);
 MODULE_PARM_DESC(pciehp_debug, "Debugging mode enabled or not");
 MODULE_PARM_DESC(pciehp_poll_mode, "Using polling mechanism for hot-plug events or not");
 MODULE_PARM_DESC(pciehp_poll_time, "Polling mechanism frequency, in seconds");
 MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if _OSC and OSHP are missing");
-MODULE_PARM_DESC(pciehp_slot_with_bus, "Use bus number in the slot name");
 
 #define PCIE_MODULE_NAME "pciehp"
 
@@ -194,6 +191,7 @@ static int init_slots(struct controller *ctrl)
         struct slot *slot;
         struct hotplug_slot *hotplug_slot;
         struct hotplug_slot_info *info;
+        int len, dup = 1;
         int retval = -ENOMEM;
 
         list_for_each_entry(slot, &ctrl->slot_list, slot_list) {
@@ -220,15 +218,24 @@ static int init_slots(struct controller *ctrl)
                 dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x "
                     "slot_device_offset=%x\n", slot->bus, slot->device,
                     slot->hp_slot, slot->number, ctrl->slot_device_offset);
+duplicate_name:
                 retval = pci_hp_register(hotplug_slot,
                                          ctrl->pci_dev->subordinate,
                                          slot->device);
                 if (retval) {
+                        /*
+                         * If slot N already exists, we'll try to create
+                         * slot N-1, N-2 ... N-M, until we overflow.
+                         */
+                        if (retval == -EEXIST) {
+                                len = snprintf(slot->name, SLOT_NAME_SIZE,
+                                               "%d-%d", slot->number, dup++);
+                                if (len < SLOT_NAME_SIZE)
+                                        goto duplicate_name;
+                                else
+                                        err("duplicate slot name overflow\n");
+                        }
                         err("pci_hp_register failed with error %d\n", retval);
-                        if (retval == -EEXIST)
-                                err("Failed to register slot because of name "
-                                    "collision. Try \'pciehp_slot_with_bus\' "
-                                    "module option.\n");
                         goto error_info;
                 }
                 /* create additional sysfs entries */
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index ad27e9e225a6..9d934ddee956 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -258,7 +258,7 @@ static int pcie_poll_cmd(struct controller *ctrl)
                         return 1;
                 }
         }
-        while (timeout > 1000) {
+        while (timeout > 0) {
                 msleep(10);
                 timeout -= 10;
                 if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) {
@@ -1030,15 +1030,6 @@ static void pcie_shutdown_notification(struct controller *ctrl)
         pciehp_free_irq(ctrl);
 }
 
-static void make_slot_name(struct slot *slot)
-{
-        if (pciehp_slot_with_bus)
-                snprintf(slot->name, SLOT_NAME_SIZE, "%04d_%04d",
-                         slot->bus, slot->number);
-        else
-                snprintf(slot->name, SLOT_NAME_SIZE, "%d", slot->number);
-}
-
 static int pcie_init_slot(struct controller *ctrl)
 {
         struct slot *slot;
@@ -1053,7 +1044,7 @@ static int pcie_init_slot(struct controller *ctrl)
         slot->device = ctrl->slot_device_offset + slot->hp_slot;
         slot->hpc_ops = ctrl->hpc_ops;
         slot->number = ctrl->first_slot;
-        make_slot_name(slot);
+        snprintf(slot->name, SLOT_NAME_SIZE, "%d", slot->number);
         mutex_init(&slot->lock);
         INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);
         list_add(&slot->slot_list, &ctrl->slot_list);
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index a8cbd039b85b..cc38615395f1 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -39,7 +39,6 @@
 int shpchp_debug;
 int shpchp_poll_mode;
 int shpchp_poll_time;
-static int shpchp_slot_with_bus;
 struct workqueue_struct *shpchp_wq;
 
 #define DRIVER_VERSION  "0.4"
@@ -53,11 +52,9 @@ MODULE_LICENSE("GPL");
 module_param(shpchp_debug, bool, 0644);
 module_param(shpchp_poll_mode, bool, 0644);
 module_param(shpchp_poll_time, int, 0644);
-module_param(shpchp_slot_with_bus, bool, 0644);
 MODULE_PARM_DESC(shpchp_debug, "Debugging mode enabled or not");
 MODULE_PARM_DESC(shpchp_poll_mode, "Using polling mechanism for hot-plug events or not");
 MODULE_PARM_DESC(shpchp_poll_time, "Polling mechanism frequency, in seconds");
-MODULE_PARM_DESC(shpchp_slot_with_bus, "Use bus number in the slot name");
 
 #define SHPC_MODULE_NAME "shpchp"
 
@@ -99,23 +96,13 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
         kfree(slot);
 }
 
-static void make_slot_name(struct slot *slot)
-{
-        if (shpchp_slot_with_bus)
-                snprintf(slot->hotplug_slot->name, SLOT_NAME_SIZE, "%04d_%04d",
-                         slot->bus, slot->number);
-        else
-                snprintf(slot->hotplug_slot->name, SLOT_NAME_SIZE, "%d",
-                         slot->number);
-}
-
 static int init_slots(struct controller *ctrl)
 {
         struct slot *slot;
         struct hotplug_slot *hotplug_slot;
         struct hotplug_slot_info *info;
         int retval = -ENOMEM;
-        int i;
+        int i, len, dup = 1;
 
         for (i = 0; i < ctrl->num_slots; i++) {
                 slot = kzalloc(sizeof(*slot), GFP_KERNEL);
@@ -146,7 +133,7 @@ static int init_slots(struct controller *ctrl)
                 /* register this slot with the hotplug pci core */
                 hotplug_slot->private = slot;
                 hotplug_slot->release = &release_slot;
-                make_slot_name(slot);
+                snprintf(slot->name, SLOT_NAME_SIZE, "%d", slot->number);
                 hotplug_slot->ops = &shpchp_hotplug_slot_ops;
 
                 get_power_status(hotplug_slot, &info->power_status);
@@ -157,14 +144,23 @@ static int init_slots(struct controller *ctrl)
                 dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x "
                     "slot_device_offset=%x\n", slot->bus, slot->device,
                     slot->hp_slot, slot->number, ctrl->slot_device_offset);
+duplicate_name:
                 retval = pci_hp_register(slot->hotplug_slot,
                                 ctrl->pci_dev->subordinate, slot->device);
                 if (retval) {
+                        /*
+                         * If slot N already exists, we'll try to create
+                         * slot N-1, N-2 ... N-M, until we overflow.
+                         */
+                        if (retval == -EEXIST) {
+                                len = snprintf(slot->name, SLOT_NAME_SIZE,
+                                               "%d-%d", slot->number, dup++);
+                                if (len < SLOT_NAME_SIZE)
+                                        goto duplicate_name;
+                                else
+                                        err("duplicate slot name overflow\n");
+                        }
                         err("pci_hp_register failed with error %d\n", retval);
-                        if (retval == -EEXIST)
-                                err("Failed to register slot because of name "
-                                    "collision. Try \'shpchp_slot_with_bus\' "
-                                    "module option.\n");
                         goto error_info;
                 }
 
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 8d0e60ac849c..c3edcdc08e72 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -2348,11 +2348,34 @@ static void __init iommu_exit_mempool(void)
 
 }
 
+static int blacklist_iommu(const struct dmi_system_id *id)
+{
+        printk(KERN_INFO "%s detected; disabling IOMMU\n",
+               id->ident);
+        dmar_disabled = 1;
+        return 0;
+}
+
+static struct dmi_system_id __initdata intel_iommu_dmi_table[] = {
+        {       /* Some DG33BU BIOS revisions advertised non-existent VT-d */
+                .callback = blacklist_iommu,
+                .ident = "Intel DG33BU",
+                {       DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
+                        DMI_MATCH(DMI_BOARD_NAME, "DG33BU"),
+                }
+        },
+        { }
+};
+
+
 void __init detect_intel_iommu(void)
 {
         if (swiotlb || no_iommu || iommu_detected || dmar_disabled)
                 return;
         if (early_dmar_detect()) {
+                dmi_check_system(intel_iommu_dmi_table);
+                if (dmar_disabled)
+                        return;
                 iommu_detected = 1;
         }
 }
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 9c718583a237..77baff022f71 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -16,6 +16,7 @@
 
 
 #include <linux/kernel.h>
+#include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/stat.h>
 #include <linux/topology.h>
@@ -484,6 +485,21 @@ pci_mmap_legacy_mem(struct kobject *kobj, struct bin_attribute *attr,
 #endif /* HAVE_PCI_LEGACY */
 
 #ifdef HAVE_PCI_MMAP
+
+static int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vma)
+{
+        unsigned long nr, start, size;
+
+        nr = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+        start = vma->vm_pgoff;
+        size = pci_resource_len(pdev, resno) >> PAGE_SHIFT;
+        if (start < size && size - start >= nr)
+                return 1;
+        WARN(1, "process \"%s\" tried to map 0x%08lx-0x%08lx on %s BAR %d (size 0x%08lx)\n",
+                current->comm, start, start+nr, pci_name(pdev), resno, size);
+        return 0;
+}
+
 /**
  * pci_mmap_resource - map a PCI resource into user memory space
  * @kobj: kobject for mapping
@@ -510,6 +526,9 @@ pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
         if (i >= PCI_ROM_RESOURCE)
                 return -ENODEV;
 
+        if (!pci_mmap_fits(pdev, i, vma))
+                return -EINVAL;
+
         /* pci_mmap_page_range() expects the same kind of entry as coming
          * from /proc/bus/pci/ which is a "user visible" value. If this is
          * different from the resource itself, arch will do necessary fixup.
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index 30f581b8791f..6dd7b13e9808 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -36,12 +36,7 @@ int aer_osc_setup(struct pcie_device *pciedev)
         if (acpi_pci_disabled)
                 return -1;
 
-        /* Find root host bridge */
-        while (pdev->bus->self)
-                pdev = pdev->bus->self;
-        handle = acpi_get_pci_rootbridge_handle(
-                pci_domain_nr(pdev->bus), pdev->bus->number);
-
+        handle = acpi_find_root_bridge_handle(pdev);
         if (handle) {
                 pcie_osc_support_set(OSC_EXT_PCI_CONFIG_SUPPORT);
                 status = pci_osc_control_set(handle,
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 9a7c9e1408a4..851f5b83cdbc 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -527,7 +527,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
                  */
                 pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
                         &reg32);
-                if (!(reg32 & PCI_EXP_DEVCAP_RBER && !aspm_force)) {
+                if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
                         printk("Pre-1.1 PCIe device detected, "
                                 "disable ASPM for %s. It can be enabled forcedly"
                                 " with 'pcie_aspm=force'\n", pci_name(pdev));
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index a04498d390c8..36698e57b97f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -304,6 +304,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                 } else {
                         res->start = l64;
                         res->end = l64 + sz64;
+                        printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
+                                pci_name(dev), pos, (unsigned long long)res->start,
+                                (unsigned long long)res->end);
                 }
         } else {
                 sz = pci_size(l, sz, mask);
@@ -313,6 +316,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
 
                 res->start = l;
                 res->end = l + sz;
+                printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev),
+                        pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio",
+                        (unsigned long long)res->start, (unsigned long long)res->end);
         }
 
  out:
@@ -383,6 +389,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
                         res->start = base;
                 if (!res->end)
                         res->end = limit + 0xfff;
+                printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n",
+                        pci_name(dev), (unsigned long long) res->start,
+                        (unsigned long long) res->end);
         }
 
         res = child->resource[1];
@@ -394,6 +403,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
                 res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
                 res->start = base;
                 res->end = limit + 0xfffff;
+                printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n",
+                        pci_name(dev), (unsigned long long) res->start,
+                        (unsigned long long) res->end);
         }
 
         res = child->resource[2];
@@ -429,6 +441,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
                 res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;
                 res->start = base;
                 res->end = limit + 0xfffff;
+                printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",
+                        pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32",
+                        (unsigned long long) res->start, (unsigned long long) res->end);
         }
 }
 
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 217814fef4ef..4edfc4731bd4 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -162,7 +162,7 @@ EXPORT_SYMBOL(pci_find_slot);
  * time.
  */
 struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device,
-                                const struct pci_dev *from)
+                                struct pci_dev *from)
 {
         struct pci_dev *pdev;
 
@@ -263,7 +263,7 @@ static int match_pci_dev_by_id(struct device *dev, void *data)
  * this file.
  */
 static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
-                                         const struct pci_dev *from)
+                                         struct pci_dev *from)
 {
         struct device *dev;
         struct device *dev_start = NULL;
@@ -280,6 +280,8 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
                               match_pci_dev_by_id);
         if (dev)
                 pdev = to_pci_dev(dev);
+        if (from)
+                pci_dev_put(from);
         return pdev;
 }
 
@@ -301,7 +303,7 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
  */
 struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
                                unsigned int ss_vendor, unsigned int ss_device,
-                               const struct pci_dev *from)
+                               struct pci_dev *from)
 {
         struct pci_dev *pdev;
         struct pci_device_id *id;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 827c0a520e2b..3abbfad9ddab 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;
@@ -530,6 +531,40 @@ void __ref pci_bus_assign_resources(struct pci_bus *bus)
 }
 EXPORT_SYMBOL(pci_bus_assign_resources);
 
+static void pci_bus_dump_res(struct pci_bus *bus)
+{
+        int i;
+
+        for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
+                struct resource *res = bus->resource[i];
+                if (!res)
+                        continue;
+
+                printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n",
+                        bus->number, i,
+                        (res->flags & IORESOURCE_IO) ? "io port" : "mmio",
+                        (unsigned long long) res->start,
+                        (unsigned long long) res->end);
+        }
+}
+
+static void pci_bus_dump_resources(struct pci_bus *bus)
+{
+        struct pci_bus *b;
+        struct pci_dev *dev;
+
+
+        pci_bus_dump_res(bus);
+
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                b = dev->subordinate;
+                if (!b)
+                        continue;
+
+                pci_bus_dump_resources(b);
+        }
+}
+
 void __init
 pci_assign_unassigned_resources(void)
 {
@@ -545,4 +580,9 @@ pci_assign_unassigned_resources(void)
                 pci_bus_assign_resources(bus);
                 pci_enable_bridges(bus);
         }
+
+        /* dump the resource on buses */
+        list_for_each_entry(bus, &pci_root_buses, node) {
+                pci_bus_dump_resources(bus);
+        }
 }
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 4174d9656e35..34c83d3ca0fa 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -427,6 +427,18 @@ static int pcmcia_device_probe(struct device * dev)
         p_drv = to_pcmcia_drv(dev->driver);
         s = p_dev->socket;
 
+        /* The PCMCIA code passes the match data in via dev->driver_data
+         * which is an ugly hack. Once the driver probe is called it may
+         * and often will overwrite the match data so we must save it first
+         *
+         * handle pseudo multifunction devices:
+         * there are at most two pseudo multifunction devices.
+         * if we're matching against the first, schedule a
+         * call which will then check whether there are two
+         * pseudo devices, and if not, add the second one.
+         */
+        did = p_dev->dev.driver_data;
+
         ds_dbg(1, "trying to bind %s to %s\n", p_dev->dev.bus_id,
                p_drv->drv.name);
 
@@ -455,21 +467,14 @@ static int pcmcia_device_probe(struct device * dev)
                 goto put_module;
         }
 
-        /* handle pseudo multifunction devices:
-         * there are at most two pseudo multifunction devices.
-         * if we're matching against the first, schedule a
-         * call which will then check whether there are two
-         * pseudo devices, and if not, add the second one.
-         */
-        did = p_dev->dev.driver_data;
         if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
             (p_dev->socket->device_count == 1) && (p_dev->device_no == 0))
                 pcmcia_add_device_later(p_dev->socket, 0);
 
- put_module:
+put_module:
         if (ret)
                 module_put(p_drv->owner);
- put_dev:
+put_dev:
         if (ret)
                 put_device(dev);
         return (ret);
diff --git a/drivers/pcmcia/pxa2xx_palmtx.c b/drivers/pcmcia/pxa2xx_palmtx.c
index a8771ffc61e8..e07b5c51ec5b 100644
--- a/drivers/pcmcia/pxa2xx_palmtx.c
+++ b/drivers/pcmcia/pxa2xx_palmtx.c
@@ -23,12 +23,57 @@
 
 static int palmtx_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-        skt->irq = IRQ_GPIO(GPIO_NR_PALMTX_PCMCIA_READY);
+        int ret;
+
+        ret = gpio_request(GPIO_NR_PALMTX_PCMCIA_POWER1, "PCMCIA PWR1");
+        if (ret)
+                goto err1;
+        ret = gpio_direction_output(GPIO_NR_PALMTX_PCMCIA_POWER1, 0);
+        if (ret)
+                goto err2;
+
+        ret = gpio_request(GPIO_NR_PALMTX_PCMCIA_POWER2, "PCMCIA PWR2");
+        if (ret)
+                goto err2;
+        ret = gpio_direction_output(GPIO_NR_PALMTX_PCMCIA_POWER2, 0);
+        if (ret)
+                goto err3;
+
+        ret = gpio_request(GPIO_NR_PALMTX_PCMCIA_RESET, "PCMCIA RST");
+        if (ret)
+                goto err3;
+        ret = gpio_direction_output(GPIO_NR_PALMTX_PCMCIA_RESET, 1);
+        if (ret)
+                goto err4;
+
+        ret = gpio_request(GPIO_NR_PALMTX_PCMCIA_READY, "PCMCIA RDY");
+        if (ret)
+                goto err4;
+        ret = gpio_direction_input(GPIO_NR_PALMTX_PCMCIA_READY);
+        if (ret)
+                goto err5;
+
+        skt->irq = gpio_to_irq(GPIO_NR_PALMTX_PCMCIA_READY);
         return 0;
+
+err5:
+        gpio_free(GPIO_NR_PALMTX_PCMCIA_READY);
+err4:
+        gpio_free(GPIO_NR_PALMTX_PCMCIA_RESET);
+err3:
+        gpio_free(GPIO_NR_PALMTX_PCMCIA_POWER2);
+err2:
+        gpio_free(GPIO_NR_PALMTX_PCMCIA_POWER1);
+err1:
+        return ret;
 }
 
 static void palmtx_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
 {
+        gpio_free(GPIO_NR_PALMTX_PCMCIA_READY);
+        gpio_free(GPIO_NR_PALMTX_PCMCIA_RESET);
+        gpio_free(GPIO_NR_PALMTX_PCMCIA_POWER2);
+        gpio_free(GPIO_NR_PALMTX_PCMCIA_POWER1);
 }
 
 static void palmtx_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
@@ -109,7 +154,7 @@ static void __exit palmtx_pcmcia_exit(void)
         platform_device_unregister(palmtx_pcmcia_device);
 }
 
-fs_initcall(palmtx_pcmcia_init);
+module_init(palmtx_pcmcia_init);
 module_exit(palmtx_pcmcia_exit);
 
 MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index c48f3f69bdaf..da3972153226 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -748,7 +748,9 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops
 
                 add_timer(&skt->poll_timer);
 
-                device_create_file(&skt->socket.dev, &dev_attr_status);
+                ret = device_create_file(&skt->socket.dev, &dev_attr_status);
+                if (ret)
+                        goto out_err_8;
         }
 
         dev_set_drvdata(dev, sinfo);
@@ -758,6 +760,8 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops
         do {
                 skt = &sinfo->skt[i];
 
+                device_remove_file(&skt->socket.dev, &dev_attr_status);
+ out_err_8:
                 del_timer_sync(&skt->poll_timer);
                 pcmcia_unregister_socket(&skt->socket);
 
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/rtc/Kconfig b/drivers/rtc/Kconfig
index 90ab73825401..9a9755c92fad 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -561,7 +561,7 @@ config RTC_DRV_AT91SAM9_GPBR
 
 config RTC_DRV_BFIN
         tristate "Blackfin On-Chip RTC"
-        depends on BLACKFIN
+        depends on BLACKFIN && !BF561
         help
           If you say yes here you will get support for the
           Blackfin On-Chip Real Time Clock.
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
index a1af4c27939b..34439ce3967e 100644
--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -218,26 +218,6 @@ static irqreturn_t bfin_rtc_interrupt(int irq, void *dev_id)
                 return IRQ_NONE;
 }
 
-static int bfin_rtc_open(struct device *dev)
-{
-        int ret;
-
-        dev_dbg_stamp(dev);
-
-        ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_SHARED, to_platform_device(dev)->name, dev);
-        if (!ret)
-                bfin_rtc_reset(dev, RTC_ISTAT_WRITE_COMPLETE);
-
-        return ret;
-}
-
-static void bfin_rtc_release(struct device *dev)
-{
-        dev_dbg_stamp(dev);
-        bfin_rtc_reset(dev, 0);
-        free_irq(IRQ_RTC, dev);
-}
-
 static void bfin_rtc_int_set(u16 rtc_int)
 {
         bfin_write_RTC_ISTAT(rtc_int);
@@ -370,8 +350,6 @@ static int bfin_rtc_proc(struct device *dev, struct seq_file *seq)
 }
 
 static struct rtc_class_ops bfin_rtc_ops = {
-        .open          = bfin_rtc_open,
-        .release       = bfin_rtc_release,
         .ioctl         = bfin_rtc_ioctl,
         .read_time     = bfin_rtc_read_time,
         .set_time      = bfin_rtc_set_time,
@@ -383,29 +361,44 @@ static struct rtc_class_ops bfin_rtc_ops = {
 static int __devinit bfin_rtc_probe(struct platform_device *pdev)
 {
         struct bfin_rtc *rtc;
+        struct device *dev = &pdev->dev;
         int ret = 0;
+        unsigned long timeout;
 
-        dev_dbg_stamp(&pdev->dev);
+        dev_dbg_stamp(dev);
 
+        /* Allocate memory for our RTC struct */
         rtc = kzalloc(sizeof(*rtc), GFP_KERNEL);
         if (unlikely(!rtc))
                 return -ENOMEM;
+        platform_set_drvdata(pdev, rtc);
+        device_init_wakeup(dev, 1);
 
-        rtc->rtc_dev = rtc_device_register(pdev->name, &pdev->dev, &bfin_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                ret = PTR_ERR(rtc->rtc_dev);
+        /* Grab the IRQ and init the hardware */
+        ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_SHARED, pdev->name, dev);
+        if (unlikely(ret))
                 goto err;
-        }
-
-        /* see comment at top of file about stopwatch/PIE */
+        /* sometimes the bootloader touched things, but the write complete was not
+         * enabled, so let's just do a quick timeout here since the IRQ will not fire ...
+         */
+        timeout = jiffies + HZ;
+        while (bfin_read_RTC_ISTAT() & RTC_ISTAT_WRITE_PENDING)
+                if (time_after(jiffies, timeout))
+                        break;
+        bfin_rtc_reset(dev, RTC_ISTAT_WRITE_COMPLETE);
         bfin_write_RTC_SWCNT(0);
 
-        platform_set_drvdata(pdev, rtc);
-
-        device_init_wakeup(&pdev->dev, 1);
+        /* Register our RTC with the RTC framework */
+        rtc->rtc_dev = rtc_device_register(pdev->name, dev, &bfin_rtc_ops, THIS_MODULE);
+        if (unlikely(IS_ERR(rtc))) {
+                ret = PTR_ERR(rtc->rtc_dev);
+                goto err_irq;
+        }
 
         return 0;
 
+ err_irq:
+        free_irq(IRQ_RTC, dev);
  err:
         kfree(rtc);
         return ret;
@@ -414,7 +407,10 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev)
 static int __devexit bfin_rtc_remove(struct platform_device *pdev)
 {
         struct bfin_rtc *rtc = platform_get_drvdata(pdev);
+        struct device *dev = &pdev->dev;
 
+        bfin_rtc_reset(dev, 0);
+        free_irq(IRQ_RTC, dev);
         rtc_device_unregister(rtc->rtc_dev);
         platform_set_drvdata(pdev, NULL);
         kfree(rtc);
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 6ea349aba3ba..b184367637d0 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -800,7 +800,6 @@ static void __exit cmos_do_remove(struct device *dev)
 static int cmos_suspend(struct device *dev, pm_message_t mesg)
 {
         struct cmos_rtc *cmos = dev_get_drvdata(dev);
-        int             do_wake = device_may_wakeup(dev);
         unsigned char   tmp;
 
         /* only the alarm might be a wakeup event source */
@@ -809,7 +808,7 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
         if (tmp & (RTC_PIE|RTC_AIE|RTC_UIE)) {
                 unsigned char   mask;
 
-                if (do_wake)
+                if (device_may_wakeup(dev))
                         mask = RTC_IRQMASK & ~RTC_AIE;
                 else
                         mask = RTC_IRQMASK;
@@ -837,6 +836,17 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
         return 0;
 }
 
+/* We want RTC alarms to wake us from e.g. ACPI G2/S5 "soft off", even
+ * after a detour through G3 "mechanical off", although the ACPI spec
+ * says wakeup should only work from G1/S4 "hibernate".  To most users,
+ * distinctions between S4 and S5 are pointless.  So when the hardware
+ * allows, don't draw that distinction.
+ */
+static inline int cmos_poweroff(struct device *dev)
+{
+        return cmos_suspend(dev, PMSG_HIBERNATE);
+}
+
 static int cmos_resume(struct device *dev)
 {
         struct cmos_rtc *cmos = dev_get_drvdata(dev);
@@ -884,6 +894,12 @@ static int cmos_resume(struct device *dev)
 #else
 #define cmos_suspend    NULL
 #define cmos_resume     NULL
+
+static inline int cmos_poweroff(struct device *dev)
+{
+        return -ENOSYS;
+}
+
 #endif
 
 /*----------------------------------------------------------------*/
@@ -903,10 +919,6 @@ static int cmos_resume(struct device *dev)
 static int __devinit
 cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
 {
-        /* REVISIT paranoia argues for a shutdown notifier, since PNP
-         * drivers can't provide shutdown() methods to disable IRQs.
-         * Or better yet, fix PNP to allow those methods...
-         */
         if (pnp_port_start(pnp,0) == 0x70 && !pnp_irq_valid(pnp,0))
                 /* Some machines contain a PNP entry for the RTC, but
                  * don't define the IRQ. It should always be safe to
@@ -942,6 +954,13 @@ static int cmos_pnp_resume(struct pnp_dev *pnp)
 #define cmos_pnp_resume         NULL
 #endif
 
+static void cmos_pnp_shutdown(struct device *pdev)
+{
+        if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(pdev))
+                return;
+
+        cmos_do_shutdown();
+}
 
 static const struct pnp_device_id rtc_ids[] = {
         { .id = "PNP0b00", },
@@ -961,6 +980,10 @@ static struct pnp_driver cmos_pnp_driver = {
         .flags          = PNP_DRIVER_RES_DO_NOT_CHANGE,
         .suspend        = cmos_pnp_suspend,
         .resume         = cmos_pnp_resume,
+        .driver         = {
+                .name     = (char *)driver_name,
+                .shutdown = cmos_pnp_shutdown,
+        }
 };
 
 #endif  /* CONFIG_PNP */
@@ -986,6 +1009,9 @@ static int __exit cmos_platform_remove(struct platform_device *pdev)
 
 static void cmos_platform_shutdown(struct platform_device *pdev)
 {
+        if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(&pdev->dev))
+                return;
+
         cmos_do_shutdown();
 }
 
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 35dcc06eb3e2..52e2743b04ec 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -403,11 +403,14 @@ static long rtc_dev_ioctl(struct file *file,
 
 #ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL
         case RTC_UIE_OFF:
+                mutex_unlock(&rtc->ops_lock);
                 clear_uie(rtc);
-                break;
+                return 0;
 
         case RTC_UIE_ON:
+                mutex_unlock(&rtc->ops_lock);
                 err = set_uie(rtc);
+                return err;
 #endif
         default:
                 err = -ENOTTY;
@@ -419,6 +422,12 @@ done:
         return err;
 }
 
+static int rtc_dev_fasync(int fd, struct file *file, int on)
+{
+        struct rtc_device *rtc = file->private_data;
+        return fasync_helper(fd, file, on, &rtc->async_queue);
+}
+
 static int rtc_dev_release(struct inode *inode, struct file *file)
 {
         struct rtc_device *rtc = file->private_data;
@@ -431,16 +440,13 @@ static int rtc_dev_release(struct inode *inode, struct file *file)
         if (rtc->ops->release)
                 rtc->ops->release(rtc->dev.parent);
 
+        if (file->f_flags & FASYNC)
+                rtc_dev_fasync(-1, file, 0);
+
         clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags);
         return 0;
 }
 
-static int rtc_dev_fasync(int fd, struct file *file, int on)
-{
-        struct rtc_device *rtc = file->private_data;
-        return fasync_helper(fd, file, on, &rtc->async_queue);
-}
-
 static const struct file_operations rtc_dev_fops = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index 640acd20fdde..a150418fba76 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -173,7 +173,7 @@ static int ds1374_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
         int cr, sr;
         int ret = 0;
 
-        if (client->irq < 0)
+        if (client->irq <= 0)
                 return -EINVAL;
 
         mutex_lock(&ds1374->mutex);
@@ -212,7 +212,7 @@ static int ds1374_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
         int cr;
         int ret = 0;
 
-        if (client->irq < 0)
+        if (client->irq <= 0)
                 return -EINVAL;
 
         ret = ds1374_read_time(dev, &now);
@@ -381,7 +381,7 @@ static int ds1374_probe(struct i2c_client *client,
         if (ret)
                 goto out_free;
 
-        if (client->irq >= 0) {
+        if (client->irq > 0) {
                 ret = request_irq(client->irq, ds1374_irq, 0,
                                   "ds1374", client);
                 if (ret) {
@@ -401,7 +401,7 @@ static int ds1374_probe(struct i2c_client *client,
         return 0;
 
 out_irq:
-        if (client->irq >= 0)
+        if (client->irq > 0)
                 free_irq(client->irq, client);
 
 out_free:
@@ -414,7 +414,7 @@ static int __devexit ds1374_remove(struct i2c_client *client)
 {
         struct ds1374 *ds1374 = i2c_get_clientdata(client);
 
-        if (client->irq >= 0) {
+        if (client->irq > 0) {
                 mutex_lock(&ds1374->mutex);
                 ds1374->exiting = 1;
                 mutex_unlock(&ds1374->mutex);
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index 9f996ec881ce..dd70bf73ce9d 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -51,10 +51,11 @@ EXPORT_SYMBOL(rtc_year_days);
  */
 void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
 {
-        unsigned int days, month, year;
+        unsigned int month, year;
+        int days;
 
         days = time / 86400;
-        time -= days * 86400;
+        time -= (unsigned int) days * 86400;
 
         /* day of the week, 1970-01-01 was a Thursday */
         tm->tm_wday = (days + 4) % 7;
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 12f0310ae89c..78b2551fb19d 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -20,8 +20,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
-
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/init.h>
diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c
index b35f9bfa2af4..395985b339c9 100644
--- a/drivers/rtc/rtc-r9701.c
+++ b/drivers/rtc/rtc-r9701.c
@@ -14,7 +14,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/device.h>
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 1b6c52ef7339..acb78017e7d0 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2333,13 +2333,11 @@ int dasd_generic_notify(struct ccw_device *cdev, int event)
 {
         struct dasd_device *device;
         struct dasd_ccw_req *cqr;
-        unsigned long flags;
         int ret;
 
-        device = dasd_device_from_cdev(cdev);
+        device = dasd_device_from_cdev_locked(cdev);
         if (IS_ERR(device))
                 return 0;
-        spin_lock_irqsave(get_ccwdev_lock(cdev), flags);
         ret = 0;
         switch (event) {
         case CIO_GONE:
@@ -2369,7 +2367,6 @@ int dasd_generic_notify(struct ccw_device *cdev, int event)
                 ret = 1;
                 break;
         }
-        spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);
         dasd_put_device(device);
         return ret;
 }
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index 4bf0aa5112c1..2476f87d21d0 100644
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -308,7 +308,7 @@ struct dasd_psf_prssd_data {
         unsigned char flags;
         unsigned char reserved[4];
         unsigned char suborder;
-        unsigned char varies[9];
+        unsigned char varies[5];
 } __attribute__ ((packed));
 
 /*
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 29da4413ad43..bf512ac75b9e 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -16,6 +16,7 @@
 #include <linux/poll.h>
 #include <linux/mutex.h>
 #include <linux/smp_lock.h>
+#include <linux/err.h>
 
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -457,7 +458,7 @@ int dasd_eer_enable(struct dasd_device *device)
 
         cqr = dasd_kmalloc_request("ECKD", 1 /* SNSS */,
                                    SNSS_DATA_SIZE, device);
-        if (!cqr)
+        if (IS_ERR(cqr))
                 return -ENOMEM;
 
         cqr->startdev = device;
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 01fcdd91b846..711b3004b3e6 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -384,6 +384,11 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
          * get minor, add to list
          */
         down_write(&dcssblk_devices_sem);
+        if (dcssblk_get_device_by_name(local_buf)) {
+                up_write(&dcssblk_devices_sem);
+                rc = -EEXIST;
+                goto unload_seg;
+        }
         rc = dcssblk_assign_free_minor(dev_info);
         if (rc) {
                 up_write(&dcssblk_devices_sem);
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 687720b552d1..be0ce2215c8d 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -109,7 +109,7 @@ tapechar_check_idalbuffer(struct tape_device *device, size_t block_size)
 
         /* The current idal buffer is not correct. Allocate a new one. */
         new = idal_buffer_alloc(block_size, 0);
-        if (new == NULL)
+        if (IS_ERR(new))
                 return -ENOMEM;
 
         if (device->char_data.idal_buf != NULL)
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 2a1af4e60be0..cc8fd781ee22 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -248,7 +248,7 @@ tape_std_mtsetblk(struct tape_device *device, int count)
 
         /* Allocate a new idal buffer. */
         new = idal_buffer_alloc(count, 0);
-        if (new == NULL)
+        if (IS_ERR(new))
                 return -ENOMEM;
         if (device->char_data.idal_buf != NULL)
                 idal_buffer_free(device->char_data.idal_buf);
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 26a930e832bd..9a50f245774b 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -112,8 +112,11 @@ ccwgroup_release (struct device *dev)
         gdev = to_ccwgroupdev(dev);
 
         for (i = 0; i < gdev->count; i++) {
-                dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
-                put_device(&gdev->cdev[i]->dev);
+                if (gdev->cdev[i]) {
+                        if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev)
+                                dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
+                        put_device(&gdev->cdev[i]->dev);
+                }
         }
         kfree(gdev);
 }
@@ -221,6 +224,13 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
         atomic_set(&gdev->onoff, 0);
         mutex_init(&gdev->reg_mutex);
         mutex_lock(&gdev->reg_mutex);
+        gdev->creator_id = creator_id;
+        gdev->count = num_devices;
+        gdev->dev.bus = &ccwgroup_bus_type;
+        gdev->dev.parent = root;
+        gdev->dev.release = ccwgroup_release;
+        device_initialize(&gdev->dev);
+
         curr_buf = buf;
         for (i = 0; i < num_devices && curr_buf; i++) {
                 rc = __get_next_bus_id(&curr_buf, tmp_bus_id);
@@ -258,16 +268,11 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
                 rc = -EINVAL;
                 goto error;
         }
-        gdev->creator_id = creator_id;
-        gdev->count = num_devices;
-        gdev->dev.bus = &ccwgroup_bus_type;
-        gdev->dev.parent = root;
-        gdev->dev.release = ccwgroup_release;
 
         snprintf (gdev->dev.bus_id, BUS_ID_SIZE, "%s",
                         gdev->cdev[0]->dev.bus_id);
 
-        rc = device_register(&gdev->dev);
+        rc = device_add(&gdev->dev);
         if (rc)
                 goto error;
         get_device(&gdev->dev);
@@ -292,6 +297,7 @@ error:
                         if (dev_get_drvdata(&gdev->cdev[i]->dev) == gdev)
                                 dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
                         put_device(&gdev->cdev[i]->dev);
+                        gdev->cdev[i] = NULL;
                 }
         mutex_unlock(&gdev->reg_mutex);
         put_device(&gdev->dev);
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..326f4cc7f92c 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -174,6 +174,7 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */
         CIO_TRACE_EVENT(4, sch->dev.bus_id);
 
         orb = &to_io_private(sch)->orb;
+        memset(orb, 0, sizeof(union orb));
         /* sch is always under 2G. */
         orb->cmd.intparm = (u32)(addr_t)sch;
         orb->cmd.fmt = 1;
@@ -208,8 +209,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 46c021d880dc..1261e1a9e8cd 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -477,7 +477,6 @@ void css_schedule_eval_all(void)
 
 void css_wait_for_slow_path(void)
 {
-        flush_workqueue(ccw_device_notify_work);
         flush_workqueue(slow_path_wq);
 }
 
@@ -634,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);
 }
 
@@ -786,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);
@@ -803,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. */
@@ -811,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;
@@ -830,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.c b/drivers/s390/cio/device.c
index e818d0c54c09..28221030b886 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -150,7 +150,6 @@ static struct css_driver io_subchannel_driver = {
 };
 
 struct workqueue_struct *ccw_device_work;
-struct workqueue_struct *ccw_device_notify_work;
 wait_queue_head_t ccw_device_init_wq;
 atomic_t ccw_device_init_count;
 
@@ -168,11 +167,6 @@ init_ccw_bus_type (void)
         ccw_device_work = create_singlethread_workqueue("cio");
         if (!ccw_device_work)
                 return -ENOMEM; /* FIXME: better errno ? */
-        ccw_device_notify_work = create_singlethread_workqueue("cio_notify");
-        if (!ccw_device_notify_work) {
-                ret = -ENOMEM; /* FIXME: better errno ? */
-                goto out_err;
-        }
         slow_path_wq = create_singlethread_workqueue("kslowcrw");
         if (!slow_path_wq) {
                 ret = -ENOMEM; /* FIXME: better errno ? */
@@ -192,8 +186,6 @@ init_ccw_bus_type (void)
 out_err:
         if (ccw_device_work)
                 destroy_workqueue(ccw_device_work);
-        if (ccw_device_notify_work)
-                destroy_workqueue(ccw_device_notify_work);
         if (slow_path_wq)
                 destroy_workqueue(slow_path_wq);
         return ret;
@@ -204,7 +196,6 @@ cleanup_ccw_bus_type (void)
 {
         css_driver_unregister(&io_subchannel_driver);
         bus_unregister(&ccw_bus_type);
-        destroy_workqueue(ccw_device_notify_work);
         destroy_workqueue(ccw_device_work);
 }
 
@@ -1496,11 +1487,22 @@ static void device_set_disconnected(struct ccw_device *cdev)
                 ccw_device_schedule_recovery();
 }
 
+void ccw_device_set_notoper(struct ccw_device *cdev)
+{
+        struct subchannel *sch = to_subchannel(cdev->dev.parent);
+
+        CIO_TRACE_EVENT(2, "notoper");
+        CIO_TRACE_EVENT(2, sch->dev.bus_id);
+        ccw_device_set_timeout(cdev, 0);
+        cio_disable_subchannel(sch);
+        cdev->private->state = DEV_STATE_NOT_OPER;
+}
+
 static int io_subchannel_sch_event(struct subchannel *sch, int slow)
 {
         int event, ret, disc;
         unsigned long flags;
-        enum { NONE, UNREGISTER, UNREGISTER_PROBE, REPROBE } action;
+        enum { NONE, UNREGISTER, UNREGISTER_PROBE, REPROBE, DISC } action;
         struct ccw_device *cdev;
 
         spin_lock_irqsave(sch->lock, flags);
@@ -1535,16 +1537,11 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
                 }
                 /* fall through */
         case CIO_GONE:
-                /* Prevent unwanted effects when opening lock. */
-                cio_disable_subchannel(sch);
-                device_set_disconnected(cdev);
                 /* Ask driver what to do with device. */
-                action = UNREGISTER;
-                spin_unlock_irqrestore(sch->lock, flags);
-                ret = io_subchannel_notify(sch, event);
-                spin_lock_irqsave(sch->lock, flags);
-                if (ret)
-                        action = NONE;
+                if (io_subchannel_notify(sch, event))
+                        action = DISC;
+                else
+                        action = UNREGISTER;
                 break;
         case CIO_REVALIDATE:
                 /* Device will be removed, so no notify necessary. */
@@ -1565,6 +1562,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
         switch (action) {
         case UNREGISTER:
         case UNREGISTER_PROBE:
+                ccw_device_set_notoper(cdev);
                 /* Unregister device (will use subchannel lock). */
                 spin_unlock_irqrestore(sch->lock, flags);
                 css_sch_device_unregister(sch);
@@ -1577,6 +1575,9 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
         case REPROBE:
                 ccw_device_trigger_reprobe(cdev);
                 break;
+        case DISC:
+                device_set_disconnected(cdev);
+                break;
         default:
                 break;
         }
@@ -1828,5 +1829,4 @@ EXPORT_SYMBOL(ccw_driver_unregister);
 EXPORT_SYMBOL(get_ccwdev_by_busid);
 EXPORT_SYMBOL(ccw_bus_type);
 EXPORT_SYMBOL(ccw_device_work);
-EXPORT_SYMBOL(ccw_device_notify_work);
 EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id);
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 9800a8335a3f..6f5c3f2b3587 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -72,7 +72,6 @@ dev_fsm_final_state(struct ccw_device *cdev)
 }
 
 extern struct workqueue_struct *ccw_device_work;
-extern struct workqueue_struct *ccw_device_notify_work;
 extern wait_queue_head_t ccw_device_init_wq;
 extern atomic_t ccw_device_init_count;
 
@@ -120,6 +119,7 @@ int ccw_device_stlck(struct ccw_device *);
 void ccw_device_trigger_reprobe(struct ccw_device *);
 void ccw_device_kill_io(struct ccw_device *);
 int ccw_device_notify(struct ccw_device *, int);
+void ccw_device_set_notoper(struct ccw_device *cdev);
 
 /* qdio needs this. */
 void ccw_device_set_timeout(struct ccw_device *, int);
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 8b5fe57fb2f3..84cc9ea346db 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -337,26 +337,34 @@ int ccw_device_notify(struct ccw_device *cdev, int event)
                 return 0;
         if (!cdev->online)
                 return 0;
+        CIO_MSG_EVENT(2, "notify called for 0.%x.%04x, event=%d\n",
+                      cdev->private->dev_id.ssid, cdev->private->dev_id.devno,
+                      event);
         return cdev->drv->notify ? cdev->drv->notify(cdev, event) : 0;
 }
 
-static void
-ccw_device_oper_notify(struct work_struct *work)
+static void cmf_reenable_delayed(struct work_struct *work)
 {
         struct ccw_device_private *priv;
         struct ccw_device *cdev;
-        int ret;
 
         priv = container_of(work, struct ccw_device_private, kick_work);
         cdev = priv->cdev;
-        ret = ccw_device_notify(cdev, CIO_OPER);
-        if (ret) {
+        cmf_reenable(cdev);
+}
+
+static void ccw_device_oper_notify(struct ccw_device *cdev)
+{
+        if (ccw_device_notify(cdev, CIO_OPER)) {
                 /* Reenable channel measurements, if needed. */
-                cmf_reenable(cdev);
-                wake_up(&cdev->private->wait_q);
-        } else
-                /* Driver doesn't want device back. */
-                ccw_device_do_unreg_rereg(work);
+                PREPARE_WORK(&cdev->private->kick_work, cmf_reenable_delayed);
+                queue_work(ccw_device_work, &cdev->private->kick_work);
+                return;
+        }
+        /* Driver doesn't want device back. */
+        ccw_device_set_notoper(cdev);
+        PREPARE_WORK(&cdev->private->kick_work, ccw_device_do_unreg_rereg);
+        queue_work(ccw_device_work, &cdev->private->kick_work);
 }
 
 /*
@@ -386,8 +394,7 @@ ccw_device_done(struct ccw_device *cdev, int state)
 
         if (cdev->private->flags.donotify) {
                 cdev->private->flags.donotify = 0;
-                PREPARE_WORK(&cdev->private->kick_work, ccw_device_oper_notify);
-                queue_work(ccw_device_notify_work, &cdev->private->kick_work);
+                ccw_device_oper_notify(cdev);
         }
         wake_up(&cdev->private->wait_q);
 
@@ -651,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/s390/cio/qdio_debug.h b/drivers/s390/cio/qdio_debug.h
index 8484b83698e1..5a4d85b829ad 100644
--- a/drivers/s390/cio/qdio_debug.h
+++ b/drivers/s390/cio/qdio_debug.h
@@ -61,18 +61,18 @@
 
 /* s390dbf views */
 #define QDIO_DBF_SETUP_LEN              8
-#define QDIO_DBF_SETUP_PAGES            4
+#define QDIO_DBF_SETUP_PAGES            8
 #define QDIO_DBF_SETUP_NR_AREAS         1
 
 #define QDIO_DBF_TRACE_LEN              8
 #define QDIO_DBF_TRACE_NR_AREAS         2
 
 #ifdef CONFIG_QDIO_DEBUG
-#define QDIO_DBF_TRACE_PAGES            16
+#define QDIO_DBF_TRACE_PAGES            32
 #define QDIO_DBF_SETUP_LEVEL            6
 #define QDIO_DBF_TRACE_LEVEL            4
 #else /* !CONFIG_QDIO_DEBUG */
-#define QDIO_DBF_TRACE_PAGES            4
+#define QDIO_DBF_TRACE_PAGES            8
 #define QDIO_DBF_SETUP_LEVEL            2
 #define QDIO_DBF_TRACE_LEVEL            2
 #endif /* CONFIG_QDIO_DEBUG */
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index d15648514a0f..e6eabc853422 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -330,6 +330,7 @@ static int qdio_siga_output(struct qdio_q *q)
         int cc;
         u32 busy_bit;
         u64 start_time = 0;
+        char dbf_text[15];
 
         QDIO_DBF_TEXT5(0, trace, "sigaout");
         QDIO_DBF_HEX5(0, trace, &q, sizeof(void *));
@@ -338,6 +339,9 @@ static int qdio_siga_output(struct qdio_q *q)
 again:
         cc = qdio_do_siga_output(q, &busy_bit);
         if (queue_type(q) == QDIO_IQDIO_QFMT && cc == 2 && busy_bit) {
+                sprintf(dbf_text, "bb%4x%2x", q->irq_ptr->schid.sch_no, q->nr);
+                QDIO_DBF_TEXT3(0, trace, dbf_text);
+
                 if (!start_time)
                         start_time = get_usecs();
                 else if ((get_usecs() - start_time) < QDIO_BUSY_BIT_PATIENCE)
@@ -748,16 +752,18 @@ static void qdio_kick_outbound_q(struct qdio_q *q)
         rc = qdio_siga_output(q);
         switch (rc) {
         case 0:
-                /* went smooth this time, reset timestamp */
-                q->u.out.timestamp = 0;
-
                 /* TODO: improve error handling for CC=0 case */
 #ifdef CONFIG_QDIO_DEBUG
-                QDIO_DBF_TEXT3(0, trace, "cc2reslv");
-                sprintf(dbf_text, "%4x%2x%2x", q->irq_ptr->schid.sch_no, q->nr,
-                        atomic_read(&q->u.out.busy_siga_counter));
-                QDIO_DBF_TEXT3(0, trace, dbf_text);
+                if (q->u.out.timestamp) {
+                        QDIO_DBF_TEXT3(0, trace, "cc2reslv");
+                        sprintf(dbf_text, "%4x%2x%2x", q->irq_ptr->schid.sch_no,
+                                q->nr,
+                                atomic_read(&q->u.out.busy_siga_counter));
+                        QDIO_DBF_TEXT3(0, trace, dbf_text);
+                }
 #endif /* CONFIG_QDIO_DEBUG */
+                /* went smooth this time, reset timestamp */
+                q->u.out.timestamp = 0;
                 break;
         /* cc=2 and busy bit */
         case (2 | QDIO_ERROR_SIGA_BUSY):
@@ -1066,14 +1072,12 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
         if (IS_ERR(irb)) {
                 switch (PTR_ERR(irb)) {
                 case -EIO:
-                        sprintf(dbf_text, "ierr%4x",
-                                cdev->private->schid.sch_no);
+                        sprintf(dbf_text, "ierr%4x", irq_ptr->schid.sch_no);
                         QDIO_DBF_TEXT2(1, setup, dbf_text);
                         qdio_int_error(cdev);
                         return;
                 case -ETIMEDOUT:
-                        sprintf(dbf_text, "qtoh%4x",
-                                cdev->private->schid.sch_no);
+                        sprintf(dbf_text, "qtoh%4x", irq_ptr->schid.sch_no);
                         QDIO_DBF_TEXT2(1, setup, dbf_text);
                         qdio_int_error(cdev);
                         return;
@@ -1124,8 +1128,10 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
 struct qdio_ssqd_desc *qdio_get_ssqd_desc(struct ccw_device *cdev)
 {
         struct qdio_irq *irq_ptr;
+        char dbf_text[15];
 
-        QDIO_DBF_TEXT0(0, setup, "getssqd");
+        sprintf(dbf_text, "qssq%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
 
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
@@ -1149,14 +1155,13 @@ int qdio_cleanup(struct ccw_device *cdev, int how)
         char dbf_text[15];
         int rc;
 
+        sprintf(dbf_text, "qcln%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
+
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
                 return -ENODEV;
 
-        sprintf(dbf_text, "qcln%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT1(0, trace, dbf_text);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
-
         rc = qdio_shutdown(cdev, how);
         if (rc == 0)
                 rc = qdio_free(cdev);
@@ -1191,6 +1196,9 @@ int qdio_shutdown(struct ccw_device *cdev, int how)
         unsigned long flags;
         char dbf_text[15];
 
+        sprintf(dbf_text, "qshu%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
+
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
                 return -ENODEV;
@@ -1205,10 +1213,6 @@ int qdio_shutdown(struct ccw_device *cdev, int how)
                 return 0;
         }
 
-        sprintf(dbf_text, "qsqs%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT1(0, trace, dbf_text);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
-
         tiqdio_remove_input_queues(irq_ptr);
         qdio_shutdown_queues(cdev);
         qdio_shutdown_debug_entries(irq_ptr, cdev);
@@ -1247,7 +1251,6 @@ no_cleanup:
 
         qdio_set_state(irq_ptr, QDIO_IRQ_STATE_INACTIVE);
         mutex_unlock(&irq_ptr->setup_mutex);
-        module_put(THIS_MODULE);
         if (rc)
                 return rc;
         return 0;
@@ -1263,16 +1266,14 @@ int qdio_free(struct ccw_device *cdev)
         struct qdio_irq *irq_ptr;
         char dbf_text[15];
 
+        sprintf(dbf_text, "qfre%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
+
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
                 return -ENODEV;
 
         mutex_lock(&irq_ptr->setup_mutex);
-
-        sprintf(dbf_text, "qfqs%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT1(0, trace, dbf_text);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
-
         cdev->private->qdio_data = NULL;
         mutex_unlock(&irq_ptr->setup_mutex);
 
@@ -1295,7 +1296,6 @@ int qdio_initialize(struct qdio_initialize *init_data)
 
         sprintf(dbf_text, "qini%4x", init_data->cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0, setup, dbf_text);
-        QDIO_DBF_TEXT0(0, trace, dbf_text);
 
         rc = qdio_allocate(init_data);
         if (rc)
@@ -1319,7 +1319,6 @@ int qdio_allocate(struct qdio_initialize *init_data)
 
         sprintf(dbf_text, "qalc%4x", init_data->cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0, setup, dbf_text);
-        QDIO_DBF_TEXT0(0, trace, dbf_text);
 
         if ((init_data->no_input_qs && !init_data->input_handler) ||
             (init_data->no_output_qs && !init_data->output_handler))
@@ -1389,6 +1388,9 @@ int qdio_establish(struct qdio_initialize *init_data)
         unsigned long saveflags;
         int rc;
 
+        sprintf(dbf_text, "qest%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
+
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
                 return -ENODEV;
@@ -1396,13 +1398,6 @@ int qdio_establish(struct qdio_initialize *init_data)
         if (cdev->private->state != DEV_STATE_ONLINE)
                 return -EINVAL;
 
-        if (!try_module_get(THIS_MODULE))
-                return -EINVAL;
-
-        sprintf(dbf_text, "qest%4x", cdev->private->schid.sch_no);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
-        QDIO_DBF_TEXT0(0, trace, dbf_text);
-
         mutex_lock(&irq_ptr->setup_mutex);
         qdio_setup_irq(init_data);
 
@@ -1472,6 +1467,9 @@ int qdio_activate(struct ccw_device *cdev)
         unsigned long saveflags;
         char dbf_text[20];
 
+        sprintf(dbf_text, "qact%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
+
         irq_ptr = cdev->private->qdio_data;
         if (!irq_ptr)
                 return -ENODEV;
@@ -1485,10 +1483,6 @@ int qdio_activate(struct ccw_device *cdev)
                 goto out;
         }
 
-        sprintf(dbf_text, "qact%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT2(0, setup, dbf_text);
-        QDIO_DBF_TEXT2(0, trace, dbf_text);
-
         irq_ptr->ccw.cmd_code = irq_ptr->aqueue.cmd;
         irq_ptr->ccw.flags = CCW_FLAG_SLI;
         irq_ptr->ccw.count = irq_ptr->aqueue.count;
@@ -1663,7 +1657,7 @@ int do_QDIO(struct ccw_device *cdev, unsigned int callflags,
 #ifdef CONFIG_QDIO_DEBUG
         char dbf_text[20];
 
-        sprintf(dbf_text, "doQD%04x", cdev->private->schid.sch_no);
+        sprintf(dbf_text, "doQD%4x", cdev->private->schid.sch_no);
         QDIO_DBF_TEXT3(0, trace, dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
 
diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 1bd2a208db28..a0b6b46e7466 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -165,7 +165,7 @@ static void setup_queues(struct qdio_irq *irq_ptr,
         void **output_sbal_array = qdio_init->output_sbal_addr_array;
         int i;
 
-        sprintf(dbf_text, "qfqs%4x", qdio_init->cdev->private->schid.sch_no);
+        sprintf(dbf_text, "qset%4x", qdio_init->cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0, setup, dbf_text);
 
         for_each_input_queue(irq_ptr, q, i) {
@@ -285,7 +285,7 @@ void qdio_setup_ssqd_info(struct qdio_irq *irq_ptr)
         rc = __get_ssqd_info(irq_ptr);
         if (rc) {
                 QDIO_DBF_TEXT2(0, setup, "ssqdasig");
-                sprintf(dbf_text, "schno%x", irq_ptr->schid.sch_no);
+                sprintf(dbf_text, "schn%4x", irq_ptr->schid.sch_no);
                 QDIO_DBF_TEXT2(0, setup, dbf_text);
                 sprintf(dbf_text, "rc:%d", rc);
                 QDIO_DBF_TEXT2(0, setup, dbf_text);
@@ -447,51 +447,36 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
 {
         char s[80];
 
-        sprintf(s, "%s ", cdev->dev.bus_id);
-
+        sprintf(s, "qdio: %s ", dev_name(&cdev->dev));
         switch (irq_ptr->qib.qfmt) {
         case QDIO_QETH_QFMT:
-                sprintf(s + strlen(s), "OSADE ");
+                sprintf(s + strlen(s), "OSA ");
                 break;
         case QDIO_ZFCP_QFMT:
                 sprintf(s + strlen(s), "ZFCP ");
                 break;
         case QDIO_IQDIO_QFMT:
-                sprintf(s + strlen(s), "HiperSockets ");
+                sprintf(s + strlen(s), "HS ");
                 break;
         }
-        sprintf(s + strlen(s), "using: ");
-
-        if (!is_thinint_irq(irq_ptr))
-                sprintf(s + strlen(s), "no");
-        sprintf(s + strlen(s), "AdapterInterrupts ");
-        if (!(irq_ptr->sch_token != 0))
-                sprintf(s + strlen(s), "no");
-        sprintf(s + strlen(s), "QEBSM ");
-        if (!(irq_ptr->qib.ac & QIB_AC_OUTBOUND_PCI_SUPPORTED))
-                sprintf(s + strlen(s), "no");
-        sprintf(s + strlen(s), "OutboundPCI ");
-        if (!css_general_characteristics.aif_tdd)
-                sprintf(s + strlen(s), "no");
-        sprintf(s + strlen(s), "TDD\n");
-        printk(KERN_INFO "qdio: %s", s);
-
-        memset(s, 0, sizeof(s));
-        sprintf(s, "%s SIGA required: ", cdev->dev.bus_id);
-        if (irq_ptr->siga_flag.input)
-                sprintf(s + strlen(s), "Read ");
-        if (irq_ptr->siga_flag.output)
-                sprintf(s + strlen(s), "Write ");
-        if (irq_ptr->siga_flag.sync)
-                sprintf(s + strlen(s), "Sync ");
-        if (!irq_ptr->siga_flag.no_sync_ti)
-                sprintf(s + strlen(s), "SyncAI ");
-        if (!irq_ptr->siga_flag.no_sync_out_ti)
-                sprintf(s + strlen(s), "SyncOutAI ");
-        if (!irq_ptr->siga_flag.no_sync_out_pci)
-                sprintf(s + strlen(s), "SyncOutPCI");
+        sprintf(s + strlen(s), "on SC %x using ", irq_ptr->schid.sch_no);
+        sprintf(s + strlen(s), "AI:%d ", is_thinint_irq(irq_ptr));
+        sprintf(s + strlen(s), "QEBSM:%d ", (irq_ptr->sch_token) ? 1 : 0);
+        sprintf(s + strlen(s), "PCI:%d ",
+                (irq_ptr->qib.ac & QIB_AC_OUTBOUND_PCI_SUPPORTED) ? 1 : 0);
+        sprintf(s + strlen(s), "TDD:%d ", css_general_characteristics.aif_tdd);
+        sprintf(s + strlen(s), "SIGA:");
+        sprintf(s + strlen(s), "%s", (irq_ptr->siga_flag.input) ? "R" : " ");
+        sprintf(s + strlen(s), "%s", (irq_ptr->siga_flag.output) ? "W" : " ");
+        sprintf(s + strlen(s), "%s", (irq_ptr->siga_flag.sync) ? "S" : " ");
+        sprintf(s + strlen(s), "%s",
+                (!irq_ptr->siga_flag.no_sync_ti) ? "A" : " ");
+        sprintf(s + strlen(s), "%s",
+                (!irq_ptr->siga_flag.no_sync_out_ti) ? "O" : " ");
+        sprintf(s + strlen(s), "%s",
+                (!irq_ptr->siga_flag.no_sync_out_pci) ? "P" : " ");
         sprintf(s + strlen(s), "\n");
-        printk(KERN_INFO "qdio: %s", s);
+        printk(KERN_INFO "%s", s);
 }
 
 int __init qdio_setup_init(void)
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index 9291a771d812..ea7f61400267 100644
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -113,7 +113,11 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)
         struct qdio_q *q;
         int i;
 
-        for_each_input_queue(irq_ptr, q, i) {
+        for (i = 0; i < irq_ptr->nr_input_qs; i++) {
+                q = irq_ptr->input_qs[i];
+                /* if establish triggered an error */
+                if (!q || !q->entry.prev || !q->entry.next)
+                        continue;
                 list_del_rcu(&q->entry);
                 synchronize_rcu();
         }
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index a08b1682c8e8..e10ac9ab2d44 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -133,14 +133,14 @@ claw_register_debug_facility(void)
 static inline void
 claw_set_busy(struct net_device *dev)
 {
- ((struct claw_privbk *) dev->priv)->tbusy=1;
+ ((struct claw_privbk *)dev->ml_priv)->tbusy = 1;
  eieio();
 }
 
 static inline void
 claw_clear_busy(struct net_device *dev)
 {
-        clear_bit(0, &(((struct claw_privbk *) dev->priv)->tbusy));
+        clear_bit(0, &(((struct claw_privbk *) dev->ml_priv)->tbusy));
         netif_wake_queue(dev);
         eieio();
 }
@@ -149,20 +149,20 @@ static inline int
 claw_check_busy(struct net_device *dev)
 {
         eieio();
-        return ((struct claw_privbk *) dev->priv)->tbusy;
+        return ((struct claw_privbk *) dev->ml_priv)->tbusy;
 }
 
 static inline void
 claw_setbit_busy(int nr,struct net_device *dev)
 {
         netif_stop_queue(dev);
-        set_bit(nr, (void *)&(((struct claw_privbk *)dev->priv)->tbusy));
+        set_bit(nr, (void *)&(((struct claw_privbk *)dev->ml_priv)->tbusy));
 }
 
 static inline void
 claw_clearbit_busy(int nr,struct net_device *dev)
 {
-        clear_bit(nr,(void *)&(((struct claw_privbk *)dev->priv)->tbusy));
+        clear_bit(nr, (void *)&(((struct claw_privbk *)dev->ml_priv)->tbusy));
         netif_wake_queue(dev);
 }
 
@@ -171,7 +171,7 @@ claw_test_and_setbit_busy(int nr,struct net_device *dev)
 {
         netif_stop_queue(dev);
         return test_and_set_bit(nr,
-                (void *)&(((struct claw_privbk *) dev->priv)->tbusy));
+                (void *)&(((struct claw_privbk *) dev->ml_priv)->tbusy));
 }
 
 
@@ -271,6 +271,7 @@ claw_probe(struct ccwgroup_device *cgdev)
         if (!get_device(&cgdev->dev))
                 return -ENODEV;
         privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL);
+        cgdev->dev.driver_data = privptr;
         if (privptr == NULL) {
                 probe_error(cgdev);
                 put_device(&cgdev->dev);
@@ -305,7 +306,6 @@ claw_probe(struct ccwgroup_device *cgdev)
         privptr->p_env->p_priv = privptr;
         cgdev->cdev[0]->handler = claw_irq_handler;
         cgdev->cdev[1]->handler = claw_irq_handler;
-        cgdev->dev.driver_data = privptr;
         CLAW_DBF_TEXT(2, setup, "prbext 0");
 
         return 0;
@@ -319,7 +319,7 @@ static int
 claw_tx(struct sk_buff *skb, struct net_device *dev)
 {
         int             rc;
-        struct claw_privbk *privptr=dev->priv;
+        struct claw_privbk *privptr = dev->ml_priv;
         unsigned long saveflags;
         struct chbk *p_ch;
 
@@ -404,7 +404,7 @@ claw_pack_skb(struct claw_privbk *privptr)
 static int
 claw_change_mtu(struct net_device *dev, int new_mtu)
 {
-        struct claw_privbk  *privptr=dev->priv;
+        struct claw_privbk *privptr = dev->ml_priv;
         int buff_size;
         CLAW_DBF_TEXT(4, trace, "setmtu");
         buff_size = privptr->p_env->write_size;
@@ -434,7 +434,7 @@ claw_open(struct net_device *dev)
         struct ccwbk *p_buf;
 
         CLAW_DBF_TEXT(4, trace, "open");
-        privptr = (struct claw_privbk *)dev->priv;
+        privptr = (struct claw_privbk *)dev->ml_priv;
         /*   allocate and initialize CCW blocks */
         if (privptr->buffs_alloc == 0) {
                 rc=init_ccw_bk(dev);
@@ -780,7 +780,7 @@ claw_irq_tasklet ( unsigned long data )
         p_ch = (struct chbk *) data;
         dev = (struct net_device *)p_ch->ndev;
         CLAW_DBF_TEXT(4, trace, "IRQtask");
-        privptr = (struct claw_privbk *) dev->priv;
+        privptr = (struct claw_privbk *)dev->ml_priv;
         unpack_read(dev);
         clear_bit(CLAW_BH_ACTIVE, (void *)&p_ch->flag_a);
         CLAW_DBF_TEXT(4, trace, "TskletXt");
@@ -805,7 +805,7 @@ claw_release(struct net_device *dev)
 
         if (!dev)
                 return 0;
-        privptr = (struct claw_privbk *) dev->priv;
+        privptr = (struct claw_privbk *)dev->ml_priv;
         if (!privptr)
                 return 0;
         CLAW_DBF_TEXT(4, trace, "release");
@@ -960,7 +960,7 @@ claw_write_next ( struct chbk * p_ch )
         if (p_ch->claw_state == CLAW_STOP)
                 return;
         dev = (struct net_device *) p_ch->ndev;
-        privptr = (struct claw_privbk *) dev->priv;
+        privptr = (struct claw_privbk *) dev->ml_priv;
         claw_free_wrt_buf( dev );
         if ((privptr->write_free_count > 0) &&
             !skb_queue_empty(&p_ch->collect_queue)) {
@@ -1042,7 +1042,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first,
         struct ccw1  temp_ccw;
         struct endccw * p_end;
         CLAW_DBF_TEXT(4, trace, "addreads");
-        privptr = dev->priv;
+        privptr = dev->ml_priv;
         p_end = privptr->p_end_ccw;
 
         /* first CCW and last CCW contains a new set of read channel programs
@@ -1212,7 +1212,7 @@ find_link(struct net_device *dev, char *host_name, char *ws_name )
         int    rc=0;
 
         CLAW_DBF_TEXT(2, setup, "findlink");
-        privptr=dev->priv;
+        privptr = dev->ml_priv;
         p_env=privptr->p_env;
         switch (p_env->packing)
         {
@@ -1264,7 +1264,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
         struct chbk                     *ch;
 
         CLAW_DBF_TEXT(4, trace, "hw_tx");
-        privptr = (struct claw_privbk *) (dev->priv);
+        privptr = (struct claw_privbk *)(dev->ml_priv);
         p_ch=(struct chbk *)&privptr->channel[WRITE];
         p_env =privptr->p_env;
         claw_free_wrt_buf(dev); /* Clean up free chain if posible */
@@ -1483,8 +1483,8 @@ init_ccw_bk(struct net_device *dev)
         struct ccwbk*p_last_CCWB;
         struct ccwbk*p_first_CCWB;
         struct endccw *p_endccw=NULL;
-        addr_t  real_address;
-        struct claw_privbk *privptr=dev->priv;
+        addr_t  real_address;
+        struct claw_privbk *privptr = dev->ml_priv;
         struct clawh *pClawH=NULL;
         addr_t   real_TIC_address;
         int i,j;
@@ -1960,19 +1960,16 @@ init_ccw_bk(struct net_device *dev)
 static void
 probe_error( struct ccwgroup_device *cgdev)
 {
-  struct claw_privbk *privptr;
+        struct claw_privbk *privptr;
 
         CLAW_DBF_TEXT(4, trace, "proberr");
-        privptr=(struct claw_privbk *)cgdev->dev.driver_data;
-        if (privptr!=NULL) {
+        privptr = (struct claw_privbk *) cgdev->dev.driver_data;
+        if (privptr != NULL) {
+                cgdev->dev.driver_data = NULL;
                 kfree(privptr->p_env);
-                privptr->p_env=NULL;
-                kfree(privptr->p_mtc_envelope);
-                privptr->p_mtc_envelope=NULL;
-                kfree(privptr);
-                privptr=NULL;
-        }
-        return;
+                kfree(privptr->p_mtc_envelope);
+                kfree(privptr);
+        }
 }    /*    probe_error    */
 
 /*-------------------------------------------------------------------*
@@ -2000,7 +1997,7 @@ claw_process_control( struct net_device *dev, struct ccwbk * p_ccw)
         CLAW_DBF_TEXT(2, setup, "clw_cntl");
         udelay(1000);  /* Wait a ms for the control packets to
                         *catch up to each other */
-        privptr=dev->priv;
+        privptr = dev->ml_priv;
         p_env=privptr->p_env;
         tdev = &privptr->channel[READ].cdev->dev;
         memcpy( &temp_host_name, p_env->host_name, 8);
@@ -2278,7 +2275,7 @@ claw_send_control(struct net_device *dev, __u8 type, __u8 link,
         struct sk_buff                  *skb;
 
         CLAW_DBF_TEXT(2, setup, "sndcntl");
-        privptr=dev->priv;
+        privptr = dev->ml_priv;
         p_ctl=(struct clawctl *)&privptr->ctl_bk;
 
         p_ctl->command=type;
@@ -2348,7 +2345,7 @@ static int
 claw_snd_conn_req(struct net_device *dev, __u8 link)
 {
         int                rc;
-        struct claw_privbk *privptr=dev->priv;
+        struct claw_privbk *privptr = dev->ml_priv;
         struct clawctl     *p_ctl;
 
         CLAW_DBF_TEXT(2, setup, "snd_conn");
@@ -2408,7 +2405,7 @@ claw_snd_sys_validate_rsp(struct net_device *dev,
         int    rc;
 
         CLAW_DBF_TEXT(2, setup, "chkresp");
-        privptr = dev->priv;
+        privptr = dev->ml_priv;
         p_env=privptr->p_env;
         rc=claw_send_control(dev, SYSTEM_VALIDATE_RESPONSE,
                 p_ctl->linkid,
@@ -2446,7 +2443,7 @@ net_device_stats *claw_stats(struct net_device *dev)
         struct claw_privbk *privptr;
 
         CLAW_DBF_TEXT(4, trace, "stats");
-        privptr = dev->priv;
+        privptr = dev->ml_priv;
         return &privptr->stats;
 }     /*   end of claw_stats   */
 
@@ -2482,7 +2479,7 @@ unpack_read(struct net_device *dev )
         p_last_ccw=NULL;
         p_packh=NULL;
         p_packd=NULL;
-        privptr=dev->priv;
+        privptr = dev->ml_priv;
 
         p_dev = &privptr->channel[READ].cdev->dev;
         p_env = privptr->p_env;
@@ -2651,7 +2648,7 @@ claw_strt_read (struct net_device *dev, int lock )
         int        rc = 0;
         __u32      parm;
         unsigned long  saveflags = 0;
-        struct claw_privbk *privptr=dev->priv;
+        struct claw_privbk *privptr = dev->ml_priv;
         struct ccwbk*p_ccwbk;
         struct chbk *p_ch;
         struct clawh *p_clawh;
@@ -2708,7 +2705,7 @@ claw_strt_out_IO( struct net_device *dev )
         if (!dev) {
                 return;
         }
-        privptr=(struct claw_privbk *)dev->priv;
+        privptr = (struct claw_privbk *)dev->ml_priv;
         p_ch=&privptr->channel[WRITE];
 
         CLAW_DBF_TEXT(4, trace, "strt_io");
@@ -2741,7 +2738,7 @@ static void
 claw_free_wrt_buf( struct net_device *dev )
 {
 
-        struct claw_privbk *privptr=(struct claw_privbk *)dev->priv;
+        struct claw_privbk *privptr = (struct claw_privbk *)dev->ml_priv;
         struct ccwbk*p_first_ccw;
         struct ccwbk*p_last_ccw;
         struct ccwbk*p_this_ccw;
@@ -2798,13 +2795,13 @@ claw_free_netdevice(struct net_device * dev, int free_dev)
         if (!dev)
                 return;
         CLAW_DBF_TEXT_(2, setup, "%s", dev->name);
-        privptr = dev->priv;
+        privptr = dev->ml_priv;
         if (dev->flags & IFF_RUNNING)
                 claw_release(dev);
         if (privptr) {
                 privptr->channel[READ].ndev = NULL;  /* say it's free */
         }
-        dev->priv=NULL;
+        dev->ml_priv = NULL;
 #ifdef MODULE
         if (free_dev) {
                 free_netdev(dev);
@@ -2921,7 +2918,7 @@ claw_new_device(struct ccwgroup_device *cgdev)
                 printk(KERN_WARNING "%s:alloc_netdev failed\n",__func__);
                 goto out;
         }
-        dev->priv = privptr;
+        dev->ml_priv = privptr;
         cgdev->dev.driver_data = privptr;
         cgdev->cdev[READ]->dev.driver_data = privptr;
         cgdev->cdev[WRITE]->dev.driver_data = privptr;
@@ -3002,7 +2999,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev)
                         ret = claw_release(ndev);
                 ndev->flags &=~IFF_RUNNING;
                 unregister_netdev(ndev);
-                ndev->priv = NULL;  /* cgdev data, not ndev's to free */
+                ndev->ml_priv = NULL;  /* cgdev data, not ndev's to free */
                 claw_free_netdevice(ndev, 1);
                 priv->channel[READ].ndev = NULL;
                 priv->channel[WRITE].ndev = NULL;
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c
index 0b4e6253abe4..42776550acfd 100644
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
@@ -245,7 +245,7 @@ static void chx_txdone(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct sk_buff *skb;
         int first = 1;
         int i;
@@ -336,7 +336,7 @@ void ctcm_chx_txidle(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCM_PR_DEBUG("%s(%s): %s\n", __func__, ch->id, dev->name);
 
@@ -357,7 +357,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         int len = ch->max_bufsize - ch->irb->scsw.cmd.count;
         struct sk_buff *skb = ch->trans_skb;
         __u16 block_len = *((__u16 *)skb->data);
@@ -459,7 +459,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg)
                         chx_rxidle(fi, event, arg);
                 } else {
                         struct net_device *dev = ch->netdev;
-                        struct ctcm_priv *priv = dev->priv;
+                        struct ctcm_priv *priv = dev->ml_priv;
                         fsm_newstate(fi, CTC_STATE_TXIDLE);
                         fsm_event(priv->fsm, DEV_EVENT_TXUP, dev);
                 }
@@ -496,7 +496,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg)
         if ((CHANNEL_DIRECTION(ch->flags) == READ) &&
             (ch->protocol == CTCM_PROTO_S390)) {
                 struct net_device *dev = ch->netdev;
-                struct ctcm_priv *priv = dev->priv;
+                struct ctcm_priv *priv = dev->ml_priv;
                 fsm_event(priv->fsm, DEV_EVENT_RXUP, dev);
         }
 }
@@ -514,7 +514,7 @@ static void chx_rxidle(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         __u16 buflen;
         int rc;
 
@@ -699,7 +699,7 @@ static void ctcm_chx_cleanup(fsm_instance *fi, int state,
                 struct channel *ch)
 {
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE,
                         "%s(%s): %s[%d]\n",
@@ -784,7 +784,7 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         /*
          * Special case: Got UC_RCRESET on setmode.
@@ -874,7 +874,7 @@ static void ctcm_chx_rxiniterr(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         if (event == CTC_EVENT_TIMER) {
                 if (!IS_MPCDEV(dev))
@@ -902,7 +902,7 @@ static void ctcm_chx_rxinitfail(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR,
                         "%s(%s): RX %s busy, init. fail",
@@ -923,7 +923,7 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg)
         struct channel *ch = arg;
         struct channel *ch2;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE,
                         "%s: %s: remote disconnect - re-init ...",
@@ -954,7 +954,7 @@ static void ctcm_chx_txiniterr(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         if (event == CTC_EVENT_TIMER) {
                 fsm_deltimer(&ch->timer);
@@ -984,7 +984,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct sk_buff *skb;
 
         CTCM_PR_DEBUG("Enter: %s: cp=%i ch=0x%p id=%s\n",
@@ -1057,7 +1057,7 @@ static void ctcm_chx_iofatal(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         int rd = CHANNEL_DIRECTION(ch->flags);
 
         fsm_deltimer(&ch->timer);
@@ -1207,7 +1207,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg)
 {
         struct channel          *ch = arg;
         struct net_device       *dev = ch->netdev;
-        struct ctcm_priv        *priv = dev->priv;
+        struct ctcm_priv        *priv = dev->ml_priv;
         struct mpc_group        *grp = priv->mpcg;
         struct sk_buff          *skb;
         int             first = 1;
@@ -1368,7 +1368,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg)
 {
         struct channel          *ch = arg;
         struct net_device       *dev = ch->netdev;
-        struct ctcm_priv        *priv = dev->priv;
+        struct ctcm_priv        *priv = dev->ml_priv;
         struct mpc_group        *grp = priv->mpcg;
         struct sk_buff          *skb = ch->trans_skb;
         struct sk_buff          *new_skb;
@@ -1471,7 +1471,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg)
 {
         struct channel          *ch = arg;
         struct net_device       *dev = ch->netdev;
-        struct ctcm_priv        *priv = dev->priv;
+        struct ctcm_priv        *priv = dev->ml_priv;
         struct mpc_group        *gptr = priv->mpcg;
 
         CTCM_PR_DEBUG("Enter %s: id=%s, ch=0x%p\n",
@@ -1525,7 +1525,7 @@ void ctcmpc_chx_rxidle(fsm_instance *fi, int event, void *arg)
 {
         struct channel *ch = arg;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv  *priv = dev->priv;
+        struct ctcm_priv  *priv = dev->ml_priv;
         struct mpc_group  *grp = priv->mpcg;
         int rc;
         unsigned long saveflags = 0;    /* avoids compiler warning */
@@ -1580,7 +1580,7 @@ static void ctcmpc_chx_attn(fsm_instance *fsm, int event, void *arg)
 {
         struct channel    *ch     = arg;
         struct net_device *dev    = ch->netdev;
-        struct ctcm_priv  *priv   = dev->priv;
+        struct ctcm_priv  *priv   = dev->ml_priv;
         struct mpc_group  *grp = priv->mpcg;
 
         CTCM_PR_DEBUG("%s(%s): %s(ch=0x%p), cp=%i, ChStat:%s, GrpStat:%s\n",
@@ -1639,7 +1639,7 @@ static void ctcmpc_chx_attnbusy(fsm_instance *fsm, int event, void *arg)
 {
         struct channel    *ch     = arg;
         struct net_device *dev    = ch->netdev;
-        struct ctcm_priv  *priv   = dev->priv;
+        struct ctcm_priv  *priv   = dev->ml_priv;
         struct mpc_group  *grp    = priv->mpcg;
 
         CTCM_PR_DEBUG("%s(%s): %s\n  ChState:%s GrpState:%s\n",
@@ -1724,7 +1724,7 @@ static void ctcmpc_chx_resend(fsm_instance *fsm, int event, void *arg)
 {
         struct channel     *ch     = arg;
         struct net_device  *dev    = ch->netdev;
-        struct ctcm_priv   *priv   = dev->priv;
+        struct ctcm_priv   *priv   = dev->ml_priv;
         struct mpc_group   *grp    = priv->mpcg;
 
         fsm_event(grp->fsm, MPCG_EVENT_XID0DO, ch);
@@ -1740,7 +1740,7 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg)
 {
         struct channel *ach = arg;
         struct net_device *dev = ach->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
         struct channel *wch = priv->channel[WRITE];
         struct channel *rch = priv->channel[READ];
@@ -2050,7 +2050,7 @@ int mpc_ch_fsm_len = ARRAY_SIZE(ctcmpc_ch_fsm);
 static void dev_action_start(fsm_instance *fi, int event, void *arg)
 {
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         int direction;
 
         CTCMY_DBF_DEV_NAME(SETUP, dev, "");
@@ -2076,7 +2076,7 @@ static void dev_action_stop(fsm_instance *fi, int event, void *arg)
 {
         int direction;
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCMY_DBF_DEV_NAME(SETUP, dev, "");
 
@@ -2096,7 +2096,7 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg)
 {
         int restart_timer;
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCMY_DBF_DEV_NAME(TRACE, dev, "");
 
@@ -2133,12 +2133,12 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg)
 static void dev_action_chup(fsm_instance *fi, int event, void *arg)
 {
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         int dev_stat = fsm_getstate(fi);
 
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE,
                         "%s(%s): priv = %p [%d,%d]\n ", CTCM_FUNTAIL,
-                                dev->name, dev->priv, dev_stat, event);
+                                dev->name, dev->ml_priv, dev_stat, event);
 
         switch (fsm_getstate(fi)) {
         case DEV_STATE_STARTWAIT_RXTX:
@@ -2195,7 +2195,7 @@ static void dev_action_chdown(fsm_instance *fi, int event, void *arg)
 {
 
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCMY_DBF_DEV_NAME(SETUP, dev, "");
 
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 126a3ebb8ab2..b11fec24c7d2 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -69,7 +69,7 @@ struct channel *channels;
 void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb)
 {
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         __u16 len = *((__u16 *) pskb->data);
 
         skb_put(pskb, 2 + LL_HEADER_LENGTH);
@@ -414,7 +414,7 @@ int ctcm_ch_alloc_buffer(struct channel *ch)
  */
 int ctcm_open(struct net_device *dev)
 {
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCMY_DBF_DEV_NAME(SETUP, dev, "");
         if (!IS_MPC(priv))
@@ -432,7 +432,7 @@ int ctcm_open(struct net_device *dev)
  */
 int ctcm_close(struct net_device *dev)
 {
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         CTCMY_DBF_DEV_NAME(SETUP, dev, "");
         if (!IS_MPC(priv))
@@ -573,7 +573,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb)
                 skb_pull(skb, LL_HEADER_LENGTH + 2);
         } else if (ccw_idx == 0) {
                 struct net_device *dev = ch->netdev;
-                struct ctcm_priv *priv = dev->priv;
+                struct ctcm_priv *priv = dev->ml_priv;
                 priv->stats.tx_packets++;
                 priv->stats.tx_bytes += skb->len - LL_HEADER_LENGTH;
         }
@@ -592,7 +592,7 @@ static void ctcmpc_send_sweep_req(struct channel *rch)
         struct channel *ch;
         /* int rc = 0; */
 
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
         ch = priv->channel[WRITE];
 
@@ -652,7 +652,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb)
 {
         struct pdu *p_header;
         struct net_device *dev = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
         struct th_header *header;
         struct sk_buff *nskb;
@@ -867,7 +867,7 @@ done:
 /* first merge version - leaving both functions separated */
 static int ctcm_tx(struct sk_buff *skb, struct net_device *dev)
 {
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
 
         if (skb == NULL) {
                 CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR,
@@ -911,7 +911,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev)
 static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev)
 {
         int len = 0;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp  = priv->mpcg;
         struct sk_buff *newskb = NULL;
 
@@ -1025,7 +1025,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu)
         if (new_mtu < 576 || new_mtu > 65527)
                 return -EINVAL;
 
-        priv = dev->priv;
+        priv = dev->ml_priv;
         max_bufsize = priv->channel[READ]->max_bufsize;
 
         if (IS_MPC(priv)) {
@@ -1050,7 +1050,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu)
  */
 static struct net_device_stats *ctcm_stats(struct net_device *dev)
 {
-        return &((struct ctcm_priv *)dev->priv)->stats;
+        return &((struct ctcm_priv *)dev->ml_priv)->stats;
 }
 
 static void ctcm_free_netdevice(struct net_device *dev)
@@ -1060,7 +1060,7 @@ static void ctcm_free_netdevice(struct net_device *dev)
 
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO,
                         "%s(%s)", CTCM_FUNTAIL, dev->name);
-        priv = dev->priv;
+        priv = dev->ml_priv;
         if (priv) {
                 grp = priv->mpcg;
                 if (grp) {
@@ -1125,7 +1125,7 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv)
                         CTCM_FUNTAIL);
                 return NULL;
         }
-        dev->priv = priv;
+        dev->ml_priv = priv;
         priv->fsm = init_fsm("ctcmdev", dev_state_names, dev_event_names,
                                 CTCM_NR_DEV_STATES, CTCM_NR_DEV_EVENTS,
                                 dev_fsm, dev_fsm_len, GFP_KERNEL);
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h
index a72e0feeb27f..8e10ee86a5ee 100644
--- a/drivers/s390/net/ctcm_main.h
+++ b/drivers/s390/net/ctcm_main.h
@@ -229,14 +229,14 @@ void ctcm_remove_files(struct device *dev);
  */
 static inline void ctcm_clear_busy_do(struct net_device *dev)
 {
-        clear_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy));
+        clear_bit(0, &(((struct ctcm_priv *)dev->ml_priv)->tbusy));
         netif_wake_queue(dev);
 }
 
 static inline void ctcm_clear_busy(struct net_device *dev)
 {
         struct mpc_group *grp;
-        grp = ((struct ctcm_priv *)dev->priv)->mpcg;
+        grp = ((struct ctcm_priv *)dev->ml_priv)->mpcg;
 
         if (!(grp && grp->in_sweep))
                 ctcm_clear_busy_do(dev);
@@ -246,7 +246,8 @@ static inline void ctcm_clear_busy(struct net_device *dev)
 static inline int ctcm_test_and_set_busy(struct net_device *dev)
 {
         netif_stop_queue(dev);
-        return test_and_set_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy));
+        return test_and_set_bit(0,
+                        &(((struct ctcm_priv *)dev->ml_priv)->tbusy));
 }
 
 extern int loglevel;
@@ -292,7 +293,7 @@ struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv);
 #define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC)
 
 /* test if struct ctcm_priv of struct net_device has MPC protocol setting */
-#define IS_MPCDEV(d) IS_MPC((struct ctcm_priv *)d->priv)
+#define IS_MPCDEV(dev) IS_MPC((struct ctcm_priv *)dev->ml_priv)
 
 static inline gfp_t gfp_type(void)
 {
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 49ae1cd25caa..cbe470493bf0 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -19,7 +19,6 @@
 #undef DEBUGDATA
 #undef DEBUGCCW
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -313,10 +312,10 @@ static struct net_device *ctcmpc_get_dev(int port_num)
                                         CTCM_FUNTAIL, device);
                 return NULL;
         }
-        priv = dev->priv;
+        priv = dev->ml_priv;
         if (priv == NULL) {
                 CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,
-                        "%s(%s): dev->priv is NULL",
+                        "%s(%s): dev->ml_priv is NULL",
                                         CTCM_FUNTAIL, device);
                 return NULL;
         }
@@ -345,7 +344,7 @@ int ctc_mpc_alloc_channel(int port_num, void (*callback)(int, int))
         dev = ctcmpc_get_dev(port_num);
         if (dev == NULL)
                 return 1;
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
 
         grp->allochanfunc = callback;
@@ -417,7 +416,7 @@ void ctc_mpc_establish_connectivity(int port_num,
         dev = ctcmpc_get_dev(port_num);
         if (dev == NULL)
                 return;
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
         rch = priv->channel[READ];
         wch = priv->channel[WRITE];
@@ -535,7 +534,7 @@ void ctc_mpc_dealloc_ch(int port_num)
         dev = ctcmpc_get_dev(port_num);
         if (dev == NULL)
                 return;
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
 
         CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG,
@@ -571,7 +570,7 @@ void ctc_mpc_flow_control(int port_num, int flowc)
         dev = ctcmpc_get_dev(port_num);
         if (dev == NULL)
                 return;
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
 
         CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG,
@@ -620,7 +619,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo)
 {
         struct channel    *rch = mpcginfo->ch;
         struct net_device *dev = rch->netdev;
-        struct ctcm_priv   *priv = dev->priv;
+        struct ctcm_priv   *priv = dev->ml_priv;
         struct mpc_group  *grp = priv->mpcg;
         struct channel    *ch = priv->channel[WRITE];
 
@@ -651,7 +650,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo)
 static void ctcmpc_send_sweep_resp(struct channel *rch)
 {
         struct net_device *dev = rch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
         int rc = 0;
         struct th_sweep *header;
@@ -713,7 +712,7 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo)
 {
         struct channel    *rch     = mpcginfo->ch;
         struct net_device *dev     = rch->netdev;
-        struct ctcm_priv  *priv = dev->priv;
+        struct ctcm_priv  *priv = dev->ml_priv;
         struct mpc_group  *grp  = priv->mpcg;
         struct channel    *ch      = priv->channel[WRITE];
 
@@ -847,7 +846,7 @@ static int mpcg_fsm_len = ARRAY_SIZE(mpcg_fsm);
 static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg)
 {
         struct net_device *dev = arg;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
 
         if (grp == NULL) {
@@ -891,7 +890,7 @@ static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg)
 void mpc_group_ready(unsigned long adev)
 {
         struct net_device *dev = (struct net_device *)adev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
         struct channel *ch = NULL;
 
@@ -947,7 +946,7 @@ void mpc_group_ready(unsigned long adev)
 void mpc_channel_action(struct channel *ch, int direction, int action)
 {
         struct net_device  *dev  = ch->netdev;
-        struct ctcm_priv   *priv = dev->priv;
+        struct ctcm_priv   *priv = dev->ml_priv;
         struct mpc_group   *grp  = priv->mpcg;
 
         if (grp == NULL) {
@@ -1057,7 +1056,7 @@ done:
 static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
 {
         struct net_device *dev  = ch->netdev;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
         struct pdu *curr_pdu;
         struct mpcg_info *mpcginfo;
@@ -1255,7 +1254,7 @@ void ctcmpc_bh(unsigned long thischan)
         struct channel    *ch   = (struct channel *)thischan;
         struct sk_buff    *skb;
         struct net_device *dev  = ch->netdev;
-        struct ctcm_priv  *priv = dev->priv;
+        struct ctcm_priv  *priv = dev->ml_priv;
         struct mpc_group  *grp  = priv->mpcg;
 
         CTCM_PR_DEBUG("%s cp:%i enter:  %s() %s\n",
@@ -1377,7 +1376,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg)
         BUG_ON(dev == NULL);
         CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name);
 
-        priv  = dev->priv;
+        priv  = dev->ml_priv;
         grp =  priv->mpcg;
         grp->flow_off_called = 0;
         fsm_deltimer(&grp->timer);
@@ -1483,7 +1482,7 @@ static void mpc_action_timeout(fsm_instance *fi, int event, void *arg)
 
         BUG_ON(dev == NULL);
 
-        priv = dev->priv;
+        priv = dev->ml_priv;
         grp = priv->mpcg;
         wch = priv->channel[WRITE];
         rch = priv->channel[READ];
@@ -1521,7 +1520,7 @@ void mpc_action_discontact(fsm_instance *fi, int event, void *arg)
         if (ch) {
                 dev = ch->netdev;
                 if (dev) {
-                        priv = dev->priv;
+                        priv = dev->ml_priv;
                         if (priv) {
                                 CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE,
                                         "%s: %s: %s\n",
@@ -1569,7 +1568,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo)
 {
         struct channel     *ch   = mpcginfo->ch;
         struct net_device  *dev  = ch->netdev;
-        struct ctcm_priv   *priv = dev->priv;
+        struct ctcm_priv   *priv = dev->ml_priv;
         struct mpc_group   *grp  = priv->mpcg;
         struct xid2        *xid  = mpcginfo->xid;
         int     rc       = 0;
@@ -1866,7 +1865,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg)
 {
         struct channel     *ch   = arg;
         struct net_device  *dev  = ch->netdev;
-        struct ctcm_priv   *priv = dev->priv;
+        struct ctcm_priv   *priv = dev->ml_priv;
         struct mpc_group   *grp  = priv->mpcg;
 
         CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n",
@@ -1906,7 +1905,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg)
 static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg)
 {
         struct net_device *dev = arg;
-        struct ctcm_priv  *priv = dev->priv;
+        struct ctcm_priv  *priv = dev->ml_priv;
         struct mpc_group  *grp  = NULL;
         int direction;
         int send = 0;
@@ -1983,7 +1982,7 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg)
         struct mpcg_info   *mpcginfo  = arg;
         struct channel     *ch   = mpcginfo->ch;
         struct net_device  *dev  = ch->netdev;
-        struct ctcm_priv   *priv = dev->priv;
+        struct ctcm_priv   *priv = dev->ml_priv;
         struct mpc_group   *grp  = priv->mpcg;
 
         CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n",
@@ -2045,7 +2044,7 @@ static void mpc_action_rcvd_xid7(fsm_instance *fsm, int event, void *arg)
         struct mpcg_info   *mpcginfo   = arg;
         struct channel     *ch         = mpcginfo->ch;
         struct net_device  *dev        = ch->netdev;
-        struct ctcm_priv   *priv    = dev->priv;
+        struct ctcm_priv   *priv    = dev->ml_priv;
         struct mpc_group   *grp     = priv->mpcg;
 
         CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n",
@@ -2097,7 +2096,7 @@ static int mpc_send_qllc_discontact(struct net_device *dev)
         __u32   new_len = 0;
         struct sk_buff   *skb;
         struct qllc      *qllcptr;
-        struct ctcm_priv *priv = dev->priv;
+        struct ctcm_priv *priv = dev->ml_priv;
         struct mpc_group *grp = priv->mpcg;
 
         CTCM_PR_DEBUG("%s: GROUP STATE: %s\n",
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 6de28385b354..9bcfa04d863b 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1412,7 +1412,8 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         }
         /* How far in the ccw chain have we processed? */
         if ((channel->state != LCS_CH_STATE_INIT) &&
-            (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC)) {
+            (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) &&
+            (irb->scsw.cmd.cpa != 0)) {
                 index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa)
                         - channel->ccws;
                 if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) ||
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 80971c21ea1a..bf8a75c92f28 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -689,6 +689,7 @@ struct qeth_mc_mac {
         struct list_head list;
         __u8 mc_addr[MAX_ADDR_LEN];
         unsigned char mc_addrlen;
+        int is_vmac;
 };
 
 struct qeth_card {
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index bd420d1b9a0d..c7ab1b864516 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3024,7 +3024,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
         struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill,
         int offset)
 {
-        int length = skb->len;
+        int length = skb->len - offset;
         int length_here;
         int element;
         char *data;
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index b3cee032f578..3ac3cc1e03cc 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -177,9 +177,10 @@ static int qeth_l2_send_delgroupmac(struct qeth_card *card, __u8 *mac)
                                           qeth_l2_send_delgroupmac_cb);
 }
 
-static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac)
+static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac, int vmac)
 {
         struct qeth_mc_mac *mc;
+        int rc;
 
         mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC);
 
@@ -188,8 +189,16 @@ static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac)
 
         memcpy(mc->mc_addr, mac, OSA_ADDR_LEN);
         mc->mc_addrlen = OSA_ADDR_LEN;
+        mc->is_vmac = vmac;
+
+        if (vmac) {
+                rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETVMAC,
+                                        NULL);
+        } else {
+                rc = qeth_l2_send_setgroupmac(card, mac);
+        }
 
-        if (!qeth_l2_send_setgroupmac(card, mac))
+        if (!rc)
                 list_add_tail(&mc->list, &card->mc_list);
         else
                 kfree(mc);
@@ -201,7 +210,11 @@ static void qeth_l2_del_all_mc(struct qeth_card *card)
 
         spin_lock_bh(&card->mclock);
         list_for_each_entry_safe(mc, tmp, &card->mc_list, list) {
-                qeth_l2_send_delgroupmac(card, mc->mc_addr);
+                if (mc->is_vmac)
+                        qeth_l2_send_setdelmac(card, mc->mc_addr,
+                                        IPA_CMD_DELVMAC, NULL);
+                else
+                        qeth_l2_send_delgroupmac(card, mc->mc_addr);
                 list_del(&mc->list);
                 kfree(mc);
         }
@@ -590,7 +603,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p)
 static void qeth_l2_set_multicast_list(struct net_device *dev)
 {
         struct qeth_card *card = dev->ml_priv;
-        struct dev_mc_list *dm;
+        struct dev_addr_list *dm;
 
         if (card->info.type == QETH_CARD_TYPE_OSN)
                 return ;
@@ -599,7 +612,11 @@ static void qeth_l2_set_multicast_list(struct net_device *dev)
         qeth_l2_del_all_mc(card);
         spin_lock_bh(&card->mclock);
         for (dm = dev->mc_list; dm; dm = dm->next)
-                qeth_l2_add_mc(card, dm->dmi_addr);
+                qeth_l2_add_mc(card, dm->da_addr, 0);
+
+        for (dm = dev->uc_list; dm; dm = dm->next)
+                qeth_l2_add_mc(card, dm->da_addr, 1);
+
         spin_unlock_bh(&card->mclock);
         if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE))
                 return;
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index ac1993708ae9..210ddb639748 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -136,7 +136,7 @@ static ssize_t qeth_l3_dev_route6_store(struct device *dev,
                 return -EINVAL;
 
         if (!qeth_is_supported(card, IPA_IPV6)) {
-                return -ENOTSUPP;
+                return -EOPNOTSUPP;
         }
 
         return qeth_l3_dev_route_store(card, &card->options.route6,
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index 391dd29749f8..51b6a05f4d12 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -152,10 +152,8 @@ static int zfcp_ccw_set_offline(struct ccw_device *ccw_device)
  */
 static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)
 {
-        struct zfcp_adapter *adapter;
+        struct zfcp_adapter *adapter = dev_get_drvdata(&ccw_device->dev);
 
-        down(&zfcp_data.config_sema);
-        adapter = dev_get_drvdata(&ccw_device->dev);
         switch (event) {
         case CIO_GONE:
                 dev_warn(&adapter->ccw_device->dev, "device gone\n");
@@ -174,8 +172,6 @@ static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)
                                         89, NULL);
                 break;
         }
-        zfcp_erp_wait(adapter);
-        up(&zfcp_data.config_sema);
         return 1;
 }
 
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index e984469bb98b..56196c98c07b 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -39,18 +39,6 @@ struct zfcp_gpn_ft {
         struct scatterlist sg_resp[ZFCP_GPN_FT_BUFFERS];
 };
 
-static struct zfcp_port *zfcp_get_port_by_did(struct zfcp_adapter *adapter,
-                                              u32 d_id)
-{
-        struct zfcp_port *port;
-
-        list_for_each_entry(port, &adapter->port_list_head, list)
-                if ((port->d_id == d_id) &&
-                    !atomic_test_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status))
-                        return port;
-        return NULL;
-}
-
 static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
                                    struct fcp_rscn_element *elem)
 {
@@ -341,12 +329,13 @@ void zfcp_test_link(struct zfcp_port *port)
 
         zfcp_port_get(port);
         retval = zfcp_fc_adisc(port);
-        if (retval == 0 || retval == -EBUSY)
+        if (retval == 0)
                 return;
 
         /* send of ADISC was not possible */
         zfcp_port_put(port);
-        zfcp_erp_port_forced_reopen(port, 0, 65, NULL);
+        if (retval != -EBUSY)
+                zfcp_erp_port_forced_reopen(port, 0, 65, NULL);
 }
 
 static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter)
@@ -363,7 +352,6 @@ static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter)
                 if (ret)
                         return ret;
                 zfcp_erp_wait(adapter);
-                zfcp_port_put(adapter->nameserver_port);
         }
         return !atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED,
                                   &adapter->nameserver_port->status);
@@ -475,7 +463,7 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
         struct zfcp_adapter *adapter = ct->port->adapter;
         struct zfcp_port *port, *tmp;
         u32 d_id;
-        int ret = 0, x;
+        int ret = 0, x, last = 0;
 
         if (ct->status)
                 return -EIO;
@@ -492,19 +480,24 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
         down(&zfcp_data.config_sema);
 
         /* first entry is the header */
-        for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES; x++) {
+        for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES && !last; x++) {
                 if (x % (ZFCP_GPN_FT_ENTRIES + 1))
                         acc++;
                 else
                         acc = sg_virt(++sg);
 
+                last = acc->control & 0x80;
                 d_id = acc->port_id[0] << 16 | acc->port_id[1] << 8 |
                        acc->port_id[2];
 
                 /* skip the adapter's port and known remote ports */
-                if (acc->wwpn == fc_host_port_name(adapter->scsi_host) ||
-                     zfcp_get_port_by_did(adapter, d_id))
+                if (acc->wwpn == fc_host_port_name(adapter->scsi_host))
+                        continue;
+                port = zfcp_get_port_by_wwpn(adapter, acc->wwpn);
+                if (port) {
+                        zfcp_port_get(port);
                         continue;
+                }
 
                 port = zfcp_port_enqueue(adapter, acc->wwpn,
                                          ZFCP_STATUS_PORT_DID_DID |
@@ -513,8 +506,6 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
                         ret = PTR_ERR(port);
                 else
                         zfcp_erp_port_reopen(port, 0, 149, NULL);
-                if (acc->control & 0x80) /* last entry */
-                        break;
         }
 
         zfcp_erp_wait(adapter);
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 19c1ca913874..49dbeb754e5f 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -710,10 +710,10 @@ static void zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *req)
 
 static int zfcp_fsf_sbal_check(struct zfcp_qdio_queue *queue)
 {
-        spin_lock(&queue->lock);
+        spin_lock_bh(&queue->lock);
         if (atomic_read(&queue->count))
                 return 1;
-        spin_unlock(&queue->lock);
+        spin_unlock_bh(&queue->lock);
         return 0;
 }
 
@@ -722,13 +722,13 @@ static int zfcp_fsf_req_sbal_get(struct zfcp_adapter *adapter)
         long ret;
         struct zfcp_qdio_queue *req_q = &adapter->req_q;
 
-        spin_unlock(&req_q->lock);
+        spin_unlock_bh(&req_q->lock);
         ret = wait_event_interruptible_timeout(adapter->request_wq,
                                         zfcp_fsf_sbal_check(req_q), 5 * HZ);
         if (ret > 0)
                 return 0;
 
-        spin_lock(&req_q->lock);
+        spin_lock_bh(&req_q->lock);
         return -EIO;
 }
 
@@ -870,14 +870,14 @@ int zfcp_fsf_status_read(struct zfcp_adapter *adapter)
         volatile struct qdio_buffer_element *sbale;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_UNSOLICITED_STATUS,
                                   ZFCP_REQ_NO_QTCB,
                                   adapter->pool.fsf_req_status_read);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -910,7 +910,7 @@ failed_buf:
         zfcp_fsf_req_free(req);
         zfcp_hba_dbf_event_fsf_unsol("fail", adapter, NULL);
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         return retval;
 }
 
@@ -988,7 +988,7 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id,
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND,
                                   req_flags, adapter->pool.fsf_req_abort);
-        if (unlikely(IS_ERR(req)))
+        if (IS_ERR(req))
                 goto out;
 
         if (unlikely(!(atomic_read(&unit->status) &
@@ -1106,13 +1106,13 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool,
         struct zfcp_fsf_req *req;
         int ret = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_GENERIC,
                                   ZFCP_REQ_AUTO_CLEANUP, pool);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 ret = PTR_ERR(req);
                 goto out;
         }
@@ -1148,7 +1148,7 @@ failed_send:
         if (erp_action)
                 erp_action->fsf_req = NULL;
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         return ret;
 }
 
@@ -1223,7 +1223,7 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_ELS,
                                   ZFCP_REQ_AUTO_CLEANUP, NULL);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 ret = PTR_ERR(req);
                 goto out;
         }
@@ -1263,14 +1263,14 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action)
         struct zfcp_adapter *adapter = erp_action->adapter;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (!atomic_read(&adapter->req_q.count))
                 goto out;
         req = zfcp_fsf_req_create(adapter,
                                   FSF_QTCB_EXCHANGE_CONFIG_DATA,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1295,7 +1295,7 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         return retval;
 }
 
@@ -1306,13 +1306,13 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter,
         struct zfcp_fsf_req *req = NULL;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_CONFIG_DATA,
                                   0, NULL);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1334,7 +1334,7 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter,
         zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
         retval = zfcp_fsf_req_send(req);
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         if (!retval)
                 wait_event(req->completion_wq,
                            req->status & ZFCP_STATUS_FSFREQ_COMPLETED);
@@ -1359,13 +1359,13 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)
         if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT))
                 return -EOPNOTSUPP;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (!atomic_read(&adapter->req_q.count))
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1385,7 +1385,7 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         return retval;
 }
 
@@ -1405,13 +1405,13 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter,
         if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT))
                 return -EOPNOTSUPP;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (!atomic_read(&adapter->req_q.count))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0,
                                   NULL);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1427,7 +1427,7 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter,
         zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
         retval = zfcp_fsf_req_send(req);
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         if (!retval)
                 wait_event(req->completion_wq,
                            req->status & ZFCP_STATUS_FSFREQ_COMPLETED);
@@ -1531,7 +1531,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
         struct zfcp_fsf_req *req;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
@@ -1539,7 +1539,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
                                   FSF_QTCB_OPEN_PORT_WITH_DID,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1562,7 +1562,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         return retval;
 }
 
@@ -1603,14 +1603,14 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action)
         struct zfcp_fsf_req *req;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PORT,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1633,7 +1633,7 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         return retval;
 }
 
@@ -1700,14 +1700,14 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action)
         struct zfcp_fsf_req *req;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PHYSICAL_PORT,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1731,7 +1731,7 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         return retval;
 }
 
@@ -1875,14 +1875,14 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)
         struct zfcp_fsf_req *req;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_OPEN_LUN,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1910,7 +1910,7 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         return retval;
 }
 
@@ -1965,13 +1965,13 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action)
         struct zfcp_fsf_req *req;
         int retval = -EIO;
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_LUN,
                                   ZFCP_REQ_AUTO_CLEANUP,
                                   adapter->pool.fsf_req_erp);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -1995,7 +1995,7 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action)
                 erp_action->fsf_req = NULL;
         }
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
         return retval;
 }
 
@@ -2228,7 +2228,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,
                                   adapter->pool.fsf_req_scsi);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = PTR_ERR(req);
                 goto out;
         }
@@ -2351,7 +2351,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,
                                   adapter->pool.fsf_req_scsi);
-        if (unlikely(IS_ERR(req)))
+        if (IS_ERR(req))
                 goto out;
 
         req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT;
@@ -2417,12 +2417,12 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,
                 return ERR_PTR(-EINVAL);
         }
 
-        spin_lock(&adapter->req_q.lock);
+        spin_lock_bh(&adapter->req_q.lock);
         if (zfcp_fsf_req_sbal_get(adapter))
                 goto out;
 
         req = zfcp_fsf_req_create(adapter, fsf_cfdc->command, 0, NULL);
-        if (unlikely(IS_ERR(req))) {
+        if (IS_ERR(req)) {
                 retval = -EPERM;
                 goto out;
         }
@@ -2447,7 +2447,7 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,
         zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
         retval = zfcp_fsf_req_send(req);
 out:
-        spin_unlock(&adapter->req_q.lock);
+        spin_unlock_bh(&adapter->req_q.lock);
 
         if (!retval) {
                 wait_event(req->completion_wq,
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index d6dbd653fde9..69d632d851d9 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -423,9 +423,9 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter)
 
         /* clear QDIOUP flag, thus do_QDIO is not called during qdio_shutdown */
         req_q = &adapter->req_q;
-        spin_lock(&req_q->lock);
+        spin_lock_bh(&req_q->lock);
         atomic_clear_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &adapter->status);
-        spin_unlock(&req_q->lock);
+        spin_unlock_bh(&req_q->lock);
 
         qdio_shutdown(adapter->ccw_device, QDIO_FLAG_CLEANUP_USING_CLEAR);
 
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index c7f06298bd3c..4e0322b1c1ea 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -63,7 +63,7 @@ comment "SCSI support type (disk, tape, CD-ROM)"
 config BLK_DEV_SD
         tristate "SCSI disk support"
         depends on SCSI
-        select CRC_T10DIF
+        select CRC_T10DIF if BLK_DEV_INTEGRITY
         ---help---
           If you want to use SCSI hard disks, Fibre Channel disks,
           Serial ATA (SATA) or Parallel ATA (PATA) hard disks,
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 994da56fffed..708e475896b9 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -425,7 +425,7 @@ static int alua_check_sense(struct scsi_device *sdev,
                         /*
                          * LUN Not Accessible - ALUA state transition
                          */
-                        return NEEDS_RETRY;
+                        return ADD_TO_MLQUEUE;
                 if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x0b)
                         /*
                          * LUN Not Accessible -- Target port in standby state
@@ -447,18 +447,18 @@ static int alua_check_sense(struct scsi_device *sdev,
                         /*
                          * Power On, Reset, or Bus Device Reset, just retry.
                          */
-                        return NEEDS_RETRY;
+                        return ADD_TO_MLQUEUE;
                 if (sense_hdr->asc == 0x2a && sense_hdr->ascq == 0x06) {
                         /*
                          * ALUA state changed
                          */
-                        return NEEDS_RETRY;
+                        return ADD_TO_MLQUEUE;
                 }
                 if (sense_hdr->asc == 0x2a && sense_hdr->ascq == 0x07) {
                         /*
                          * Implicit ALUA state transition failed
                          */
-                        return NEEDS_RETRY;
+                        return ADD_TO_MLQUEUE;
                 }
                 break;
         }
@@ -490,7 +490,7 @@ static int alua_stpg(struct scsi_device *sdev, int state,
                 if (!err)
                         return SCSI_DH_IO;
                 err = alua_check_sense(sdev, &sense_hdr);
-                if (retry > 0 && err == NEEDS_RETRY) {
+                if (retry > 0 && err == ADD_TO_MLQUEUE) {
                         retry--;
                         goto retry;
                 }
@@ -535,7 +535,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
                         return SCSI_DH_IO;
 
                 err = alua_check_sense(sdev, &sense_hdr);
-                if (err == NEEDS_RETRY)
+                if (err == ADD_TO_MLQUEUE)
                         goto retry;
                 sdev_printk(KERN_INFO, sdev,
                             "%s: rtpg sense code %02x/%02x/%02x\n",
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index b9d23e9e9a44..ef693e8412e9 100644
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -439,7 +439,7 @@ static int clariion_check_sense(struct scsi_device *sdev,
                          * Unit Attention Code. This is the first IO
                          * to the new path, so just retry.
                          */
-                        return NEEDS_RETRY;
+                        return ADD_TO_MLQUEUE;
                 break;
         }
 
@@ -514,7 +514,7 @@ retry:
                         return SCSI_DH_IO;
 
                 err = clariion_check_sense(sdev, &sshdr);
-                if (retry > 0 && err == NEEDS_RETRY) {
+                if (retry > 0 && err == ADD_TO_MLQUEUE) {
                         retry--;
                         goto retry;
                 }
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index e7c7b4ebc1fe..6e2f130d56de 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -376,7 +376,7 @@ static int get_lun(struct scsi_device *sdev, struct rdac_dh_data *h)
                 if (inqp->page_id[0] != 'e' || inqp->page_id[1] != 'd' ||
                     inqp->page_id[2] != 'i' || inqp->page_id[3] != 'd')
                         return SCSI_DH_NOSYS;
-                h->lun = scsilun_to_int((struct scsi_lun *)inqp->lun);
+                h->lun = inqp->lun[7]; /* Uses only the last byte */
         }
         return err;
 }
@@ -386,6 +386,7 @@ static int check_ownership(struct scsi_device *sdev, struct rdac_dh_data *h)
         int err;
         struct c9_inquiry *inqp;
 
+        h->lun_state = RDAC_LUN_UNOWNED;
         err = submit_inquiry(sdev, 0xC9, sizeof(struct c9_inquiry), h);
         if (err == SCSI_DH_OK) {
                 inqp = &h->inq.c9;
@@ -550,7 +551,7 @@ static int rdac_check_sense(struct scsi_device *sdev,
                          *
                          * Just retry and wait.
                          */
-                        return NEEDS_RETRY;
+                        return ADD_TO_MLQUEUE;
                 break;
         case ILLEGAL_REQUEST:
                 if (sense_hdr->asc == 0x94 && sense_hdr->ascq == 0x01) {
@@ -567,7 +568,7 @@ static int rdac_check_sense(struct scsi_device *sdev,
                         /*
                          * Power On, Reset, or Bus Device Reset, just retry.
                          */
-                        return NEEDS_RETRY;
+                        return ADD_TO_MLQUEUE;
                 break;
         }
         /* success just means we do not care what scsi-ml does */
diff --git a/drivers/scsi/dpt/dpti_i2o.h b/drivers/scsi/dpt/dpti_i2o.h
index 19406cea6d6a..179ad77f6cc9 100644
--- a/drivers/scsi/dpt/dpti_i2o.h
+++ b/drivers/scsi/dpt/dpti_i2o.h
@@ -21,7 +21,6 @@
 
 #include <linux/i2o-dev.h>
 
-#include <linux/version.h>
 #include <linux/notifier.h>
 #include <asm/atomic.h>
 
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index ae560bc04f9d..4e0b7c8eb32e 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -556,11 +556,12 @@ static void ibmvfc_link_down(struct ibmvfc_host *vhost,
 /**
  * ibmvfc_init_host - Start host initialization
  * @vhost:              ibmvfc host struct
+ * @relogin:    is this a re-login?
  *
  * Return value:
  *      nothing
  **/
-static void ibmvfc_init_host(struct ibmvfc_host *vhost)
+static void ibmvfc_init_host(struct ibmvfc_host *vhost, int relogin)
 {
         struct ibmvfc_target *tgt;
 
@@ -574,6 +575,11 @@ static void ibmvfc_init_host(struct ibmvfc_host *vhost)
         }
 
         if (!ibmvfc_set_host_state(vhost, IBMVFC_INITIALIZING)) {
+                if (!relogin) {
+                        memset(vhost->async_crq.msgs, 0, PAGE_SIZE);
+                        vhost->async_crq.cur = 0;
+                }
+
                 list_for_each_entry(tgt, &vhost->targets, queue)
                         tgt->need_login = 1;
                 scsi_block_requests(vhost->host);
@@ -1059,9 +1065,10 @@ static void ibmvfc_get_starget_port_id(struct scsi_target *starget)
 static int ibmvfc_wait_while_resetting(struct ibmvfc_host *vhost)
 {
         long timeout = wait_event_timeout(vhost->init_wait_q,
-                                          (vhost->state == IBMVFC_ACTIVE ||
-                                           vhost->state == IBMVFC_HOST_OFFLINE ||
-                                           vhost->state == IBMVFC_LINK_DEAD),
+                                          ((vhost->state == IBMVFC_ACTIVE ||
+                                            vhost->state == IBMVFC_HOST_OFFLINE ||
+                                            vhost->state == IBMVFC_LINK_DEAD) &&
+                                           vhost->action == IBMVFC_HOST_ACTION_NONE),
                                           (init_timeout * HZ));
 
         return timeout ? 0 : -EIO;
@@ -1450,8 +1457,8 @@ static void ibmvfc_scsi_done(struct ibmvfc_event *evt)
         struct ibmvfc_cmd *vfc_cmd = &evt->xfer_iu->cmd;
         struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->rsp;
         struct scsi_cmnd *cmnd = evt->cmnd;
-        int rsp_len = 0;
-        int sense_len = rsp->fcp_sense_len;
+        u32 rsp_len = 0;
+        u32 sense_len = rsp->fcp_sense_len;
 
         if (cmnd) {
                 if (vfc_cmd->response_flags & IBMVFC_ADAPTER_RESID_VALID)
@@ -1468,7 +1475,7 @@ static void ibmvfc_scsi_done(struct ibmvfc_event *evt)
                                 rsp_len = rsp->fcp_rsp_len;
                         if ((sense_len + rsp_len) > SCSI_SENSE_BUFFERSIZE)
                                 sense_len = SCSI_SENSE_BUFFERSIZE - rsp_len;
-                        if ((rsp->flags & FCP_SNS_LEN_VALID) && rsp->fcp_sense_len)
+                        if ((rsp->flags & FCP_SNS_LEN_VALID) && rsp->fcp_sense_len && rsp_len <= 8)
                                 memcpy(cmnd->sense_buffer, rsp->data.sense + rsp_len, sense_len);
 
                         ibmvfc_log_error(evt);
@@ -2077,17 +2084,18 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
 {
         const char *desc = ibmvfc_get_ae_desc(crq->event);
 
-        ibmvfc_log(vhost, 3, "%s event received\n", desc);
+        ibmvfc_log(vhost, 3, "%s event received. scsi_id: %lx, wwpn: %lx,"
+                   " node_name: %lx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
 
         switch (crq->event) {
         case IBMVFC_AE_LINK_UP:
         case IBMVFC_AE_RESUME:
                 vhost->events_to_log |= IBMVFC_AE_LINKUP;
-                ibmvfc_init_host(vhost);
+                ibmvfc_init_host(vhost, 1);
                 break;
         case IBMVFC_AE_SCN_FABRIC:
                 vhost->events_to_log |= IBMVFC_AE_RSCN;
-                ibmvfc_init_host(vhost);
+                ibmvfc_init_host(vhost, 1);
                 break;
         case IBMVFC_AE_SCN_NPORT:
         case IBMVFC_AE_SCN_GROUP:
@@ -2133,13 +2141,13 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost)
                         /* Send back a response */
                         rc = ibmvfc_send_crq_init_complete(vhost);
                         if (rc == 0)
-                                ibmvfc_init_host(vhost);
+                                ibmvfc_init_host(vhost, 0);
                         else
                                 dev_err(vhost->dev, "Unable to send init rsp. rc=%ld\n", rc);
                         break;
                 case IBMVFC_CRQ_INIT_COMPLETE:
                         dev_info(vhost->dev, "Partner initialization complete\n");
-                        ibmvfc_init_host(vhost);
+                        ibmvfc_init_host(vhost, 0);
                         break;
                 default:
                         dev_err(vhost->dev, "Unknown crq message type: %d\n", crq->format);
@@ -3357,8 +3365,6 @@ static void ibmvfc_npiv_login(struct ibmvfc_host *vhost)
         mad->buffer.va = vhost->login_buf_dma;
         mad->buffer.len = sizeof(*vhost->login_buf);
 
-        memset(vhost->async_crq.msgs, 0, PAGE_SIZE);
-        vhost->async_crq.cur = 0;
         ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_INIT_WAIT);
 
         if (!ibmvfc_send_event(evt, vhost, default_timeout))
@@ -3601,8 +3607,9 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost)
                         }
                 }
 
-                if (vhost->reinit) {
+                if (vhost->reinit && !ibmvfc_set_host_state(vhost, IBMVFC_INITIALIZING)) {
                         vhost->reinit = 0;
+                        scsi_block_requests(vhost->host);
                         ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_QUERY);
                 } else {
                         ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_NONE);
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index 4bf6e374f076..fb3177ab6691 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -29,8 +29,8 @@
 #include "viosrp.h"
 
 #define IBMVFC_NAME     "ibmvfc"
-#define IBMVFC_DRIVER_VERSION           "1.0.1"
-#define IBMVFC_DRIVER_DATE              "(July 11, 2008)"
+#define IBMVFC_DRIVER_VERSION           "1.0.2"
+#define IBMVFC_DRIVER_DATE              "(August 14, 2008)"
 
 #define IBMVFC_DEFAULT_TIMEOUT  15
 #define IBMVFC_INIT_TIMEOUT             30
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 6b24b9cdb04c..7b1502c0ab6e 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1636,7 +1636,7 @@ static unsigned long ibmvscsi_get_desired_dma(struct vio_dev *vdev)
         unsigned long desired_io = max_requests * sizeof(union viosrp_iu);
 
         /* add io space for sg data */
-        desired_io += (IBMVSCSI_MAX_SECTORS_DEFAULT *
+        desired_io += (IBMVSCSI_MAX_SECTORS_DEFAULT * 512 *
                              IBMVSCSI_CMDS_PER_LUN_DEFAULT);
 
         return desired_io;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 7c615c70ec5c..bc9e6ddf41df 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -165,7 +165,6 @@
 #include <asm/byteorder.h>
 #include <asm/page.h>
 #include <linux/stddef.h>
-#include <linux/version.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
index e0657b6f009c..4e49fbcfe8af 100644
--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -50,7 +50,6 @@
 #ifndef _IPS_H_
    #define _IPS_H_
 
-#include <linux/version.h>
 #include <linux/nmi.h>
    #include <asm/uaccess.h>
    #include <asm/io.h>
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 90272e65957a..094b47e94b29 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -27,7 +27,6 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/ctype.h>
-#include <linux/version.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index fc7ac158476c..97b763378e7d 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -10,7 +10,7 @@
  *         2 of the License, or (at your option) any later version.
  *
  * FILE         : megaraid_sas.c
- * Version      : v00.00.03.20-rc1
+ * Version     : v00.00.04.01-rc1
  *
  * Authors:
  *      (email-id : megaraidlinux@lsi.com)
@@ -71,6 +71,10 @@ static struct pci_device_id megasas_pci_table[] = {
         /* ppc IOP */
         {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078DE)},
         /* ppc IOP */
+        {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078GEN2)},
+        /* gen2*/
+        {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0079GEN2)},
+        /* gen2*/
         {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)},
         /* xscale IOP, vega */
         {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
@@ -198,6 +202,9 @@ megasas_clear_intr_xscale(struct megasas_register_set __iomem * regs)
          */
         writel(status, &regs->outbound_intr_status);
 
+        /* Dummy readl to force pci flush */
+        readl(&regs->outbound_intr_status);
+
         return 0;
 }
 
@@ -293,6 +300,9 @@ megasas_clear_intr_ppc(struct megasas_register_set __iomem * regs)
          */
         writel(status, &regs->outbound_doorbell_clear);
 
+        /* Dummy readl to force pci flush */
+        readl(&regs->outbound_doorbell_clear);
+
         return 0;
 }
 /**
@@ -318,6 +328,99 @@ static struct megasas_instance_template megasas_instance_template_ppc = {
 };
 
 /**
+*       The following functions are defined for gen2 (deviceid : 0x78 0x79)
+*       controllers
+*/
+
+/**
+ * megasas_enable_intr_gen2 -  Enables interrupts
+ * @regs:                      MFI register set
+ */
+static inline void
+megasas_enable_intr_gen2(struct megasas_register_set __iomem *regs)
+{
+        writel(0xFFFFFFFF, &(regs)->outbound_doorbell_clear);
+
+        /* write ~0x00000005 (4 & 1) to the intr mask*/
+        writel(~MFI_GEN2_ENABLE_INTERRUPT_MASK, &(regs)->outbound_intr_mask);
+
+        /* Dummy readl to force pci flush */
+        readl(&regs->outbound_intr_mask);
+}
+
+/**
+ * megasas_disable_intr_gen2 - Disables interrupt
+ * @regs:                      MFI register set
+ */
+static inline void
+megasas_disable_intr_gen2(struct megasas_register_set __iomem *regs)
+{
+        u32 mask = 0xFFFFFFFF;
+        writel(mask, &regs->outbound_intr_mask);
+        /* Dummy readl to force pci flush */
+        readl(&regs->outbound_intr_mask);
+}
+
+/**
+ * megasas_read_fw_status_reg_gen2 - returns the current FW status value
+ * @regs:                      MFI register set
+ */
+static u32
+megasas_read_fw_status_reg_gen2(struct megasas_register_set __iomem *regs)
+{
+        return readl(&(regs)->outbound_scratch_pad);
+}
+
+/**
+ * megasas_clear_interrupt_gen2 -      Check & clear interrupt
+ * @regs:                              MFI register set
+ */
+static int
+megasas_clear_intr_gen2(struct megasas_register_set __iomem *regs)
+{
+        u32 status;
+        /*
+         * Check if it is our interrupt
+         */
+        status = readl(&regs->outbound_intr_status);
+
+        if (!(status & MFI_GEN2_ENABLE_INTERRUPT_MASK))
+                return 1;
+
+        /*
+         * Clear the interrupt by writing back the same value
+         */
+        writel(status, &regs->outbound_doorbell_clear);
+
+        /* Dummy readl to force pci flush */
+        readl(&regs->outbound_intr_status);
+
+        return 0;
+}
+/**
+ * megasas_fire_cmd_gen2 -     Sends command to the FW
+ * @frame_phys_addr :          Physical address of cmd
+ * @frame_count :              Number of frames for the command
+ * @regs :                     MFI register set
+ */
+static inline void
+megasas_fire_cmd_gen2(dma_addr_t frame_phys_addr, u32 frame_count,
+                        struct megasas_register_set __iomem *regs)
+{
+        writel((frame_phys_addr | (frame_count<<1))|1,
+                        &(regs)->inbound_queue_port);
+}
+
+static struct megasas_instance_template megasas_instance_template_gen2 = {
+
+        .fire_cmd = megasas_fire_cmd_gen2,
+        .enable_intr = megasas_enable_intr_gen2,
+        .disable_intr = megasas_disable_intr_gen2,
+        .clear_intr = megasas_clear_intr_gen2,
+        .read_fw_status_reg = megasas_read_fw_status_reg_gen2,
+};
+
+/**
 *       This is the end of set of functions & definitions
 *       specific to ppc (deviceid : 0x60) controllers
 */
@@ -1976,7 +2079,12 @@ static int megasas_init_mfi(struct megasas_instance *instance)
         /*
          * Map the message registers
          */
-        instance->base_addr = pci_resource_start(instance->pdev, 0);
+        if ((instance->pdev->device == PCI_DEVICE_ID_LSI_SAS1078GEN2) ||
+                (instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0079GEN2)) {
+                instance->base_addr = pci_resource_start(instance->pdev, 1);
+        } else {
+                instance->base_addr = pci_resource_start(instance->pdev, 0);
+        }
 
         if (pci_request_regions(instance->pdev, "megasas: LSI")) {
                 printk(KERN_DEBUG "megasas: IO memory region busy!\n");
@@ -1998,6 +2106,10 @@ static int megasas_init_mfi(struct megasas_instance *instance)
                 case PCI_DEVICE_ID_LSI_SAS1078DE:
                         instance->instancet = &megasas_instance_template_ppc;
                         break;
+                case PCI_DEVICE_ID_LSI_SAS1078GEN2:
+                case PCI_DEVICE_ID_LSI_SAS0079GEN2:
+                        instance->instancet = &megasas_instance_template_gen2;
+                        break;
                 case PCI_DEVICE_ID_LSI_SAS1064R:
                 case PCI_DEVICE_ID_DELL_PERC5:
                 default:
@@ -2857,6 +2969,7 @@ static void megasas_shutdown(struct pci_dev *pdev)
 {
         struct megasas_instance *instance = pci_get_drvdata(pdev);
         megasas_flush_cache(instance);
+        megasas_shutdown_controller(instance, MR_DCMD_CTRL_SHUTDOWN);
 }
 
 /**
@@ -3292,7 +3405,7 @@ megasas_sysfs_set_dbg_lvl(struct device_driver *dd, const char *buf, size_t coun
         return retval;
 }
 
-static DRIVER_ATTR(dbg_lvl, S_IRUGO|S_IWUGO, megasas_sysfs_show_dbg_lvl,
+static DRIVER_ATTR(dbg_lvl, S_IRUGO|S_IWUSR, megasas_sysfs_show_dbg_lvl,
                 megasas_sysfs_set_dbg_lvl);
 
 static ssize_t
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index b0c41e671702..0d033248fdf1 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -18,9 +18,9 @@
 /*
  * MegaRAID SAS Driver meta data
  */
-#define MEGASAS_VERSION                 "00.00.03.20-rc1"
-#define MEGASAS_RELDATE                 "March 10, 2008"
-#define MEGASAS_EXT_VERSION             "Mon. March 10 11:02:31 PDT 2008"
+#define MEGASAS_VERSION                         "00.00.04.01"
+#define MEGASAS_RELDATE                         "July 24, 2008"
+#define MEGASAS_EXT_VERSION                     "Thu July 24 11:41:51 PST 2008"
 
 /*
  * Device IDs
@@ -28,6 +28,8 @@
 #define PCI_DEVICE_ID_LSI_SAS1078R              0x0060
 #define PCI_DEVICE_ID_LSI_SAS1078DE             0x007C
 #define PCI_DEVICE_ID_LSI_VERDE_ZCR             0x0413
+#define PCI_DEVICE_ID_LSI_SAS1078GEN2           0x0078
+#define PCI_DEVICE_ID_LSI_SAS0079GEN2           0x0079
 
 /*
  * =====================================
@@ -580,6 +582,8 @@ struct megasas_ctrl_info {
 #define MEGASAS_COMPLETION_TIMER_INTERVAL      (HZ/10)
 
 #define MFI_REPLY_1078_MESSAGE_INTERRUPT        0x80000000
+#define MFI_REPLY_GEN2_MESSAGE_INTERRUPT        0x00000001
+#define MFI_GEN2_ENABLE_INTERRUPT_MASK          (0x00000001 | 0x00000004)
 
 /*
 * register set for both 1068 and 1078 controllers
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index edf9fdb3cb3c..22052bb7becb 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -23,7 +23,6 @@
  *   1.2: PowerPC (big endian) support.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h
index 6715ecb3bfca..9565acf1aa72 100644
--- a/drivers/scsi/nsp32.h
+++ b/drivers/scsi/nsp32.h
@@ -16,7 +16,6 @@
 #ifndef _NSP32_H
 #define _NSP32_H
 
-#include <linux/version.h>
 //#define NSP32_DEBUG 9
 
 /*
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index a221b6ef9fa9..24e6cb8396e3 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -25,7 +25,6 @@
 
 ***********************************************************************/
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index a319a20ed440..45e7dcb4b34d 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -993,6 +993,17 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)
 {
         fc_port_t *fcport = *(fc_port_t **)rport->dd_data;
 
+        /*
+         * At this point all fcport's software-states are cleared.  Perform any
+         * final cleanup of firmware resources (PCBs and XCBs).
+         */
+        if (fcport->loop_id != FC_NO_LOOP_ID) {
+                fcport->ha->isp_ops->fabric_logout(fcport->ha, fcport->loop_id,
+                    fcport->d_id.b.domain, fcport->d_id.b.area,
+                    fcport->d_id.b.al_pa);
+                fcport->loop_id = FC_NO_LOOP_ID;
+        }
+
         qla2x00_abort_fcport_cmds(fcport);
         scsi_target_unblock(&rport->dev);
 }
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 6da31ba94404..94a720eabfd8 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2237,6 +2237,7 @@ typedef struct scsi_qla_host {
 #define REGISTER_FDMI_NEEDED    26
 #define FCPORT_UPDATE_NEEDED    27
 #define VP_DPC_NEEDED           28      /* wake up for VP dpc handling */
+#define UNLOADING               29
 
         uint32_t        device_flags;
 #define DFLG_LOCAL_DEVICES              BIT_0
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 601a6b29750c..ee89ddd64aae 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -976,8 +976,9 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
                                     &ha->fw_attributes, &ha->fw_memory_size);
                                 qla2x00_resize_request_q(ha);
                                 ha->flags.npiv_supported = 0;
-                                if ((IS_QLA24XX(ha) || IS_QLA25XX(ha)) &&
-                                    (ha->fw_attributes & BIT_2)) {
+                                if ((IS_QLA24XX(ha) || IS_QLA25XX(ha) ||
+                                     IS_QLA84XX(ha)) &&
+                                         (ha->fw_attributes & BIT_2)) {
                                         ha->flags.npiv_supported = 1;
                                         if ((!ha->max_npiv_vports) ||
                                             ((ha->max_npiv_vports + 1) %
@@ -3251,6 +3252,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
 {
         int rval;
         uint8_t        status = 0;
+        scsi_qla_host_t *vha;
 
         if (ha->flags.online) {
                 ha->flags.online = 0;
@@ -3265,6 +3267,8 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
                 if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
                         atomic_set(&ha->loop_state, LOOP_DOWN);
                         qla2x00_mark_all_devices_lost(ha, 0);
+                        list_for_each_entry(vha, &ha->vp_list, vp_list)
+                               qla2x00_mark_all_devices_lost(vha, 0);
                 } else {
                         if (!atomic_read(&ha->loop_down_timer))
                                 atomic_set(&ha->loop_down_timer,
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 874d802edb7d..bf41887cdd65 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -879,11 +879,12 @@ qla2x00_handle_sense(srb_t *sp, uint8_t *sense_data, uint32_t sense_len)
         sp->request_sense_ptr += sense_len;
         sp->request_sense_length -= sense_len;
         if (sp->request_sense_length != 0)
-                sp->ha->status_srb = sp;
+                sp->fcport->ha->status_srb = sp;
 
         DEBUG5(printk("%s(): Check condition Sense data, scsi(%ld:%d:%d:%d) "
-            "cmd=%p pid=%ld\n", __func__, sp->ha->host_no, cp->device->channel,
-            cp->device->id, cp->device->lun, cp, cp->serial_number));
+            "cmd=%p pid=%ld\n", __func__, sp->fcport->ha->host_no,
+            cp->device->channel, cp->device->id, cp->device->lun, cp,
+            cp->serial_number));
         if (sense_len)
                 DEBUG5(qla2x00_dump_buffer(cp->sense_buffer,
                     CMD_ACTUAL_SNSLEN(cp)));
@@ -1184,9 +1185,8 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
                     atomic_read(&fcport->state)));
 
                 cp->result = DID_BUS_BUSY << 16;
-                if (atomic_read(&fcport->state) == FCS_ONLINE) {
-                        qla2x00_mark_device_lost(ha, fcport, 1, 1);
-                }
+                if (atomic_read(&fcport->state) == FCS_ONLINE)
+                        qla2x00_mark_device_lost(fcport->ha, fcport, 1, 1);
                 break;
 
         case CS_RESET:
@@ -1229,7 +1229,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
 
                 /* Check to see if logout occurred. */
                 if ((le16_to_cpu(sts->status_flags) & SF_LOGOUT_SENT))
-                        qla2x00_mark_device_lost(ha, fcport, 1, 1);
+                        qla2x00_mark_device_lost(fcport->ha, fcport, 1, 1);
                 break;
 
         default:
@@ -1834,7 +1834,6 @@ clear_risc_ints:
                 WRT_REG_WORD(&reg->isp.hccr, HCCR_CLR_HOST_INT);
         }
         spin_unlock_irq(&ha->hardware_lock);
-        ha->isp_ops->enable_intrs(ha);
 
 fail:
         return ret;
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index bc90d6b8d0a0..813bc7784c0a 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -2686,7 +2686,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *ha,
                 set_bit(VP_IDX_ACQUIRED, &vha->vp_flags);
                 set_bit(VP_DPC_NEEDED, &ha->dpc_flags);
 
-                wake_up_process(ha->dpc_thread);
+                qla2xxx_wake_dpc(ha);
         }
 }
 
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 50baf6a1d67c..93560cd72784 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -6,7 +6,6 @@
  */
 #include "qla_def.h"
 
-#include <linux/version.h>
 #include <linux/moduleparam.h>
 #include <linux/vmalloc.h>
 #include <linux/smp_lock.h>
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 7c8af7ed2a5d..6d0f0e5f2827 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -780,7 +780,8 @@ qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *ha, unsigned int t,
                 sp = pha->outstanding_cmds[cnt];
                 if (!sp)
                         continue;
-                if (ha->vp_idx != sp->ha->vp_idx)
+
+                if (ha->vp_idx != sp->fcport->ha->vp_idx)
                         continue;
                 match = 0;
                 switch (type) {
@@ -1080,9 +1081,7 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *ha, int res)
                 sp = ha->outstanding_cmds[cnt];
                 if (sp) {
                         ha->outstanding_cmds[cnt] = NULL;
-                        sp->flags = 0;
                         sp->cmd->result = res;
-                        sp->cmd->host_scribble = (unsigned char *)NULL;
                         qla2x00_sp_compl(ha, sp);
                 }
         }
@@ -1741,6 +1740,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         if (ret)
                 goto probe_failed;
 
+        ha->isp_ops->enable_intrs(ha);
+
         scsi_scan_host(host);
 
         qla2x00_alloc_sysfs_attr(ha);
@@ -1776,10 +1777,15 @@ probe_out:
 static void
 qla2x00_remove_one(struct pci_dev *pdev)
 {
-        scsi_qla_host_t *ha;
+        scsi_qla_host_t *ha, *vha, *temp;
 
         ha = pci_get_drvdata(pdev);
 
+        list_for_each_entry_safe(vha, temp, &ha->vp_list, vp_list)
+                fc_vport_terminate(vha->fc_vport);
+
+        set_bit(UNLOADING, &ha->dpc_flags);
+
         qla2x00_dfs_remove(ha);
 
         qla84xx_put_chip(ha);
@@ -2451,8 +2457,10 @@ qla2x00_do_dpc(void *data)
 void
 qla2xxx_wake_dpc(scsi_qla_host_t *ha)
 {
-        if (ha->dpc_thread)
-                wake_up_process(ha->dpc_thread);
+        struct task_struct *t = ha->dpc_thread;
+
+        if (!test_bit(UNLOADING, &ha->dpc_flags) && t)
+                wake_up_process(t);
 }
 
 /*
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 676c390db354..4160e4caa7b9 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.02.01-k6"
+#define QLA2XXX_VERSION      "8.02.01-k7"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    2
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 4a1cf6377f6c..905350896725 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -914,6 +914,7 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd,
                                 ds[i].d_count = sg_dma_len(s);
                         }
                         sg_count -= n;
+                        sg = s;
                 }
         } else {
                 cmd->dataseg[0].d_base = 0;
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 880051c89bde..39ce3aba1dac 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -391,7 +391,7 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)
 
         case HARDWARE_ERROR:
                 if (scmd->device->retry_hwerror)
-                        return NEEDS_RETRY;
+                        return ADD_TO_MLQUEUE;
                 else
                         return SUCCESS;
 
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ff5d56b3ee4d..62307bd794a9 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -852,7 +852,7 @@ static void scsi_end_bidi_request(struct scsi_cmnd *cmd)
 void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
 {
         int result = cmd->result;
-        int this_count = scsi_bufflen(cmd);
+        int this_count;
         struct request_queue *q = cmd->device->request_queue;
         struct request *req = cmd->request;
         int error = 0;
@@ -908,6 +908,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
          */
         if (scsi_end_request(cmd, error, good_bytes, result == 0) == NULL)
                 return;
+        this_count = blk_rq_bytes(req);
 
         /* good_bytes = 0, or (inclusive) there were leftovers and
          * result = 0, so scsi_end_request couldn't retry.
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 84b4879cff11..34d0de6cd511 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1080,7 +1080,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
          * PDT=1Fh none (no FDD connected to the requested logical unit)
          */
         if (((result[0] >> 5) == 1 || starget->pdt_1f_for_no_lun) &&
-             (result[0] & 0x1f) == 0x1f) {
+            (result[0] & 0x1f) == 0x1f &&
+            !scsi_is_wlun(lun)) {
                 SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO
                                         "scsi scan: peripheral device type"
                                         " of 31, no device added\n"));
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 3d36270a8b4d..661f9f21650a 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -217,6 +217,18 @@ static int sg_last_dev(void);
 #define SZ_SG_IOVEC sizeof(sg_iovec_t)
 #define SZ_SG_REQ_INFO sizeof(sg_req_info_t)
 
+static int sg_allow_access(struct file *filp, unsigned char *cmd)
+{
+        struct sg_fd *sfp = (struct sg_fd *)filp->private_data;
+        struct request_queue *q = sfp->parentdp->device->request_queue;
+
+        if (sfp->parentdp->device->type == TYPE_SCANNER)
+                return 0;
+
+        return blk_verify_command(&q->cmd_filter,
+                                  cmd, filp->f_mode & FMODE_WRITE);
+}
+
 static int
 sg_open(struct inode *inode, struct file *filp)
 {
@@ -689,7 +701,7 @@ sg_new_write(Sg_fd *sfp, struct file *file, const char __user *buf,
                 sg_remove_request(sfp, srp);
                 return -EFAULT;
         }
-        if (read_only && !blk_verify_command(file, cmnd)) {
+        if (read_only && sg_allow_access(file, cmnd)) {
                 sg_remove_request(sfp, srp);
                 return -EPERM;
         }
@@ -793,6 +805,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
 
         if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
                 return -ENXIO;
+
         SCSI_LOG_TIMEOUT(3, printk("sg_ioctl: %s, cmd=0x%x\n",
                                    sdp->disk->disk_name, (int) cmd_in));
         read_only = (O_RDWR != (filp->f_flags & O_ACCMODE));
@@ -1061,7 +1074,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
 
                         if (copy_from_user(&opcode, siocp->data, 1))
                                 return -EFAULT;
-                        if (!blk_verify_command(filp, &opcode))
+                        if (sg_allow_access(filp, &opcode))
                                 return -EPERM;
                 }
                 return sg_scsi_ioctl(filp, sdp->device->request_queue, NULL, p);
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 342e12fb1c25..9ccc563d8730 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1908,15 +1908,23 @@ static int serial8250_startup(struct uart_port *port)
                  * kick the UART on a regular basis.
                  */
                 if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
+                        up->bugs |= UART_BUG_THRE;
                         pr_debug("ttyS%d - using backup timer\n", port->line);
-                        up->timer.function = serial8250_backup_timeout;
-                        up->timer.data = (unsigned long)up;
-                        mod_timer(&up->timer, jiffies +
-                                poll_timeout(up->port.timeout) + HZ / 5);
                 }
         }
 
         /*
+         * The above check will only give an accurate result the first time
+         * the port is opened so this value needs to be preserved.
+         */
+        if (up->bugs & UART_BUG_THRE) {
+                up->timer.function = serial8250_backup_timeout;
+                up->timer.data = (unsigned long)up;
+                mod_timer(&up->timer, jiffies +
+                          poll_timeout(up->port.timeout) + HZ / 5);
+        }
+
+        /*
          * If the "interrupt" for this port doesn't correspond with any
          * hardware interrupt, we use a timer-based system.  The original
          * driver used to do this with IRQ0.
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index 78c00162b04e..520260326f3d 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -47,6 +47,7 @@ struct serial8250_config {
 #define UART_BUG_QUOT   (1 << 0)        /* UART has buggy quot LSB */
 #define UART_BUG_TXEN   (1 << 1)        /* UART has buggy TX IIR status */
 #define UART_BUG_NOMSR  (1 << 2)        /* UART has buggy MSR status bits (Au1x00) */
+#define UART_BUG_THRE   (1 << 3)        /* UART has buggy THRE reassertion */
 
 #define PROBE_RSA       (1 << 0)
 #define PROBE_ANY       (~0)
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 3b4a14e355c1..77cb34270fc1 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -449,6 +449,7 @@ config SERIAL_CLPS711X_CONSOLE
 config SERIAL_SAMSUNG
         tristate "Samsung SoC serial support"
         depends on ARM && PLAT_S3C24XX
+        select SERIAL_CORE
         help
           Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
           providing /dev/ttySAC0, 1 and 2 (note, some machines may not
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 3a6da80b081c..61fb8b6d19af 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -131,7 +131,8 @@ struct atmel_uart_char {
 struct atmel_uart_port {
         struct uart_port        uart;           /* uart */
         struct clk              *clk;           /* uart clock */
-        unsigned short          suspended;      /* is port suspended? */
+        int                     may_wakeup;     /* cached value of device_may_wakeup for times we need to disable it */
+        u32                     backup_imr;     /* IMR saved during suspend */
         int                     break_active;   /* break being received */
 
         short                   use_dma_rx;     /* enable PDC receiver */
@@ -984,8 +985,15 @@ static void atmel_serial_pm(struct uart_port *port, unsigned int state,
                  * This is called on uart_open() or a resume event.
                  */
                 clk_enable(atmel_port->clk);
+
+                /* re-enable interrupts if we disabled some on suspend */
+                UART_PUT_IER(port, atmel_port->backup_imr);
                 break;
         case 3:
+                /* Back up the interrupt mask and disable all interrupts */
+                atmel_port->backup_imr = UART_GET_IMR(port);
+                UART_PUT_IDR(port, -1);
+
                 /*
                  * Disable the peripheral clock for this serial port.
                  * This is called on uart_close() or a suspend event.
@@ -1475,13 +1483,12 @@ static int atmel_serial_suspend(struct platform_device *pdev,
                         cpu_relax();
         }
 
-        if (device_may_wakeup(&pdev->dev)
-            && !atmel_serial_clk_will_stop())
-                enable_irq_wake(port->irq);
-        else {
-                uart_suspend_port(&atmel_uart, port);
-                atmel_port->suspended = 1;
-        }
+        /* we can not wake up if we're running on slow clock */
+        atmel_port->may_wakeup = device_may_wakeup(&pdev->dev);
+        if (atmel_serial_clk_will_stop())
+                device_set_wakeup_enable(&pdev->dev, 0);
+
+        uart_suspend_port(&atmel_uart, port);
 
         return 0;
 }
@@ -1491,11 +1498,8 @@ static int atmel_serial_resume(struct platform_device *pdev)
         struct uart_port *port = platform_get_drvdata(pdev);
         struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
 
-        if (atmel_port->suspended) {
-                uart_resume_port(&atmel_uart, port);
-                atmel_port->suspended = 0;
-        } else
-                disable_irq_wake(port->irq);
+        uart_resume_port(&atmel_uart, port);
+        device_set_wakeup_enable(&pdev->dev, atmel_port->may_wakeup);
 
         return 0;
 }
@@ -1513,6 +1517,8 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev)
         BUILD_BUG_ON(!is_power_of_2(ATMEL_SERIAL_RINGSIZE));
 
         port = &atmel_ports[pdev->id];
+        port->backup_imr = 0;
+
         atmel_init_port(port, pdev);
 
         if (!atmel_use_dma_rx(&port->uart)) {
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index efcd44344fb1..4a0d30bed9f1 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -28,7 +28,7 @@
 #endif
 
 #include <asm/gpio.h>
-#include <asm/mach/bfin_serial_5xx.h>
+#include <mach/bfin_serial_5xx.h>
 
 #ifdef CONFIG_SERIAL_BFIN_DMA
 #include <linux/dma-mapping.h>
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 6a29f9330a73..3f90f1bbbbcd 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -127,8 +127,13 @@
 #define  UCR3_RXDSEN     (1<<6)  /* Receive status interrupt enable */
 #define  UCR3_AIRINTEN   (1<<5)  /* Async IR wake interrupt enable */
 #define  UCR3_AWAKEN     (1<<4)  /* Async wake interrupt enable */
-#define  UCR3_REF25      (1<<3)  /* Ref freq 25 MHz */
-#define  UCR3_REF30      (1<<2)  /* Ref Freq 30 MHz */
+#ifdef CONFIG_ARCH_IMX
+#define  UCR3_REF25      (1<<3)  /* Ref freq 25 MHz, only on mx1 */
+#define  UCR3_REF30      (1<<2)  /* Ref Freq 30 MHz, only on mx1 */
+#endif
+#if defined CONFIG_ARCH_MX2 || defined CONFIG_ARCH_MX3
+#define  UCR3_RXDMUXSEL  (1<<2)  /* RXD Muxed Input Select, on mx2/mx3 */
+#endif
 #define  UCR3_INVT       (1<<1)  /* Inverted Infrared transmission */
 #define  UCR3_BPEN       (1<<0)  /* Preset registers enable */
 #define  UCR4_CTSTL_32   (32<<10) /* CTS trigger level (32 chars) */
@@ -445,7 +450,7 @@ static irqreturn_t imx_int(int irq, void *dev_id)
                         readl(sport->port.membase + UCR1) & UCR1_TXMPTYEN)
                 imx_txint(irq, dev_id);
 
-        if (sts & USR1_RTSS)
+        if (sts & USR1_RTSD)
                 imx_rtsint(irq, dev_id);
 
         return IRQ_HANDLED;
@@ -598,6 +603,12 @@ static int imx_startup(struct uart_port *port)
         temp |= (UCR2_RXEN | UCR2_TXEN);
         writel(temp, sport->port.membase + UCR2);
 
+#if defined CONFIG_ARCH_MX2 || defined CONFIG_ARCH_MX3
+        temp = readl(sport->port.membase + UCR3);
+        temp |= UCR3_RXDMUXSEL;
+        writel(temp, sport->port.membase + UCR3);
+#endif
+
         /*
          * Enable modem status interrupts
          */
@@ -1133,13 +1144,19 @@ static int serial_imx_probe(struct platform_device *pdev)
         if(pdata && (pdata->flags & IMXUART_HAVE_RTSCTS))
                 sport->have_rtscts = 1;
 
-        if (pdata->init)
-                pdata->init(pdev);
+        if (pdata->init) {
+                ret = pdata->init(pdev);
+                if (ret)
+                        goto clkput;
+        }
 
         uart_add_one_port(&imx_reg, &sport->port);
         platform_set_drvdata(pdev, &sport->port);
 
         return 0;
+clkput:
+        clk_put(sport->clk);
+        clk_disable(sport->clk);
 unmap:
         iounmap(sport->port.membase);
 free:
diff --git a/drivers/spi/orion_spi.c b/drivers/spi/orion_spi.c
index c4eaacd6e553..b872bfaf4bd2 100644
--- a/drivers/spi/orion_spi.c
+++ b/drivers/spi/orion_spi.c
@@ -427,7 +427,7 @@ static int orion_spi_transfer(struct spi_device *spi, struct spi_message *m)
                         goto msg_rejected;
                 }
 
-                if (t->speed_hz < orion_spi->min_speed) {
+                if (t->speed_hz && t->speed_hz < orion_spi->min_speed) {
                         dev_err(&spi->dev,
                                 "message rejected : "
                                 "device min speed (%d Hz) exceeds "
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 34c7c9875681..d47d3636227f 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -47,9 +47,10 @@ MODULE_ALIAS("platform:pxa2xx-spi");
 
 #define MAX_BUSES 3
 
-#define DMA_INT_MASK (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)
-#define RESET_DMA_CHANNEL (DCSR_NODESC | DMA_INT_MASK)
-#define IS_DMA_ALIGNED(x) (((u32)(x)&0x07)==0)
+#define DMA_INT_MASK            (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)
+#define RESET_DMA_CHANNEL       (DCSR_NODESC | DMA_INT_MASK)
+#define IS_DMA_ALIGNED(x)       ((((u32)(x)) & 0x07) == 0)
+#define MAX_DMA_LEN             8191
 
 /*
  * for testing SSCR1 changes that require SSP restart, basically
@@ -144,7 +145,6 @@ struct driver_data {
         size_t tx_map_len;
         u8 n_bytes;
         u32 dma_width;
-        int cs_change;
         int (*write)(struct driver_data *drv_data);
         int (*read)(struct driver_data *drv_data);
         irqreturn_t (*transfer_handler)(struct driver_data *drv_data);
@@ -406,8 +406,45 @@ static void giveback(struct driver_data *drv_data)
                                         struct spi_transfer,
                                         transfer_list);
 
+        /* Delay if requested before any change in chip select */
+        if (last_transfer->delay_usecs)
+                udelay(last_transfer->delay_usecs);
+
+        /* Drop chip select UNLESS cs_change is true or we are returning
+         * a message with an error, or next message is for another chip
+         */
         if (!last_transfer->cs_change)
                 drv_data->cs_control(PXA2XX_CS_DEASSERT);
+        else {
+                struct spi_message *next_msg;
+
+                /* Holding of cs was hinted, but we need to make sure
+                 * the next message is for the same chip.  Don't waste
+                 * time with the following tests unless this was hinted.
+                 *
+                 * We cannot postpone this until pump_messages, because
+                 * after calling msg->complete (below) the driver that
+                 * sent the current message could be unloaded, which
+                 * could invalidate the cs_control() callback...
+                 */
+
+                /* get a pointer to the next message, if any */
+                spin_lock_irqsave(&drv_data->lock, flags);
+                if (list_empty(&drv_data->queue))
+                        next_msg = NULL;
+                else
+                        next_msg = list_entry(drv_data->queue.next,
+                                        struct spi_message, queue);
+                spin_unlock_irqrestore(&drv_data->lock, flags);
+
+                /* see if the next and current messages point
+                 * to the same chip
+                 */
+                if (next_msg && next_msg->spi != msg->spi)
+                        next_msg = NULL;
+                if (!next_msg || msg->state == ERROR_STATE)
+                        drv_data->cs_control(PXA2XX_CS_DEASSERT);
+        }
 
         msg->state = NULL;
         if (msg->complete)
@@ -490,10 +527,9 @@ static void dma_transfer_complete(struct driver_data *drv_data)
         msg->actual_length += drv_data->len -
                                 (drv_data->rx_end - drv_data->rx);
 
-        /* Release chip select if requested, transfer delays are
-         * handled in pump_transfers */
-        if (drv_data->cs_change)
-                drv_data->cs_control(PXA2XX_CS_DEASSERT);
+        /* Transfer delays and chip select release are
+         * handled in pump_transfers or giveback
+         */
 
         /* Move to next transfer */
         msg->state = next_transfer(drv_data);
@@ -602,10 +638,9 @@ static void int_transfer_complete(struct driver_data *drv_data)
         drv_data->cur_msg->actual_length += drv_data->len -
                                 (drv_data->rx_end - drv_data->rx);
 
-        /* Release chip select if requested, transfer delays are
-         * handled in pump_transfers */
-        if (drv_data->cs_change)
-                drv_data->cs_control(PXA2XX_CS_DEASSERT);
+        /* Transfer delays and chip select release are
+         * handled in pump_transfers or giveback
+         */
 
         /* Move to next transfer */
         drv_data->cur_msg->state = next_transfer(drv_data);
@@ -840,23 +875,40 @@ static void pump_transfers(unsigned long data)
                 return;
         }
 
-        /* Delay if requested at end of transfer*/
+        /* Delay if requested at end of transfer before CS change */
         if (message->state == RUNNING_STATE) {
                 previous = list_entry(transfer->transfer_list.prev,
                                         struct spi_transfer,
                                         transfer_list);
                 if (previous->delay_usecs)
                         udelay(previous->delay_usecs);
+
+                /* Drop chip select only if cs_change is requested */
+                if (previous->cs_change)
+                        drv_data->cs_control(PXA2XX_CS_DEASSERT);
         }
 
-        /* Check transfer length */
-        if (transfer->len > 8191)
-        {
-                dev_warn(&drv_data->pdev->dev, "pump_transfers: transfer "
-                                "length greater than 8191\n");
-                message->status = -EINVAL;
-                giveback(drv_data);
-                return;
+        /* Check for transfers that need multiple DMA segments */
+        if (transfer->len > MAX_DMA_LEN && chip->enable_dma) {
+
+                /* reject already-mapped transfers; PIO won't always work */
+                if (message->is_dma_mapped
+                                || transfer->rx_dma || transfer->tx_dma) {
+                        dev_err(&drv_data->pdev->dev,
+                                "pump_transfers: mapped transfer length "
+                                "of %u is greater than %d\n",
+                                transfer->len, MAX_DMA_LEN);
+                        message->status = -EINVAL;
+                        giveback(drv_data);
+                        return;
+                }
+
+                /* warn ... we force this to PIO mode */
+                if (printk_ratelimit())
+                        dev_warn(&message->spi->dev, "pump_transfers: "
+                                "DMA disabled for transfer length %ld "
+                                "greater than %d\n",
+                                (long)drv_data->len, MAX_DMA_LEN);
         }
 
         /* Setup the transfer state based on the type of transfer */
@@ -878,7 +930,6 @@ static void pump_transfers(unsigned long data)
         drv_data->len = transfer->len & DCMD_LENGTH;
         drv_data->write = drv_data->tx ? chip->write : null_writer;
         drv_data->read = drv_data->rx ? chip->read : null_reader;
-        drv_data->cs_change = transfer->cs_change;
 
         /* Change speed and bit per word on a per transfer */
         cr0 = chip->cr0;
@@ -925,7 +976,7 @@ static void pump_transfers(unsigned long data)
                                                         &dma_thresh))
                                 if (printk_ratelimit())
                                         dev_warn(&message->spi->dev,
-                                                "pump_transfer: "
+                                                "pump_transfers: "
                                                 "DMA burst size reduced to "
                                                 "match bits_per_word\n");
                 }
@@ -939,8 +990,23 @@ static void pump_transfers(unsigned long data)
 
         message->state = RUNNING_STATE;
 
-        /* Try to map dma buffer and do a dma transfer if successful */
-        if ((drv_data->dma_mapped = map_dma_buffers(drv_data))) {
+        /* Try to map dma buffer and do a dma transfer if successful, but
+         * only if the length is non-zero and less than MAX_DMA_LEN.
+         *
+         * Zero-length non-descriptor DMA is illegal on PXA2xx; force use
+         * of PIO instead.  Care is needed above because the transfer may
+         * have have been passed with buffers that are already dma mapped.
+         * A zero-length transfer in PIO mode will not try to write/read
+         * to/from the buffers
+         *
+         * REVISIT large transfers are exactly where we most want to be
+         * using DMA.  If this happens much, split those transfers into
+         * multiple DMA segments rather than forcing PIO.
+         */
+        drv_data->dma_mapped = 0;
+        if (drv_data->len > 0 && drv_data->len <= MAX_DMA_LEN)
+                drv_data->dma_mapped = map_dma_buffers(drv_data);
+        if (drv_data->dma_mapped) {
 
                 /* Ensure we have the correct interrupt handler */
                 drv_data->transfer_handler = dma_transfer;
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 964124b60db2..75e86865234c 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -226,10 +226,11 @@ EXPORT_SYMBOL_GPL(spi_alloc_device);
  * Companion function to spi_alloc_device.  Devices allocated with
  * spi_alloc_device can be added onto the spi bus with this function.
  *
- * Returns 0 on success; non-zero on failure
+ * Returns 0 on success; negative errno on failure
  */
 int spi_add_device(struct spi_device *spi)
 {
+        static DEFINE_MUTEX(spi_add_lock);
         struct device *dev = spi->master->dev.parent;
         int status;
 
@@ -246,26 +247,43 @@ int spi_add_device(struct spi_device *spi)
                         "%s.%u", spi->master->dev.bus_id,
                         spi->chip_select);
 
-        /* drivers may modify this initial i/o setup */
+
+        /* We need to make sure there's no other device with this
+         * chipselect **BEFORE** we call setup(), else we'll trash
+         * its configuration.  Lock against concurrent add() calls.
+         */
+        mutex_lock(&spi_add_lock);
+
+        if (bus_find_device_by_name(&spi_bus_type, NULL, spi->dev.bus_id)
+                        != NULL) {
+                dev_err(dev, "chipselect %d already in use\n",
+                                spi->chip_select);
+                status = -EBUSY;
+                goto done;
+        }
+
+        /* Drivers may modify this initial i/o setup, but will
+         * normally rely on the device being setup.  Devices
+         * using SPI_CS_HIGH can't coexist well otherwise...
+         */
         status = spi->master->setup(spi);
         if (status < 0) {
                 dev_err(dev, "can't %s %s, status %d\n",
                                 "setup", spi->dev.bus_id, status);
-                return status;
+                goto done;
         }
 
-        /* driver core catches callers that misbehave by defining
-         * devices that already exist.
-         */
+        /* Device may be bound to an active driver when this returns */
         status = device_add(&spi->dev);
-        if (status < 0) {
+        if (status < 0)
                 dev_err(dev, "can't %s %s, status %d\n",
                                 "add", spi->dev.bus_id, status);
-                return status;
-        }
+        else
+                dev_dbg(dev, "registered child %s\n", spi->dev.bus_id);
 
-        dev_dbg(dev, "registered child %s\n", spi->dev.bus_id);
-        return 0;
+done:
+        mutex_unlock(&spi_add_lock);
+        return status;
 }
 EXPORT_SYMBOL_GPL(spi_add_device);
 
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 070c6219e2d6..ac0e3e4b3c54 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -267,16 +267,13 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
         cs->hw_mode |= SPMODE_LEN(bits_per_word);
 
         if ((mpc83xx_spi->spibrg / hz) > 64) {
+                cs->hw_mode |= SPMODE_DIV16;
                 pm = mpc83xx_spi->spibrg / (hz * 64);
                 if (pm > 16) {
-                        cs->hw_mode |= SPMODE_DIV16;
-                        pm /= 16;
-                        if (pm > 16) {
-                                dev_err(&spi->dev, "Requested speed is too "
-                                        "low: %d Hz. Will use %d Hz instead.\n",
-                                        hz, mpc83xx_spi->spibrg / 1024);
-                                pm = 16;
-                        }
+                        dev_err(&spi->dev, "Requested speed is too "
+                                "low: %d Hz. Will use %d Hz instead.\n",
+                                hz, mpc83xx_spi->spibrg / 1024);
+                        pm = 16;
                 }
         } else
                 pm = mpc83xx_spi->spibrg / (hz * 4);
@@ -315,11 +312,20 @@ static int mpc83xx_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
         if (t->bits_per_word)
                 bits_per_word = t->bits_per_word;
         len = t->len;
-        if (bits_per_word > 8)
+        if (bits_per_word > 8) {
+                /* invalid length? */
+                if (len & 1)
+                        return -EINVAL;
                 len /= 2;
-        if (bits_per_word > 16)
+        }
+        if (bits_per_word > 16) {
+                /* invalid length? */
+                if (len & 1)
+                        return -EINVAL;
                 len /= 2;
+        }
         mpc83xx_spi->count = len;
+
         INIT_COMPLETION(mpc83xx_spi->done);
 
         /* enable rx ints */
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 98abc73c1a1d..3eb414b84a9d 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -430,7 +430,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev)
 #endif
 
 MODULE_ALIAS("platform:s3c2410-spi");
-static struct platform_driver s3c24xx_spidrv = {
+static struct platform_driver s3c24xx_spi_driver = {
         .remove         = __exit_p(s3c24xx_spi_remove),
         .suspend        = s3c24xx_spi_suspend,
         .resume         = s3c24xx_spi_resume,
@@ -442,12 +442,12 @@ static struct platform_driver s3c24xx_spidrv = {
 
 static int __init s3c24xx_spi_init(void)
 {
-        return platform_driver_probe(&s3c24xx_spidrv, s3c24xx_spi_probe);
+        return platform_driver_probe(&s3c24xx_spi_driver, s3c24xx_spi_probe);
 }
 
 static void __exit s3c24xx_spi_exit(void)
 {
-        platform_driver_unregister(&s3c24xx_spidrv);
+        platform_driver_unregister(&s3c24xx_spi_driver);
 }
 
 module_init(s3c24xx_spi_init);
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index d831a2beff39..0ffabf5c0b60 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -471,6 +471,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
 #endif
                         break;
                 case SSB_BUSTYPE_SSB:
+                        dev->dma_mask = &dev->coherent_dma_mask;
                         break;
                 }
 
@@ -1165,15 +1166,19 @@ EXPORT_SYMBOL(ssb_dma_translation);
 
 int ssb_dma_set_mask(struct ssb_device *dev, u64 mask)
 {
+#ifdef CONFIG_SSB_PCIHOST
         int err;
+#endif
 
         switch (dev->bus->bustype) {
         case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                 err = pci_set_dma_mask(dev->bus->host_pci, mask);
                 if (err)
                         return err;
                 err = pci_set_consistent_dma_mask(dev->bus->host_pci, mask);
                 return err;
+#endif
         case SSB_BUSTYPE_SSB:
                 return dma_set_mask(dev->dev, mask);
         default:
@@ -1188,6 +1193,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,
 {
         switch (dev->bus->bustype) {
         case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                 if (gfp_flags & GFP_DMA) {
                         /* Workaround: The PCI API does not support passing
                          * a GFP flag. */
@@ -1195,6 +1201,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,
                                                   size, dma_handle, gfp_flags);
                 }
                 return pci_alloc_consistent(dev->bus->host_pci, size, dma_handle);
+#endif
         case SSB_BUSTYPE_SSB:
                 return dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags);
         default:
@@ -1210,6 +1217,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,
 {
         switch (dev->bus->bustype) {
         case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                 if (gfp_flags & GFP_DMA) {
                         /* Workaround: The PCI API does not support passing
                          * a GFP flag. */
@@ -1220,6 +1228,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,
                 pci_free_consistent(dev->bus->host_pci, size,
                                     vaddr, dma_handle);
                 return;
+#endif
         case SSB_BUSTYPE_SSB:
                 dma_free_coherent(dev->dev, size, vaddr, dma_handle);
                 return;
diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index 2e9079df26b3..4190be64917f 100644
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -33,6 +33,19 @@ config UIO_PDRV
 
           If you don't know what to do here, say N.
 
+config UIO_PDRV_GENIRQ
+        tristate "Userspace I/O platform driver with generic IRQ handling"
+        help
+          Platform driver for Userspace I/O devices, including generic
+          interrupt handling code. Shared interrupts are not supported.
+
+          This kernel driver requires that the matching userspace driver
+          handles interrupts in a special way. Userspace is responsible
+          for acknowledging the hardware device if needed, and re-enabling
+          interrupts in the interrupt controller using the write() syscall.
+
+          If you don't know what to do here, say N.
+
 config UIO_SMX
         tristate "SMX cryptengine UIO interface"
         default n
diff --git a/drivers/uio/Makefile b/drivers/uio/Makefile
index e00ce0def1a0..8667bbdef904 100644
--- a/drivers/uio/Makefile
+++ b/drivers/uio/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_UIO)       += uio.o
 obj-$(CONFIG_UIO_CIF)   += uio_cif.o
 obj-$(CONFIG_UIO_PDRV)  += uio_pdrv.o
+obj-$(CONFIG_UIO_PDRV_GENIRQ)   += uio_pdrv_genirq.o
 obj-$(CONFIG_UIO_SMX)   += uio_smx.o
diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
index 5d0d2e85d982..0b4ef39cd85d 100644
--- a/drivers/uio/uio_pdrv.c
+++ b/drivers/uio/uio_pdrv.c
@@ -88,6 +88,8 @@ static int uio_pdrv_remove(struct platform_device *pdev)
 
         uio_unregister_device(pdata->uioinfo);
 
+        kfree(pdata);
+
         return 0;
 }
 
@@ -114,5 +116,5 @@ module_exit(uio_pdrv_exit);
 
 MODULE_AUTHOR("Uwe Kleine-Koenig");
 MODULE_DESCRIPTION("Userspace I/O platform driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
new file mode 100644
index 000000000000..1f82c83a92ae
--- /dev/null
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -0,0 +1,188 @@
+/*
+ * drivers/uio/uio_pdrv_genirq.c
+ *
+ * Userspace I/O platform driver with generic IRQ handling code.
+ *
+ * Copyright (C) 2008 Magnus Damm
+ *
+ * Based on uio_pdrv.c by Uwe Kleine-Koenig,
+ * Copyright (C) 2008 by Digi International Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/uio_driver.h>
+#include <linux/spinlock.h>
+#include <linux/bitops.h>
+#include <linux/interrupt.h>
+#include <linux/stringify.h>
+
+#define DRIVER_NAME "uio_pdrv_genirq"
+
+struct uio_pdrv_genirq_platdata {
+        struct uio_info *uioinfo;
+        spinlock_t lock;
+        unsigned long flags;
+};
+
+static irqreturn_t uio_pdrv_genirq_handler(int irq, struct uio_info *dev_info)
+{
+        struct uio_pdrv_genirq_platdata *priv = dev_info->priv;
+
+        /* Just disable the interrupt in the interrupt controller, and
+         * remember the state so we can allow user space to enable it later.
+         */
+
+        if (!test_and_set_bit(0, &priv->flags))
+                disable_irq_nosync(irq);
+
+        return IRQ_HANDLED;
+}
+
+static int uio_pdrv_genirq_irqcontrol(struct uio_info *dev_info, s32 irq_on)
+{
+        struct uio_pdrv_genirq_platdata *priv = dev_info->priv;
+        unsigned long flags;
+
+        /* Allow user space to enable and disable the interrupt
+         * in the interrupt controller, but keep track of the
+         * state to prevent per-irq depth damage.
+         *
+         * Serialize this operation to support multiple tasks.
+         */
+
+        spin_lock_irqsave(&priv->lock, flags);
+        if (irq_on) {
+                if (test_and_clear_bit(0, &priv->flags))
+                        enable_irq(dev_info->irq);
+        } else {
+                if (!test_and_set_bit(0, &priv->flags))
+                        disable_irq(dev_info->irq);
+        }
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        return 0;
+}
+
+static int uio_pdrv_genirq_probe(struct platform_device *pdev)
+{
+        struct uio_info *uioinfo = pdev->dev.platform_data;
+        struct uio_pdrv_genirq_platdata *priv;
+        struct uio_mem *uiomem;
+        int ret = -EINVAL;
+        int i;
+
+        if (!uioinfo || !uioinfo->name || !uioinfo->version) {
+                dev_err(&pdev->dev, "missing platform_data\n");
+                goto bad0;
+        }
+
+        if (uioinfo->handler || uioinfo->irqcontrol || uioinfo->irq_flags) {
+                dev_err(&pdev->dev, "interrupt configuration error\n");
+                goto bad0;
+        }
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                ret = -ENOMEM;
+                dev_err(&pdev->dev, "unable to kmalloc\n");
+                goto bad0;
+        }
+
+        priv->uioinfo = uioinfo;
+        spin_lock_init(&priv->lock);
+        priv->flags = 0; /* interrupt is enabled to begin with */
+
+        uiomem = &uioinfo->mem[0];
+
+        for (i = 0; i < pdev->num_resources; ++i) {
+                struct resource *r = &pdev->resource[i];
+
+                if (r->flags != IORESOURCE_MEM)
+                        continue;
+
+                if (uiomem >= &uioinfo->mem[MAX_UIO_MAPS]) {
+                        dev_warn(&pdev->dev, "device has more than "
+                                        __stringify(MAX_UIO_MAPS)
+                                        " I/O memory resources.\n");
+                        break;
+                }
+
+                uiomem->memtype = UIO_MEM_PHYS;
+                uiomem->addr = r->start;
+                uiomem->size = r->end - r->start + 1;
+                ++uiomem;
+        }
+
+        while (uiomem < &uioinfo->mem[MAX_UIO_MAPS]) {
+                uiomem->size = 0;
+                ++uiomem;
+        }
+
+        /* This driver requires no hardware specific kernel code to handle
+         * interrupts. Instead, the interrupt handler simply disables the
+         * interrupt in the interrupt controller. User space is responsible
+         * for performing hardware specific acknowledge and re-enabling of
+         * the interrupt in the interrupt controller.
+         *
+         * Interrupt sharing is not supported.
+         */
+
+        uioinfo->irq_flags = IRQF_DISABLED;
+        uioinfo->handler = uio_pdrv_genirq_handler;
+        uioinfo->irqcontrol = uio_pdrv_genirq_irqcontrol;
+        uioinfo->priv = priv;
+
+        ret = uio_register_device(&pdev->dev, priv->uioinfo);
+        if (ret) {
+                dev_err(&pdev->dev, "unable to register uio device\n");
+                goto bad1;
+        }
+
+        platform_set_drvdata(pdev, priv);
+        return 0;
+ bad1:
+        kfree(priv);
+ bad0:
+        return ret;
+}
+
+static int uio_pdrv_genirq_remove(struct platform_device *pdev)
+{
+        struct uio_pdrv_genirq_platdata *priv = platform_get_drvdata(pdev);
+
+        uio_unregister_device(priv->uioinfo);
+        kfree(priv);
+        return 0;
+}
+
+static struct platform_driver uio_pdrv_genirq = {
+        .probe = uio_pdrv_genirq_probe,
+        .remove = uio_pdrv_genirq_remove,
+        .driver = {
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init uio_pdrv_genirq_init(void)
+{
+        return platform_driver_register(&uio_pdrv_genirq);
+}
+
+static void __exit uio_pdrv_genirq_exit(void)
+{
+        platform_driver_unregister(&uio_pdrv_genirq);
+}
+
+module_init(uio_pdrv_genirq_init);
+module_exit(uio_pdrv_genirq_exit);
+
+MODULE_AUTHOR("Magnus Damm");
+MODULE_DESCRIPTION("Userspace I/O platform driver with generic IRQ handling");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index cb01b5106efd..b6483dd98acc 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -64,7 +64,6 @@
 #include <linux/ctype.h>
 #include <linux/sched.h>
 #include <linux/kthread.h>
-#include <linux/version.h>
 #include <linux/mutex.h>
 #include <linux/freezer.h>
 
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index efc4373ededb..c257453fa9de 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -589,8 +589,8 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
         tasklet_schedule(&acm->urb_task);
 
 done:
-err_out:
         mutex_unlock(&acm->mutex);
+err_out:
         mutex_unlock(&open_mutex);
         return rv;
 
@@ -1362,6 +1362,9 @@ static struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x0803, 0x3095), /* Zoom Telephonics Model 3095F USB MODEM */
         .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
         },
+        { USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */
+        .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+        },
 
         /* control interfaces with various AT-command sets */
         { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 2be37fe466f2..5a7fa6f09958 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -230,6 +230,13 @@ static int usb_probe_interface(struct device *dev)
                  */
                 intf->pm_usage_cnt = !(driver->supports_autosuspend);
 
+                /* Carry out a deferred switch to altsetting 0 */
+                if (intf->needs_altsetting0) {
+                        usb_set_interface(udev, intf->altsetting[0].
+                                        desc.bInterfaceNumber, 0);
+                        intf->needs_altsetting0 = 0;
+                }
+
                 error = driver->probe(intf, id);
                 if (error) {
                         mark_quiesced(intf);
@@ -266,8 +273,17 @@ static int usb_unbind_interface(struct device *dev)
 
         driver->disconnect(intf);
 
-        /* reset other interface state */
-        usb_set_interface(udev, intf->altsetting[0].desc.bInterfaceNumber, 0);
+        /* Reset other interface state.
+         * We cannot do a Set-Interface if the device is suspended or
+         * if it is prepared for a system sleep (since installing a new
+         * altsetting means creating new endpoint device entries).
+         * When either of these happens, defer the Set-Interface.
+         */
+        if (!error && intf->dev.power.status == DPM_ON)
+                usb_set_interface(udev, intf->altsetting[0].
+                                desc.bInterfaceNumber, 0);
+        else
+                intf->needs_altsetting0 = 1;
         usb_set_intfdata(intf, NULL);
 
         intf->condition = USB_INTERFACE_UNBOUND;
@@ -798,7 +814,8 @@ void usb_forced_unbind_intf(struct usb_interface *intf)
  * The caller must hold @intf's device's lock, but not its pm_mutex
  * and not @intf->dev.sem.
  *
- * FIXME: The caller must block system sleep transitions.
+ * Note: Rebinds will be skipped if a system sleep transition is in
+ * progress and the PM "complete" callback hasn't occurred yet.
  */
 void usb_rebind_intf(struct usb_interface *intf)
 {
@@ -814,10 +831,12 @@ void usb_rebind_intf(struct usb_interface *intf)
         }
 
         /* Try to rebind the interface */
-        intf->needs_binding = 0;
-        rc = device_attach(&intf->dev);
-        if (rc < 0)
-                dev_warn(&intf->dev, "rebind failed: %d\n", rc);
+        if (intf->dev.power.status == DPM_ON) {
+                intf->needs_binding = 0;
+                rc = device_attach(&intf->dev);
+                if (rc < 0)
+                        dev_warn(&intf->dev, "rebind failed: %d\n", rc);
+        }
 }
 
 #ifdef CONFIG_PM
@@ -829,7 +848,6 @@ void usb_rebind_intf(struct usb_interface *intf)
  * or rebind interfaces that have been unbound, according to @action.
  *
  * The caller must hold @udev's device lock.
- * FIXME: For rebinds, the caller must block system sleep transitions.
  */
 static void do_unbind_rebind(struct usb_device *udev, int action)
 {
@@ -851,22 +869,8 @@ static void do_unbind_rebind(struct usb_device *udev, int action)
                                 }
                                 break;
                         case DO_REBIND:
-                                if (intf->needs_binding) {
-
-        /* FIXME: The next line is needed because we are going to probe
-         * the interface, but as far as the PM core is concerned the
-         * interface is still suspended.  The problem wouldn't exist
-         * if we could rebind the interface during the interface's own
-         * resume() call, but at the time the usb_device isn't locked!
-         *
-         * The real solution will be to carry this out during the device's
-         * complete() callback.  Until that is implemented, we have to
-         * use this hack.
-         */
-//                                      intf->dev.power.sleeping = 0;
-
+                                if (intf->needs_binding)
                                         usb_rebind_intf(intf);
-                                }
                                 break;
                         }
                 }
@@ -926,14 +930,14 @@ static int usb_resume_device(struct usb_device *udev)
 }
 
 /* Caller has locked intf's usb_device's pm mutex */
-static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
+static int usb_suspend_interface(struct usb_device *udev,
+                struct usb_interface *intf, pm_message_t msg)
 {
         struct usb_driver       *driver;
         int                     status = 0;
 
         /* with no hardware, USB interfaces only use FREEZE and ON states */
-        if (interface_to_usbdev(intf)->state == USB_STATE_NOTATTACHED ||
-                        !is_active(intf))
+        if (udev->state == USB_STATE_NOTATTACHED || !is_active(intf))
                 goto done;
 
         if (intf->condition == USB_INTERFACE_UNBOUND)   /* This can't happen */
@@ -944,7 +948,7 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
                 status = driver->suspend(intf, msg);
                 if (status == 0)
                         mark_quiesced(intf);
-                else if (!interface_to_usbdev(intf)->auto_pm)
+                else if (!udev->auto_pm)
                         dev_err(&intf->dev, "%s error %d\n",
                                         "suspend", status);
         } else {
@@ -961,13 +965,13 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
 }
 
 /* Caller has locked intf's usb_device's pm_mutex */
-static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
+static int usb_resume_interface(struct usb_device *udev,
+                struct usb_interface *intf, int reset_resume)
 {
         struct usb_driver       *driver;
         int                     status = 0;
 
-        if (interface_to_usbdev(intf)->state == USB_STATE_NOTATTACHED ||
-                        is_active(intf))
+        if (udev->state == USB_STATE_NOTATTACHED || is_active(intf))
                 goto done;
 
         /* Don't let autoresume interfere with unbinding */
@@ -975,8 +979,17 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
                 goto done;
 
         /* Can't resume it if it doesn't have a driver. */
-        if (intf->condition == USB_INTERFACE_UNBOUND)
+        if (intf->condition == USB_INTERFACE_UNBOUND) {
+
+                /* Carry out a deferred switch to altsetting 0 */
+                if (intf->needs_altsetting0 &&
+                                intf->dev.power.status == DPM_ON) {
+                        usb_set_interface(udev, intf->altsetting[0].
+                                        desc.bInterfaceNumber, 0);
+                        intf->needs_altsetting0 = 0;
+                }
                 goto done;
+        }
 
         /* Don't resume if the interface is marked for rebinding */
         if (intf->needs_binding)
@@ -1151,7 +1164,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
         if (udev->actconfig) {
                 for (; i < udev->actconfig->desc.bNumInterfaces; i++) {
                         intf = udev->actconfig->interface[i];
-                        status = usb_suspend_interface(intf, msg);
+                        status = usb_suspend_interface(udev, intf, msg);
                         if (status != 0)
                                 break;
                 }
@@ -1163,7 +1176,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
         if (status != 0) {
                 while (--i >= 0) {
                         intf = udev->actconfig->interface[i];
-                        usb_resume_interface(intf, 0);
+                        usb_resume_interface(udev, intf, 0);
                 }
 
                 /* Try another autosuspend when the interfaces aren't busy */
@@ -1276,7 +1289,7 @@ static int usb_resume_both(struct usb_device *udev)
         if (status == 0 && udev->actconfig) {
                 for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) {
                         intf = udev->actconfig->interface[i];
-                        usb_resume_interface(intf, udev->reset_resume);
+                        usb_resume_interface(udev, intf, udev->reset_resume);
                 }
         }
 
@@ -1605,12 +1618,10 @@ int usb_external_resume_device(struct usb_device *udev)
         return status;
 }
 
-static int usb_suspend(struct device *dev, pm_message_t message)
+int usb_suspend(struct device *dev, pm_message_t message)
 {
         struct usb_device       *udev;
 
-        if (!is_usb_device(dev))        /* Ignore PM for interfaces */
-                return 0;
         udev = to_usb_device(dev);
 
         /* If udev is already suspended, we can skip this suspend and
@@ -1629,12 +1640,10 @@ static int usb_suspend(struct device *dev, pm_message_t message)
         return usb_external_suspend_device(udev, message);
 }
 
-static int usb_resume(struct device *dev)
+int usb_resume(struct device *dev)
 {
         struct usb_device       *udev;
 
-        if (!is_usb_device(dev))        /* Ignore PM for interfaces */
-                return 0;
         udev = to_usb_device(dev);
 
         /* If udev->skip_sys_resume is set then udev was already suspended
@@ -1646,17 +1655,10 @@ static int usb_resume(struct device *dev)
         return usb_external_resume_device(udev);
 }
 
-#else
-
-#define usb_suspend     NULL
-#define usb_resume      NULL
-
 #endif /* CONFIG_PM */
 
 struct bus_type usb_bus_type = {
         .name =         "usb",
         .match =        usb_device_match,
         .uevent =       usb_uevent,
-        .suspend =      usb_suspend,
-        .resume =       usb_resume,
 };
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index f7bfd72ef115..8ab389dca2b9 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -924,15 +924,6 @@ static int register_root_hub(struct usb_hcd *hcd)
         return retval;
 }
 
-void usb_enable_root_hub_irq (struct usb_bus *bus)
-{
-        struct usb_hcd *hcd;
-
-        hcd = container_of (bus, struct usb_hcd, self);
-        if (hcd->driver->hub_irq_enable && hcd->state != HC_STATE_HALT)
-                hcd->driver->hub_irq_enable (hcd);
-}
-
 
 /*-------------------------------------------------------------------------*/
 
@@ -1885,7 +1876,8 @@ int usb_add_hcd(struct usb_hcd *hcd,
                  * with IRQF_SHARED. As usb_hcd_irq() will always disable
                  * interrupts we can remove it here.
                  */
-                irqflags &= ~IRQF_DISABLED;
+                if (irqflags & IRQF_SHARED)
+                        irqflags &= ~IRQF_DISABLED;
 
                 snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
                                 hcd->driver->description, hcd->self.busnum);
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index 5b0b59b0d89b..e710ce04e228 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -212,8 +212,6 @@ struct hc_driver {
         int     (*bus_suspend)(struct usb_hcd *);
         int     (*bus_resume)(struct usb_hcd *);
         int     (*start_port_reset)(struct usb_hcd *, unsigned port_num);
-        void    (*hub_irq_enable)(struct usb_hcd *);
-                /* Needed only if port-change IRQs are level-triggered */
 
                 /* force handover of high-speed port to full-speed companion */
         void    (*relinquish_port)(struct usb_hcd *, int);
@@ -379,8 +377,6 @@ extern struct list_head usb_bus_list;
 extern struct mutex usb_bus_list_lock;
 extern wait_queue_head_t usb_kill_urb_queue;
 
-extern void usb_enable_root_hub_irq(struct usb_bus *bus);
-
 extern int usb_find_interface_driver(struct usb_device *dev,
         struct usb_interface *interface);
 
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 107e1d25ddec..d99963873e37 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2102,8 +2102,6 @@ int usb_port_resume(struct usb_device *udev)
         }
 
         clear_bit(port1, hub->busy_bits);
-        if (!hub->hdev->parent && !hub->busy_bits[0])
-                usb_enable_root_hub_irq(hub->hdev->bus);
 
         status = check_port_resume_type(udev,
                         hub, port1, status, portchange, portstatus);
@@ -2685,35 +2683,17 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
                                 USB_PORT_STAT_C_ENABLE);
 #endif
 
-        /* Try to use the debounce delay for protection against
-         * port-enable changes caused, for example, by EMI.
-         */
-        if (portchange & (USB_PORT_STAT_C_CONNECTION |
-                                USB_PORT_STAT_C_ENABLE)) {
-                status = hub_port_debounce(hub, port1);
-                if (status < 0) {
-                        if (printk_ratelimit())
-                                dev_err (hub_dev, "connect-debounce failed, "
-                                                "port %d disabled\n", port1);
-                        portstatus &= ~USB_PORT_STAT_CONNECTION;
-                } else {
-                        portstatus = status;
-                }
-        }
-
         /* Try to resuscitate an existing device */
         udev = hdev->children[port1-1];
         if ((portstatus & USB_PORT_STAT_CONNECTION) && udev &&
                         udev->state != USB_STATE_NOTATTACHED) {
-
                 usb_lock_device(udev);
                 if (portstatus & USB_PORT_STAT_ENABLE) {
                         status = 0;             /* Nothing to do */
-                } else if (!udev->persist_enabled) {
-                        status = -ENODEV;       /* Mustn't resuscitate */
 
 #ifdef CONFIG_USB_SUSPEND
-                } else if (udev->state == USB_STATE_SUSPENDED) {
+                } else if (udev->state == USB_STATE_SUSPENDED &&
+                                udev->persist_enabled) {
                         /* For a suspended device, treat this as a
                          * remote wakeup event.
                          */
@@ -2728,7 +2708,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
 #endif
 
                 } else {
-                        status = usb_reset_device(udev);
+                        status = -ENODEV;       /* Don't resuscitate */
                 }
                 usb_unlock_device(udev);
 
@@ -2743,6 +2723,19 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
                 usb_disconnect(&hdev->children[port1-1]);
         clear_bit(port1, hub->change_bits);
 
+        if (portchange & (USB_PORT_STAT_C_CONNECTION |
+                                USB_PORT_STAT_C_ENABLE)) {
+                status = hub_port_debounce(hub, port1);
+                if (status < 0) {
+                        if (printk_ratelimit())
+                                dev_err(hub_dev, "connect-debounce failed, "
+                                                "port %d disabled\n", port1);
+                        portstatus &= ~USB_PORT_STAT_CONNECTION;
+                } else {
+                        portstatus = status;
+                }
+        }
+
         /* Return now if debouncing failed or nothing is connected */
         if (!(portstatus & USB_PORT_STAT_CONNECTION)) {
 
@@ -2750,7 +2743,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
                 if ((wHubCharacteristics & HUB_CHAR_LPSM) < 2
                                 && !(portstatus & (1 << USB_PORT_FEAT_POWER)))
                         set_port_feature(hdev, port1, USB_PORT_FEAT_POWER);
- 
+
                 if (portstatus & USB_PORT_STAT_ENABLE)
                         goto done;
                 return;
@@ -3081,11 +3074,6 @@ static void hub_events(void)
                         }
                 }
 
-                /* If this is a root hub, tell the HCD it's okay to
-                 * re-enable port-change interrupts now. */
-                if (!hdev->parent && !hub->busy_bits[0])
-                        usb_enable_root_hub_irq(hdev->bus);
-
 loop_autopm:
                 /* Allow autosuspend if we're not going to run again */
                 if (list_empty(&hub->event_list))
@@ -3311,8 +3299,6 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
                         break;
         }
         clear_bit(port1, parent_hub->busy_bits);
-        if (!parent_hdev->parent && !parent_hub->busy_bits[0])
-                usb_enable_root_hub_irq(parent_hdev->bus);
 
         if (ret < 0)
                 goto re_enumerate;
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index c0b1ae25ae2a..47111e88f791 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -601,15 +601,20 @@ EXPORT_SYMBOL_GPL(usb_kill_anchored_urbs);
 void usb_unlink_anchored_urbs(struct usb_anchor *anchor)
 {
         struct urb *victim;
+        unsigned long flags;
 
-        spin_lock_irq(&anchor->lock);
+        spin_lock_irqsave(&anchor->lock, flags);
         while (!list_empty(&anchor->urb_list)) {
                 victim = list_entry(anchor->urb_list.prev, struct urb,
                                     anchor_list);
+                usb_get_urb(victim);
+                spin_unlock_irqrestore(&anchor->lock, flags);
                 /* this will unanchor the URB */
                 usb_unlink_urb(victim);
+                usb_put_urb(victim);
+                spin_lock_irqsave(&anchor->lock, flags);
         }
-        spin_unlock_irq(&anchor->lock);
+        spin_unlock_irqrestore(&anchor->lock, flags);
 }
 EXPORT_SYMBOL_GPL(usb_unlink_anchored_urbs);
 
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 84fcaa6a21ec..be1fa0723f2c 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -219,12 +219,6 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
 }
 #endif  /* CONFIG_HOTPLUG */
 
-struct device_type usb_device_type = {
-        .name =         "usb_device",
-        .release =      usb_release_dev,
-        .uevent =       usb_dev_uevent,
-};
-
 #ifdef  CONFIG_PM
 
 static int ksuspend_usb_init(void)
@@ -244,13 +238,80 @@ static void ksuspend_usb_cleanup(void)
         destroy_workqueue(ksuspend_usb_wq);
 }
 
+/* USB device Power-Management thunks.
+ * There's no need to distinguish here between quiescing a USB device
+ * and powering it down; the generic_suspend() routine takes care of
+ * it by skipping the usb_port_suspend() call for a quiesce.  And for
+ * USB interfaces there's no difference at all.
+ */
+
+static int usb_dev_prepare(struct device *dev)
+{
+        return 0;               /* Implement eventually? */
+}
+
+static void usb_dev_complete(struct device *dev)
+{
+        /* Currently used only for rebinding interfaces */
+        usb_resume(dev);        /* Implement eventually? */
+}
+
+static int usb_dev_suspend(struct device *dev)
+{
+        return usb_suspend(dev, PMSG_SUSPEND);
+}
+
+static int usb_dev_resume(struct device *dev)
+{
+        return usb_resume(dev);
+}
+
+static int usb_dev_freeze(struct device *dev)
+{
+        return usb_suspend(dev, PMSG_FREEZE);
+}
+
+static int usb_dev_thaw(struct device *dev)
+{
+        return usb_resume(dev);
+}
+
+static int usb_dev_poweroff(struct device *dev)
+{
+        return usb_suspend(dev, PMSG_HIBERNATE);
+}
+
+static int usb_dev_restore(struct device *dev)
+{
+        return usb_resume(dev);
+}
+
+static struct pm_ops usb_device_pm_ops = {
+        .prepare =      usb_dev_prepare,
+        .complete =     usb_dev_complete,
+        .suspend =      usb_dev_suspend,
+        .resume =       usb_dev_resume,
+        .freeze =       usb_dev_freeze,
+        .thaw =         usb_dev_thaw,
+        .poweroff =     usb_dev_poweroff,
+        .restore =      usb_dev_restore,
+};
+
 #else
 
 #define ksuspend_usb_init()     0
 #define ksuspend_usb_cleanup()  do {} while (0)
+#define usb_device_pm_ops       (*(struct pm_ops *)0)
 
 #endif  /* CONFIG_PM */
 
+struct device_type usb_device_type = {
+        .name =         "usb_device",
+        .release =      usb_release_dev,
+        .uevent =       usb_dev_uevent,
+        .pm =           &usb_device_pm_ops,
+};
+
 
 /* Returns 1 if @usb_bus is WUSB, 0 otherwise */
 static unsigned usb_bus_is_wusb(struct usb_bus *bus)
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index d9a6e16dbf84..9a1a45ac3add 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -41,6 +41,9 @@ extern void usb_host_cleanup(void);
 
 #ifdef  CONFIG_PM
 
+extern int usb_suspend(struct device *dev, pm_message_t msg);
+extern int usb_resume(struct device *dev);
+
 extern void usb_autosuspend_work(struct work_struct *work);
 extern int usb_port_suspend(struct usb_device *dev);
 extern int usb_port_resume(struct usb_device *dev);
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index 1500e1b3c302..abf8192f89e8 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -44,7 +44,6 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/sched.h>
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
index 1cfccf102a2d..45ad556169f1 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/drivers/usb/gadget/fsl_usb2_udc.c
@@ -223,7 +223,7 @@ static int dr_controller_setup(struct fsl_udc *udc)
         fsl_writel(tmp, &dr_regs->endpointlistaddr);
 
         VDBG("vir[qh_base] is %p phy[qh_base] is 0x%8x reg is 0x%8x",
-                (int)udc->ep_qh, (int)tmp,
+                udc->ep_qh, (int)tmp,
                 fsl_readl(&dr_regs->endpointlistaddr));
 
         /* Config PHY interface */
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 574c53831a05..bb54cca4c543 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -787,7 +787,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
                         omap_set_dma_dest_params(ep->lch,
                                 OMAP_DMA_PORT_TIPB,
                                 OMAP_DMA_AMODE_CONSTANT,
-                                (unsigned long) io_v2p(UDC_DATA_DMA),
+                                UDC_DATA_DMA,
                                 0, 0);
                 }
         } else {
@@ -804,7 +804,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel)
                         omap_set_dma_src_params(ep->lch,
                                 OMAP_DMA_PORT_TIPB,
                                 OMAP_DMA_AMODE_CONSTANT,
-                                (unsigned long) io_v2p(UDC_DATA_DMA),
+                                UDC_DATA_DMA,
                                 0, 0);
                         /* EMIFF or SDRC */
                         omap_set_dma_dest_burst_mode(ep->lch,
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index a28513ecbe5b..7cbc78a6853d 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1622,7 +1622,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         struct pxa_udc *udc = the_controller;
         int retval;
 
-        if (!driver || driver->speed != USB_SPEED_FULL || !driver->bind
+        if (!driver || driver->speed < USB_SPEED_FULL || !driver->bind
                         || !driver->disconnect || !driver->setup)
                 return -EINVAL;
         if (!udc)
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index 538807384592..29d13ebe7500 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -35,7 +35,6 @@
 #include <linux/list.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <linux/version.h>
 #include <linux/clk.h>
 
 #include <linux/debugfs.h>
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index d9d53f289caf..8409e0705d63 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -145,16 +145,6 @@ static int handshake (struct ehci_hcd *ehci, void __iomem *ptr,
         return -ETIMEDOUT;
 }
 
-static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
-                                       u32 mask, u32 done, int usec)
-{
-        int error = handshake(ehci, ptr, mask, done, usec);
-        if (error)
-                ehci_to_hcd(ehci)->state = HC_STATE_HALT;
-
-        return error;
-}
-
 /* force HC to halt state from unknown (EHCI spec section 2.3) */
 static int ehci_halt (struct ehci_hcd *ehci)
 {
@@ -173,6 +163,22 @@ static int ehci_halt (struct ehci_hcd *ehci)
                           STS_HALT, STS_HALT, 16 * 125);
 }
 
+static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
+                                       u32 mask, u32 done, int usec)
+{
+        int error;
+
+        error = handshake(ehci, ptr, mask, done, usec);
+        if (error) {
+                ehci_halt(ehci);
+                ehci_to_hcd(ehci)->state = HC_STATE_HALT;
+                ehci_err(ehci, "force halt; handhake %p %08x %08x -> %d\n",
+                        ptr, mask, done, error);
+        }
+
+        return error;
+}
+
 /* put TDI/ARC silicon into EHCI mode */
 static void tdi_reset (struct ehci_hcd *ehci)
 {
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 5fbdc14e63b3..5416cf969005 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -12,7 +12,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mbus.h>
-#include <asm/plat-orion/ehci-orion.h>
+#include <plat/ehci-orion.h>
 
 #define rdl(off)        __raw_readl(hcd->regs + (off))
 #define wrl(off, val)   __raw_writel((val), hcd->regs + (off))
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index b7853c8bac0f..4a0c5a78b2ed 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -437,6 +437,9 @@ static int enable_periodic (struct ehci_hcd *ehci)
         u32     cmd;
         int     status;
 
+        if (ehci->periodic_sched++)
+                return 0;
+
         /* did clearing PSE did take effect yet?
          * takes effect only at frame boundaries...
          */
@@ -461,6 +464,9 @@ static int disable_periodic (struct ehci_hcd *ehci)
         u32     cmd;
         int     status;
 
+        if (--ehci->periodic_sched)
+                return 0;
+
         /* did setting PSE not take effect yet?
          * takes effect only at frame boundaries...
          */
@@ -544,13 +550,10 @@ static int qh_link_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
                 : (qh->usecs * 8);
 
         /* maybe enable periodic schedule processing */
-        if (!ehci->periodic_sched++)
-                return enable_periodic (ehci);
-
-        return 0;
+        return enable_periodic(ehci);
 }
 
-static void qh_unlink_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
+static int qh_unlink_periodic(struct ehci_hcd *ehci, struct ehci_qh *qh)
 {
         unsigned        i;
         unsigned        period;
@@ -586,9 +589,7 @@ static void qh_unlink_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
         qh_put (qh);
 
         /* maybe turn off periodic schedule */
-        ehci->periodic_sched--;
-        if (!ehci->periodic_sched)
-                (void) disable_periodic (ehci);
+        return disable_periodic(ehci);
 }
 
 static void intr_deschedule (struct ehci_hcd *ehci, struct ehci_qh *qh)
@@ -1562,9 +1563,7 @@ itd_link_urb (
         urb->hcpriv = NULL;
 
         timer_action (ehci, TIMER_IO_WATCHDOG);
-        if (unlikely (!ehci->periodic_sched++))
-                return enable_periodic (ehci);
-        return 0;
+        return enable_periodic(ehci);
 }
 
 #define ISO_ERRS (EHCI_ISOC_BUF_ERR | EHCI_ISOC_BABBLE | EHCI_ISOC_XACTERR)
@@ -1642,7 +1641,7 @@ itd_complete (
         ehci_urb_done(ehci, urb, 0);
         retval = true;
         urb = NULL;
-        ehci->periodic_sched--;
+        (void) disable_periodic(ehci);
         ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
 
         if (unlikely (list_empty (&stream->td_list))) {
@@ -1951,9 +1950,7 @@ sitd_link_urb (
         urb->hcpriv = NULL;
 
         timer_action (ehci, TIMER_IO_WATCHDOG);
-        if (!ehci->periodic_sched++)
-                return enable_periodic (ehci);
-        return 0;
+        return enable_periodic(ehci);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -2019,7 +2016,7 @@ sitd_complete (
         ehci_urb_done(ehci, urb, 0);
         retval = true;
         urb = NULL;
-        ehci->periodic_sched--;
+        (void) disable_periodic(ehci);
         ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
 
         if (list_empty (&stream->td_list)) {
@@ -2243,8 +2240,7 @@ restart:
                         if (unlikely (modified)) {
                                 if (likely(ehci->periodic_sched > 0))
                                         goto restart;
-                                /* maybe we can short-circuit this scan! */
-                                disable_periodic(ehci);
+                                /* short-circuit this scan */
                                 now_uframe = clock;
                                 break;
                         }
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index d22a84f86a33..8017f1cf78e2 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -988,7 +988,7 @@ static void do_atl_int(struct usb_hcd *usb_hcd)
                 /*
                  * write bank1 address twice to ensure the 90ns delay (time
                  * between BANK0 write and the priv_read_copy() call is at
-                 * least 3*t_WHWL + 2*t_w11 = 3*25ns + 2*17ns = 92ns)
+                 * least 3*t_WHWL + 2*t_w11 = 3*25ns + 2*17ns = 109ns)
                  */
                 isp1760_writel(payload  + ISP_BANK(1), usb_hcd->regs +
                                 HC_MEMORY_REG);
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 6db7a2889e66..4ed228a89943 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -260,7 +260,6 @@ static const struct hc_driver ohci_at91_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index c0948008fe3d..2ac4e022a13f 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -163,7 +163,6 @@ static const struct hc_driver ohci_au1xxx_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index cb0b506f8259..fb3055f084b5 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -134,7 +134,6 @@ static struct hc_driver ohci_ep93xx_hc_driver = {
         .get_frame_number       = ohci_get_frame,
         .hub_status_data        = ohci_hub_status_data,
         .hub_control            = ohci_hub_control,
-        .hub_irq_enable         = ohci_rhsc_enable,
 #ifdef CONFIG_PM
         .bus_suspend            = ohci_bus_suspend,
         .bus_resume             = ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 439beb784f3e..7ea9a7b31155 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -36,18 +36,6 @@
 
 /*-------------------------------------------------------------------------*/
 
-/* hcd->hub_irq_enable() */
-static void ohci_rhsc_enable (struct usb_hcd *hcd)
-{
-        struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
-
-        spin_lock_irq(&ohci->lock);
-        if (!ohci->autostop)
-                del_timer(&hcd->rh_timer);      /* Prevent next poll */
-        ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable);
-        spin_unlock_irq(&ohci->lock);
-}
-
 #define OHCI_SCHED_ENABLES \
         (OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE)
 
@@ -374,18 +362,28 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
                 int any_connected)
 {
         int     poll_rh = 1;
+        int     rhsc;
 
+        rhsc = ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC;
         switch (ohci->hc_control & OHCI_CTRL_HCFS) {
 
         case OHCI_USB_OPER:
-                /* keep on polling until we know a device is connected
-                 * and RHSC is enabled */
+                /* If no status changes are pending, enable status-change
+                 * interrupts.
+                 */
+                if (!rhsc && !changed) {
+                        rhsc = OHCI_INTR_RHSC;
+                        ohci_writel(ohci, rhsc, &ohci->regs->intrenable);
+                }
+
+                /* Keep on polling until we know a device is connected
+                 * and RHSC is enabled, or until we autostop.
+                 */
                 if (!ohci->autostop) {
                         if (any_connected ||
                                         !device_may_wakeup(&ohci_to_hcd(ohci)
                                                 ->self.root_hub->dev)) {
-                                if (ohci_readl(ohci, &ohci->regs->intrenable) &
-                                                OHCI_INTR_RHSC)
+                                if (rhsc)
                                         poll_rh = 0;
                         } else {
                                 ohci->autostop = 1;
@@ -398,12 +396,13 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
                                 ohci->autostop = 0;
                                 ohci->next_statechange = jiffies +
                                                 STATECHANGE_DELAY;
-                        } else if (time_after_eq(jiffies,
+                        } else if (rhsc && time_after_eq(jiffies,
                                                 ohci->next_statechange)
                                         && !ohci->ed_rm_list
                                         && !(ohci->hc_control &
                                                 OHCI_SCHED_ENABLES)) {
                                 ohci_rh_suspend(ohci, 1);
+                                poll_rh = 0;
                         }
                 }
                 break;
@@ -417,6 +416,12 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
                         else
                                 usb_hcd_resume_root_hub(ohci_to_hcd(ohci));
                 } else {
+                        if (!rhsc && (ohci->autostop ||
+                                        ohci_to_hcd(ohci)->self.root_hub->
+                                                do_remote_wakeup))
+                                ohci_writel(ohci, OHCI_INTR_RHSC,
+                                                &ohci->regs->intrenable);
+
                         /* everything is idle, no need for polling */
                         poll_rh = 0;
                 }
@@ -438,12 +443,16 @@ static inline int ohci_rh_resume(struct ohci_hcd *ohci)
 static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
                 int any_connected)
 {
-        int     poll_rh = 1;
-
-        /* keep on polling until RHSC is enabled */
+        /* If RHSC is enabled, don't poll */
         if (ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC)
-                poll_rh = 0;
-        return poll_rh;
+                return 0;
+
+        /* If no status changes are pending, enable status-change interrupts */
+        if (!changed) {
+                ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable);
+                return 0;
+        }
+        return 1;
 }
 
 #endif  /* CONFIG_PM */
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c
index 9e31d440d115..de42283149c7 100644
--- a/drivers/usb/host/ohci-lh7a404.c
+++ b/drivers/usb/host/ohci-lh7a404.c
@@ -193,7 +193,6 @@ static const struct hc_driver ohci_lh7a404_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 3d532b709670..95b3ec89c126 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -208,7 +208,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)
         if (cpu_is_omap16xx())
                 ocpi_enable();
 
-#ifdef  CONFIG_ARCH_OMAP_OTG
+#ifdef  CONFIG_USB_OTG
         if (need_transceiver) {
                 ohci->transceiver = otg_get_transceiver();
                 if (ohci->transceiver) {
@@ -470,7 +470,6 @@ static const struct hc_driver ohci_omap_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 083e8df0a817..a9c2ae36c7ad 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -459,7 +459,6 @@ static const struct hc_driver ohci_pci_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c
index b02cd0761977..658a2a978c32 100644
--- a/drivers/usb/host/ohci-pnx4008.c
+++ b/drivers/usb/host/ohci-pnx4008.c
@@ -277,7 +277,6 @@ static const struct hc_driver ohci_pnx4008_hc_driver = {
          */
         .hub_status_data = ohci_hub_status_data,
         .hub_control = ohci_hub_control,
-        .hub_irq_enable = ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend = ohci_bus_suspend,
         .bus_resume = ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-pnx8550.c b/drivers/usb/host/ohci-pnx8550.c
index 605d59cba28e..28467e288a93 100644
--- a/drivers/usb/host/ohci-pnx8550.c
+++ b/drivers/usb/host/ohci-pnx8550.c
@@ -201,7 +201,6 @@ static const struct hc_driver ohci_pnx8550_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 91e6e101a4cc..7ac53264ead3 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -72,7 +72,6 @@ static const struct hc_driver ohci_ppc_of_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c
index 523c30125577..cd3398b675b2 100644
--- a/drivers/usb/host/ohci-ppc-soc.c
+++ b/drivers/usb/host/ohci-ppc-soc.c
@@ -172,7 +172,6 @@ static const struct hc_driver ohci_ppc_soc_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 55c95647f008..2089d8a46c4b 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -68,7 +68,6 @@ static const struct hc_driver ps3_ohci_hc_driver = {
         .get_frame_number       = ohci_get_frame,
         .hub_status_data        = ohci_hub_status_data,
         .hub_control            = ohci_hub_control,
-        .hub_irq_enable         = ohci_rhsc_enable,
         .start_port_reset       = ohci_start_port_reset,
 #if defined(CONFIG_PM)
         .bus_suspend            = ohci_bus_suspend,
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 8c9c4849db6e..7f0f35c78185 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -298,7 +298,6 @@ static const struct hc_driver ohci_pxa27x_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 9e3dc4069e8b..f46af7a718d4 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -466,7 +466,6 @@ static const struct hc_driver ohci_s3c2410_hc_driver = {
          */
         .hub_status_data =      ohci_s3c2410_hub_status_data,
         .hub_control =          ohci_s3c2410_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index 4626b002e670..e4bbe8e188e4 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -231,7 +231,6 @@ static const struct hc_driver ohci_sa1111_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c
index e7ee607278fe..60f03cc7ec4f 100644
--- a/drivers/usb/host/ohci-sh.c
+++ b/drivers/usb/host/ohci-sh.c
@@ -68,7 +68,6 @@ static const struct hc_driver ohci_sh_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index 21b164e4abeb..cff23637cfcc 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -75,7 +75,6 @@ static const struct hc_driver ohci_sm501_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
index 3660c83d80af..23fd6a886bdd 100644
--- a/drivers/usb/host/ohci-ssb.c
+++ b/drivers/usb/host/ohci-ssb.c
@@ -81,7 +81,6 @@ static const struct hc_driver ssb_ohci_hc_driver = {
 
         .hub_status_data        = ohci_hub_status_data,
         .hub_control            = ohci_hub_control,
-        .hub_irq_enable         = ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend            = ohci_bus_suspend,
         .bus_resume             = ohci_bus_resume,
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 20ad3c48fcb2..228f2b070f2b 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -2934,16 +2934,6 @@ static int u132_start_port_reset(struct usb_hcd *hcd, unsigned port_num)
                 return 0;
 }
 
-static void u132_hub_irq_enable(struct usb_hcd *hcd)
-{
-        struct u132 *u132 = hcd_to_u132(hcd);
-        if (u132->going > 1) {
-                dev_err(&u132->platform_dev->dev, "device has been removed %d\n"
-                        , u132->going);
-        } else if (u132->going > 0)
-                dev_err(&u132->platform_dev->dev, "device is being removed\n");
-}
-
 
 #ifdef CONFIG_PM
 static int u132_bus_suspend(struct usb_hcd *hcd)
@@ -2995,7 +2985,6 @@ static struct hc_driver u132_hc_driver = {
         .bus_suspend = u132_bus_suspend,
         .bus_resume = u132_bus_resume,
         .start_port_reset = u132_start_port_reset,
-        .hub_irq_enable = u132_hub_irq_enable,
 };
 
 /*
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index e6ca9979e3ae..a4ef77ef917d 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/poll.h>
-#include <linux/version.h>
 #include <linux/usb/iowarrior.h>
 
 /* Version Information */
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index fbace41a7cba..69c34a58e205 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3270,6 +3270,7 @@ static struct usb_device_id sisusb_table [] = {
         { USB_DEVICE(0x0711, 0x0900) },
         { USB_DEVICE(0x0711, 0x0901) },
         { USB_DEVICE(0x0711, 0x0902) },
+        { USB_DEVICE(0x0711, 0x0918) },
         { USB_DEVICE(0x182d, 0x021c) },
         { USB_DEVICE(0x182d, 0x0269) },
         { }
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index faca4333f27a..58b2b8fc9439 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -9,6 +9,7 @@ comment "Enable Host or Gadget support to see Inventra options"
 # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller
 config USB_MUSB_HDRC
         depends on (USB || USB_GADGET) && HAVE_CLK
+        depends on !SUPERH
         select TWL4030_USB if MACH_OMAP_3430SDP
         tristate 'Inventra Highspeed Dual Role Controller (TI, ...)'
         help
@@ -165,12 +166,11 @@ config USB_TUSB_OMAP_DMA
         help
           Enable DMA transfers on TUSB 6010 when OMAP DMA is available.
 
-config  USB_MUSB_LOGLEVEL
+config  USB_MUSB_DEBUG
         depends on USB_MUSB_HDRC
-        int  'Logging Level (0 - none / 3 - annoying / ... )'
-        default 0
+        bool "Enable debugging messages"
+        default n
         help
-          Set the logging level. 0 disables the debugging altogether,
-          although when USB_DEBUG is set the value is at least 1.
-          Starting at level 3, per-transfer (urb, usb_request, packet,
-          or dma transfer) tracing may kick in.
+          This enables musb debugging. To set the logging level use the debug
+          module parameter. Starting at level 3, per-transfer (urb, usb_request,
+          packet, or dma transfer) tracing may kick in.
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 88eb67de08ae..b6af0d687a73 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -64,23 +64,6 @@ endif
 
 # Debugging
 
-MUSB_DEBUG:=$(CONFIG_USB_MUSB_LOGLEVEL)
-
-ifeq ("$(strip $(MUSB_DEBUG))","")
-    ifdef CONFIG_USB_DEBUG
-        MUSB_DEBUG:=1
-    else
-        MUSB_DEBUG:=0
-    endif
+ifeq ($(CONFIG_USB_MUSB_DEBUG),y)
+        EXTRA_CFLAGS += -DDEBUG
 endif
-
-ifneq ($(MUSB_DEBUG),0)
-    EXTRA_CFLAGS += -DDEBUG
-
-    ifeq ($(CONFIG_PROC_FS),y)
-        musb_hdrc-objs          += musb_procfs.o
-    endif
-
-endif
-
-EXTRA_CFLAGS += -DMUSB_DEBUG=$(MUSB_DEBUG)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index d68ec6daf335..128e949db47c 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -100,8 +100,8 @@
 #include <linux/io.h>
 
 #ifdef  CONFIG_ARM
-#include <asm/arch/hardware.h>
-#include <asm/arch/memory.h>
+#include <mach/hardware.h>
+#include <mach/memory.h>
 #include <asm/mach-types.h>
 #endif
 
@@ -114,23 +114,14 @@
 
 
 
-#if MUSB_DEBUG > 0
-unsigned debug = MUSB_DEBUG;
-module_param(debug, uint, 0);
-MODULE_PARM_DESC(debug, "initial debug message level");
-
-#define MUSB_VERSION_SUFFIX     "/dbg"
-#endif
+unsigned debug;
+module_param(debug, uint, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug message level. Default = 0");
 
 #define DRIVER_AUTHOR "Mentor Graphics, Texas Instruments, Nokia"
 #define DRIVER_DESC "Inventra Dual-Role USB Controller Driver"
 
-#define MUSB_VERSION_BASE "6.0"
-
-#ifndef MUSB_VERSION_SUFFIX
-#define MUSB_VERSION_SUFFIX     ""
-#endif
-#define MUSB_VERSION    MUSB_VERSION_BASE MUSB_VERSION_SUFFIX
+#define MUSB_VERSION "6.0"
 
 #define DRIVER_INFO DRIVER_DESC ", v" MUSB_VERSION
 
@@ -2037,6 +2028,8 @@ bad_config:
                 musb->xceiv.state = OTG_STATE_A_IDLE;
 
                 status = usb_add_hcd(musb_to_hcd(musb), -1, 0);
+                if (status)
+                        goto fail;
 
                 DBG(1, "%s mode, status %d, devctl %02x %c\n",
                         "HOST", status,
@@ -2051,6 +2044,8 @@ bad_config:
                 musb->xceiv.state = OTG_STATE_B_IDLE;
 
                 status = musb_gadget_setup(musb);
+                if (status)
+                        goto fail;
 
                 DBG(1, "%s mode, status %d, dev%02x\n",
                         is_otg_enabled(musb) ? "OTG" : "PERIPHERAL",
@@ -2059,16 +2054,14 @@ bad_config:
 
         }
 
-        if (status == 0)
-                musb_debug_create("driver/musb_hdrc", musb);
-        else {
+        return 0;
+
 fail:
-                if (musb->clock)
-                        clk_put(musb->clock);
-                device_init_wakeup(dev, 0);
-                musb_free(musb);
-                return status;
-        }
+        if (musb->clock)
+                clk_put(musb->clock);
+        device_init_wakeup(dev, 0);
+        musb_free(musb);
+        return status;
 
 #ifdef CONFIG_SYSFS
         status = device_create_file(dev, &dev_attr_mode);
@@ -2131,7 +2124,6 @@ static int __devexit musb_remove(struct platform_device *pdev)
          *  - OTG mode: both roles are deactivated (or never-activated)
          */
         musb_shutdown(pdev);
-        musb_debug_delete("driver/musb_hdrc", musb);
 #ifdef CONFIG_USB_MUSB_HDRC_HCD
         if (musb->board_mode == MUSB_HOST)
                 usb_remove_hcd(musb_to_hcd(musb));
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index eade46d81708..82227251931b 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -485,23 +485,4 @@ extern int musb_platform_get_vbus_status(struct musb *musb);
 extern int __init musb_platform_init(struct musb *musb);
 extern int musb_platform_exit(struct musb *musb);
 
-/*-------------------------- ProcFS definitions ---------------------*/
-
-struct proc_dir_entry;
-
-#if (MUSB_DEBUG > 0) && defined(MUSB_CONFIG_PROC_FS)
-extern struct proc_dir_entry *musb_debug_create(char *name, struct musb *data);
-extern void musb_debug_delete(char *name, struct musb *data);
-
-#else
-static inline struct proc_dir_entry *
-musb_debug_create(char *name, struct musb *data)
-{
-        return NULL;
-}
-static inline void musb_debug_delete(char *name, struct musb *data)
-{
-}
-#endif
-
 #endif  /* __MUSB_CORE_H__ */
diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h
index 3bdb311e820d..4d2794441b15 100644
--- a/drivers/usb/musb/musb_debug.h
+++ b/drivers/usb/musb/musb_debug.h
@@ -48,11 +48,7 @@
                                 __func__, __LINE__ , ## args); \
         } } while (0)
 
-#if MUSB_DEBUG > 0
 extern unsigned debug;
-#else
-#define debug   0
-#endif
 
 static inline int _dbg_level(unsigned l)
 {
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 48d7d3ccb243..a57652fff39c 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -476,6 +476,7 @@ static void ep0_rxstate(struct musb *musb)
                         return;
                 musb->ackpend = 0;
         }
+        musb_ep_select(musb->mregs, 0);
         musb_writew(regs, MUSB_CSR0, tmp);
 }
 
@@ -528,6 +529,7 @@ static void ep0_txstate(struct musb *musb)
         }
 
         /* send it out, triggering a "txpktrdy cleared" irq */
+        musb_ep_select(musb->mregs, 0);
         musb_writew(regs, MUSB_CSR0, csr);
 }
 
diff --git a/drivers/usb/musb/musb_procfs.c b/drivers/usb/musb/musb_procfs.c
deleted file mode 100644
index 55e6b78bdccc..000000000000
--- a/drivers/usb/musb/musb_procfs.c
+++ /dev/null
@@ -1,830 +0,0 @@
-/*
- * MUSB OTG driver debug support
- *
- * Copyright 2005 Mentor Graphics Corporation
- * Copyright (C) 2005-2006 by Texas Instruments
- * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/uaccess.h>      /* FIXME remove procfs writes */
-#include <asm/arch/hardware.h>
-
-#include "musb_core.h"
-
-#include "davinci.h"
-
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
-
-static int dump_qh(struct musb_qh *qh, char *buf, unsigned max)
-{
-        int                             count;
-        int                             tmp;
-        struct usb_host_endpoint        *hep = qh->hep;
-        struct urb                      *urb;
-
-        count = snprintf(buf, max, "    qh %p dev%d ep%d%s max%d\n",
-                        qh, qh->dev->devnum, qh->epnum,
-                        ({ char *s; switch (qh->type) {
-                        case USB_ENDPOINT_XFER_BULK:
-                                s = "-bulk"; break;
-                        case USB_ENDPOINT_XFER_INT:
-                                s = "-int"; break;
-                        case USB_ENDPOINT_XFER_CONTROL:
-                                s = ""; break;
-                        default:
-                                s = "iso"; break;
-                        }; s; }),
-                        qh->maxpacket);
-        if (count <= 0)
-                return 0;
-        buf += count;
-        max -= count;
-
-        list_for_each_entry(urb, &hep->urb_list, urb_list) {
-                tmp = snprintf(buf, max, "\t%s urb %p %d/%d\n",
-                                usb_pipein(urb->pipe) ? "in" : "out",
-                                urb, urb->actual_length,
-                                urb->transfer_buffer_length);
-                if (tmp <= 0)
-                        break;
-                tmp = min(tmp, (int)max);
-                count += tmp;
-                buf += tmp;
-                max -= tmp;
-        }
-        return count;
-}
-
-static int
-dump_queue(struct list_head *q, char *buf, unsigned max)
-{
-        int             count = 0;
-        struct musb_qh  *qh;
-
-        list_for_each_entry(qh, q, ring) {
-                int     tmp;
-
-                tmp = dump_qh(qh, buf, max);
-                if (tmp <= 0)
-                        break;
-                tmp = min(tmp, (int)max);
-                count += tmp;
-                buf += tmp;
-                max -= tmp;
-        }
-        return count;
-}
-
-#endif  /* HCD */
-
-#ifdef CONFIG_USB_GADGET_MUSB_HDRC
-static int dump_ep(struct musb_ep *ep, char *buffer, unsigned max)
-{
-        char            *buf = buffer;
-        int             code = 0;
-        void __iomem    *regs = ep->hw_ep->regs;
-        char            *mode = "1buf";
-
-        if (ep->is_in) {
-                if (ep->hw_ep->tx_double_buffered)
-                        mode = "2buf";
-        } else {
-                if (ep->hw_ep->rx_double_buffered)
-                        mode = "2buf";
-        }
-
-        do {
-                struct usb_request      *req;
-
-                code = snprintf(buf, max,
-                                "\n%s (hw%d): %s%s, csr %04x maxp %04x\n",
-                                ep->name, ep->current_epnum,
-                                mode, ep->dma ? " dma" : "",
-                                musb_readw(regs,
-                                        (ep->is_in || !ep->current_epnum)
-                                                ? MUSB_TXCSR
-                                                : MUSB_RXCSR),
-                                musb_readw(regs, ep->is_in
-                                                ? MUSB_TXMAXP
-                                                : MUSB_RXMAXP)
-                                );
-                if (code <= 0)
-                        break;
-                code = min(code, (int) max);
-                buf += code;
-                max -= code;
-
-                if (is_cppi_enabled() && ep->current_epnum) {
-                        unsigned        cppi = ep->current_epnum - 1;
-                        void __iomem    *base = ep->musb->ctrl_base;
-                        unsigned        off1 = cppi << 2;
-                        void __iomem    *ram = base;
-                        char            tmp[16];
-
-                        if (ep->is_in) {
-                                ram += DAVINCI_TXCPPI_STATERAM_OFFSET(cppi);
-                                tmp[0] = 0;
-                        } else {
-                                ram += DAVINCI_RXCPPI_STATERAM_OFFSET(cppi);
-                                snprintf(tmp, sizeof tmp, "%d left, ",
-                                        musb_readl(base,
-                                        DAVINCI_RXCPPI_BUFCNT0_REG + off1));
-                        }
-
-                        code = snprintf(buf, max, "%cX DMA%d: %s"
-                                        "%08x %08x, %08x %08x; "
-                                        "%08x %08x %08x .. %08x\n",
-                                ep->is_in ? 'T' : 'R',
-                                ep->current_epnum - 1, tmp,
-                                musb_readl(ram, 0 * 4),
-                                musb_readl(ram, 1 * 4),
-                                musb_readl(ram, 2 * 4),
-                                musb_readl(ram, 3 * 4),
-                                musb_readl(ram, 4 * 4),
-                                musb_readl(ram, 5 * 4),
-                                musb_readl(ram, 6 * 4),
-                                musb_readl(ram, 7 * 4));
-                        if (code <= 0)
-                                break;
-                        code = min(code, (int) max);
-                        buf += code;
-                        max -= code;
-                }
-
-                if (list_empty(&ep->req_list)) {
-                        code = snprintf(buf, max, "\t(queue empty)\n");
-                        if (code <= 0)
-                                break;
-                        code = min(code, (int) max);
-                        buf += code;
-                        max -= code;
-                        break;
-                }
-                list_for_each_entry(req, &ep->req_list, list) {
-                        code = snprintf(buf, max, "\treq %p, %s%s%d/%d\n",
-                                        req,
-                                        req->zero ? "zero, " : "",
-                                        req->short_not_ok ? "!short, " : "",
-                                        req->actual, req->length);
-                        if (code <= 0)
-                                break;
-                        code = min(code, (int) max);
-                        buf += code;
-                        max -= code;
-                }
-        } while (0);
-        return buf - buffer;
-}
-#endif
-
-static int
-dump_end_info(struct musb *musb, u8 epnum, char *aBuffer, unsigned max)
-{
-        int                     code = 0;
-        char                    *buf = aBuffer;
-        struct musb_hw_ep       *hw_ep = &musb->endpoints[epnum];
-
-        do {
-                musb_ep_select(musb->mregs, epnum);
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
-                if (is_host_active(musb)) {
-                        int             dump_rx, dump_tx;
-                        void __iomem    *regs = hw_ep->regs;
-
-                        /* TEMPORARY (!) until we have a real periodic
-                         * schedule tree ...
-                         */
-                        if (!epnum) {
-                                /* control is shared, uses RX queue
-                                 * but (mostly) shadowed tx registers
-                                 */
-                                dump_tx = !list_empty(&musb->control);
-                                dump_rx = 0;
-                        } else if (hw_ep == musb->bulk_ep) {
-                                dump_tx = !list_empty(&musb->out_bulk);
-                                dump_rx = !list_empty(&musb->in_bulk);
-                        } else if (musb->periodic[epnum]) {
-                                struct usb_host_endpoint        *hep;
-
-                                hep = musb->periodic[epnum]->hep;
-                                dump_rx = hep->desc.bEndpointAddress
-                                                & USB_ENDPOINT_DIR_MASK;
-                                dump_tx = !dump_rx;
-                        } else
-                                break;
-                        /* END TEMPORARY */
-
-
-                        if (dump_rx) {
-                                code = snprintf(buf, max,
-                                        "\nRX%d: %s rxcsr %04x interval %02x "
-                                        "max %04x type %02x; "
-                                        "dev %d hub %d port %d"
-                                        "\n",
-                                        epnum,
-                                        hw_ep->rx_double_buffered
-                                                ? "2buf" : "1buf",
-                                        musb_readw(regs, MUSB_RXCSR),
-                                        musb_readb(regs, MUSB_RXINTERVAL),
-                                        musb_readw(regs, MUSB_RXMAXP),
-                                        musb_readb(regs, MUSB_RXTYPE),
-                                        /* FIXME:  assumes multipoint */
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_RXFUNCADDR)),
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_RXHUBADDR)),
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_RXHUBPORT))
-                                        );
-                                if (code <= 0)
-                                        break;
-                                code = min(code, (int) max);
-                                buf += code;
-                                max -= code;
-
-                                if (is_cppi_enabled()
-                                                && epnum
-                                                && hw_ep->rx_channel) {
-                                        unsigned        cppi = epnum - 1;
-                                        unsigned        off1 = cppi << 2;
-                                        void __iomem    *base;
-                                        void __iomem    *ram;
-                                        char            tmp[16];
-
-                                        base = musb->ctrl_base;
-                                        ram = DAVINCI_RXCPPI_STATERAM_OFFSET(
-                                                        cppi) + base;
-                                        snprintf(tmp, sizeof tmp, "%d left, ",
-                                                musb_readl(base,
-                                                DAVINCI_RXCPPI_BUFCNT0_REG
-                                                                + off1));
-
-                                        code = snprintf(buf, max,
-                                                "    rx dma%d: %s"
-                                                "%08x %08x, %08x %08x; "
-                                                "%08x %08x %08x .. %08x\n",
-                                                cppi, tmp,
-                                                musb_readl(ram, 0 * 4),
-                                                musb_readl(ram, 1 * 4),
-                                                musb_readl(ram, 2 * 4),
-                                                musb_readl(ram, 3 * 4),
-                                                musb_readl(ram, 4 * 4),
-                                                musb_readl(ram, 5 * 4),
-                                                musb_readl(ram, 6 * 4),
-                                                musb_readl(ram, 7 * 4));
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                }
-
-                                if (hw_ep == musb->bulk_ep
-                                                && !list_empty(
-                                                        &musb->in_bulk)) {
-                                        code = dump_queue(&musb->in_bulk,
-                                                        buf, max);
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                } else if (musb->periodic[epnum]) {
-                                        code = dump_qh(musb->periodic[epnum],
-                                                        buf, max);
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                }
-                        }
-
-                        if (dump_tx) {
-                                code = snprintf(buf, max,
-                                        "\nTX%d: %s txcsr %04x interval %02x "
-                                        "max %04x type %02x; "
-                                        "dev %d hub %d port %d"
-                                        "\n",
-                                        epnum,
-                                        hw_ep->tx_double_buffered
-                                                ? "2buf" : "1buf",
-                                        musb_readw(regs, MUSB_TXCSR),
-                                        musb_readb(regs, MUSB_TXINTERVAL),
-                                        musb_readw(regs, MUSB_TXMAXP),
-                                        musb_readb(regs, MUSB_TXTYPE),
-                                        /* FIXME:  assumes multipoint */
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_TXFUNCADDR)),
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_TXHUBADDR)),
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_TXHUBPORT))
-                                        );
-                                if (code <= 0)
-                                        break;
-                                code = min(code, (int) max);
-                                buf += code;
-                                max -= code;
-
-                                if (is_cppi_enabled()
-                                                && epnum
-                                                && hw_ep->tx_channel) {
-                                        unsigned        cppi = epnum - 1;
-                                        void __iomem    *base;
-                                        void __iomem    *ram;
-
-                                        base = musb->ctrl_base;
-                                        ram = DAVINCI_RXCPPI_STATERAM_OFFSET(
-                                                        cppi) + base;
-                                        code = snprintf(buf, max,
-                                                "    tx dma%d: "
-                                                "%08x %08x, %08x %08x; "
-                                                "%08x %08x %08x .. %08x\n",
-                                                cppi,
-                                                musb_readl(ram, 0 * 4),
-                                                musb_readl(ram, 1 * 4),
-                                                musb_readl(ram, 2 * 4),
-                                                musb_readl(ram, 3 * 4),
-                                                musb_readl(ram, 4 * 4),
-                                                musb_readl(ram, 5 * 4),
-                                                musb_readl(ram, 6 * 4),
-                                                musb_readl(ram, 7 * 4));
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                }
-
-                                if (hw_ep == musb->control_ep
-                                                && !list_empty(
-                                                        &musb->control)) {
-                                        code = dump_queue(&musb->control,
-                                                        buf, max);
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                } else if (hw_ep == musb->bulk_ep
-                                                && !list_empty(
-                                                        &musb->out_bulk)) {
-                                        code = dump_queue(&musb->out_bulk,
-                                                        buf, max);
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                } else if (musb->periodic[epnum]) {
-                                        code = dump_qh(musb->periodic[epnum],
-                                                        buf, max);
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                }
-                        }
-                }
-#endif
-#ifdef CONFIG_USB_GADGET_MUSB_HDRC
-                if (is_peripheral_active(musb)) {
-                        code = 0;
-
-                        if (hw_ep->ep_in.desc || !epnum) {
-                                code = dump_ep(&hw_ep->ep_in, buf, max);
-                                if (code <= 0)
-                                        break;
-                                code = min(code, (int) max);
-                                buf += code;
-                                max -= code;
-                        }
-                        if (hw_ep->ep_out.desc) {
-                                code = dump_ep(&hw_ep->ep_out, buf, max);
-                                if (code <= 0)
-                                        break;
-                                code = min(code, (int) max);
-                                buf += code;
-                                max -= code;
-                        }
-                }
-#endif
-        } while (0);
-
-        return buf - aBuffer;
-}
-
-/* Dump the current status and compile options.
- * @param musb the device driver instance
- * @param buffer where to dump the status; it must be big enough to hold the
- * result otherwise "BAD THINGS HAPPENS(TM)".
- */
-static int dump_header_stats(struct musb *musb, char *buffer)
-{
-        int code, count = 0;
-        const void __iomem *mbase = musb->mregs;
-
-        *buffer = 0;
-        count = sprintf(buffer, "Status: %sHDRC, Mode=%s "
-                                "(Power=%02x, DevCtl=%02x)\n",
-                        (musb->is_multipoint ? "M" : ""), MUSB_MODE(musb),
-                        musb_readb(mbase, MUSB_POWER),
-                        musb_readb(mbase, MUSB_DEVCTL));
-        if (count <= 0)
-                return 0;
-        buffer += count;
-
-        code = sprintf(buffer, "OTG state: %s; %sactive\n",
-                        otg_state_string(musb),
-                        musb->is_active ? "" : "in");
-        if (code <= 0)
-                goto done;
-        buffer += code;
-        count += code;
-
-        code = sprintf(buffer,
-                        "Options: "
-#ifdef CONFIG_MUSB_PIO_ONLY
-                        "pio"
-#elif defined(CONFIG_USB_TI_CPPI_DMA)
-                        "cppi-dma"
-#elif defined(CONFIG_USB_INVENTRA_DMA)
-                        "musb-dma"
-#elif defined(CONFIG_USB_TUSB_OMAP_DMA)
-                        "tusb-omap-dma"
-#else
-                        "?dma?"
-#endif
-                        ", "
-#ifdef CONFIG_USB_MUSB_OTG
-                        "otg (peripheral+host)"
-#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)
-                        "peripheral"
-#elif defined(CONFIG_USB_MUSB_HDRC_HCD)
-                        "host"
-#endif
-                        ", debug=%d [eps=%d]\n",
-                debug,
-                musb->nr_endpoints);
-        if (code <= 0)
-                goto done;
-        count += code;
-        buffer += code;
-
-#ifdef  CONFIG_USB_GADGET_MUSB_HDRC
-        code = sprintf(buffer, "Peripheral address: %02x\n",
-                        musb_readb(musb->ctrl_base, MUSB_FADDR));
-        if (code <= 0)
-                goto done;
-        buffer += code;
-        count += code;
-#endif
-
-#ifdef  CONFIG_USB_MUSB_HDRC_HCD
-        code = sprintf(buffer, "Root port status: %08x\n",
-                        musb->port1_status);
-        if (code <= 0)
-                goto done;
-        buffer += code;
-        count += code;
-#endif
-
-#ifdef  CONFIG_ARCH_DAVINCI
-        code = sprintf(buffer,
-                        "DaVinci: ctrl=%02x stat=%1x phy=%03x\n"
-                        "\trndis=%05x auto=%04x intsrc=%08x intmsk=%08x"
-                        "\n",
-                        musb_readl(musb->ctrl_base, DAVINCI_USB_CTRL_REG),
-                        musb_readl(musb->ctrl_base, DAVINCI_USB_STAT_REG),
-                        __raw_readl((void __force __iomem *)
-                                        IO_ADDRESS(USBPHY_CTL_PADDR)),
-                        musb_readl(musb->ctrl_base, DAVINCI_RNDIS_REG),
-                        musb_readl(musb->ctrl_base, DAVINCI_AUTOREQ_REG),
-                        musb_readl(musb->ctrl_base,
-                                        DAVINCI_USB_INT_SOURCE_REG),
-                        musb_readl(musb->ctrl_base,
-                                        DAVINCI_USB_INT_MASK_REG));
-        if (code <= 0)
-                goto done;
-        count += code;
-        buffer += code;
-#endif  /* DAVINCI */
-
-#ifdef CONFIG_USB_TUSB6010
-        code = sprintf(buffer,
-                        "TUSB6010: devconf %08x, phy enable %08x drive %08x"
-                        "\n\totg %03x timer %08x"
-                        "\n\tprcm conf %08x mgmt %08x; int src %08x mask %08x"
-                        "\n",
-                        musb_readl(musb->ctrl_base, TUSB_DEV_CONF),
-                        musb_readl(musb->ctrl_base, TUSB_PHY_OTG_CTRL_ENABLE),
-                        musb_readl(musb->ctrl_base, TUSB_PHY_OTG_CTRL),
-                        musb_readl(musb->ctrl_base, TUSB_DEV_OTG_STAT),
-                        musb_readl(musb->ctrl_base, TUSB_DEV_OTG_TIMER),
-                        musb_readl(musb->ctrl_base, TUSB_PRCM_CONF),
-                        musb_readl(musb->ctrl_base, TUSB_PRCM_MNGMT),
-                        musb_readl(musb->ctrl_base, TUSB_INT_SRC),
-                        musb_readl(musb->ctrl_base, TUSB_INT_MASK));
-        if (code <= 0)
-                goto done;
-        count += code;
-        buffer += code;
-#endif  /* DAVINCI */
-
-        if (is_cppi_enabled() && musb->dma_controller) {
-                code = sprintf(buffer,
-                                "CPPI: txcr=%d txsrc=%01x txena=%01x; "
-                                "rxcr=%d rxsrc=%01x rxena=%01x "
-                                "\n",
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_TXCPPI_CTRL_REG),
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_TXCPPI_RAW_REG),
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_TXCPPI_INTENAB_REG),
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_RXCPPI_CTRL_REG),
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_RXCPPI_RAW_REG),
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_RXCPPI_INTENAB_REG));
-                if (code <= 0)
-                        goto done;
-                count += code;
-                buffer += code;
-        }
-
-#ifdef CONFIG_USB_GADGET_MUSB_HDRC
-        if (is_peripheral_enabled(musb)) {
-                code = sprintf(buffer, "Gadget driver: %s\n",
-                                musb->gadget_driver
-                                        ? musb->gadget_driver->driver.name
-                                        : "(none)");
-                if (code <= 0)
-                        goto done;
-                count += code;
-                buffer += code;
-        }
-#endif
-
-done:
-        return count;
-}
-
-/* Write to ProcFS
- *
- * C soft-connect
- * c soft-disconnect
- * I enable HS
- * i disable HS
- * s stop session
- * F force session (OTG-unfriendly)
- * E rElinquish bus (OTG)
- * H request host mode
- * h cancel host request
- * T start sending TEST_PACKET
- * D<num> set/query the debug level
- */
-static int musb_proc_write(struct file *file, const char __user *buffer,
-                        unsigned long count, void *data)
-{
-        char cmd;
-        u8 reg;
-        struct musb *musb = (struct musb *)data;
-        void __iomem *mbase = musb->mregs;
-
-        /* MOD_INC_USE_COUNT; */
-
-        if (unlikely(copy_from_user(&cmd, buffer, 1)))
-                return -EFAULT;
-
-        switch (cmd) {
-        case 'C':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_POWER)
-                                        | MUSB_POWER_SOFTCONN;
-                        musb_writeb(mbase, MUSB_POWER, reg);
-                }
-                break;
-
-        case 'c':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_POWER)
-                                        & ~MUSB_POWER_SOFTCONN;
-                        musb_writeb(mbase, MUSB_POWER, reg);
-                }
-                break;
-
-        case 'I':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_POWER)
-                                        | MUSB_POWER_HSENAB;
-                        musb_writeb(mbase, MUSB_POWER, reg);
-                }
-                break;
-
-        case 'i':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_POWER)
-                                        & ~MUSB_POWER_HSENAB;
-                        musb_writeb(mbase, MUSB_POWER, reg);
-                }
-                break;
-
-        case 'F':
-                reg = musb_readb(mbase, MUSB_DEVCTL);
-                reg |= MUSB_DEVCTL_SESSION;
-                musb_writeb(mbase, MUSB_DEVCTL, reg);
-                break;
-
-        case 'H':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_DEVCTL);
-                        reg |= MUSB_DEVCTL_HR;
-                        musb_writeb(mbase, MUSB_DEVCTL, reg);
-                        /* MUSB_HST_MODE( ((struct musb*)data) ); */
-                        /* WARNING("Host Mode\n"); */
-                }
-                break;
-
-        case 'h':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_DEVCTL);
-                        reg &= ~MUSB_DEVCTL_HR;
-                        musb_writeb(mbase, MUSB_DEVCTL, reg);
-                }
-                break;
-
-        case 'T':
-                if (mbase) {
-                        musb_load_testpacket(musb);
-                        musb_writeb(mbase, MUSB_TESTMODE,
-                                        MUSB_TEST_PACKET);
-                }
-                break;
-
-#if (MUSB_DEBUG > 0)
-                /* set/read debug level */
-        case 'D':{
-                        if (count > 1) {
-                                char digits[8], *p = digits;
-                                int i = 0, level = 0, sign = 1;
-                                int len = min(count - 1, (unsigned long)8);
-
-                                if (copy_from_user(&digits, &buffer[1], len))
-                                        return -EFAULT;
-
-                                /* optional sign */
-                                if (*p == '-') {
-                                        len -= 1;
-                                        sign = -sign;
-                                        p++;
-                                }
-
-                                /* read it */
-                                while (i++ < len && *p > '0' && *p < '9') {
-                                        level = level * 10 + (*p - '0');
-                                        p++;
-                                }
-
-                                level *= sign;
-                                DBG(1, "debug level %d\n", level);
-                                debug = level;
-                        }
-                }
-                break;
-
-
-        case '?':
-                INFO("?: you are seeing it\n");
-                INFO("C/c: soft connect enable/disable\n");
-                INFO("I/i: hispeed enable/disable\n");
-                INFO("F: force session start\n");
-                INFO("H: host mode\n");
-                INFO("T: start sending TEST_PACKET\n");
-                INFO("D: set/read dbug level\n");
-                break;
-#endif
-
-        default:
-                ERR("Command %c not implemented\n", cmd);
-                break;
-        }
-
-        musb_platform_try_idle(musb, 0);
-
-        return count;
-}
-
-static int musb_proc_read(char *page, char **start,
-                        off_t off, int count, int *eof, void *data)
-{
-        char *buffer = page;
-        int code = 0;
-        unsigned long   flags;
-        struct musb     *musb = data;
-        unsigned        epnum;
-
-        count -= off;
-        count -= 1;             /* for NUL at end */
-        if (count <= 0)
-                return -EINVAL;
-
-        spin_lock_irqsave(&musb->lock, flags);
-
-        code = dump_header_stats(musb, buffer);
-        if (code > 0) {
-                buffer += code;
-                count -= code;
-        }
-
-        /* generate the report for the end points */
-        /* REVISIT ... not unless something's connected! */
-        for (epnum = 0; count >= 0 && epnum < musb->nr_endpoints;
-                        epnum++) {
-                code = dump_end_info(musb, epnum, buffer, count);
-                if (code > 0) {
-                        buffer += code;
-                        count -= code;
-                }
-        }
-
-        musb_platform_try_idle(musb, 0);
-
-        spin_unlock_irqrestore(&musb->lock, flags);
-        *eof = 1;
-
-        return buffer - page;
-}
-
-void __devexit musb_debug_delete(char *name, struct musb *musb)
-{
-        if (musb->proc_entry)
-                remove_proc_entry(name, NULL);
-}
-
-struct proc_dir_entry *__init
-musb_debug_create(char *name, struct musb *data)
-{
-        struct proc_dir_entry   *pde;
-
-        /* FIXME convert everything to seq_file; then later, debugfs */
-
-        if (!name)
-                return NULL;
-
-        pde = create_proc_entry(name, S_IFREG | S_IRUGO | S_IWUSR, NULL);
-        data->proc_entry = pde;
-        if (pde) {
-                pde->data = data;
-                /* pde->owner = THIS_MODULE; */
-
-                pde->read_proc = musb_proc_read;
-                pde->write_proc = musb_proc_write;
-
-                pde->size = 0;
-
-                pr_debug("Registered /proc/%s\n", name);
-        } else {
-                pr_debug("Cannot create a valid proc file entry");
-        }
-
-        return pde;
-}
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 298b22e6ad0d..9d2dcb121c5e 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -35,8 +35,8 @@
 #include <linux/io.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/mux.h>
+#include <mach/hardware.h>
+#include <mach/mux.h>
 
 #include "musb_core.h"
 #include "omap2430.h"
diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
index 786a62071f72..dc7670718cd2 100644
--- a/drivers/usb/musb/omap2430.h
+++ b/drivers/usb/musb/omap2430.h
@@ -11,8 +11,8 @@
 #define __MUSB_OMAP243X_H__
 
 #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
-#include <asm/arch/hardware.h>
-#include <asm/arch/usb.h>
+#include <mach/hardware.h>
+#include <mach/usb.h>
 
 /*
  * OMAP2430-specific definitions
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/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 442cba69cce5..1279553381e3 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -72,6 +72,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
         { USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */
         { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
+        { USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */
         { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */
         { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */
         { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
@@ -83,6 +84,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */
         { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
         { USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */
+        { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
         { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
@@ -93,6 +95,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
         { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */
         { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
+        { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
         { } /* Terminating Entry */
 };
 
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 984f6eff4c47..3dc93b542b30 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -654,6 +654,9 @@ static struct usb_device_id id_table_combined [] = {
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
         { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) },
+        { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) },
         { },                                    /* Optional parameter entry */
         { }                                     /* Terminating entry */
 };
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 382265bba969..8a5b6df3a976 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -750,6 +750,7 @@
 
 #define PAPOUCH_VID                     0x5050  /* Vendor ID */
 #define PAPOUCH_TMU_PID                 0x0400  /* TMU USB Thermometer */
+#define PAPOUCH_QUIDO4x4_PID            0x0900  /* Quido 4/4 Module */
 
 /*
  * ACG Identification Technologies GmbH products (http://www.acg.de/).
@@ -838,6 +839,10 @@
 /* Rig Expert Ukraine devices */
 #define FTDI_REU_TINY_PID               0xED22  /* RigExpert Tiny */
 
+/* Domintell products  http://www.domintell.com */
+#define FTDI_DOMINTELL_DGQG_PID 0xEF50  /* Master */
+#define FTDI_DOMINTELL_DUSB_PID 0xEF51  /* DUSB01 module */
+
 /* Commands */
 #define FTDI_SIO_RESET          0 /* Reset the port */
 #define FTDI_SIO_MODEM_CTRL     1 /* Set the modem control register */
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 2e663f1afd5e..d95382088075 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -38,8 +38,6 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
-#include <linux/version.h>
-
 /* the mode to be set when the port ist opened */
 static int initial_mode = 1;
 
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index e143198aeb02..73f8277f88f2 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -173,6 +173,7 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
 #define KYOCERA_PRODUCT_KPC680                  0x180a
 
 #define ANYDATA_VENDOR_ID                       0x16d5
+#define ANYDATA_PRODUCT_ADU_620UW               0x6202
 #define ANYDATA_PRODUCT_ADU_E100A               0x6501
 #define ANYDATA_PRODUCT_ADU_500A                0x6502
 
@@ -217,6 +218,7 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
 /* ZTE PRODUCTS */
 #define ZTE_VENDOR_ID                           0x19d2
 #define ZTE_PRODUCT_MF628                       0x0015
+#define ZTE_PRODUCT_CDMA_TECH                   0xfffe
 
 static struct usb_device_id option_ids[] = {
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
@@ -318,6 +320,7 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(DELL_VENDOR_ID, 0x8138) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
+        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) },
         { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) },
         { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) },
         { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) },
@@ -345,6 +348,7 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
         { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) },
+        { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 706033753adb..ea1a103c99be 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -14,7 +14,7 @@
   Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org>
 */
 
-#define DRIVER_VERSION "v.1.2.13a"
+#define DRIVER_VERSION "v.1.3.2"
 #define DRIVER_AUTHOR "Kevin Lloyd <klloyd@sierrawireless.com>"
 #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems"
 
@@ -30,9 +30,6 @@
 
 #define SWIMS_USB_REQUEST_SetPower      0x00
 #define SWIMS_USB_REQUEST_SetNmea       0x07
-#define SWIMS_USB_REQUEST_SetMode       0x0B
-#define SWIMS_USB_REQUEST_GetSwocInfo   0x0A
-#define SWIMS_SET_MODE_Modem            0x0001
 
 /* per port private data */
 #define N_IN_URB        4
@@ -163,7 +160,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x1199, 0x0017) }, /* Sierra Wireless EM5625 */
         { USB_DEVICE(0x1199, 0x0018) }, /* Sierra Wireless MC5720 */
         { USB_DEVICE(0x1199, 0x0218) }, /* Sierra Wireless MC5720 */
-        { USB_DEVICE(0x0f30, 0x1b1d) }, /* Sierra Wireless MC5720 */
+        { USB_DEVICE(0x03f0, 0x1b1d) }, /* HP ev2200 a.k.a MC5720 */
         { USB_DEVICE(0x1199, 0x0020) }, /* Sierra Wireless MC5725 */
         { USB_DEVICE(0x1199, 0x0024) }, /* Sierra Wireless MC5727 */
         { USB_DEVICE(0x1199, 0x0220) }, /* Sierra Wireless MC5725 */
@@ -175,6 +172,8 @@ static struct usb_device_id id_table [] = {
          /* Sierra Wireless Device */
         { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0025, 0xFF, 0xFF, 0xFF) },
         { USB_DEVICE(0x1199, 0x0026) }, /* Sierra Wireless Device */
+        { USB_DEVICE(0x1199, 0x0027) }, /* Sierra Wireless Device */
+        { USB_DEVICE(0x1199, 0x0028) }, /* Sierra Wireless Device */
 
         { USB_DEVICE(0x1199, 0x6802) }, /* Sierra Wireless MC8755 */
         { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */
@@ -187,6 +186,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x1199, 0x6821) }, /* Sierra Wireless AirCard 875U */
         { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780 */
         { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781 */
+        { USB_DEVICE(0x1199, 0x683A) }, /* Sierra Wireless MC8785 */
         { USB_DEVICE(0x1199, 0x683B) }, /* Sierra Wireless MC8785 Composite */
         { USB_DEVICE(0x1199, 0x683C) }, /* Sierra Wireless MC8790 */
         { USB_DEVICE(0x1199, 0x683D) }, /* Sierra Wireless MC8790 */
@@ -204,6 +204,8 @@ static struct usb_device_id id_table [] = {
         /* Sierra Wireless Device */
         { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6890, 0xFF, 0xFF, 0xFF)},
         /* Sierra Wireless Device */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6891, 0xFF, 0xFF, 0xFF)},
+        /* Sierra Wireless Device */
         { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)},
 
         { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index e39c779e4160..9a3e495c769c 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -1744,7 +1744,7 @@ static int ti_download_firmware(struct ti_device *tdev, int type)
         if (buffer) {
                 memcpy(buffer, fw_p->data, fw_p->size);
                 memset(buffer + fw_p->size, 0xff, buffer_size - fw_p->size);
-                ti_do_download(dev, pipe, buffer, fw_p->size);
+                status = ti_do_download(dev, pipe, buffer, fw_p->size);
                 kfree(buffer);
         }
         release_firmware(fw_p);
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index b157c48e8b78..4f7f9e3ae0a4 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -733,7 +733,9 @@ int usb_serial_probe(struct usb_interface *interface,
             ((le16_to_cpu(dev->descriptor.idVendor) == ATEN_VENDOR_ID) &&
              (le16_to_cpu(dev->descriptor.idProduct) == ATEN_PRODUCT_ID)) ||
             ((le16_to_cpu(dev->descriptor.idVendor) == ALCOR_VENDOR_ID) &&
-             (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID))) {
+             (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID)) ||
+            ((le16_to_cpu(dev->descriptor.idVendor) == SIEMENS_VENDOR_ID) &&
+             (le16_to_cpu(dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_EF81))) {
                 if (interface != dev->actconfig->interface[0]) {
                         /* check out the endpoints of the other interface*/
                         iface_desc = dev->actconfig->interface[0]->cur_altsetting;
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index c76034672c18..3d9249632ae1 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -146,18 +146,6 @@ config USB_STORAGE_KARMA
           on the resulting scsi device node returns the Karma to normal
           operation.
 
-config USB_STORAGE_SIERRA
-        bool "Sierra Wireless TRU-Install Feature Support"
-        depends on USB_STORAGE
-        help
-          Say Y here to include additional code to support Sierra Wireless
-          products with the TRU-Install feature (e.g., AC597E, AC881U).
-
-          This code switches the Sierra Wireless device from being in
-          Mass Storage mode to Modem mode. It also has the ability to
-          support host software upgrades should full Linux support be added
-          to TRU-Install.
-
 config USB_STORAGE_CYPRESS_ATACB
         bool "SAT emulation on Cypress USB/ATA Bridge with ATACB"
         depends on USB_STORAGE
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
index bc3415b475c9..7f8beb5366ae 100644
--- a/drivers/usb/storage/Makefile
+++ b/drivers/usb/storage/Makefile
@@ -21,11 +21,10 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT)	+= jumpshot.o
 usb-storage-obj-$(CONFIG_USB_STORAGE_ALAUDA)    += alauda.o
 usb-storage-obj-$(CONFIG_USB_STORAGE_ONETOUCH)  += onetouch.o
 usb-storage-obj-$(CONFIG_USB_STORAGE_KARMA)     += karma.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_SIERRA)    += sierra_ms.o
 usb-storage-obj-$(CONFIG_USB_STORAGE_CYPRESS_ATACB) += cypress_atacb.o
 
 usb-storage-objs :=     scsiglue.o protocol.o transport.o usb.o \
-                        initializers.o $(usb-storage-obj-y)
+                        initializers.o sierra_ms.o $(usb-storage-obj-y)
 
 ifneq ($(CONFIG_USB_LIBUSUAL),)
         obj-$(CONFIG_USB)       += libusual.o
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index ba412e68d474..cd155475cb6e 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -160,6 +160,13 @@ UNUSUAL_DEV(  0x0421, 0x0019, 0x0592, 0x0592,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_MAX_SECTORS_64 ),
 
+/* Reported by Filip Joelsson <filip@blueturtle.nu> */
+UNUSUAL_DEV(  0x0421, 0x005d, 0x0001, 0x0600,
+                "Nokia",
+                "Nokia 3110c",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY ),
+
 /* Reported by Mario Rettig <mariorettig@web.de> */
 UNUSUAL_DEV(  0x0421, 0x042e, 0x0100, 0x0100,
                 "Nokia",
@@ -232,6 +239,20 @@ UNUSUAL_DEV(  0x0421, 0x04b9, 0x0551, 0x0551,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY ),
 
+/* Reported by Richard Nauber <RichardNauber@web.de> */
+UNUSUAL_DEV(  0x0421, 0x04fa, 0x0601, 0x0601,
+                "Nokia",
+                "6300",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY ),
+
+/* Patch for Nokia 5310 capacity */
+UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0591,
+        "Nokia",
+        "5310",
+        US_SC_DEVICE, US_PR_DEVICE, NULL,
+        US_FL_FIX_CAPACITY ),
+
 /* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */
 UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
                 "SMSC",
@@ -987,6 +1008,13 @@ UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY ),
 
+/* Reported by Adrian Pilchowiec <adi1981@epf.pl> */
+UNUSUAL_DEV(  0x071b, 0x3203, 0x0000, 0x0000,
+                "RockChip",
+                "MP3",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64),
+
 /* Reported by Massimiliano Ghilardi <massimiliano.ghilardi@gmail.com>
  * This USB MP3/AVI player device fails and disconnects if more than 128
  * sectors (64kB) are read/written in a single command, and may be present
@@ -1576,7 +1604,6 @@ UNUSUAL_DEV(  0x10d6, 0x2200, 0x0100, 0x0100,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 0),
 
-#ifdef CONFIG_USB_STORAGE_SIERRA
 /* Reported by Kevin Lloyd <linux@sierrawireless.com>
  * Entry is needed for the initializer function override,
  * which instructs the device to load as a modem
@@ -1587,7 +1614,6 @@ UNUSUAL_DEV(  0x1199, 0x0fff, 0x0000, 0x9999,
                 "USB MMC Storage",
                 US_SC_DEVICE, US_PR_DEVICE, sierra_ms_init,
                 0),
-#endif
 
 /* Reported by Jaco Kroon <jaco@kroon.co.za>
  * The usb-storage module found on the Digitech GNX4 (and supposedly other
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 73679aa506de..27016fd2cad1 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -102,9 +102,7 @@
 #ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB
 #include "cypress_atacb.h"
 #endif
-#ifdef CONFIG_USB_STORAGE_SIERRA
 #include "sierra_ms.h"
-#endif
 
 /* Some informational data */
 MODULE_AUTHOR("Matthew Dharm <mdharm-usb@one-eyed-alien.net>");
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 4bd569e479a7..314d18694b6a 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -11,7 +11,6 @@
  *  Code is based on s3fb
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 9c5925927ece..75dac578104f 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -208,6 +208,36 @@ static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2)
         return value;
 }
 
+static void atmel_lcdfb_stop_nowait(struct atmel_lcdfb_info *sinfo)
+{
+        /* Turn off the LCD controller and the DMA controller */
+        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
+                        sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
+
+        /* Wait for the LCDC core to become idle */
+        while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
+                msleep(10);
+
+        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
+}
+
+static void atmel_lcdfb_stop(struct atmel_lcdfb_info *sinfo)
+{
+        atmel_lcdfb_stop_nowait(sinfo);
+
+        /* Wait for DMA engine to become idle... */
+        while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
+                msleep(10);
+}
+
+static void atmel_lcdfb_start(struct atmel_lcdfb_info *sinfo)
+{
+        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
+        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
+                (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET)
+                | ATMEL_LCDC_PWR);
+}
+
 static void atmel_lcdfb_update_dma(struct fb_info *info,
                                struct fb_var_screeninfo *var)
 {
@@ -420,26 +450,8 @@ static void atmel_lcdfb_reset(struct atmel_lcdfb_info *sinfo)
 {
         might_sleep();
 
-        /* LCD power off */
-        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
-
-        /* wait for the LCDC core to become idle */
-        while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
-                msleep(10);
-
-        /* DMA disable */
-        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
-
-        /* wait for DMA engine to become idle */
-        while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
-                msleep(10);
-
-        /* LCD power on */
-        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
-                (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR);
-
-        /* DMA enable */
-        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
+        atmel_lcdfb_stop(sinfo);
+        atmel_lcdfb_start(sinfo);
 }
 
 /**
@@ -471,14 +483,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
                  info->var.xres, info->var.yres,
                  info->var.xres_virtual, info->var.yres_virtual);
 
-        /* Turn off the LCD controller and the DMA controller */
-        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
-
-        /* Wait for the LCDC core to become idle */
-        while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
-                msleep(10);
-
-        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
+        atmel_lcdfb_stop_nowait(sinfo);
 
         if (info->var.bits_per_pixel == 1)
                 info->fix.visual = FB_VISUAL_MONO01;
@@ -583,13 +588,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
         while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
                 msleep(10);
 
-        dev_dbg(info->device, "  * re-enable DMA engine\n");
-        /* ...and enable it with updated configuration */
-        lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
-
-        dev_dbg(info->device, "  * re-enable LCDC core\n");
-        lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
-                (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR);
+        atmel_lcdfb_start(sinfo);
 
         dev_dbg(info->device, "  * DONE\n");
 
@@ -939,7 +938,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 +954,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 +992,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);
@@ -1030,11 +1031,20 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
         struct fb_info *info = platform_get_drvdata(pdev);
         struct atmel_lcdfb_info *sinfo = info->par;
 
+        /*
+         * We don't want to handle interrupts while the clock is
+         * stopped. It may take forever.
+         */
+        lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
+
         sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
         lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(0);
+
+        atmel_lcdfb_stop(sinfo);
         atmel_lcdfb_stop_clock(sinfo);
+
         return 0;
 }
 
@@ -1044,9 +1054,15 @@ static int atmel_lcdfb_resume(struct platform_device *pdev)
         struct atmel_lcdfb_info *sinfo = info->par;
 
         atmel_lcdfb_start_clock(sinfo);
+        atmel_lcdfb_start(sinfo);
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(1);
         lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon);
+
+        /* Enable FIFO & DMA errors */
+        lcdc_writel(sinfo, ATMEL_LCDC_IER, ATMEL_LCDC_UFLWI
+                        | ATMEL_LCDC_OWRI | ATMEL_LCDC_MERI);
+
         return 0;
 }
 
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index 940467aed13f..7644ed249564 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -58,7 +58,7 @@
 #include <asm/gpio.h>
 #include <asm/portmux.h>
 
-#include <asm/mach/bf54x-lq043.h>
+#include <mach/bf54x-lq043.h>
 
 #define NO_BL_SUPPORT
 
@@ -733,7 +733,6 @@ static int bfin_bf54x_remove(struct platform_device *pdev)
 static int bfin_bf54x_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct fb_info *fbinfo = platform_get_drvdata(pdev);
-        struct bfin_bf54xfb_info *info = fbinfo->par;
 
         bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() & ~EPPI_EN);
         disable_dma(CH_EPPI0);
@@ -747,8 +746,18 @@ static int bfin_bf54x_resume(struct platform_device *pdev)
         struct fb_info *fbinfo = platform_get_drvdata(pdev);
         struct bfin_bf54xfb_info *info = fbinfo->par;
 
-        enable_dma(CH_EPPI0);
-        bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() | EPPI_EN);
+        if (info->lq043_open_cnt) {
+
+                bfin_write_EPPI0_CONTROL(0);
+                SSYNC();
+
+                config_dma(info);
+                config_ppi(info);
+
+                /* start dma */
+                enable_dma(CH_EPPI0);
+                bfin_write_EPPI0_CONTROL(bfin_read_EPPI0_CONTROL() | EPPI_EN);
+        }
 
         return 0;
 }
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index c14b2435d23e..e729fb279645 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -628,27 +628,18 @@ static long cirrusfb_get_mclk(long freq, int bpp, long *div)
 static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                               struct fb_info *info)
 {
-        int nom, den;           /* translyting from pixels->bytes */
-        int yres, i;
-        static struct { int xres, yres; } modes[] =
-        { { 1600, 1280 },
-          { 1280, 1024 },
-          { 1024, 768 },
-          { 800, 600 },
-          { 640, 480 },
-          { -1, -1 } };
+        int yres;
+        /* memory size in pixels */
+        unsigned pixels = info->screen_size * 8 / var->bits_per_pixel;
 
         switch (var->bits_per_pixel) {
         case 1:
-                nom = 4;
-                den = 8;
+                pixels /= 4;
                 break;          /* 8 pixel per byte, only 1/4th of mem usable */
         case 8:
         case 16:
         case 24:
         case 32:
-                nom = var->bits_per_pixel / 8;
-                den = 1;
                 break;          /* 1 pixel == 1 byte */
         default:
                 printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..."
@@ -658,43 +649,29 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                 return -EINVAL;
         }
 
-        if (var->xres * nom / den * var->yres > info->screen_size) {
-                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..."
-                        "resolution too high to fit into video memory!\n",
-                        var->xres, var->yres, var->bits_per_pixel);
-                DPRINTK("EXIT - EINVAL error\n");
-                return -EINVAL;
-        }
-
+        if (var->xres_virtual < var->xres)
+                var->xres_virtual = var->xres;
         /* use highest possible virtual resolution */
-        if (var->xres_virtual == -1 &&
-            var->yres_virtual == -1) {
-                printk(KERN_INFO
-                     "cirrusfb: using maximum available virtual resolution\n");
-                for (i = 0; modes[i].xres != -1; i++) {
-                        int size = modes[i].xres * nom / den * modes[i].yres;
-                        if (size < info->screen_size / 2)
-                                break;
-                }
-                if (modes[i].xres == -1) {
-                        printk(KERN_ERR "cirrusfb: could not find a virtual "
-                                "resolution that fits into video memory!!\n");
-                        DPRINTK("EXIT - EINVAL error\n");
-                        return -EINVAL;
-                }
-                var->xres_virtual = modes[i].xres;
-                var->yres_virtual = modes[i].yres;
+        if (var->yres_virtual == -1) {
+                var->yres_virtual = pixels / var->xres_virtual;
 
                 printk(KERN_INFO "cirrusfb: virtual resolution set to "
                         "maximum of %dx%d\n", var->xres_virtual,
                         var->yres_virtual);
         }
-
-        if (var->xres_virtual < var->xres)
-                var->xres_virtual = var->xres;
         if (var->yres_virtual < var->yres)
                 var->yres_virtual = var->yres;
 
+        if (var->xres_virtual * var->yres_virtual > pixels) {
+                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected... "
+                      "virtual resolution too high to fit into video memory!\n",
+                        var->xres_virtual, var->yres_virtual,
+                        var->bits_per_pixel);
+                DPRINTK("EXIT - EINVAL error\n");
+                return -EINVAL;
+        }
+
+
         if (var->xoffset < 0)
                 var->xoffset = 0;
         if (var->yoffset < 0)
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index c6299e8a041d..9cbff84b787d 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2400,11 +2400,15 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
 
         if (!fbcon_is_inactive(vc, info)) {
                 if (ops->blank_state != blank) {
+                        int ret = 1;
+
                         ops->blank_state = blank;
                         fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
                         ops->cursor_flash = (!blank);
 
-                        if (fb_blank(info, blank))
+                        if (info->fbops->fb_blank)
+                                ret = info->fbops->fb_blank(blank, info);
+                        if (ret)
                                 fbcon_generic_blank(vc, info, blank);
                 }
 
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index a6e38e9ea73f..89a346880ec0 100644
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -110,7 +110,7 @@ static inline int mono_col(const struct fb_info *info)
         __u32 max_len;
         max_len = max(info->var.green.length, info->var.red.length);
         max_len = max(info->var.blue.length, max_len);
-        return ~(0xfff << (max_len & 0xff));
+        return (~(0xfff << max_len)) & 0xff;
 }
 
 static inline int attr_col_ec(int shift, struct vc_data *vc,
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 59df132cc375..4835bdc4e9f1 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -114,6 +114,17 @@ static struct vm_operations_struct fb_deferred_io_vm_ops = {
         .page_mkwrite   = fb_deferred_io_mkwrite,
 };
 
+static int fb_deferred_io_set_page_dirty(struct page *page)
+{
+        if (!PageDirty(page))
+                SetPageDirty(page);
+        return 0;
+}
+
+static const struct address_space_operations fb_deferred_io_aops = {
+        .set_page_dirty = fb_deferred_io_set_page_dirty,
+};
+
 static int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
         vma->vm_ops = &fb_deferred_io_vm_ops;
@@ -163,6 +174,14 @@ void fb_deferred_io_init(struct fb_info *info)
 }
 EXPORT_SYMBOL_GPL(fb_deferred_io_init);
 
+void fb_deferred_io_open(struct fb_info *info,
+                         struct inode *inode,
+                         struct file *file)
+{
+        file->f_mapping->a_ops = &fb_deferred_io_aops;
+}
+EXPORT_SYMBOL_GPL(fb_deferred_io_open);
+
 void fb_deferred_io_cleanup(struct fb_info *info)
 {
         void *screen_base = (void __force *) info->screen_base;
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 6b487801eeae..98843c2ecf73 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1344,6 +1344,10 @@ fb_open(struct inode *inode, struct file *file)
                 if (res)
                         module_put(info->fbops->owner);
         }
+#ifdef CONFIG_FB_DEFERRED_IO
+        if (info->fbdefio)
+                fb_deferred_io_open(info, inode, file);
+#endif
 out:
         unlock_kernel();
         return res;
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index bd320a2bfb7c..fb51197d1c98 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -479,6 +479,10 @@ static void adjust_aoi_size_position(struct fb_var_screeninfo *var,
         base_plane_width = machine_data->fsl_diu_info[0]->var.xres;
         base_plane_height = machine_data->fsl_diu_info[0]->var.yres;
 
+        if (mfbi->x_aoi_d < 0)
+                mfbi->x_aoi_d = 0;
+        if (mfbi->y_aoi_d < 0)
+                mfbi->y_aoi_d = 0;
         switch (index) {
         case 0:
                 if (mfbi->x_aoi_d != 0)
@@ -778,6 +782,22 @@ static void unmap_video_memory(struct fb_info *info)
 }
 
 /*
+ * Using the fb_var_screeninfo in fb_info we set the aoi of this
+ * particular framebuffer. It is a light version of fsl_diu_set_par.
+ */
+static int fsl_diu_set_aoi(struct fb_info *info)
+{
+        struct fb_var_screeninfo *var = &info->var;
+        struct mfb_info *mfbi = info->par;
+        struct diu_ad *ad = mfbi->ad;
+
+        /* AOI should not be greater than display size */
+        ad->offset_xyi = cpu_to_le32((var->yoffset << 16) | var->xoffset);
+        ad->offset_xyd = cpu_to_le32((mfbi->y_aoi_d << 16) | mfbi->x_aoi_d);
+        return 0;
+}
+
+/*
  * Using the fb_var_screeninfo in fb_info we set the resolution of this
  * particular framebuffer. This function alters the fb_fix_screeninfo stored
  * in fb_info. It does not alter var in fb_info since we are using that
@@ -817,11 +837,11 @@ static int fsl_diu_set_par(struct fb_info *info)
                 diu_ops.get_pixel_format(var->bits_per_pixel,
                                          machine_data->monitor_port);
         ad->addr    = cpu_to_le32(info->fix.smem_start);
-        ad->src_size_g_alpha = cpu_to_le32((var->yres << 12) |
-                                var->xres) | mfbi->g_alpha;
-        /* fix me. AOI should not be greater than display size */
+        ad->src_size_g_alpha = cpu_to_le32((var->yres_virtual << 12) |
+                                var->xres_virtual) | mfbi->g_alpha;
+        /* AOI should not be greater than display size */
         ad->aoi_size    = cpu_to_le32((var->yres << 16) | var->xres);
-        ad->offset_xyi = 0;
+        ad->offset_xyi = cpu_to_le32((var->yoffset << 16) | var->xoffset);
         ad->offset_xyd = cpu_to_le32((mfbi->y_aoi_d << 16) | mfbi->x_aoi_d);
 
         /* Disable chroma keying function */
@@ -921,6 +941,8 @@ static int fsl_diu_pan_display(struct fb_var_screeninfo *var,
         else
                 info->var.vmode &= ~FB_VMODE_YWRAP;
 
+        fsl_diu_set_aoi(info);
+
         return 0;
 }
 
@@ -989,7 +1011,7 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd,
                 pr_debug("set AOI display offset of index %d to (%d,%d)\n",
                                  mfbi->index, aoi_d.x_aoi_d, aoi_d.y_aoi_d);
                 fsl_diu_check_var(&info->var, info);
-                fsl_diu_set_par(info);
+                fsl_diu_set_aoi(info);
                 break;
         case MFB_GET_AOID:
                 aoi_d.x_aoi_d = mfbi->x_aoi_d;
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 3f1ca2adda3d..c6dd924976a4 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -1746,6 +1746,7 @@ static void __devexit pm2fb_remove(struct pci_dev *pdev)
         release_mem_region(fix->mmio_start, fix->mmio_len);
 
         pci_set_drvdata(pdev, NULL);
+        fb_dealloc_cmap(&info->cmap);
         kfree(info->pixmap.addr);
         kfree(info);
 }
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index e7aa7ae8fca8..97204497d9f7 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1031,7 +1031,9 @@ static void pxafb_setup_gpio(struct pxafb_info *fbi)
         pxa_gpio_mode(GPIO74_LCD_FCLK_MD);
         pxa_gpio_mode(GPIO75_LCD_LCLK_MD);
         pxa_gpio_mode(GPIO76_LCD_PCLK_MD);
-        pxa_gpio_mode(GPIO77_LCD_ACBIAS_MD);
+
+        if ((lccr0 & LCCR0_PAS) == 0)
+                pxa_gpio_mode(GPIO77_LCD_ACBIAS_MD);
 }
 
 static void pxafb_enable_controller(struct pxafb_info *fbi)
@@ -1400,6 +1402,8 @@ static void pxafb_decode_mach_info(struct pxafb_info *fbi,
         if (lcd_conn == LCD_MONO_STN_8BPP)
                 fbi->lccr0 |= LCCR0_DPD;
 
+        fbi->lccr0 |= (lcd_conn & LCD_ALTERNATE_MAPPING) ? LCCR0_LDDALT : 0;
+
         fbi->lccr3 = LCCR3_Acb((inf->lcd_conn >> 10) & 0xff);
         fbi->lccr3 |= (lcd_conn & LCD_BIAS_ACTIVE_LOW) ? LCCR3_OEP : 0;
         fbi->lccr3 |= (lcd_conn & LCD_PCLK_EDGE_FALL)  ? LCCR3_PCP : 0;
@@ -1673,53 +1677,63 @@ MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)");
 #define pxafb_setup_options()           (0)
 #endif
 
-static int __devinit pxafb_probe(struct platform_device *dev)
-{
-        struct pxafb_info *fbi;
-        struct pxafb_mach_info *inf;
-        struct resource *r;
-        int irq, ret;
-
-        dev_dbg(&dev->dev, "pxafb_probe\n");
-
-        inf = dev->dev.platform_data;
-        ret = -ENOMEM;
-        fbi = NULL;
-        if (!inf)
-                goto failed;
-
-        ret = pxafb_parse_options(&dev->dev, g_options);
-        if (ret < 0)
-                goto failed;
-
 #ifdef DEBUG_VAR
-        /* Check for various illegal bit-combinations. Currently only
-         * a warning is given. */
+/* Check for various illegal bit-combinations. Currently only
+ * a warning is given. */
+static void __devinit pxafb_check_options(struct device *dev,
+                                          struct pxafb_mach_info *inf)
+{
+        if (inf->lcd_conn)
+                return;
 
         if (inf->lccr0 & LCCR0_INVALID_CONFIG_MASK)
-                dev_warn(&dev->dev, "machine LCCR0 setting contains "
+                dev_warn(dev, "machine LCCR0 setting contains "
                                 "illegal bits: %08x\n",
                         inf->lccr0 & LCCR0_INVALID_CONFIG_MASK);
         if (inf->lccr3 & LCCR3_INVALID_CONFIG_MASK)
-                dev_warn(&dev->dev, "machine LCCR3 setting contains "
+                dev_warn(dev, "machine LCCR3 setting contains "
                                 "illegal bits: %08x\n",
                         inf->lccr3 & LCCR3_INVALID_CONFIG_MASK);
         if (inf->lccr0 & LCCR0_DPD &&
             ((inf->lccr0 & LCCR0_PAS) != LCCR0_Pas ||
              (inf->lccr0 & LCCR0_SDS) != LCCR0_Sngl ||
              (inf->lccr0 & LCCR0_CMS) != LCCR0_Mono))
-                dev_warn(&dev->dev, "Double Pixel Data (DPD) mode is "
+                dev_warn(dev, "Double Pixel Data (DPD) mode is "
                                 "only valid in passive mono"
                                 " single panel mode\n");
         if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Act &&
             (inf->lccr0 & LCCR0_SDS) == LCCR0_Dual)
-                dev_warn(&dev->dev, "Dual panel only valid in passive mode\n");
+                dev_warn(dev, "Dual panel only valid in passive mode\n");
         if ((inf->lccr0 & LCCR0_PAS) == LCCR0_Pas &&
              (inf->modes->upper_margin || inf->modes->lower_margin))
-                dev_warn(&dev->dev, "Upper and lower margins must be 0 in "
+                dev_warn(dev, "Upper and lower margins must be 0 in "
                                 "passive mode\n");
+}
+#else
+#define pxafb_check_options(...)        do {} while (0)
 #endif
 
+static int __devinit pxafb_probe(struct platform_device *dev)
+{
+        struct pxafb_info *fbi;
+        struct pxafb_mach_info *inf;
+        struct resource *r;
+        int irq, ret;
+
+        dev_dbg(&dev->dev, "pxafb_probe\n");
+
+        inf = dev->dev.platform_data;
+        ret = -ENOMEM;
+        fbi = NULL;
+        if (!inf)
+                goto failed;
+
+        ret = pxafb_parse_options(&dev->dev, g_options);
+        if (ret < 0)
+                goto failed;
+
+        pxafb_check_options(&dev->dev, inf);
+
         dev_dbg(&dev->dev, "got a %dx%dx%d LCD\n",
                         inf->modes->xres,
                         inf->modes->yres,
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 8361bd0e3df1..4dcec48a1d78 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -11,7 +11,6 @@
  * which is based on the code of neofb.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index f6ef6cca73cd..4c32c06579a0 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -595,6 +595,8 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
                 info->fbops = &sh_mobile_lcdc_ops;
                 info->var.xres = info->var.xres_virtual = cfg->lcd_cfg.xres;
                 info->var.yres = info->var.yres_virtual = cfg->lcd_cfg.yres;
+                info->var.width = cfg->lcd_size_cfg.width;
+                info->var.height = cfg->lcd_size_cfg.height;
                 info->var.activate = FB_ACTIVATE_NOW;
                 error = sh_mobile_lcdc_set_bpp(&info->var, cfg->bpp);
                 if (error)
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 77aafcfae037..4599a4385bc9 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -95,7 +95,6 @@ static inline int mtrr_del(int reg, unsigned long base,
 #define VOODOO5_MAX_PIXCLOCK 350000
 
 static struct fb_fix_screeninfo tdfx_fix __devinitdata = {
-        .id =           "3Dfx",
         .type =         FB_TYPE_PACKED_PIXELS,
         .visual =       FB_VISUAL_PSEUDOCOLOR,
         .ypanstep =     1,
@@ -426,7 +425,7 @@ static unsigned long do_lfb_size(struct tdfx_par *par, unsigned short dev_id)
         if (dev_id < PCI_DEVICE_ID_3DFX_VOODOO5) {
                 /* Banshee/Voodoo3 */
                 chip_size = 2;
-                if (has_sgram && (draminit0 & DRAMINIT0_SGRAM_TYPE))
+                if (has_sgram && !(draminit0 & DRAMINIT0_SGRAM_TYPE))
                         chip_size = 1;
         } else {
                 /* Voodoo4/5 */
@@ -1200,15 +1199,15 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
         /* Configure the default fb_fix_screeninfo first */
         switch (pdev->device) {
         case PCI_DEVICE_ID_3DFX_BANSHEE:
-                strcat(tdfx_fix.id, " Banshee");
+                strcpy(tdfx_fix.id, "3Dfx Banshee");
                 default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK;
                 break;
         case PCI_DEVICE_ID_3DFX_VOODOO3:
-                strcat(tdfx_fix.id, " Voodoo3");
+                strcpy(tdfx_fix.id, "3Dfx Voodoo3");
                 default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK;
                 break;
         case PCI_DEVICE_ID_3DFX_VOODOO5:
-                strcat(tdfx_fix.id, " Voodoo5");
+                strcpy(tdfx_fix.id, "3Dfx Voodoo5");
                 default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK;
                 break;
         }
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h
index c4aba59d4809..7491abfcf1fc 100644
--- a/drivers/video/vermilion/vermilion.h
+++ b/drivers/video/vermilion/vermilion.h
@@ -30,7 +30,6 @@
 #define _VERMILION_H_
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/pci.h>
 #include <asm/atomic.h>
 #include <linux/mutex.h>
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 34aae7a2a62b..3df17dc8c3d7 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -12,7 +12,6 @@
  * (http://davesdomain.org.uk/viafb/)
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 7b3a8423f485..5da3d2423cc0 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -24,7 +24,6 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index bfef604160d1..62eab43152d2 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -158,7 +158,7 @@ static inline s64 towards_target(struct virtio_balloon *vb)
         vb->vdev->config->get(vb->vdev,
                               offsetof(struct virtio_balloon_config, num_pages),
                               &v, sizeof(v));
-        return v - vb->num_pages;
+        return (s64)v - vb->num_pages;
 }
 
 static void update_balloon_size(struct virtio_balloon *vb)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index db20542796bf..c51036716700 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -465,6 +465,16 @@ config PC87413_WDT
 
           Most people will say N.
 
+config RDC321X_WDT
+        tristate "RDC R-321x SoC watchdog"
+        depends on X86_RDC321X
+        help
+          This is the driver for the built in hardware watchdog
+          in the RDC R-321x SoC.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rdc321x_wdt.
+
 config 60XX_WDT
         tristate "SBC-60XX Watchdog Timer"
         depends on X86
@@ -633,6 +643,16 @@ config SBC_EPX_C3_WATCHDOG
 
 # MIPS Architecture
 
+config RC32434_WDT
+        tristate "IDT RC32434 SoC Watchdog Timer"
+        depends on MIKROTIK_RB532
+        help
+          Hardware driver for the IDT RC32434 SoC built-in
+          watchdog timer.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rc32434_wdt.
+
 config INDYDOG
         tristate "Indy/I2 Hardware Watchdog"
         depends on SGI_HAS_INDYDOG
@@ -692,10 +712,6 @@ config MPC5200_WDT
         tristate "MPC5200 Watchdog Timer"
         depends on PPC_MPC52xx
 
-config 8xx_WDT
-        tristate "MPC8xx Watchdog Timer"
-        depends on 8xx
-
 config 8xxx_WDT
         tristate "MPC8xxx Platform Watchdog Timer"
         depends on PPC_8xx || PPC_83xx || PPC_86xx
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index ca3dc043d786..e0ef123fbdea 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -75,6 +75,7 @@ obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o
 obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
 obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
 obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o
+obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o
 obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
 obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
 obj-$(CONFIG_SBC7240_WDT) += sbc7240_wdt.o
@@ -94,6 +95,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
 # M68KNOMMU Architecture
 
 # MIPS Architecture
+obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o
 obj-$(CONFIG_INDYDOG) += indydog.o
 obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
 obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
@@ -104,7 +106,6 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
 # PARISC Architecture
 
 # POWERPC Architecture
-obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
 obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o
 obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
 obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index d061f0ad2d20..993e5f52afef 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -241,7 +241,7 @@ static int at91wdt_resume(struct platform_device *pdev)
 {
         if (at91wdt_busy)
                 at91_wdt_start();
-                return 0;
+        return 0;
 }
 
 #else
diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index 614a5c7017b6..6799a6de66fe 100644
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -130,8 +130,8 @@ static ssize_t geodewdt_write(struct file *file, const char __user *data,
         return len;
 }
 
-static int geodewdt_ioctl(struct inode *inode, struct file *file,
-                                unsigned int cmd, unsigned long arg)
+static long geodewdt_ioctl(struct file *file, unsigned int cmd,
+                                unsigned long arg)
 {
         void __user *argp = (void __user *)arg;
         int __user *p = argp;
@@ -198,7 +198,7 @@ static const struct file_operations geodewdt_fops = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
         .write          = geodewdt_write,
-        .ioctl          = geodewdt_ioctl,
+        .unlocked_ioctl = geodewdt_ioctl,
         .open           = geodewdt_open,
         .release        = geodewdt_release,
 };
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index d039d5f2fd1c..a3765e0be4a8 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -116,6 +116,7 @@ static unsigned int reload;			/* the computed soft_margin */
 static int nowayout = WATCHDOG_NOWAYOUT;
 static char expect_release;
 static unsigned long hpwdt_is_open;
+static unsigned int allow_kdump;
 
 static void __iomem *pci_mem_addr;              /* the PCI-memory address */
 static unsigned long __iomem *hpwdt_timer_reg;
@@ -221,19 +222,19 @@ static int __devinit cru_detect(unsigned long map_entry,
 
         if (cmn_regs.u1.ral != 0) {
                 printk(KERN_WARNING
-                       "hpwdt: Call succeeded but with an error: 0x%x\n",
-                       cmn_regs.u1.ral);
+                        "hpwdt: Call succeeded but with an error: 0x%x\n",
+                        cmn_regs.u1.ral);
         } else {
                 physical_bios_base = cmn_regs.u2.rebx;
                 physical_bios_offset = cmn_regs.u4.redx;
                 cru_length = cmn_regs.u3.recx;
                 cru_physical_address =
-                    physical_bios_base + physical_bios_offset;
+                        physical_bios_base + physical_bios_offset;
 
                 /* If the values look OK, then map it in. */
                 if ((physical_bios_base + physical_bios_offset)) {
                         cru_rom_addr =
-                            ioremap(cru_physical_address, cru_length);
+                                ioremap(cru_physical_address, cru_length);
                         if (cru_rom_addr)
                                 retval = 0;
                 }
@@ -356,7 +357,6 @@ asm(".text                      \n\t"
     "call       *%r12           \n\t"
     "pushfq                     \n\t"
     "popq        %r12           \n\t"
-    "popfq                      \n\t"
     "movl       %eax, (%r9)     \n\t"
     "movl       %ebx, 4(%r9)    \n\t"
     "movl       %ecx, 8(%r9)    \n\t"
@@ -390,10 +390,10 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm)
                 smbios_cru64_ptr = (struct smbios_cru64_info *) dm;
                 if (smbios_cru64_ptr->signature == CRU_BIOS_SIGNATURE_VALUE) {
                         cru_physical_address =
-                            smbios_cru64_ptr->physical_address +
-                            smbios_cru64_ptr->double_offset;
+                                smbios_cru64_ptr->physical_address +
+                                smbios_cru64_ptr->double_offset;
                         cru_rom_addr = ioremap(cru_physical_address,
-                                    smbios_cru64_ptr->double_length);
+                                smbios_cru64_ptr->double_length);
                 }
         }
 }
@@ -405,7 +405,7 @@ static int __devinit detect_cru_service(void)
         dmi_walk(dmi_find_cru);
 
         /* if cru_rom_addr has been set then we found a CRU service */
-        return ((cru_rom_addr != NULL) ? 0: -ENODEV);
+        return ((cru_rom_addr != NULL) ? 0 : -ENODEV);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -413,34 +413,6 @@ static int __devinit detect_cru_service(void)
 #endif
 
 /*
- *      NMI Handler
- */
-static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
-                            void *data)
-{
-        unsigned long rom_pl;
-        static int die_nmi_called;
-
-        if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI)
-                return NOTIFY_OK;
-
-        spin_lock_irqsave(&rom_lock, rom_pl);
-        if (!die_nmi_called)
-                asminline_call(&cmn_regs, cru_rom_addr);
-        die_nmi_called = 1;
-        spin_unlock_irqrestore(&rom_lock, rom_pl);
-        if (cmn_regs.u1.ral == 0) {
-                printk(KERN_WARNING "hpwdt: An NMI occurred, "
-                       "but unable to determine source.\n");
-        } else {
-                panic("An NMI occurred, please see the Integrated "
-                        "Management Log for details.\n");
-        }
-
-        return NOTIFY_STOP;
-}
-
-/*
  *      Watchdog operations
  */
 static void hpwdt_start(void)
@@ -484,6 +456,36 @@ static int hpwdt_change_timer(int new_margin)
 }
 
 /*
+ *      NMI Handler
+ */
+static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
+                                void *data)
+{
+        unsigned long rom_pl;
+        static int die_nmi_called;
+
+        if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI)
+                return NOTIFY_OK;
+
+        spin_lock_irqsave(&rom_lock, rom_pl);
+        if (!die_nmi_called)
+                asminline_call(&cmn_regs, cru_rom_addr);
+        die_nmi_called = 1;
+        spin_unlock_irqrestore(&rom_lock, rom_pl);
+        if (cmn_regs.u1.ral == 0) {
+                printk(KERN_WARNING "hpwdt: An NMI occurred, "
+                        "but unable to determine source.\n");
+        } else {
+                if (allow_kdump)
+                        hpwdt_stop();
+                panic("An NMI occurred, please see the Integrated "
+                        "Management Log for details.\n");
+        }
+
+        return NOTIFY_STOP;
+}
+
+/*
  *      /dev/watchdog handling
  */
 static int hpwdt_open(struct inode *inode, struct file *file)
@@ -625,17 +627,18 @@ static struct notifier_block die_notifier = {
  */
 
 static int __devinit hpwdt_init_one(struct pci_dev *dev,
-                                    const struct pci_device_id *ent)
+                                        const struct pci_device_id *ent)
 {
         int retval;
 
         /*
          * First let's find out if we are on an iLO2 server. We will
          * not run on a legacy ASM box.
+         * So we only support the G5 ProLiant servers and higher.
          */
         if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) {
                 dev_warn(&dev->dev,
-                       "This server does not have an iLO2 ASIC.\n");
+                        "This server does not have an iLO2 ASIC.\n");
                 return -ENODEV;
         }
 
@@ -669,7 +672,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
         retval = detect_cru_service();
         if (retval < 0) {
                 dev_warn(&dev->dev,
-                       "Unable to detect the %d Bit CRU Service.\n",
+                        "Unable to detect the %d Bit CRU Service.\n",
                         HPWDT_ARCH);
                 goto error_get_cru;
         }
@@ -684,7 +687,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
         retval = register_die_notifier(&die_notifier);
         if (retval != 0) {
                 dev_warn(&dev->dev,
-                       "Unable to register a die notifier (err=%d).\n",
+                        "Unable to register a die notifier (err=%d).\n",
                         retval);
                 goto error_die_notifier;
         }
@@ -699,8 +702,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
 
         printk(KERN_INFO
                 "hp Watchdog Timer Driver: 1.00"
-                ", timer margin: %d seconds( nowayout=%d).\n",
-                soft_margin, nowayout);
+                ", timer margin: %d seconds (nowayout=%d)"
+                ", allow kernel dump: %s (default = 0/OFF).\n",
+                soft_margin, nowayout, (allow_kdump == 0) ? "OFF" : "ON");
 
         return 0;
 
@@ -755,6 +759,9 @@ MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 module_param(soft_margin, int, 0);
 MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds");
 
+module_param(allow_kdump, int, 0);
+MODULE_PARM_DESC(allow_kdump, "Start a kernel dump after NMI occurs");
+
 module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
                 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
index b82405cfb4cd..89fcefcc8510 100644
--- a/drivers/watchdog/ibmasr.c
+++ b/drivers/watchdog/ibmasr.c
@@ -85,7 +85,6 @@ static void __asr_toggle(void)
 
         outb(reg & ~asr_toggle_mask, asr_write_addr);
         reg = inb(asr_read_addr);
-        spin_unlock(&asr_lock);
 }
 
 static void asr_toggle(void)
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c
deleted file mode 100644
index 1336425acf20..000000000000
--- a/drivers/watchdog/mpc8xx_wdt.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * mpc8xx_wdt.c - MPC8xx watchdog userspace interface
- *
- * Author: Florian Schirmer <jolt@tuxbox.org>
- *
- * 2002 (c) Florian Schirmer <jolt@tuxbox.org> This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#include <linux/fs.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/miscdevice.h>
-#include <linux/module.h>
-#include <linux/watchdog.h>
-#include <asm/8xx_immap.h>
-#include <linux/uaccess.h>
-#include <linux/io.h>
-#include <syslib/m8xx_wdt.h>
-
-static unsigned long wdt_opened;
-static int wdt_status;
-static spinlock_t wdt_lock;
-
-static void mpc8xx_wdt_handler_disable(void)
-{
-        volatile uint __iomem *piscr;
-        piscr = (uint *)&((immap_t *)IMAP_ADDR)->im_sit.sit_piscr;
-
-        if (!m8xx_has_internal_rtc)
-                m8xx_wdt_stop_timer();
-        else
-                out_be32(piscr, in_be32(piscr) & ~(PISCR_PIE | PISCR_PTE));
-        printk(KERN_NOTICE "mpc8xx_wdt: keep-alive handler deactivated\n");
-}
-
-static void mpc8xx_wdt_handler_enable(void)
-{
-        volatile uint __iomem *piscr;
-        piscr = (uint *)&((immap_t *)IMAP_ADDR)->im_sit.sit_piscr;
-
-        if (!m8xx_has_internal_rtc)
-                m8xx_wdt_install_timer();
-        else
-                out_be32(piscr, in_be32(piscr) | PISCR_PIE | PISCR_PTE);
-        printk(KERN_NOTICE "mpc8xx_wdt: keep-alive handler activated\n");
-}
-
-static int mpc8xx_wdt_open(struct inode *inode, struct file *file)
-{
-        if (test_and_set_bit(0, &wdt_opened))
-                return -EBUSY;
-        m8xx_wdt_reset();
-        mpc8xx_wdt_handler_disable();
-        return nonseekable_open(inode, file);
-}
-
-static int mpc8xx_wdt_release(struct inode *inode, struct file *file)
-{
-        m8xx_wdt_reset();
-#if !defined(CONFIG_WATCHDOG_NOWAYOUT)
-        mpc8xx_wdt_handler_enable();
-#endif
-        clear_bit(0, &wdt_opened);
-        return 0;
-}
-
-static ssize_t mpc8xx_wdt_write(struct file *file, const char *data,
-                                                size_t len, loff_t *ppos)
-{
-        if (len) {
-                spin_lock(&wdt_lock);
-                m8xx_wdt_reset();
-                spin_unlock(&wdt_lock);
-        }
-        return len;
-}
-
-static long mpc8xx_wdt_ioctl(struct file *file,
-                                        unsigned int cmd, unsigned long arg)
-{
-        int timeout;
-        static struct watchdog_info info = {
-                .options = WDIOF_KEEPALIVEPING,
-                .firmware_version = 0,
-                .identity = "MPC8xx watchdog",
-        };
-
-        switch (cmd) {
-        case WDIOC_GETSUPPORT:
-                if (copy_to_user((void *)arg, &info, sizeof(info)))
-                        return -EFAULT;
-                break;
-
-        case WDIOC_GETSTATUS:
-        case WDIOC_GETBOOTSTATUS:
-                if (put_user(wdt_status, (int *)arg))
-                        return -EFAULT;
-                wdt_status &= ~WDIOF_KEEPALIVEPING;
-                break;
-
-        case WDIOC_GETTEMP:
-                return -EOPNOTSUPP;
-
-        case WDIOC_SETOPTIONS:
-                return -EOPNOTSUPP;
-
-        case WDIOC_KEEPALIVE:
-                spin_lock(&wdt_lock);
-                m8xx_wdt_reset();
-                wdt_status |= WDIOF_KEEPALIVEPING;
-                spin_unlock(&wdt_lock);
-                break;
-
-        case WDIOC_SETTIMEOUT:
-                return -EOPNOTSUPP;
-
-        case WDIOC_GETTIMEOUT:
-                spin_lock(&wdt_lock);
-                timeout = m8xx_wdt_get_timeout();
-                spin_unlock(&wdt_lock);
-                if (put_user(timeout, (int *)arg))
-                        return -EFAULT;
-                break;
-
-        default:
-                return -ENOTTY;
-        }
-
-        return 0;
-}
-
-static const struct file_operations mpc8xx_wdt_fops = {
-        .owner = THIS_MODULE,
-        .llseek = no_llseek,
-        .write = mpc8xx_wdt_write,
-        .unlocked_ioctl = mpc8xx_wdt_ioctl,
-        .open = mpc8xx_wdt_open,
-        .release = mpc8xx_wdt_release,
-};
-
-static struct miscdevice mpc8xx_wdt_miscdev = {
-        .minor = WATCHDOG_MINOR,
-        .name = "watchdog",
-        .fops = &mpc8xx_wdt_fops,
-};
-
-static int __init mpc8xx_wdt_init(void)
-{
-        spin_lock_init(&wdt_lock);
-        return misc_register(&mpc8xx_wdt_miscdev);
-}
-
-static void __exit mpc8xx_wdt_exit(void)
-{
-        misc_deregister(&mpc8xx_wdt_miscdev);
-
-        m8xx_wdt_reset();
-        mpc8xx_wdt_handler_enable();
-}
-
-module_init(mpc8xx_wdt_init);
-module_exit(mpc8xx_wdt_exit);
-
-MODULE_AUTHOR("Florian Schirmer <jolt@tuxbox.org>");
-MODULE_DESCRIPTION("MPC8xx watchdog driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index f2094960e662..38c588ee694f 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -48,6 +48,7 @@ struct mpc8xxx_wdt_type {
 };
 
 static struct mpc8xxx_wdt __iomem *wd_base;
+static int mpc8xxx_wdt_init_late(void);
 
 static u16 timeout = 0xffff;
 module_param(timeout, ushort, 0);
@@ -213,6 +214,12 @@ static int __devinit mpc8xxx_wdt_probe(struct of_device *ofdev,
         else
                 timeout_sec = timeout / freq;
 
+#ifdef MODULE
+        ret = mpc8xxx_wdt_init_late();
+        if (ret)
+                goto err_unmap;
+#endif
+
         pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d "
                 "(%d seconds)\n", reset ? "reset" : "interrupt", timeout,
                 timeout_sec);
@@ -280,7 +287,7 @@ static struct of_platform_driver mpc8xxx_wdt_driver = {
  * very early to start pinging the watchdog (misc devices are not yet
  * available), and later module_init() just registers the misc device.
  */
-static int __init mpc8xxx_wdt_init_late(void)
+static int mpc8xxx_wdt_init_late(void)
 {
         int ret;
 
@@ -295,7 +302,9 @@ static int __init mpc8xxx_wdt_init_late(void)
         }
         return 0;
 }
+#ifndef MODULE
 module_init(mpc8xxx_wdt_init_late);
+#endif
 
 static int __init mpc8xxx_wdt_init(void)
 {
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c
index e91ada72da1d..484c215e9f3f 100644
--- a/drivers/watchdog/pc87413_wdt.c
+++ b/drivers/watchdog/pc87413_wdt.c
@@ -30,7 +30,6 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
 
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 0ed84162437b..6d9f3d4a9987 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -173,8 +173,8 @@ static const struct watchdog_info ident = {
         .identity = "PNX4008 Watchdog",
 };
 
-static long pnx4008_wdt_ioctl(struct inode *inode, struct file *file,
-                                        unsigned int cmd, unsigned long arg)
+static long pnx4008_wdt_ioctl(struct file *file, unsigned int cmd,
+                                unsigned long arg)
 {
         int ret = -ENOTTY;
         int time;
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
new file mode 100644
index 000000000000..c9c73b69c5e5
--- /dev/null
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -0,0 +1,344 @@
+/*
+ *  IDT Interprise 79RC32434 watchdog driver
+ *
+ *  Copyright (C) 2006, Ondrej Zajicek <santiago@crfreenet.org>
+ *  Copyright (C) 2008, Florian Fainelli <florian@openwrt.org>
+ *
+ *  based on
+ *  SoftDog 0.05:       A Software Watchdog Device
+ *
+ *  (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/reboot.h>
+#include <linux/smp_lock.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/uaccess.h>
+
+#include <asm/bootinfo.h>
+#include <asm/time.h>
+#include <asm/mach-rc32434/integ.h>
+
+#define MAX_TIMEOUT                     20
+#define RC32434_WDT_INTERVAL            (15 * HZ)
+
+#define VERSION "0.2"
+
+static struct {
+        struct completion stop;
+        int running;
+        struct timer_list timer;
+        int queue;
+        int default_ticks;
+        unsigned long inuse;
+} rc32434_wdt_device;
+
+static struct integ __iomem *wdt_reg;
+static int ticks = 100 * HZ;
+
+static int expect_close;
+static int timeout;
+
+static int nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+        __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+
+static void rc32434_wdt_start(void)
+{
+        u32 val;
+
+        if (!rc32434_wdt_device.inuse) {
+                writel(0, &wdt_reg->wtcount);
+
+                val = RC32434_ERR_WRE;
+                writel(readl(&wdt_reg->errcs) | val, &wdt_reg->errcs);
+
+                val = RC32434_WTC_EN;
+                writel(readl(&wdt_reg->wtc) | val, &wdt_reg->wtc);
+        }
+        rc32434_wdt_device.running++;
+}
+
+static void rc32434_wdt_stop(void)
+{
+        u32 val;
+
+        if (rc32434_wdt_device.running) {
+
+                val = ~RC32434_WTC_EN;
+                writel(readl(&wdt_reg->wtc) & val, &wdt_reg->wtc);
+
+                val = ~RC32434_ERR_WRE;
+                writel(readl(&wdt_reg->errcs) & val, &wdt_reg->errcs);
+
+                rc32434_wdt_device.running = 0;
+        }
+}
+
+static void rc32434_wdt_set(int new_timeout)
+{
+        u32 cmp = new_timeout * HZ;
+        u32 state, val;
+
+        timeout = new_timeout;
+        /*
+         * store and disable WTC
+         */
+        state = (u32)(readl(&wdt_reg->wtc) & RC32434_WTC_EN);
+        val = ~RC32434_WTC_EN;
+        writel(readl(&wdt_reg->wtc) & val, &wdt_reg->wtc);
+
+        writel(0, &wdt_reg->wtcount);
+        writel(cmp, &wdt_reg->wtcompare);
+
+        /*
+         * restore WTC
+         */
+
+        writel(readl(&wdt_reg->wtc) | state, &wdt_reg);
+}
+
+static void rc32434_wdt_reset(void)
+{
+        ticks = rc32434_wdt_device.default_ticks;
+}
+
+static void rc32434_wdt_update(unsigned long unused)
+{
+        if (rc32434_wdt_device.running)
+                ticks--;
+
+        writel(0, &wdt_reg->wtcount);
+
+        if (rc32434_wdt_device.queue && ticks)
+                mod_timer(&rc32434_wdt_device.timer,
+                        jiffies + RC32434_WDT_INTERVAL);
+        else
+                complete(&rc32434_wdt_device.stop);
+}
+
+static int rc32434_wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(0, &rc32434_wdt_device.inuse))
+                return -EBUSY;
+
+        if (nowayout)
+                __module_get(THIS_MODULE);
+
+        return nonseekable_open(inode, file);
+}
+
+static int rc32434_wdt_release(struct inode *inode, struct file *file)
+{
+        if (expect_close && nowayout == 0) {
+                rc32434_wdt_stop();
+                printk(KERN_INFO KBUILD_MODNAME ": disabling watchdog timer\n");
+                module_put(THIS_MODULE);
+        } else
+                printk(KERN_CRIT KBUILD_MODNAME
+                        ": device closed unexpectedly. WDT will not stop !\n");
+
+        clear_bit(0, &rc32434_wdt_device.inuse);
+        return 0;
+}
+
+static ssize_t rc32434_wdt_write(struct file *file, const char *data,
+                                size_t len, loff_t *ppos)
+{
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+
+                        /* In case it was set long ago */
+                        expect_close = 0;
+
+                        for (i = 0; i != len; i++) {
+                                char c;
+                                if (get_user(c, data + i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        expect_close = 1;
+                        }
+                }
+                rc32434_wdt_update(0);
+                return len;
+        }
+        return 0;
+}
+
+static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
+                                unsigned long arg)
+{
+        void __user *argp = (void __user *)arg;
+        int new_timeout;
+        unsigned int value;
+        static struct watchdog_info ident = {
+                .options =              WDIOF_SETTIMEOUT |
+                                        WDIOF_KEEPALIVEPING |
+                                        WDIOF_MAGICCLOSE,
+                .identity =             "RC32434_WDT Watchdog",
+        };
+        switch (cmd) {
+        case WDIOC_KEEPALIVE:
+                rc32434_wdt_reset();
+                break;
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                value = readl(&wdt_reg->wtcount);
+                if (copy_to_user(argp, &value, sizeof(int)))
+                        return -EFAULT;
+                break;
+        case WDIOC_GETSUPPORT:
+                if (copy_to_user(argp, &ident, sizeof(ident)))
+                        return -EFAULT;
+                break;
+        case WDIOC_SETOPTIONS:
+                if (copy_from_user(&value, argp, sizeof(int)))
+                        return -EFAULT;
+                switch (value) {
+                case WDIOS_ENABLECARD:
+                        rc32434_wdt_start();
+                        break;
+                case WDIOS_DISABLECARD:
+                        rc32434_wdt_stop();
+                default:
+                        return -EINVAL;
+                }
+                break;
+        case WDIOC_SETTIMEOUT:
+                if (copy_from_user(&new_timeout, argp, sizeof(int)))
+                        return -EFAULT;
+                if (new_timeout < 1)
+                        return -EINVAL;
+                if (new_timeout > MAX_TIMEOUT)
+                        return -EINVAL;
+                rc32434_wdt_set(new_timeout);
+        case WDIOC_GETTIMEOUT:
+                return copy_to_user(argp, &timeout, sizeof(int));
+        default:
+                return -ENOTTY;
+        }
+
+        return 0;
+}
+
+static struct file_operations rc32434_wdt_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .write          = rc32434_wdt_write,
+        .unlocked_ioctl = rc32434_wdt_ioctl,
+        .open           = rc32434_wdt_open,
+        .release        = rc32434_wdt_release,
+};
+
+static struct miscdevice rc32434_wdt_miscdev = {
+        .minor  = WATCHDOG_MINOR,
+        .name   = "watchdog",
+        .fops   = &rc32434_wdt_fops,
+};
+
+static char banner[] = KERN_INFO KBUILD_MODNAME
+                ": Watchdog Timer version " VERSION ", timer margin: %d sec\n";
+
+static int rc32434_wdt_probe(struct platform_device *pdev)
+{
+        int ret;
+        struct resource *r;
+
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rb500_wdt_res");
+        if (!r) {
+                printk(KERN_ERR KBUILD_MODNAME
+                        "failed to retrieve resources\n");
+                return -ENODEV;
+        }
+
+        wdt_reg = ioremap_nocache(r->start, r->end - r->start);
+        if (!wdt_reg) {
+                printk(KERN_ERR KBUILD_MODNAME
+                        "failed to remap I/O resources\n");
+                return -ENXIO;
+        }
+
+        ret = misc_register(&rc32434_wdt_miscdev);
+
+        if (ret < 0) {
+                printk(KERN_ERR KBUILD_MODNAME
+                        "failed to register watchdog device\n");
+                goto unmap;
+        }
+
+        init_completion(&rc32434_wdt_device.stop);
+        rc32434_wdt_device.queue = 0;
+
+        clear_bit(0, &rc32434_wdt_device.inuse);
+
+        setup_timer(&rc32434_wdt_device.timer, rc32434_wdt_update, 0L);
+
+        rc32434_wdt_device.default_ticks = ticks;
+
+        rc32434_wdt_start();
+
+        printk(banner, timeout);
+
+        return 0;
+
+unmap:
+        iounmap(wdt_reg);
+        return ret;
+}
+
+static int rc32434_wdt_remove(struct platform_device *pdev)
+{
+        if (rc32434_wdt_device.queue) {
+                rc32434_wdt_device.queue = 0;
+                wait_for_completion(&rc32434_wdt_device.stop);
+        }
+        misc_deregister(&rc32434_wdt_miscdev);
+
+        iounmap(wdt_reg);
+
+        return 0;
+}
+
+static struct platform_driver rc32434_wdt = {
+        .probe  = rc32434_wdt_probe,
+        .remove = rc32434_wdt_remove,
+        .driver = {
+                .name = "rc32434_wdt",
+        }
+};
+
+static int __init rc32434_wdt_init(void)
+{
+        return platform_driver_register(&rc32434_wdt);
+}
+
+static void __exit rc32434_wdt_exit(void)
+{
+        platform_driver_unregister(&rc32434_wdt);
+}
+
+module_init(rc32434_wdt_init);
+module_exit(rc32434_wdt_exit);
+
+MODULE_AUTHOR("Ondrej Zajicek <santiago@crfreenet.org>,"
+                "Florian Fainelli <florian@openwrt.org>");
+MODULE_DESCRIPTION("Driver for the IDT RC32434 SoC watchdog");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
new file mode 100644
index 000000000000..bf92802f2bbe
--- /dev/null
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -0,0 +1,285 @@
+/*
+ * RDC321x watchdog driver
+ *
+ * Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
+ *
+ * This driver is highly inspired from the cpu5_wdt driver
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/miscdevice.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/timer.h>
+#include <linux/completion.h>
+#include <linux/jiffies.h>
+#include <linux/platform_device.h>
+#include <linux/watchdog.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+
+#include <asm/mach-rdc321x/rdc321x_defs.h>
+
+#define RDC_WDT_MASK    0x80000000 /* Mask */
+#define RDC_WDT_EN      0x00800000 /* Enable bit */
+#define RDC_WDT_WTI     0x00200000 /* Generate CPU reset/NMI/WDT on timeout */
+#define RDC_WDT_RST     0x00100000 /* Reset bit */
+#define RDC_WDT_WIF     0x00040000 /* WDT IRQ Flag */
+#define RDC_WDT_IRT     0x00000100 /* IRQ Routing table */
+#define RDC_WDT_CNT     0x00000001 /* WDT count */
+
+#define RDC_CLS_TMR     0x80003844 /* Clear timer */
+
+#define RDC_WDT_INTERVAL        (HZ/10+1)
+
+static int ticks = 1000;
+
+/* some device data */
+
+static struct {
+        struct completion stop;
+        int running;
+        struct timer_list timer;
+        int queue;
+        int default_ticks;
+        unsigned long inuse;
+        spinlock_t lock;
+} rdc321x_wdt_device;
+
+/* generic helper functions */
+
+static void rdc321x_wdt_trigger(unsigned long unused)
+{
+        unsigned long flags;
+
+        if (rdc321x_wdt_device.running)
+                ticks--;
+
+        /* keep watchdog alive */
+        spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
+        outl(RDC_WDT_EN | inl(RDC3210_CFGREG_DATA),
+                RDC3210_CFGREG_DATA);
+        spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
+
+        /* requeue?? */
+        if (rdc321x_wdt_device.queue && ticks)
+                mod_timer(&rdc321x_wdt_device.timer,
+                                jiffies + RDC_WDT_INTERVAL);
+        else {
+                /* ticks doesn't matter anyway */
+                complete(&rdc321x_wdt_device.stop);
+        }
+
+}
+
+static void rdc321x_wdt_reset(void)
+{
+        ticks = rdc321x_wdt_device.default_ticks;
+}
+
+static void rdc321x_wdt_start(void)
+{
+        unsigned long flags;
+
+        if (!rdc321x_wdt_device.queue) {
+                rdc321x_wdt_device.queue = 1;
+
+                /* Clear the timer */
+                spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
+                outl(RDC_CLS_TMR, RDC3210_CFGREG_ADDR);
+
+                /* Enable watchdog and set the timeout to 81.92 us */
+                outl(RDC_WDT_EN | RDC_WDT_CNT, RDC3210_CFGREG_DATA);
+                spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
+
+                mod_timer(&rdc321x_wdt_device.timer,
+                                jiffies + RDC_WDT_INTERVAL);
+        }
+
+        /* if process dies, counter is not decremented */
+        rdc321x_wdt_device.running++;
+}
+
+static int rdc321x_wdt_stop(void)
+{
+        if (rdc321x_wdt_device.running)
+                rdc321x_wdt_device.running = 0;
+
+        ticks = rdc321x_wdt_device.default_ticks;
+
+        return -EIO;
+}
+
+/* filesystem operations */
+static int rdc321x_wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(0, &rdc321x_wdt_device.inuse))
+                return -EBUSY;
+
+        return nonseekable_open(inode, file);
+}
+
+static int rdc321x_wdt_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &rdc321x_wdt_device.inuse);
+        return 0;
+}
+
+static long rdc321x_wdt_ioctl(struct file *file, unsigned int cmd,
+                                unsigned long arg)
+{
+        void __user *argp = (void __user *)arg;
+        unsigned int value;
+        static struct watchdog_info ident = {
+                .options = WDIOF_CARDRESET,
+                .identity = "RDC321x WDT",
+        };
+        unsigned long flags;
+
+        switch (cmd) {
+        case WDIOC_KEEPALIVE:
+                rdc321x_wdt_reset();
+                break;
+        case WDIOC_GETSTATUS:
+                /* Read the value from the DATA register */
+                spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
+                value = inl(RDC3210_CFGREG_DATA);
+                spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
+                if (copy_to_user(argp, &value, sizeof(int)))
+                        return -EFAULT;
+                break;
+        case WDIOC_GETSUPPORT:
+                if (copy_to_user(argp, &ident, sizeof(ident)))
+                        return -EFAULT;
+                break;
+        case WDIOC_SETOPTIONS:
+                if (copy_from_user(&value, argp, sizeof(int)))
+                        return -EFAULT;
+                switch (value) {
+                case WDIOS_ENABLECARD:
+                        rdc321x_wdt_start();
+                        break;
+                case WDIOS_DISABLECARD:
+                        return rdc321x_wdt_stop();
+                default:
+                        return -EINVAL;
+                }
+                break;
+        default:
+                return -ENOTTY;
+        }
+        return 0;
+}
+
+static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        if (!count)
+                return -EIO;
+
+        rdc321x_wdt_reset();
+
+        return count;
+}
+
+static const struct file_operations rdc321x_wdt_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .unlocked_ioctl = rdc321x_wdt_ioctl,
+        .open           = rdc321x_wdt_open,
+        .write          = rdc321x_wdt_write,
+        .release        = rdc321x_wdt_release,
+};
+
+static struct miscdevice rdc321x_wdt_misc = {
+        .minor  = WATCHDOG_MINOR,
+        .name   = "watchdog",
+        .fops   = &rdc321x_wdt_fops,
+};
+
+static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
+{
+        int err;
+
+        err = misc_register(&rdc321x_wdt_misc);
+        if (err < 0) {
+                printk(KERN_ERR PFX "watchdog misc_register failed\n");
+                return err;
+        }
+
+        spin_lock_init(&rdc321x_wdt_device.lock);
+
+        /* Reset the watchdog */
+        outl(RDC_WDT_RST, RDC3210_CFGREG_DATA);
+
+        init_completion(&rdc321x_wdt_device.stop);
+        rdc321x_wdt_device.queue = 0;
+
+        clear_bit(0, &rdc321x_wdt_device.inuse);
+
+        setup_timer(&rdc321x_wdt_device.timer, rdc321x_wdt_trigger, 0);
+
+        rdc321x_wdt_device.default_ticks = ticks;
+
+        printk(KERN_INFO PFX "watchdog init success\n");
+
+        return 0;
+}
+
+static int rdc321x_wdt_remove(struct platform_device *pdev)
+{
+        if (rdc321x_wdt_device.queue) {
+                rdc321x_wdt_device.queue = 0;
+                wait_for_completion(&rdc321x_wdt_device.stop);
+        }
+
+        misc_deregister(&rdc321x_wdt_misc);
+
+        return 0;
+}
+
+static struct platform_driver rdc321x_wdt_driver = {
+        .probe = rdc321x_wdt_probe,
+        .remove = rdc321x_wdt_remove,
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "rdc321x-wdt",
+        },
+};
+
+static int __init rdc321x_wdt_init(void)
+{
+        return platform_driver_register(&rdc321x_wdt_driver);
+}
+
+static void __exit rdc321x_wdt_exit(void)
+{
+        platform_driver_unregister(&rdc321x_wdt_driver);
+}
+
+module_init(rdc321x_wdt_init);
+module_exit(rdc321x_wdt_exit);
+
+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
+MODULE_DESCRIPTION("RDC321x watchdog driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 3da2b90d2fe6..86d42801de45 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -21,18 +21,6 @@
  * 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
- *
- * Changelog:
- *      05-Oct-2004     BJD     Added semaphore init to stop crashes on open
- *                              Fixed tmr_count / wdt_count confusion
- *                              Added configurable debug
- *
- *      11-Jan-2005     BJD     Fixed divide-by-2 in timeout code
- *
- *      25-Jan-2005     DA      Added suspend/resume support
- *                              Replaced reboot notifier with .shutdown method
- *
- *      10-Mar-2005     LCVR    Changed S3C2410_VA to S3C24XX_VA
 */
 
 #include <linux/module.h>
@@ -157,8 +145,6 @@ static void s3c2410wdt_start(void)
         writel(wdt_count, wdt_base + S3C2410_WTCNT);
         writel(wtcon, wdt_base + S3C2410_WTCON);
         spin_unlock(&wdt_lock);
-
-        return 0;
 }
 
 static int s3c2410wdt_set_heartbeat(int timeout)
@@ -367,7 +353,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        size = (res->end-res->start)+1;
+        size = (res->end - res->start) + 1;
         wdt_mem = request_mem_region(res->start, size, pdev->name);
         if (wdt_mem == NULL) {
                 dev_err(dev, "failed to get memory region\n");
@@ -376,7 +362,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
         }
 
         wdt_base = ioremap(res->start, size);
-        if (wdt_base == 0) {
+        if (wdt_base == NULL) {
                 dev_err(dev, "failed to ioremap() region\n");
                 ret = -EINVAL;
                 goto err_req;
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index db362c34958b..191ea6302107 100644
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -115,8 +115,8 @@ static int watchdog_release(struct inode *inode, struct file *file)
         return 0;
 }
 
-static ssize_t watchdog_write(struct file *file, const char *data,
-                                                size_t len, loff_t *ppos)
+static ssize_t watchdog_write(struct file *file, const char __user *data,
+                              size_t len, loff_t *ppos)
 {
         /*
          *      Refresh the timer.
@@ -133,21 +133,22 @@ static const struct watchdog_info ident = {
 };
 
 static long watchdog_ioctl(struct file *file, unsigned int cmd,
-                                                        unsigned long arg)
+                           unsigned long arg)
 {
         unsigned int new_margin;
+        int __user *int_arg = (int __user *)arg;
         int ret = -ENOTTY;
 
         switch (cmd) {
         case WDIOC_GETSUPPORT:
                 ret = 0;
-                if (copy_to_user((void *)arg, &ident, sizeof(ident)))
+                if (copy_to_user((void __user *)arg, &ident, sizeof(ident)))
                         ret = -EFAULT;
                 break;
 
         case WDIOC_GETSTATUS:
         case WDIOC_GETBOOTSTATUS:
-                ret = put_user(0, (int *)arg);
+                ret = put_user(0, int_arg);
                 break;
 
         case WDIOC_KEEPALIVE:
@@ -156,7 +157,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
                 break;
 
         case WDIOC_SETTIMEOUT:
-                ret = get_user(new_margin, (int *)arg);
+                ret = get_user(new_margin, int_arg);
                 if (ret)
                         break;
 
@@ -171,7 +172,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
                 watchdog_ping();
                 /* Fall */
         case WDIOC_GETTIMEOUT:
-                ret = put_user(soft_margin, (int *)arg);
+                ret = put_user(soft_margin, int_arg);
                 break;
         }
         return ret;
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'. */
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index a5bc91ae6ff6..d0e87cbe157c 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -102,7 +102,7 @@ static void do_suspend(void)
         /* XXX use normal device tree? */
         xenbus_suspend();
 
-        err = stop_machine_run(xen_suspend, &cancelled, 0);
+        err = stop_machine(xen_suspend, &cancelled, &cpumask_of_cpu(0));
         if (err) {
                 printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
                 goto out;