Merge commit 'v2.6.29-rc4' into core/percpu

Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
	arch/x86/mm/fault.c

195 files changed, 3917 insertions, 2396 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index d7f9839ba264..a7799a99f2d9 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -9,6 +9,7 @@ menuconfig ACPI
         depends on PCI
         depends on PM
         select PNP
+        select CPU_IDLE
         default y
         ---help---
           Advanced Configuration and Power Interface (ACPI) support for 
@@ -287,7 +288,7 @@ config ACPI_CONTAINER
           support physical cpu/memory hot-plug.
 
           If one selects "m", this driver can be loaded with
-          "modprobe acpi_container".
+          "modprobe container".
 
 config ACPI_HOTPLUG_MEMORY
         tristate "Memory Hotplug"
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 9684cc827930..22ce48985720 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -538,10 +538,9 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
                         if (ACPI_FAILURE(status)) {
                                 ACPI_WARNING((AE_INFO,
                                               "Truncating %u table entries!",
-                                              (unsigned)
-                                              (acpi_gbl_root_table_list.size -
-                                               acpi_gbl_root_table_list.
-                                               count)));
+                                              (unsigned) (table_count -
+                                               (acpi_gbl_root_table_list.
+                                               count - 2))));
                                 break;
                         }
                 }
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index da9450bc60f7..9c9897dbe907 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -116,9 +116,9 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
-        /* Default return value is SUPPORTED */
+        /* Default return value is 0, NOT-SUPPORTED */
 
-        return_desc->integer.value = ACPI_UINT32_MAX;
+        return_desc->integer.value = 0;
         walk_state->return_desc = return_desc;
 
         /* Compare input string to static table of supported interfaces */
@@ -127,10 +127,8 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
                 if (!ACPI_STRCMP
                     (string_desc->string.pointer,
                      acpi_interfaces_supported[i])) {
-
-                        /* The interface is supported */
-
-                        return_ACPI_STATUS(AE_OK);
+                        return_desc->integer.value = ACPI_UINT32_MAX;
+                        goto done;
                 }
         }
 
@@ -141,15 +139,14 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
          */
         status = acpi_os_validate_interface(string_desc->string.pointer);
         if (ACPI_SUCCESS(status)) {
-
-                /* The interface is supported */
-
-                return_ACPI_STATUS(AE_OK);
+                return_desc->integer.value = ACPI_UINT32_MAX;
         }
 
-        /* The interface is not supported */
+done:
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INFO, "ACPI: BIOS _OSI(%s) %ssupported\n",
+                string_desc->string.pointer,
+                return_desc->integer.value == 0 ? "not-" : ""));
 
-        return_desc->integer.value = 0;
         return_ACPI_STATUS(AE_OK);
 }
 
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 17020c12623c..fe0cdf83641a 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -163,7 +163,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
         case ACPI_NOTIFY_BUS_CHECK:
                 /* Fall through */
         case ACPI_NOTIFY_DEVICE_CHECK:
-                printk("Container driver received %s event\n",
+                printk(KERN_WARNING "Container driver received %s event\n",
                        (type == ACPI_NOTIFY_BUS_CHECK) ?
                        "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");
                 status = acpi_bus_get_device(handle, &device);
@@ -174,7 +174,8 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
                                         kobject_uevent(&device->dev.kobj,
                                                        KOBJ_ONLINE);
                                 else
-                                        printk("Failed to add container\n");
+                                        printk(KERN_WARNING
+                                               "Failed to add container\n");
                         }
                 } else {
                         if (ACPI_SUCCESS(status)) {
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 5b30b8d91d71..35094f230b1e 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -855,10 +855,14 @@ fdd_out:
 static ssize_t show_docked(struct device *dev,
                            struct device_attribute *attr, char *buf)
 {
+        struct acpi_device *tmp;
+
         struct dock_station *dock_station = *((struct dock_station **)
                 dev->platform_data);
-        return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
 
+        if (ACPI_SUCCESS(acpi_bus_get_device(dock_station->handle, &tmp)))
+                return snprintf(buf, PAGE_SIZE, "1\n");
+        return snprintf(buf, PAGE_SIZE, "0\n");
 }
 static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
 
@@ -984,7 +988,7 @@ static int dock_add(acpi_handle handle)
 
         ret = device_create_file(&dock_device->dev, &dev_attr_docked);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 platform_device_unregister(dock_device);
                 kfree(dock_station);
                 dock_station = NULL;
@@ -992,7 +996,7 @@ static int dock_add(acpi_handle handle)
         }
         ret = device_create_file(&dock_device->dev, &dev_attr_undock);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 device_remove_file(&dock_device->dev, &dev_attr_docked);
                 platform_device_unregister(dock_device);
                 kfree(dock_station);
@@ -1001,7 +1005,7 @@ static int dock_add(acpi_handle handle)
         }
         ret = device_create_file(&dock_device->dev, &dev_attr_uid);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 device_remove_file(&dock_device->dev, &dev_attr_docked);
                 device_remove_file(&dock_device->dev, &dev_attr_undock);
                 platform_device_unregister(dock_device);
@@ -1011,7 +1015,7 @@ static int dock_add(acpi_handle handle)
         }
         ret = device_create_file(&dock_device->dev, &dev_attr_flags);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 device_remove_file(&dock_device->dev, &dev_attr_docked);
                 device_remove_file(&dock_device->dev, &dev_attr_undock);
                 device_remove_file(&dock_device->dev, &dev_attr_uid);
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index a2b82c90a683..5c2f5d343be6 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -982,7 +982,7 @@ int __init acpi_ec_ecdt_probe(void)
                 saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
                 if (!saved_ec)
                         return -ENOMEM;
-                memcpy(&saved_ec, boot_ec, sizeof(saved_ec));
+                memcpy(saved_ec, boot_ec, sizeof(*saved_ec));
         /* fall through */
         }
         /* This workaround is needed only on some broken machines,
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index adec3d15810a..5479b9f42513 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -255,12 +255,12 @@ static int acpi_platform_notify(struct device *dev)
         }
         type = acpi_get_bus_type(dev->bus);
         if (!type) {
-                DBG("No ACPI bus support for %s\n", dev->bus_id);
+                DBG("No ACPI bus support for %s\n", dev_name(dev));
                 ret = -EINVAL;
                 goto end;
         }
         if ((ret = type->find_device(dev, &handle)) != 0)
-                DBG("Can't get handler for %s\n", dev->bus_id);
+                DBG("Can't get handler for %s\n", dev_name(dev));
       end:
         if (!ret)
                 acpi_bind_one(dev, handle);
@@ -271,10 +271,10 @@ static int acpi_platform_notify(struct device *dev)
 
                 acpi_get_name(dev->archdata.acpi_handle,
                               ACPI_FULL_PATHNAME, &buffer);
-                DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer);
+                DBG("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer);
                 kfree(buffer.pointer);
         } else
-                DBG("Device %s -> No ACPI support\n", dev->bus_id);
+                DBG("Device %s -> No ACPI support\n", dev_name(dev));
 #endif
 
         return ret;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 6729a4992f2b..b3193ec0a2ef 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -228,10 +228,10 @@ void acpi_os_vprintf(const char *fmt, va_list args)
         if (acpi_in_debugger) {
                 kdb_printf("%s", buffer);
         } else {
-                printk("%s", buffer);
+                printk(KERN_CONT "%s", buffer);
         }
 #else
-        printk("%s", buffer);
+        printk(KERN_CONT "%s", buffer);
 #endif
 }
 
@@ -1317,6 +1317,54 @@ acpi_os_validate_interface (char *interface)
         return AE_SUPPORT;
 }
 
+#ifdef  CONFIG_X86
+
+struct aml_port_desc {
+        uint    start;
+        uint    end;
+        char*   name;
+        char    warned;
+};
+
+static struct aml_port_desc aml_invalid_port_list[] = {
+        {0x20, 0x21, "PIC0", 0},
+        {0xA0, 0xA1, "PIC1", 0},
+        {0x4D0, 0x4D1, "ELCR", 0}
+};
+
+/*
+ * valid_aml_io_address()
+ *
+ * if valid, return true
+ * else invalid, warn once, return false
+ */
+static bool valid_aml_io_address(uint address, uint length)
+{
+        int i;
+        int entries = sizeof(aml_invalid_port_list) / sizeof(struct aml_port_desc);
+
+        for (i = 0; i < entries; ++i) {
+                if ((address >= aml_invalid_port_list[i].start &&
+                        address <= aml_invalid_port_list[i].end) ||
+                        (address + length >= aml_invalid_port_list[i].start &&
+                        address  + length <= aml_invalid_port_list[i].end))
+                {
+                        if (!aml_invalid_port_list[i].warned)
+                        {
+                                printk(KERN_ERR "ACPI: Denied BIOS AML access"
+                                        " to invalid port 0x%x+0x%x (%s)\n",
+                                        address, length,
+                                        aml_invalid_port_list[i].name);
+                                aml_invalid_port_list[i].warned = 1;
+                        }
+                        return false;   /* invalid */
+                }
+        }
+        return true;    /* valid */
+}
+#else
+static inline bool valid_aml_io_address(uint address, uint length) { return true; }
+#endif
 /******************************************************************************
  *
  * FUNCTION:    acpi_os_validate_address
@@ -1346,6 +1394,8 @@ acpi_os_validate_address (
 
         switch (space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
+                if (!valid_aml_io_address(address, length))
+                        return AE_AML_ILLEGAL_ADDRESS;
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
                 /* Only interference checks against SystemIO and SytemMemory
                    are needed */
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 1c6e73c7865e..6c772ca76bd1 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -593,7 +593,7 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
                 return -ENODEV;
         } else {
                 acpi_irq_penalty[link->irq.active] += PIRQ_PENALTY_PCI_USING;
-                printk(PREFIX "%s [%s] enabled at IRQ %d\n",
+                printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n",
                        acpi_device_name(link->device),
                        acpi_device_bid(link->device), link->irq.active);
         }
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 66a9d8145562..7bc22a471fe3 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -66,43 +66,17 @@ ACPI_MODULE_NAME("processor_idle");
 #define ACPI_PROCESSOR_FILE_POWER       "power"
 #define US_TO_PM_TIMER_TICKS(t)         ((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
 #define PM_TIMER_TICK_NS                (1000000000ULL/PM_TIMER_FREQUENCY)
-#ifndef CONFIG_CPU_IDLE
-#define C2_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
-#define C3_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
-static void (*pm_idle_save) (void) __read_mostly;
-#else
 #define C2_OVERHEAD                     1       /* 1us */
 #define C3_OVERHEAD                     1       /* 1us */
-#endif
 #define PM_TIMER_TICKS_TO_US(p)         (((p) * 1000)/(PM_TIMER_FREQUENCY/1000))
 
 static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;
-#ifdef CONFIG_CPU_IDLE
 module_param(max_cstate, uint, 0000);
-#else
-module_param(max_cstate, uint, 0644);
-#endif
 static unsigned int nocst __read_mostly;
 module_param(nocst, uint, 0000);
 
-#ifndef CONFIG_CPU_IDLE
-/*
- * bm_history -- bit-mask with a bit per jiffy of bus-master activity
- * 1000 HZ: 0xFFFFFFFF: 32 jiffies = 32ms
- * 800 HZ: 0xFFFFFFFF: 32 jiffies = 40ms
- * 100 HZ: 0x0000000F: 4 jiffies = 40ms
- * reduce history for more aggressive entry into C3
- */
-static unsigned int bm_history __read_mostly =
-    (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1));
-module_param(bm_history, uint, 0644);
-
-static int acpi_processor_set_power_policy(struct acpi_processor *pr);
-
-#else   /* CONFIG_CPU_IDLE */
 static unsigned int latency_factor __read_mostly = 2;
 module_param(latency_factor, uint, 0644);
-#endif
 
 /*
  * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.
@@ -224,71 +198,6 @@ static void acpi_safe_halt(void)
         current_thread_info()->status |= TS_POLLING;
 }
 
-#ifndef CONFIG_CPU_IDLE
-
-static void
-acpi_processor_power_activate(struct acpi_processor *pr,
-                              struct acpi_processor_cx *new)
-{
-        struct acpi_processor_cx *old;
-
-        if (!pr || !new)
-                return;
-
-        old = pr->power.state;
-
-        if (old)
-                old->promotion.count = 0;
-        new->demotion.count = 0;
-
-        /* Cleanup from old state. */
-        if (old) {
-                switch (old->type) {
-                case ACPI_STATE_C3:
-                        /* Disable bus master reload */
-                        if (new->type != ACPI_STATE_C3 && pr->flags.bm_check)
-                                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
-                        break;
-                }
-        }
-
-        /* Prepare to use new state. */
-        switch (new->type) {
-        case ACPI_STATE_C3:
-                /* Enable bus master reload */
-                if (old->type != ACPI_STATE_C3 && pr->flags.bm_check)
-                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
-                break;
-        }
-
-        pr->power.state = new;
-
-        return;
-}
-
-static atomic_t c3_cpu_count;
-
-/* Common C-state entry for C2, C3, .. */
-static void acpi_cstate_enter(struct acpi_processor_cx *cstate)
-{
-        /* Don't trace irqs off for idle */
-        stop_critical_timings();
-        if (cstate->entry_method == ACPI_CSTATE_FFH) {
-                /* Call into architectural FFH based C-state */
-                acpi_processor_ffh_cstate_enter(cstate);
-        } else {
-                int unused;
-                /* IO port based C-state */
-                inb(cstate->address);
-                /* Dummy wait op - must do something useless after P_LVL2 read
-                   because chipsets cannot guarantee that STPCLK# signal
-                   gets asserted in time to freeze execution properly. */
-                unused = inl(acpi_gbl_FADT.xpm_timer_block.address);
-        }
-        start_critical_timings();
-}
-#endif /* !CONFIG_CPU_IDLE */
-
 #ifdef ARCH_APICTIMER_STOPS_ON_C3
 
 /*
@@ -390,421 +299,6 @@ static int tsc_halts_in_c(int state)
 }
 #endif
 
-#ifndef CONFIG_CPU_IDLE
-static void acpi_processor_idle(void)
-{
-        struct acpi_processor *pr = NULL;
-        struct acpi_processor_cx *cx = NULL;
-        struct acpi_processor_cx *next_state = NULL;
-        int sleep_ticks = 0;
-        u32 t1, t2 = 0;
-
-        /*
-         * Interrupts must be disabled during bus mastering calculations and
-         * for C2/C3 transitions.
-         */
-        local_irq_disable();
-
-        pr = __get_cpu_var(processors);
-        if (!pr) {
-                local_irq_enable();
-                return;
-        }
-
-        /*
-         * Check whether we truly need to go idle, or should
-         * reschedule:
-         */
-        if (unlikely(need_resched())) {
-                local_irq_enable();
-                return;
-        }
-
-        cx = pr->power.state;
-        if (!cx || acpi_idle_suspend) {
-                if (pm_idle_save) {
-                        pm_idle_save(); /* enables IRQs */
-                } else {
-                        acpi_safe_halt();
-                        local_irq_enable();
-                }
-
-                return;
-        }
-
-        /*
-         * Check BM Activity
-         * -----------------
-         * Check for bus mastering activity (if required), record, and check
-         * for demotion.
-         */
-        if (pr->flags.bm_check) {
-                u32 bm_status = 0;
-                unsigned long diff = jiffies - pr->power.bm_check_timestamp;
-
-                if (diff > 31)
-                        diff = 31;
-
-                pr->power.bm_activity <<= diff;
-
-                acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
-                if (bm_status) {
-                        pr->power.bm_activity |= 0x1;
-                        acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
-                }
-                /*
-                 * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
-                 * the true state of bus mastering activity; forcing us to
-                 * manually check the BMIDEA bit of each IDE channel.
-                 */
-                else if (errata.piix4.bmisx) {
-                        if ((inb_p(errata.piix4.bmisx + 0x02) & 0x01)
-                            || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01))
-                                pr->power.bm_activity |= 0x1;
-                }
-
-                pr->power.bm_check_timestamp = jiffies;
-
-                /*
-                 * If bus mastering is or was active this jiffy, demote
-                 * to avoid a faulty transition.  Note that the processor
-                 * won't enter a low-power state during this call (to this
-                 * function) but should upon the next.
-                 *
-                 * TBD: A better policy might be to fallback to the demotion
-                 *      state (use it for this quantum only) istead of
-                 *      demoting -- and rely on duration as our sole demotion
-                 *      qualification.  This may, however, introduce DMA
-                 *      issues (e.g. floppy DMA transfer overrun/underrun).
-                 */
-                if ((pr->power.bm_activity & 0x1) &&
-                    cx->demotion.threshold.bm) {
-                        local_irq_enable();
-                        next_state = cx->demotion.state;
-                        goto end;
-                }
-        }
-
-#ifdef CONFIG_HOTPLUG_CPU
-        /*
-         * Check for P_LVL2_UP flag before entering C2 and above on
-         * an SMP system. We do it here instead of doing it at _CST/P_LVL
-         * detection phase, to work cleanly with logical CPU hotplug.
-         */
-        if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-            !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
-                cx = &pr->power.states[ACPI_STATE_C1];
-#endif
-
-        /*
-         * Sleep:
-         * ------
-         * Invoke the current Cx state to put the processor to sleep.
-         */
-        if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) {
-                current_thread_info()->status &= ~TS_POLLING;
-                /*
-                 * TS_POLLING-cleared state must be visible before we
-                 * test NEED_RESCHED:
-                 */
-                smp_mb();
-                if (need_resched()) {
-                        current_thread_info()->status |= TS_POLLING;
-                        local_irq_enable();
-                        return;
-                }
-        }
-
-        switch (cx->type) {
-
-        case ACPI_STATE_C1:
-                /*
-                 * Invoke C1.
-                 * Use the appropriate idle routine, the one that would
-                 * be used without acpi C-states.
-                 */
-                if (pm_idle_save) {
-                        pm_idle_save(); /* enables IRQs */
-                } else {
-                        acpi_safe_halt();
-                        local_irq_enable();
-                }
-
-                /*
-                 * TBD: Can't get time duration while in C1, as resumes
-                 *      go to an ISR rather than here.  Need to instrument
-                 *      base interrupt handler.
-                 *
-                 * Note: the TSC better not stop in C1, sched_clock() will
-                 *       skew otherwise.
-                 */
-                sleep_ticks = 0xFFFFFFFF;
-
-                break;
-
-        case ACPI_STATE_C2:
-                /* Get start time (ticks) */
-                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                /* Tell the scheduler that we are going deep-idle: */
-                sched_clock_idle_sleep_event();
-                /* Invoke C2 */
-                acpi_state_timer_broadcast(pr, cx, 1);
-                acpi_cstate_enter(cx);
-                /* Get end time (ticks) */
-                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
-                /* TSC halts in C2, so notify users */
-                if (tsc_halts_in_c(ACPI_STATE_C2))
-                        mark_tsc_unstable("possible TSC halt in C2");
-#endif
-                /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks = ticks_elapsed(t1, t2);
-
-                /* Tell the scheduler how much we idled: */
-                sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
-
-                /* Re-enable interrupts */
-                local_irq_enable();
-                /* Do not account our idle-switching overhead: */
-                sleep_ticks -= cx->latency_ticks + C2_OVERHEAD;
-
-                current_thread_info()->status |= TS_POLLING;
-                acpi_state_timer_broadcast(pr, cx, 0);
-                break;
-
-        case ACPI_STATE_C3:
-                acpi_unlazy_tlb(smp_processor_id());
-                /*
-                 * Must be done before busmaster disable as we might
-                 * need to access HPET !
-                 */
-                acpi_state_timer_broadcast(pr, cx, 1);
-                /*
-                 * disable bus master
-                 * bm_check implies we need ARB_DIS
-                 * !bm_check implies we need cache flush
-                 * bm_control implies whether we can do ARB_DIS
-                 *
-                 * That leaves a case where bm_check is set and bm_control is
-                 * not set. In that case we cannot do much, we enter C3
-                 * without doing anything.
-                 */
-                if (pr->flags.bm_check && pr->flags.bm_control) {
-                        if (atomic_inc_return(&c3_cpu_count) ==
-                            num_online_cpus()) {
-                                /*
-                                 * All CPUs are trying to go to C3
-                                 * Disable bus master arbitration
-                                 */
-                                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
-                        }
-                } else if (!pr->flags.bm_check) {
-                        /* SMP with no shared cache... Invalidate cache  */
-                        ACPI_FLUSH_CPU_CACHE();
-                }
-
-                /* Get start time (ticks) */
-                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                /* Invoke C3 */
-                /* Tell the scheduler that we are going deep-idle: */
-                sched_clock_idle_sleep_event();
-                acpi_cstate_enter(cx);
-                /* Get end time (ticks) */
-                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                if (pr->flags.bm_check && pr->flags.bm_control) {
-                        /* Enable bus master arbitration */
-                        atomic_dec(&c3_cpu_count);
-                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
-                }
-
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
-                /* TSC halts in C3, so notify users */
-                if (tsc_halts_in_c(ACPI_STATE_C3))
-                        mark_tsc_unstable("TSC halts in C3");
-#endif
-                /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks = ticks_elapsed(t1, t2);
-                /* Tell the scheduler how much we idled: */
-                sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
-
-                /* Re-enable interrupts */
-                local_irq_enable();
-                /* Do not account our idle-switching overhead: */
-                sleep_ticks -= cx->latency_ticks + C3_OVERHEAD;
-
-                current_thread_info()->status |= TS_POLLING;
-                acpi_state_timer_broadcast(pr, cx, 0);
-                break;
-
-        default:
-                local_irq_enable();
-                return;
-        }
-        cx->usage++;
-        if ((cx->type != ACPI_STATE_C1) && (sleep_ticks > 0))
-                cx->time += sleep_ticks;
-
-        next_state = pr->power.state;
-
-#ifdef CONFIG_HOTPLUG_CPU
-        /* Don't do promotion/demotion */
-        if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-            !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED)) {
-                next_state = cx;
-                goto end;
-        }
-#endif
-
-        /*
-         * Promotion?
-         * ----------
-         * Track the number of longs (time asleep is greater than threshold)
-         * and promote when the count threshold is reached.  Note that bus
-         * mastering activity may prevent promotions.
-         * Do not promote above max_cstate.
-         */
-        if (cx->promotion.state &&
-            ((cx->promotion.state - pr->power.states) <= max_cstate)) {
-                if (sleep_ticks > cx->promotion.threshold.ticks &&
-                  cx->promotion.state->latency <=
-                                pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) {
-                        cx->promotion.count++;
-                        cx->demotion.count = 0;
-                        if (cx->promotion.count >=
-                            cx->promotion.threshold.count) {
-                                if (pr->flags.bm_check) {
-                                        if (!
-                                            (pr->power.bm_activity & cx->
-                                             promotion.threshold.bm)) {
-                                                next_state =
-                                                    cx->promotion.state;
-                                                goto end;
-                                        }
-                                } else {
-                                        next_state = cx->promotion.state;
-                                        goto end;
-                                }
-                        }
-                }
-        }
-
-        /*
-         * Demotion?
-         * ---------
-         * Track the number of shorts (time asleep is less than time threshold)
-         * and demote when the usage threshold is reached.
-         */
-        if (cx->demotion.state) {
-                if (sleep_ticks < cx->demotion.threshold.ticks) {
-                        cx->demotion.count++;
-                        cx->promotion.count = 0;
-                        if (cx->demotion.count >= cx->demotion.threshold.count) {
-                                next_state = cx->demotion.state;
-                                goto end;
-                        }
-                }
-        }
-
-      end:
-        /*
-         * Demote if current state exceeds max_cstate
-         * or if the latency of the current state is unacceptable
-         */
-        if ((pr->power.state - pr->power.states) > max_cstate ||
-                pr->power.state->latency >
-                                pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) {
-                if (cx->demotion.state)
-                        next_state = cx->demotion.state;
-        }
-
-        /*
-         * New Cx State?
-         * -------------
-         * If we're going to start using a new Cx state we must clean up
-         * from the previous and prepare to use the new.
-         */
-        if (next_state != pr->power.state)
-                acpi_processor_power_activate(pr, next_state);
-}
-
-static int acpi_processor_set_power_policy(struct acpi_processor *pr)
-{
-        unsigned int i;
-        unsigned int state_is_set = 0;
-        struct acpi_processor_cx *lower = NULL;
-        struct acpi_processor_cx *higher = NULL;
-        struct acpi_processor_cx *cx;
-
-
-        if (!pr)
-                return -EINVAL;
-
-        /*
-         * This function sets the default Cx state policy (OS idle handler).
-         * Our scheme is to promote quickly to C2 but more conservatively
-         * to C3.  We're favoring C2  for its characteristics of low latency
-         * (quick response), good power savings, and ability to allow bus
-         * mastering activity.  Note that the Cx state policy is completely
-         * customizable and can be altered dynamically.
-         */
-
-        /* startup state */
-        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
-                cx = &pr->power.states[i];
-                if (!cx->valid)
-                        continue;
-
-                if (!state_is_set)
-                        pr->power.state = cx;
-                state_is_set++;
-                break;
-        }
-
-        if (!state_is_set)
-                return -ENODEV;
-
-        /* demotion */
-        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
-                cx = &pr->power.states[i];
-                if (!cx->valid)
-                        continue;
-
-                if (lower) {
-                        cx->demotion.state = lower;
-                        cx->demotion.threshold.ticks = cx->latency_ticks;
-                        cx->demotion.threshold.count = 1;
-                        if (cx->type == ACPI_STATE_C3)
-                                cx->demotion.threshold.bm = bm_history;
-                }
-
-                lower = cx;
-        }
-
-        /* promotion */
-        for (i = (ACPI_PROCESSOR_MAX_POWER - 1); i > 0; i--) {
-                cx = &pr->power.states[i];
-                if (!cx->valid)
-                        continue;
-
-                if (higher) {
-                        cx->promotion.state = higher;
-                        cx->promotion.threshold.ticks = cx->latency_ticks;
-                        if (cx->type >= ACPI_STATE_C2)
-                                cx->promotion.threshold.count = 4;
-                        else
-                                cx->promotion.threshold.count = 10;
-                        if (higher->type == ACPI_STATE_C3)
-                                cx->promotion.threshold.bm = bm_history;
-                }
-
-                higher = cx;
-        }
-
-        return 0;
-}
-#endif /* !CONFIG_CPU_IDLE */
-
 static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 {
 
@@ -1047,11 +541,7 @@ static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)
          */
         cx->valid = 1;
 
-#ifndef CONFIG_CPU_IDLE
-        cx->latency_ticks = US_TO_PM_TIMER_TICKS(cx->latency);
-#else
         cx->latency_ticks = cx->latency;
-#endif
 
         return;
 }
@@ -1121,7 +611,6 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
                                           " for C3 to be enabled on SMP systems\n"));
                         return;
                 }
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
         }
 
         /*
@@ -1132,11 +621,16 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
          */
         cx->valid = 1;
 
-#ifndef CONFIG_CPU_IDLE
-        cx->latency_ticks = US_TO_PM_TIMER_TICKS(cx->latency);
-#else
         cx->latency_ticks = cx->latency;
-#endif
+        /*
+         * On older chipsets, BM_RLD needs to be set
+         * in order for Bus Master activity to wake the
+         * system from C3.  Newer chipsets handle DMA
+         * during C3 automatically and BM_RLD is a NOP.
+         * In either case, the proper way to
+         * handle BM_RLD is to set it and leave it set.
+         */
+        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
 
         return;
 }
@@ -1201,20 +695,6 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
 
         pr->power.count = acpi_processor_power_verify(pr);
 
-#ifndef CONFIG_CPU_IDLE
-        /*
-         * Set Default Policy
-         * ------------------
-         * Now that we know which states are supported, set the default
-         * policy.  Note that this policy can be changed dynamically
-         * (e.g. encourage deeper sleeps to conserve battery life when
-         * not on AC).
-         */
-        result = acpi_processor_set_power_policy(pr);
-        if (result)
-                return result;
-#endif
-
         /*
          * if one state of type C2 or C3 is available, mark this
          * CPU as being "idle manageable"
@@ -1312,69 +792,6 @@ static const struct file_operations acpi_processor_power_fops = {
         .release = single_release,
 };
 
-#ifndef CONFIG_CPU_IDLE
-
-int acpi_processor_cst_has_changed(struct acpi_processor *pr)
-{
-        int result = 0;
-
-        if (boot_option_idle_override)
-                return 0;
-
-        if (!pr)
-                return -EINVAL;
-
-        if (nocst) {
-                return -ENODEV;
-        }
-
-        if (!pr->flags.power_setup_done)
-                return -ENODEV;
-
-        /*
-         * Fall back to the default idle loop, when pm_idle_save had
-         * been initialized.
-         */
-        if (pm_idle_save) {
-                pm_idle = pm_idle_save;
-                /* Relies on interrupts forcing exit from idle. */
-                synchronize_sched();
-        }
-
-        pr->flags.power = 0;
-        result = acpi_processor_get_power_info(pr);
-        if ((pr->flags.power == 1) && (pr->flags.power_setup_done))
-                pm_idle = acpi_processor_idle;
-
-        return result;
-}
-
-#ifdef CONFIG_SMP
-static void smp_callback(void *v)
-{
-        /* we already woke the CPU up, nothing more to do */
-}
-
-/*
- * This function gets called when a part of the kernel has a new latency
- * requirement.  This means we need to get all processors out of their C-state,
- * and then recalculate a new suitable C-state. Just do a cross-cpu IPI; that
- * wakes them all right up.
- */
-static int acpi_processor_latency_notify(struct notifier_block *b,
-                unsigned long l, void *v)
-{
-        smp_call_function(smp_callback, NULL, 1);
-        return NOTIFY_OK;
-}
-
-static struct notifier_block acpi_processor_latency_notifier = {
-        .notifier_call = acpi_processor_latency_notify,
-};
-
-#endif
-
-#else /* CONFIG_CPU_IDLE */
 
 /**
  * acpi_idle_bm_check - checks if bus master activity was detected
@@ -1383,7 +800,7 @@ static int acpi_idle_bm_check(void)
 {
         u32 bm_status = 0;
 
-        acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
+        acpi_get_register_unlocked(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
         if (bm_status)
                 acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
         /*
@@ -1400,25 +817,6 @@ static int acpi_idle_bm_check(void)
 }
 
 /**
- * acpi_idle_update_bm_rld - updates the BM_RLD bit depending on target state
- * @pr: the processor
- * @target: the new target state
- */
-static inline void acpi_idle_update_bm_rld(struct acpi_processor *pr,
-                                           struct acpi_processor_cx *target)
-{
-        if (pr->flags.bm_rld_set && target->type != ACPI_STATE_C3) {
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
-                pr->flags.bm_rld_set = 0;
-        }
-
-        if (!pr->flags.bm_rld_set && target->type == ACPI_STATE_C3) {
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
-                pr->flags.bm_rld_set = 1;
-        }
-}
-
-/**
  * acpi_idle_do_entry - a helper function that does C2 and C3 type entry
  * @cx: cstate data
  *
@@ -1473,9 +871,6 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
                 return 0;
         }
 
-        if (pr->flags.bm_check)
-                acpi_idle_update_bm_rld(pr, cx);
-
         t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
         acpi_idle_do_entry(cx);
         t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
@@ -1527,9 +922,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
          */
         acpi_state_timer_broadcast(pr, cx, 1);
 
-        if (pr->flags.bm_check)
-                acpi_idle_update_bm_rld(pr, cx);
-
         if (cx->type == ACPI_STATE_C3)
                 ACPI_FLUSH_CPU_CACHE();
 
@@ -1621,8 +1013,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
          */
         acpi_state_timer_broadcast(pr, cx, 1);
 
-        acpi_idle_update_bm_rld(pr, cx);
-
         /*
          * disable bus master
          * bm_check implies we need ARB_DIS
@@ -1795,8 +1185,6 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
         return ret;
 }
 
-#endif /* CONFIG_CPU_IDLE */
-
 int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                               struct acpi_device *device)
 {
@@ -1825,10 +1213,6 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                "ACPI: processor limited to max C-state %d\n",
                                max_cstate);
                 first_run++;
-#if !defined(CONFIG_CPU_IDLE) && defined(CONFIG_SMP)
-                pm_qos_add_notifier(PM_QOS_CPU_DMA_LATENCY,
-                                &acpi_processor_latency_notifier);
-#endif
         }
 
         if (!pr)
@@ -1852,11 +1236,9 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
          * platforms that only support C1.
          */
         if (pr->flags.power) {
-#ifdef CONFIG_CPU_IDLE
                 acpi_processor_setup_cpuidle(pr);
                 if (cpuidle_register_device(&pr->power.dev))
                         return -EIO;
-#endif
 
                 printk(KERN_INFO PREFIX "CPU%d (power states:", pr->id);
                 for (i = 1; i <= pr->power.count; i++)
@@ -1864,13 +1246,6 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                 printk(" C%d[C%d]", i,
                                        pr->power.states[i].type);
                 printk(")\n");
-
-#ifndef CONFIG_CPU_IDLE
-                if (pr->id == 0) {
-                        pm_idle_save = pm_idle;
-                        pm_idle = acpi_processor_idle;
-                }
-#endif
         }
 
         /* 'power' [R] */
@@ -1889,34 +1264,12 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
         if (boot_option_idle_override)
                 return 0;
 
-#ifdef CONFIG_CPU_IDLE
         cpuidle_unregister_device(&pr->power.dev);
-#endif
         pr->flags.power_setup_done = 0;
 
         if (acpi_device_dir(device))
                 remove_proc_entry(ACPI_PROCESSOR_FILE_POWER,
                                   acpi_device_dir(device));
 
-#ifndef CONFIG_CPU_IDLE
-
-        /* Unregister the idle handler when processor #0 is removed. */
-        if (pr->id == 0) {
-                if (pm_idle_save)
-                        pm_idle = pm_idle_save;
-
-                /*
-                 * We are about to unload the current idle thread pm callback
-                 * (pm_idle), Wait for all processors to update cached/local
-                 * copies of pm_idle before proceeding.
-                 */
-                cpu_idle_wait();
-#ifdef CONFIG_SMP
-                pm_qos_remove_notifier(PM_QOS_CPU_DMA_LATENCY,
-                                &acpi_processor_latency_notifier);
-#endif
-        }
-#endif
-
         return 0;
 }
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 846e227592d4..9cc769b587ff 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -31,14 +31,6 @@
 #include <linux/init.h>
 #include <linux/cpufreq.h>
 
-#ifdef CONFIG_X86_ACPI_CPUFREQ_PROC_INTF
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/mutex.h>
-
-#include <asm/uaccess.h>
-#endif
-
 #ifdef CONFIG_X86
 #include <asm/cpufeature.h>
 #endif
@@ -434,96 +426,6 @@ int acpi_processor_notify_smm(struct module *calling_module)
 
 EXPORT_SYMBOL(acpi_processor_notify_smm);
 
-#ifdef CONFIG_X86_ACPI_CPUFREQ_PROC_INTF
-/* /proc/acpi/processor/../performance interface (DEPRECATED) */
-
-static int acpi_processor_perf_open_fs(struct inode *inode, struct file *file);
-static struct file_operations acpi_processor_perf_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_processor_perf_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)
-{
-        struct acpi_processor *pr = seq->private;
-        int i;
-
-
-        if (!pr)
-                goto end;
-
-        if (!pr->performance) {
-                seq_puts(seq, "<not supported>\n");
-                goto end;
-        }
-
-        seq_printf(seq, "state count:             %d\n"
-                   "active state:            P%d\n",
-                   pr->performance->state_count, pr->performance->state);
-
-        seq_puts(seq, "states:\n");
-        for (i = 0; i < pr->performance->state_count; i++)
-                seq_printf(seq,
-                           "   %cP%d:                  %d MHz, %d mW, %d uS\n",
-                           (i == pr->performance->state ? '*' : ' '), i,
-                           (u32) pr->performance->states[i].core_frequency,
-                           (u32) pr->performance->states[i].power,
-                           (u32) pr->performance->states[i].transition_latency);
-
-      end:
-        return 0;
-}
-
-static int acpi_processor_perf_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_processor_perf_seq_show,
-                           PDE(inode)->data);
-}
-
-static void acpi_cpufreq_add_file(struct acpi_processor *pr)
-{
-        struct acpi_device *device = NULL;
-
-
-        if (acpi_bus_get_device(pr->handle, &device))
-                return;
-
-        /* add file 'performance' [R/W] */
-        proc_create_data(ACPI_PROCESSOR_FILE_PERFORMANCE, S_IFREG | S_IRUGO,
-                         acpi_device_dir(device),
-                         &acpi_processor_perf_fops, acpi_driver_data(device));
-        return;
-}
-
-static void acpi_cpufreq_remove_file(struct acpi_processor *pr)
-{
-        struct acpi_device *device = NULL;
-
-
-        if (acpi_bus_get_device(pr->handle, &device))
-                return;
-
-        /* remove file 'performance' */
-        remove_proc_entry(ACPI_PROCESSOR_FILE_PERFORMANCE,
-                          acpi_device_dir(device));
-
-        return;
-}
-
-#else
-static void acpi_cpufreq_add_file(struct acpi_processor *pr)
-{
-        return;
-}
-static void acpi_cpufreq_remove_file(struct acpi_processor *pr)
-{
-        return;
-}
-#endif                          /* CONFIG_X86_ACPI_CPUFREQ_PROC_INTF */
-
 static int acpi_processor_get_psd(struct acpi_processor *pr)
 {
         int result = 0;
@@ -747,14 +649,12 @@ err_ret:
 }
 EXPORT_SYMBOL(acpi_processor_preregister_performance);
 
-
 int
 acpi_processor_register_performance(struct acpi_processor_performance
                                     *performance, unsigned int cpu)
 {
         struct acpi_processor *pr;
 
-
         if (!(acpi_processor_ppc_status & PPC_REGISTERED))
                 return -EINVAL;
 
@@ -781,8 +681,6 @@ acpi_processor_register_performance(struct acpi_processor_performance
                 return -EIO;
         }
 
-        acpi_cpufreq_add_file(pr);
-
         mutex_unlock(&performance_mutex);
         return 0;
 }
@@ -795,7 +693,6 @@ acpi_processor_unregister_performance(struct acpi_processor_performance
 {
         struct acpi_processor *pr;
 
-
         mutex_lock(&performance_mutex);
 
         pr = per_cpu(processors, cpu);
@@ -808,8 +705,6 @@ acpi_processor_unregister_performance(struct acpi_processor_performance
                 kfree(pr->performance->states);
         pr->performance = NULL;
 
-        acpi_cpufreq_remove_file(pr);
-
         mutex_unlock(&performance_mutex);
 
         return;
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 7e3c609cbef2..519266654f06 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -90,31 +90,6 @@ void __init acpi_old_suspend_ordering(void)
         old_suspend_ordering = true;
 }
 
-/*
- * According to the ACPI specification the BIOS should make sure that ACPI is
- * enabled and SCI_EN bit is set on wake-up from S1 - S3 sleep states.  Still,
- * some BIOSes don't do that and therefore we use acpi_enable() to enable ACPI
- * on such systems during resume.  Unfortunately that doesn't help in
- * particularly pathological cases in which SCI_EN has to be set directly on
- * resume, although the specification states very clearly that this flag is
- * owned by the hardware.  The set_sci_en_on_resume variable will be set in such
- * cases.
- */
-static bool set_sci_en_on_resume;
-/*
- * The ACPI specification wants us to save NVS memory regions during hibernation
- * and to restore them during the subsequent resume.  However, it is not certain
- * if this mechanism is going to work on all machines, so we allow the user to
- * disable this mechanism using the 'acpi_sleep=s4_nonvs' kernel command line
- * option.
- */
-static bool s4_no_nvs;
-
-void __init acpi_s4_no_nvs(void)
-{
-        s4_no_nvs = true;
-}
-
 /**
  *      acpi_pm_disable_gpes - Disable the GPEs.
  */
@@ -193,6 +168,18 @@ static void acpi_pm_end(void)
 #endif /* CONFIG_ACPI_SLEEP */
 
 #ifdef CONFIG_SUSPEND
+/*
+ * According to the ACPI specification the BIOS should make sure that ACPI is
+ * enabled and SCI_EN bit is set on wake-up from S1 - S3 sleep states.  Still,
+ * some BIOSes don't do that and therefore we use acpi_enable() to enable ACPI
+ * on such systems during resume.  Unfortunately that doesn't help in
+ * particularly pathological cases in which SCI_EN has to be set directly on
+ * resume, although the specification states very clearly that this flag is
+ * owned by the hardware.  The set_sci_en_on_resume variable will be set in such
+ * cases.
+ */
+static bool set_sci_en_on_resume;
+
 extern void do_suspend_lowlevel(void);
 
 static u32 acpi_suspend_states[] = {
@@ -396,6 +383,20 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 #endif /* CONFIG_SUSPEND */
 
 #ifdef CONFIG_HIBERNATION
+/*
+ * The ACPI specification wants us to save NVS memory regions during hibernation
+ * and to restore them during the subsequent resume.  However, it is not certain
+ * if this mechanism is going to work on all machines, so we allow the user to
+ * disable this mechanism using the 'acpi_sleep=s4_nonvs' kernel command line
+ * option.
+ */
+static bool s4_no_nvs;
+
+void __init acpi_s4_no_nvs(void)
+{
+        s4_no_nvs = true;
+}
+
 static unsigned long s4_hardware_signature;
 static struct acpi_table_facs *facs;
 static bool nosigcheck;
@@ -679,7 +680,7 @@ static void acpi_power_off_prepare(void)
 static void acpi_power_off(void)
 {
         /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
-        printk("%s called\n", __func__);
+        printk(KERN_DEBUG "%s called\n", __func__);
         local_irq_disable();
         acpi_enable_wakeup_device(ACPI_STATE_S5);
         acpi_enter_sleep_state(ACPI_STATE_S5);
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 775c97a282bd..a8852952fac4 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -293,7 +293,12 @@ static void __init check_multiple_madt(void)
 
 int __init acpi_table_init(void)
 {
-        acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
+        acpi_status status;
+
+        status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
+        if (ACPI_FAILURE(status))
+                return 1;
+
         check_multiple_madt();
         return 0;
 }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index f261737636da..bb5ed059114a 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1020,7 +1020,7 @@ acpi_video_device_brightness_seq_show(struct seq_file *seq, void *offset)
         }
 
         seq_printf(seq, "levels: ");
-        for (i = 0; i < dev->brightness->count; i++)
+        for (i = 2; i < dev->brightness->count; i++)
                 seq_printf(seq, " %d", dev->brightness->levels[i]);
         seq_printf(seq, "\ncurrent: %d\n", dev->brightness->curr);
 
@@ -1059,7 +1059,7 @@ acpi_video_device_write_brightness(struct file *file,
                 return -EFAULT;
 
         /* validate through the list of available levels */
-        for (i = 0; i < dev->brightness->count; i++)
+        for (i = 2; i < dev->brightness->count; i++)
                 if (level == dev->brightness->levels[i]) {
                         if (ACPI_SUCCESS
                             (acpi_video_device_lcd_set_level(dev, level)))
@@ -1260,7 +1260,7 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
                         printk(KERN_WARNING PREFIX
                                "This indicates a BIOS bug. Please contact the manufacturer.\n");
                 }
-                printk("%llx\n", options);
+                printk(KERN_WARNING "%llx\n", options);
                 seq_printf(seq, "can POST: <integrated video>");
                 if (options & 2)
                         seq_printf(seq, " <PCI video>");
@@ -1712,7 +1712,7 @@ acpi_video_get_next_level(struct acpi_video_device *device,
         max = max_below = 0;
         min = min_above = 255;
         /* Find closest level to level_current */
-        for (i = 0; i < device->brightness->count; i++) {
+        for (i = 2; i < device->brightness->count; i++) {
                 l = device->brightness->levels[i];
                 if (abs(l - level_current) < abs(delta)) {
                         delta = l - level_current;
@@ -1722,7 +1722,7 @@ acpi_video_get_next_level(struct acpi_video_device *device,
         }
         /* Ajust level_current to closest available level */
         level_current += delta;
-        for (i = 0; i < device->brightness->count; i++) {
+        for (i = 2; i < device->brightness->count; i++) {
                 l = device->brightness->levels[i];
                 if (l < min)
                         min = l;
@@ -2006,6 +2006,12 @@ static int acpi_video_bus_add(struct acpi_device *device)
                         device->pnp.bus_id[3] = '0' + instance;
                 instance ++;
         }
+        /* a hack to fix the duplicate name "VGA" problem on Pa 3553 */
+        if (!strcmp(device->pnp.bus_id, "VGA")) {
+                if (instance)
+                        device->pnp.bus_id[3] = '0' + instance;
+                instance++;
+        }
 
         video->device = device;
         strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 77bba4c083cb..a603bbf9b1b7 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -61,9 +61,14 @@
 #define EM_MSG_LED_VALUE_ON           0x00010000
 
 static int ahci_skip_host_reset;
+static int ahci_ignore_sss;
+
 module_param_named(skip_host_reset, ahci_skip_host_reset, int, 0444);
 MODULE_PARM_DESC(skip_host_reset, "skip global host reset (0=don't skip, 1=skip)");
 
+module_param_named(ignore_sss, ahci_ignore_sss, int, 0444);
+MODULE_PARM_DESC(ignore_sss, "Ignore staggered spinup flag (0=don't ignore, 1=ignore)");
+
 static int ahci_enable_alpm(struct ata_port *ap,
                 enum link_pm policy);
 static void ahci_disable_alpm(struct ata_port *ap);
@@ -2692,8 +2697,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         host->iomap = pcim_iomap_table(pdev);
         host->private_data = hpriv;
 
-        if (!(hpriv->cap & HOST_CAP_SSS))
+        if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)
                 host->flags |= ATA_HOST_PARALLEL_SCAN;
+        else
+                printk(KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n");
 
         if (pi.flags & ATA_FLAG_EM)
                 ahci_reset_em(host);
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 88c242856dae..9fbf0595f3d4 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -164,6 +164,11 @@ MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
 
+static bool ata_sstatus_online(u32 sstatus)
+{
+        return (sstatus & 0xf) == 0x3;
+}
+
 /**
  *      ata_link_next - link iteration helper
  *      @link: the previous link, NULL to start
@@ -1015,18 +1020,6 @@ static const char *sata_spd_string(unsigned int spd)
         return spd_str[spd - 1];
 }
 
-void ata_dev_disable(struct ata_device *dev)
-{
-        if (ata_dev_enabled(dev)) {
-                if (ata_msg_drv(dev->link->ap))
-                        ata_dev_printk(dev, KERN_WARNING, "disabled\n");
-                ata_acpi_on_disable(dev);
-                ata_down_xfermask_limit(dev, ATA_DNXFER_FORCE_PIO0 |
-                                             ATA_DNXFER_QUIET);
-                dev->class++;
-        }
-}
-
 static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy)
 {
         struct ata_link *link = dev->link;
@@ -2239,6 +2232,40 @@ retry:
         return rc;
 }
 
+static int ata_do_link_spd_horkage(struct ata_device *dev)
+{
+        struct ata_link *plink = ata_dev_phys_link(dev);
+        u32 target, target_limit;
+
+        if (!sata_scr_valid(plink))
+                return 0;
+
+        if (dev->horkage & ATA_HORKAGE_1_5_GBPS)
+                target = 1;
+        else
+                return 0;
+
+        target_limit = (1 << target) - 1;
+
+        /* if already on stricter limit, no need to push further */
+        if (plink->sata_spd_limit <= target_limit)
+                return 0;
+
+        plink->sata_spd_limit = target_limit;
+
+        /* Request another EH round by returning -EAGAIN if link is
+         * going faster than the target speed.  Forward progress is
+         * guaranteed by setting sata_spd_limit to target_limit above.
+         */
+        if (plink->sata_spd > target) {
+                ata_dev_printk(dev, KERN_INFO,
+                               "applying link speed limit horkage to %s\n",
+                               sata_spd_string(target));
+                return -EAGAIN;
+        }
+        return 0;
+}
+
 static inline u8 ata_dev_knobble(struct ata_device *dev)
 {
         struct ata_port *ap = dev->link->ap;
@@ -2329,6 +2356,10 @@ int ata_dev_configure(struct ata_device *dev)
                 return 0;
         }
 
+        rc = ata_do_link_spd_horkage(dev);
+        if (rc)
+                return rc;
+
         /* let ACPI work its magic */
         rc = ata_acpi_on_devcfg(dev);
         if (rc)
@@ -2784,7 +2815,7 @@ int ata_bus_probe(struct ata_port *ap)
                         /* This is the last chance, better to slow
                          * down than lose it.
                          */
-                        sata_down_spd_limit(&ap->link);
+                        sata_down_spd_limit(&ap->link, 0);
                         ata_down_xfermask_limit(dev, ATA_DNXFER_PIO);
                 }
         }
@@ -2880,21 +2911,27 @@ void ata_port_disable(struct ata_port *ap)
 /**
  *      sata_down_spd_limit - adjust SATA spd limit downward
  *      @link: Link to adjust SATA spd limit for
+ *      @spd_limit: Additional limit
  *
  *      Adjust SATA spd limit of @link downward.  Note that this
  *      function only adjusts the limit.  The change must be applied
  *      using sata_set_spd().
  *
+ *      If @spd_limit is non-zero, the speed is limited to equal to or
+ *      lower than @spd_limit if such speed is supported.  If
+ *      @spd_limit is slower than any supported speed, only the lowest
+ *      supported speed is allowed.
+ *
  *      LOCKING:
  *      Inherited from caller.
  *
  *      RETURNS:
  *      0 on success, negative errno on failure
  */
-int sata_down_spd_limit(struct ata_link *link)
+int sata_down_spd_limit(struct ata_link *link, u32 spd_limit)
 {
         u32 sstatus, spd, mask;
-        int rc, highbit;
+        int rc, bit;
 
         if (!sata_scr_valid(link))
                 return -EOPNOTSUPP;
@@ -2903,7 +2940,7 @@ int sata_down_spd_limit(struct ata_link *link)
          * If not, use cached value in link->sata_spd.
          */
         rc = sata_scr_read(link, SCR_STATUS, &sstatus);
-        if (rc == 0)
+        if (rc == 0 && ata_sstatus_online(sstatus))
                 spd = (sstatus >> 4) & 0xf;
         else
                 spd = link->sata_spd;
@@ -2913,8 +2950,8 @@ int sata_down_spd_limit(struct ata_link *link)
                 return -EINVAL;
 
         /* unconditionally mask off the highest bit */
-        highbit = fls(mask) - 1;
-        mask &= ~(1 << highbit);
+        bit = fls(mask) - 1;
+        mask &= ~(1 << bit);
 
         /* Mask off all speeds higher than or equal to the current
          * one.  Force 1.5Gbps if current SPD is not available.
@@ -2928,6 +2965,15 @@ int sata_down_spd_limit(struct ata_link *link)
         if (!mask)
                 return -EINVAL;
 
+        if (spd_limit) {
+                if (mask & ((1 << spd_limit) - 1))
+                        mask &= (1 << spd_limit) - 1;
+                else {
+                        bit = ffs(mask) - 1;
+                        mask = 1 << bit;
+                }
+        }
+
         link->sata_spd_limit = mask;
 
         ata_link_printk(link, KERN_WARNING, "limiting SATA link speed to %s\n",
@@ -4215,6 +4261,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         /* Devices that do not need bridging limits applied */
         { "MTRON MSP-SATA*",            NULL,   ATA_HORKAGE_BRIDGE_OK, },
 
+        /* Devices which aren't very happy with higher link speeds */
+        { "WD My Book",                 NULL,   ATA_HORKAGE_1_5_GBPS, },
+
         /* End Marker */
         { }
 };
@@ -4709,8 +4758,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)
 
 /**
  *      ata_qc_new - Request an available ATA command, for queueing
- *      @ap: Port associated with device @dev
- *      @dev: Device from whom we request an available command structure
+ *      @ap: target port
  *
  *      LOCKING:
  *      None.
@@ -5175,7 +5223,7 @@ bool ata_phys_link_online(struct ata_link *link)
         u32 sstatus;
 
         if (sata_scr_read(link, SCR_STATUS, &sstatus) == 0 &&
-            (sstatus & 0xf) == 0x3)
+            ata_sstatus_online(sstatus))
                 return true;
         return false;
 }
@@ -5199,7 +5247,7 @@ bool ata_phys_link_offline(struct ata_link *link)
         u32 sstatus;
 
         if (sata_scr_read(link, SCR_STATUS, &sstatus) == 0 &&
-            (sstatus & 0xf) != 0x3)
+            !ata_sstatus_online(sstatus))
                 return true;
         return false;
 }
@@ -5412,8 +5460,8 @@ void ata_dev_init(struct ata_device *dev)
         dev->horkage = 0;
         spin_unlock_irqrestore(ap->lock, flags);
 
-        memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0,
-               sizeof(*dev) - ATA_DEVICE_CLEAR_OFFSET);
+        memset((void *)dev + ATA_DEVICE_CLEAR_BEGIN, 0,
+               ATA_DEVICE_CLEAR_END - ATA_DEVICE_CLEAR_BEGIN);
         dev->pio_mask = UINT_MAX;
         dev->mwdma_mask = UINT_MAX;
         dev->udma_mask = UINT_MAX;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 8147a8386370..ce2ef0475339 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -82,6 +82,10 @@ enum {
         ATA_EH_FASTDRAIN_INTERVAL       =  3000,
 
         ATA_EH_UA_TRIES                 = 5,
+
+        /* probe speed down parameters, see ata_eh_schedule_probe() */
+        ATA_EH_PROBE_TRIAL_INTERVAL     = 60000,        /* 1 min */
+        ATA_EH_PROBE_TRIALS             = 2,
 };
 
 /* The following table determines how we sequence resets.  Each entry
@@ -1176,6 +1180,32 @@ void ata_eh_qc_retry(struct ata_queued_cmd *qc)
 }
 
 /**
+ *      ata_dev_disable - disable ATA device
+ *      @dev: ATA device to disable
+ *
+ *      Disable @dev.
+ *
+ *      Locking:
+ *      EH context.
+ */
+void ata_dev_disable(struct ata_device *dev)
+{
+        if (!ata_dev_enabled(dev))
+                return;
+
+        if (ata_msg_drv(dev->link->ap))
+                ata_dev_printk(dev, KERN_WARNING, "disabled\n");
+        ata_acpi_on_disable(dev);
+        ata_down_xfermask_limit(dev, ATA_DNXFER_FORCE_PIO0 | ATA_DNXFER_QUIET);
+        dev->class++;
+
+        /* From now till the next successful probe, ering is used to
+         * track probe failures.  Clear accumulated device error info.
+         */
+        ata_ering_clear(&dev->ering);
+}
+
+/**
  *      ata_eh_detach_dev - detach ATA device
  *      @dev: ATA device to detach
  *
@@ -1849,7 +1879,7 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev,
         /* speed down? */
         if (verdict & ATA_EH_SPDN_SPEED_DOWN) {
                 /* speed down SATA link speed if possible */
-                if (sata_down_spd_limit(link) == 0) {
+                if (sata_down_spd_limit(link, 0) == 0) {
                         action |= ATA_EH_RESET;
                         goto done;
                 }
@@ -2601,11 +2631,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
         }
 
         if (try == max_tries - 1) {
-                sata_down_spd_limit(link);
+                sata_down_spd_limit(link, 0);
                 if (slave)
-                        sata_down_spd_limit(slave);
+                        sata_down_spd_limit(slave, 0);
         } else if (rc == -EPIPE)
-                sata_down_spd_limit(failed_link);
+                sata_down_spd_limit(failed_link, 0);
 
         if (hardreset)
                 reset = hardreset;
@@ -2744,6 +2774,8 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link,
                                                      readid_flags, dev->id);
                         switch (rc) {
                         case 0:
+                                /* clear error info accumulated during probe */
+                                ata_ering_clear(&dev->ering);
                                 new_mask |= 1 << dev->devno;
                                 break;
                         case -ENOENT:
@@ -2947,9 +2979,24 @@ static int ata_eh_skip_recovery(struct ata_link *link)
         return 1;
 }
 
+static int ata_count_probe_trials_cb(struct ata_ering_entry *ent, void *void_arg)
+{
+        u64 interval = msecs_to_jiffies(ATA_EH_PROBE_TRIAL_INTERVAL);
+        u64 now = get_jiffies_64();
+        int *trials = void_arg;
+
+        if (ent->timestamp < now - min(now, interval))
+                return -1;
+
+        (*trials)++;
+        return 0;
+}
+
 static int ata_eh_schedule_probe(struct ata_device *dev)
 {
         struct ata_eh_context *ehc = &dev->link->eh_context;
+        struct ata_link *link = ata_dev_phys_link(dev);
+        int trials = 0;
 
         if (!(ehc->i.probe_mask & (1 << dev->devno)) ||
             (ehc->did_probe_mask & (1 << dev->devno)))
@@ -2962,6 +3009,25 @@ static int ata_eh_schedule_probe(struct ata_device *dev)
         ehc->saved_xfer_mode[dev->devno] = 0;
         ehc->saved_ncq_enabled &= ~(1 << dev->devno);
 
+        /* Record and count probe trials on the ering.  The specific
+         * error mask used is irrelevant.  Because a successful device
+         * detection clears the ering, this count accumulates only if
+         * there are consecutive failed probes.
+         *
+         * If the count is equal to or higher than ATA_EH_PROBE_TRIALS
+         * in the last ATA_EH_PROBE_TRIAL_INTERVAL, link speed is
+         * forced to 1.5Gbps.
+         *
+         * This is to work around cases where failed link speed
+         * negotiation results in device misdetection leading to
+         * infinite DEVXCHG or PHRDY CHG events.
+         */
+        ata_ering_record(&dev->ering, 0, AC_ERR_OTHER);
+        ata_ering_map(&dev->ering, ata_count_probe_trials_cb, &trials);
+
+        if (trials > ATA_EH_PROBE_TRIALS)
+                sata_down_spd_limit(link, 1);
+
         return 1;
 }
 
@@ -2969,7 +3035,11 @@ static int ata_eh_handle_dev_fail(struct ata_device *dev, int err)
 {
         struct ata_eh_context *ehc = &dev->link->eh_context;
 
-        ehc->tries[dev->devno]--;
+        /* -EAGAIN from EH routine indicates retry without prejudice.
+         * The requester is responsible for ensuring forward progress.
+         */
+        if (err != -EAGAIN)
+                ehc->tries[dev->devno]--;
 
         switch (err) {
         case -ENODEV:
@@ -2979,12 +3049,13 @@ static int ata_eh_handle_dev_fail(struct ata_device *dev, int err)
                 /* give it just one more chance */
                 ehc->tries[dev->devno] = min(ehc->tries[dev->devno], 1);
         case -EIO:
-                if (ehc->tries[dev->devno] == 1 && dev->pio_mode > XFER_PIO_0) {
+                if (ehc->tries[dev->devno] == 1) {
                         /* This is the last chance, better to slow
                          * down than lose it.
                          */
-                        sata_down_spd_limit(ata_dev_phys_link(dev));
-                        ata_down_xfermask_limit(dev, ATA_DNXFER_PIO);
+                        sata_down_spd_limit(ata_dev_phys_link(dev), 0);
+                        if (dev->pio_mode > XFER_PIO_0)
+                                ata_down_xfermask_limit(dev, ATA_DNXFER_PIO);
                 }
         }
 
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index 98ca07a2db87..619f2c33950e 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -729,7 +729,7 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,
                 if (tries) {
                         /* consecutive revalidation failures? speed down */
                         if (reval_failed)
-                                sata_down_spd_limit(link);
+                                sata_down_spd_limit(link, 0);
                         else
                                 reval_failed = 1;
 
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 3c4c5ae277ba..b9747fa59e54 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -415,6 +415,7 @@ int ata_std_bios_param(struct scsi_device *sdev, struct block_device *bdev,
 
 /**
  *      ata_get_identity - Handler for HDIO_GET_IDENTITY ioctl
+ *      @ap: target port
  *      @sdev: SCSI device to get identify data for
  *      @arg: User buffer area for identify data
  *
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index fe2839e58774..cea8014cd87e 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -79,7 +79,6 @@ extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,
                            u64 block, u32 n_block, unsigned int tf_flags,
                            unsigned int tag);
 extern u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev);
-extern void ata_dev_disable(struct ata_device *dev);
 extern void ata_pio_queue_task(struct ata_port *ap, void *data,
                                unsigned long delay);
 extern void ata_port_flush_task(struct ata_port *ap);
@@ -100,7 +99,7 @@ extern int ata_dev_reread_id(struct ata_device *dev, unsigned int readid_flags);
 extern int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,
                               unsigned int readid_flags);
 extern int ata_dev_configure(struct ata_device *dev);
-extern int sata_down_spd_limit(struct ata_link *link);
+extern int sata_down_spd_limit(struct ata_link *link, u32 spd_limit);
 extern int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel);
 extern void ata_sg_clean(struct ata_queued_cmd *qc);
 extern void ata_qc_free(struct ata_queued_cmd *qc);
@@ -160,6 +159,7 @@ extern void ata_scsi_error(struct Scsi_Host *host);
 extern void ata_port_wait_eh(struct ata_port *ap);
 extern void ata_eh_fastdrain_timerfn(unsigned long arg);
 extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);
+extern void ata_dev_disable(struct ata_device *dev);
 extern void ata_eh_detach_dev(struct ata_device *dev);
 extern void ata_eh_about_to_do(struct ata_link *link, struct ata_device *dev,
                                unsigned int action);
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index 3080f371222c..f1b26f7c8e4d 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -12,7 +12,7 @@
  *
  * Probe code based on drivers/ide/legacy/qd65xx.c
  * Rewritten from the work of Colten Edwards <pje120@cs.usask.ca> by
- * Samuel Thibault <samuel.thibault@fnac.net>
+ * Samuel Thibault <samuel.thibault@ens-lyon.org>
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index f2d8a020ea53..4ae1a4138b47 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -663,8 +663,8 @@ static const struct pci_device_id mv_pci_tbl[] = {
         { PCI_VDEVICE(MARVELL, 0x5081), chip_508x },
         /* RocketRAID 1720/174x have different identifiers */
         { PCI_VDEVICE(TTI, 0x1720), chip_6042 },
-        { PCI_VDEVICE(TTI, 0x1740), chip_508x },
-        { PCI_VDEVICE(TTI, 0x1742), chip_508x },
+        { PCI_VDEVICE(TTI, 0x1740), chip_6042 },
+        { PCI_VDEVICE(TTI, 0x1742), chip_6042 },
 
         { PCI_VDEVICE(MARVELL, 0x6040), chip_604x },
         { PCI_VDEVICE(MARVELL, 0x6041), chip_604x },
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index c49ad0e61b6f..444af0415ca1 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -436,11 +436,16 @@ static struct ata_port_operations nv_nf2_ops = {
         .hardreset              = nv_noclassify_hardreset,
 };
 
-/* CK804 finally gets hardreset right */
+/* For initial probing after boot and hot plugging, hardreset mostly
+ * works fine on CK804 but curiously, reprobing on the initial port by
+ * rescanning or rmmod/insmod fails to acquire the initial D2H Reg FIS
+ * in somewhat undeterministic way.  Use noclassify hardreset.
+ */
 static struct ata_port_operations nv_ck804_ops = {
         .inherits               = &nv_common_ops,
         .freeze                 = nv_ck804_freeze,
         .thaw                   = nv_ck804_thaw,
+        .hardreset              = nv_noclassify_hardreset,
         .host_stop              = nv_ck804_host_stop,
 };
 
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 9f029595f454..d0091609e210 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -324,7 +324,7 @@ static void sil_fill_sg(struct ata_queued_cmd *qc)
 
                 prd->addr = cpu_to_le32(addr);
                 prd->flags_len = cpu_to_le32(sg_len);
-                VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", pi, addr, sg_len);
+                VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", si, addr, sg_len);
 
                 last_prd = prd;
                 prd++;
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index f5be8081cd81..735bbe2be51a 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -761,7 +761,7 @@ source "drivers/char/hw_random/Kconfig"
 
 config NVRAM
         tristate "/dev/nvram support"
-        depends on ATARI || X86 || ARM || GENERIC_NVRAM
+        depends on ATARI || X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM
         ---help---
           If you say Y here and create a character special file /dev/nvram
           with major number 10 and minor number 144 using mknod ("man mknod"),
diff --git a/drivers/char/selection.c b/drivers/char/selection.c
index f29fbe9b8ed7..cb8ca5698963 100644
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
@@ -268,7 +268,7 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t
 
         /* Allocate a new buffer before freeing the old one ... */
         multiplier = use_unicode ? 3 : 1;  /* chars can take up to 3 bytes */
-        bp = kmalloc((sel_end-sel_start)/2*multiplier+1, GFP_KERNEL);
+        bp = kmalloc(((sel_end-sel_start)/2+1)*multiplier, GFP_KERNEL);
         if (!bp) {
                 printk(KERN_WARNING "selection: kmalloc() failed\n");
                 clear_selection();
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index b60be7b0decf..f146e90404fa 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1713,8 +1713,8 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 for (i = 0; i < SX_NBOARDS; i++)
                         sx_dprintk(SX_DEBUG_FIRMWARE, "<%x> ", boards[i].flags);
                 sx_dprintk(SX_DEBUG_FIRMWARE, "\n");
-                unlock_kernel();
-                return -EIO;
+                rc = -EIO;
+                goto out;
         }
 
         switch (cmd) {
@@ -1747,7 +1747,8 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 break;
         case SXIO_DO_RAMTEST:
                 if (sx_initialized)     /* Already initialized: better not ramtest the board.  */
-                        return -EPERM;
+                        rc = -EPERM;
+                        break;
                 if (IS_SX_BOARD(board)) {
                         rc = do_memtest(board, 0, 0x7000);
                         if (!rc)
@@ -1844,6 +1845,7 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 rc = -ENOTTY;
                 break;
         }
+out:
         unlock_kernel();
         func_exit();
         return rc;
diff --git a/drivers/dca/dca-core.c b/drivers/dca/dca-core.c
index 55433849bfa6..33bd75347518 100644
--- a/drivers/dca/dca-core.c
+++ b/drivers/dca/dca-core.c
@@ -28,7 +28,7 @@
 #include <linux/device.h>
 #include <linux/dca.h>
 
-#define DCA_VERSION "1.4"
+#define DCA_VERSION "1.8"
 
 MODULE_VERSION(DCA_VERSION);
 MODULE_LICENSE("GPL");
@@ -60,16 +60,17 @@ int dca_add_requester(struct device *dev)
 {
         struct dca_provider *dca;
         int err, slot = -ENODEV;
+        unsigned long flags;
 
         if (!dev)
                 return -EFAULT;
 
-        spin_lock(&dca_lock);
+        spin_lock_irqsave(&dca_lock, flags);
 
         /* check if the requester has not been added already */
         dca = dca_find_provider_by_dev(dev);
         if (dca) {
-                spin_unlock(&dca_lock);
+                spin_unlock_irqrestore(&dca_lock, flags);
                 return -EEXIST;
         }
 
@@ -78,19 +79,21 @@ int dca_add_requester(struct device *dev)
                 if (slot >= 0)
                         break;
         }
-        if (slot < 0) {
-                spin_unlock(&dca_lock);
+
+        spin_unlock_irqrestore(&dca_lock, flags);
+
+        if (slot < 0)
                 return slot;
-        }
 
         err = dca_sysfs_add_req(dca, dev, slot);
         if (err) {
-                dca->ops->remove_requester(dca, dev);
-                spin_unlock(&dca_lock);
+                spin_lock_irqsave(&dca_lock, flags);
+                if (dca == dca_find_provider_by_dev(dev))
+                        dca->ops->remove_requester(dca, dev);
+                spin_unlock_irqrestore(&dca_lock, flags);
                 return err;
         }
 
-        spin_unlock(&dca_lock);
         return 0;
 }
 EXPORT_SYMBOL_GPL(dca_add_requester);
@@ -103,25 +106,25 @@ int dca_remove_requester(struct device *dev)
 {
         struct dca_provider *dca;
         int slot;
+        unsigned long flags;
 
         if (!dev)
                 return -EFAULT;
 
-        spin_lock(&dca_lock);
+        spin_lock_irqsave(&dca_lock, flags);
         dca = dca_find_provider_by_dev(dev);
         if (!dca) {
-                spin_unlock(&dca_lock);
+                spin_unlock_irqrestore(&dca_lock, flags);
                 return -ENODEV;
         }
         slot = dca->ops->remove_requester(dca, dev);
-        if (slot < 0) {
-                spin_unlock(&dca_lock);
+        spin_unlock_irqrestore(&dca_lock, flags);
+
+        if (slot < 0)
                 return slot;
-        }
 
         dca_sysfs_remove_req(dca, slot);
 
-        spin_unlock(&dca_lock);
         return 0;
 }
 EXPORT_SYMBOL_GPL(dca_remove_requester);
@@ -135,17 +138,18 @@ u8 dca_common_get_tag(struct device *dev, int cpu)
 {
         struct dca_provider *dca;
         u8 tag;
+        unsigned long flags;
 
-        spin_lock(&dca_lock);
+        spin_lock_irqsave(&dca_lock, flags);
 
         dca = dca_find_provider_by_dev(dev);
         if (!dca) {
-                spin_unlock(&dca_lock);
+                spin_unlock_irqrestore(&dca_lock, flags);
                 return -ENODEV;
         }
         tag = dca->ops->get_tag(dca, dev, cpu);
 
-        spin_unlock(&dca_lock);
+        spin_unlock_irqrestore(&dca_lock, flags);
         return tag;
 }
 
@@ -217,11 +221,16 @@ static BLOCKING_NOTIFIER_HEAD(dca_provider_chain);
 int register_dca_provider(struct dca_provider *dca, struct device *dev)
 {
         int err;
+        unsigned long flags;
 
         err = dca_sysfs_add_provider(dca, dev);
         if (err)
                 return err;
+
+        spin_lock_irqsave(&dca_lock, flags);
         list_add(&dca->node, &dca_providers);
+        spin_unlock_irqrestore(&dca_lock, flags);
+
         blocking_notifier_call_chain(&dca_provider_chain,
                                      DCA_PROVIDER_ADD, NULL);
         return 0;
@@ -234,9 +243,15 @@ EXPORT_SYMBOL_GPL(register_dca_provider);
  */
 void unregister_dca_provider(struct dca_provider *dca)
 {
+        unsigned long flags;
+
         blocking_notifier_call_chain(&dca_provider_chain,
                                      DCA_PROVIDER_REMOVE, NULL);
+
+        spin_lock_irqsave(&dca_lock, flags);
         list_del(&dca->node);
+        spin_unlock_irqrestore(&dca_lock, flags);
+
         dca_sysfs_remove_provider(dca);
 }
 EXPORT_SYMBOL_GPL(unregister_dca_provider);
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 7be2cf3514e7..a5dd7a665aa8 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -412,6 +412,7 @@ fw_card_add(struct fw_card *card,
 {
         u32 *config_rom;
         size_t length;
+        int err;
 
         card->max_receive = max_receive;
         card->link_speed = link_speed;
@@ -422,7 +423,13 @@ fw_card_add(struct fw_card *card,
         list_add_tail(&card->link, &card_list);
         mutex_unlock(&card_mutex);
 
-        return card->driver->enable(card, config_rom, length);
+        err = card->driver->enable(card, config_rom, length);
+        if (err < 0) {
+                mutex_lock(&card_mutex);
+                list_del(&card->link);
+                mutex_unlock(&card_mutex);
+        }
+        return err;
 }
 EXPORT_SYMBOL(fw_card_add);
 
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 9da581452874..6915fb82d0b0 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -136,7 +136,7 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size)
         obj = kcalloc(1, sizeof(*obj), GFP_KERNEL);
 
         obj->dev = dev;
-        obj->filp = shmem_file_setup("drm mm object", size, 0);
+        obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
         if (IS_ERR(obj->filp)) {
                 kfree(obj);
                 return NULL;
diff --git a/drivers/hwmon/hp_accel.c b/drivers/hwmon/hp_accel.c
index 03705240000f..abf4dfc8ec22 100644
--- a/drivers/hwmon/hp_accel.c
+++ b/drivers/hwmon/hp_accel.c
@@ -153,7 +153,10 @@ static struct axis_conversion lis3lv02d_axis_y_inverted = {1, -2, 3};
 static struct axis_conversion lis3lv02d_axis_x_inverted = {-1, 2, 3};
 static struct axis_conversion lis3lv02d_axis_z_inverted = {1, 2, -3};
 static struct axis_conversion lis3lv02d_axis_xy_rotated_left = {-2, 1, 3};
+static struct axis_conversion lis3lv02d_axis_xy_rotated_left_usd = {-2, 1, -3};
 static struct axis_conversion lis3lv02d_axis_xy_swap_inverted = {-2, -1, 3};
+static struct axis_conversion lis3lv02d_axis_xy_rotated_right = {2, -1, 3};
+static struct axis_conversion lis3lv02d_axis_xy_swap_yz_inverted = {2, -1, -3};
 
 #define AXIS_DMI_MATCH(_ident, _name, _axis) {          \
         .ident = _ident,                                \
@@ -172,10 +175,12 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = {
         AXIS_DMI_MATCH("NC2510", "HP Compaq 2510", y_inverted),
         AXIS_DMI_MATCH("NC8510", "HP Compaq 8510", xy_swap_inverted),
         AXIS_DMI_MATCH("HP2133", "HP 2133", xy_rotated_left),
+        AXIS_DMI_MATCH("NC653x", "HP Compaq 653", xy_rotated_left_usd),
+        AXIS_DMI_MATCH("NC673x", "HP Compaq 673", xy_rotated_left_usd),
+        AXIS_DMI_MATCH("NC651xx", "HP Compaq 651", xy_rotated_right),
+        AXIS_DMI_MATCH("NC671xx", "HP Compaq 671", xy_swap_yz_inverted),
         { NULL, }
 /* Laptop models without axis info (yet):
- * "NC651xx" "HP Compaq 651"
- * "NC671xx" "HP Compaq 671"
  * "NC6910" "HP Compaq 6910"
  * HP Compaq 8710x Notebook PC / Mobile Workstation
  * "NC2400" "HP Compaq nc2400"
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index b1c6f68d98ce..3dad2299d9c5 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -465,6 +465,16 @@ config BLK_DEV_CS5535
 
           It is safe to say Y to this question.
 
+config BLK_DEV_CS5536
+        tristate "CS5536 chipset support"
+        depends on X86_32
+        select BLK_DEV_IDEDMA_PCI
+        help
+          This option enables support for the AMD CS5536
+          companion chip used with the Geode LX processor family.
+
+          If unsure, say N.
+
 config BLK_DEV_HPT366
         tristate "HPT36X/37X chipset support"
         select BLK_DEV_IDEDMA_PCI
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index c2b9c93f0095..d0e3d7d5b467 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_BLK_DEV_CMD64X)		+= cmd64x.o
 obj-$(CONFIG_BLK_DEV_CS5520)            += cs5520.o
 obj-$(CONFIG_BLK_DEV_CS5530)            += cs5530.o
 obj-$(CONFIG_BLK_DEV_CS5535)            += cs5535.o
+obj-$(CONFIG_BLK_DEV_CS5536)            += cs5536.o
 obj-$(CONFIG_BLK_DEV_SC1200)            += sc1200.o
 obj-$(CONFIG_BLK_DEV_CY82C693)          += cy82c693.o
 obj-$(CONFIG_BLK_DEV_DELKIN)            += delkin_cb.o
diff --git a/drivers/ide/cs5536.c b/drivers/ide/cs5536.c
new file mode 100644
index 000000000000..7a62db719a46
--- /dev/null
+++ b/drivers/ide/cs5536.c
@@ -0,0 +1,308 @@
+/*
+ * CS5536 PATA support
+ * (C) 2007 Martin K. Petersen <mkp@mkp.net>
+ * (C) 2009 Bartlomiej Zolnierkiewicz
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Documentation:
+ *      Available from AMD web site.
+ *
+ * The IDE timing registers for the CS5536 live in the Geode Machine
+ * Specific Register file and not PCI config space.  Most BIOSes
+ * virtualize the PCI registers so the chip looks like a standard IDE
+ * controller.  Unfortunately not all implementations get this right.
+ * In particular some have problems with unaligned accesses to the
+ * virtualized PCI registers.  This driver always does full dword
+ * writes to work around the issue.  Also, in case of a bad BIOS this
+ * driver can be loaded with the "msr=1" parameter which forces using
+ * the Machine Specific Registers to configure the device.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/ide.h>
+#include <asm/msr.h>
+
+#define DRV_NAME        "cs5536"
+
+enum {
+        MSR_IDE_CFG             = 0x51300010,
+        PCI_IDE_CFG             = 0x40,
+
+        CFG                     = 0,
+        DTC                     = 2,
+        CAST                    = 3,
+        ETC                     = 4,
+
+        IDE_CFG_CHANEN          = (1 << 1),
+        IDE_CFG_CABLE           = (1 << 17) | (1 << 16),
+
+        IDE_D0_SHIFT            = 24,
+        IDE_D1_SHIFT            = 16,
+        IDE_DRV_MASK            = 0xff,
+
+        IDE_CAST_D0_SHIFT       = 6,
+        IDE_CAST_D1_SHIFT       = 4,
+        IDE_CAST_DRV_MASK       = 0x3,
+
+        IDE_CAST_CMD_SHIFT      = 24,
+        IDE_CAST_CMD_MASK       = 0xff,
+
+        IDE_ETC_UDMA_MASK       = 0xc0,
+};
+
+static int use_msr;
+
+static int cs5536_read(struct pci_dev *pdev, int reg, u32 *val)
+{
+        if (unlikely(use_msr)) {
+                u32 dummy;
+
+                rdmsr(MSR_IDE_CFG + reg, *val, dummy);
+                return 0;
+        }
+
+        return pci_read_config_dword(pdev, PCI_IDE_CFG + reg * 4, val);
+}
+
+static int cs5536_write(struct pci_dev *pdev, int reg, int val)
+{
+        if (unlikely(use_msr)) {
+                wrmsr(MSR_IDE_CFG + reg, val, 0);
+                return 0;
+        }
+
+        return pci_write_config_dword(pdev, PCI_IDE_CFG + reg * 4, val);
+}
+
+static void cs5536_program_dtc(ide_drive_t *drive, u8 tim)
+{
+        struct pci_dev *pdev = to_pci_dev(drive->hwif->dev);
+        int dshift = (drive->dn & 1) ? IDE_D1_SHIFT : IDE_D0_SHIFT;
+        u32 dtc;
+
+        cs5536_read(pdev, DTC, &dtc);
+        dtc &= ~(IDE_DRV_MASK << dshift);
+        dtc |= tim << dshift;
+        cs5536_write(pdev, DTC, dtc);
+}
+
+/**
+ *      cs5536_cable_detect     -       detect cable type
+ *      @hwif: Port to detect on
+ *
+ *      Perform cable detection for ATA66 capable cable.
+ *
+ *      Returns a cable type.
+ */
+
+static u8 cs5536_cable_detect(ide_hwif_t *hwif)
+{
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
+        u32 cfg;
+
+        cs5536_read(pdev, CFG, &cfg);
+
+        if (cfg & IDE_CFG_CABLE)
+                return ATA_CBL_PATA80;
+        else
+                return ATA_CBL_PATA40;
+}
+
+/**
+ *      cs5536_set_pio_mode             -       PIO timing setup
+ *      @drive: ATA device
+ *      @pio: PIO mode number
+ */
+
+static void cs5536_set_pio_mode(ide_drive_t *drive, const u8 pio)
+{
+        static const u8 drv_timings[5] = {
+                0x98, 0x55, 0x32, 0x21, 0x20,
+        };
+
+        static const u8 addr_timings[5] = {
+                0x2, 0x1, 0x0, 0x0, 0x0,
+        };
+
+        static const u8 cmd_timings[5] = {
+                0x99, 0x92, 0x90, 0x22, 0x20,
+        };
+
+        struct pci_dev *pdev = to_pci_dev(drive->hwif->dev);
+        ide_drive_t *pair = ide_get_pair_dev(drive);
+        int cshift = (drive->dn & 1) ? IDE_CAST_D1_SHIFT : IDE_CAST_D0_SHIFT;
+        u32 cast;
+        u8 cmd_pio = pio;
+
+        if (pair)
+                cmd_pio = min(pio, ide_get_best_pio_mode(pair, 255, 4));
+
+        drive->drive_data &= (IDE_DRV_MASK << 8);
+        drive->drive_data |= drv_timings[pio];
+
+        cs5536_program_dtc(drive, drv_timings[pio]);
+
+        cs5536_read(pdev, CAST, &cast);
+
+        cast &= ~(IDE_CAST_DRV_MASK << cshift);
+        cast |= addr_timings[pio] << cshift;
+
+        cast &= ~(IDE_CAST_CMD_MASK << IDE_CAST_CMD_SHIFT);
+        cast |= cmd_timings[cmd_pio] << IDE_CAST_CMD_SHIFT;
+
+        cs5536_write(pdev, CAST, cast);
+}
+
+/**
+ *      cs5536_set_dma_mode             -       DMA timing setup
+ *      @drive: ATA device
+ *      @mode: DMA mode
+ */
+
+static void cs5536_set_dma_mode(ide_drive_t *drive, const u8 mode)
+{
+        static const u8 udma_timings[6] = {
+                0xc2, 0xc1, 0xc0, 0xc4, 0xc5, 0xc6,
+        };
+
+        static const u8 mwdma_timings[3] = {
+                0x67, 0x21, 0x20,
+        };
+
+        struct pci_dev *pdev = to_pci_dev(drive->hwif->dev);
+        int dshift = (drive->dn & 1) ? IDE_D1_SHIFT : IDE_D0_SHIFT;
+        u32 etc;
+
+        cs5536_read(pdev, ETC, &etc);
+
+        if (mode >= XFER_UDMA_0) {
+                etc &= ~(IDE_DRV_MASK << dshift);
+                etc |= udma_timings[mode - XFER_UDMA_0] << dshift;
+        } else { /* MWDMA */
+                etc &= ~(IDE_ETC_UDMA_MASK << dshift);
+                drive->drive_data &= IDE_DRV_MASK;
+                drive->drive_data |= mwdma_timings[mode - XFER_MW_DMA_0] << 8;
+        }
+
+        cs5536_write(pdev, ETC, etc);
+}
+
+static void cs5536_dma_start(ide_drive_t *drive)
+{
+        if (drive->current_speed < XFER_UDMA_0 &&
+            (drive->drive_data >> 8) != (drive->drive_data & IDE_DRV_MASK))
+                cs5536_program_dtc(drive, drive->drive_data >> 8);
+
+        ide_dma_start(drive);
+}
+
+static int cs5536_dma_end(ide_drive_t *drive)
+{
+        int ret = ide_dma_end(drive);
+
+        if (drive->current_speed < XFER_UDMA_0 &&
+            (drive->drive_data >> 8) != (drive->drive_data & IDE_DRV_MASK))
+                cs5536_program_dtc(drive, drive->drive_data & IDE_DRV_MASK);
+
+        return ret;
+}
+
+static const struct ide_port_ops cs5536_port_ops = {
+        .set_pio_mode           = cs5536_set_pio_mode,
+        .set_dma_mode           = cs5536_set_dma_mode,
+        .cable_detect           = cs5536_cable_detect,
+};
+
+static const struct ide_dma_ops cs5536_dma_ops = {
+        .dma_host_set           = ide_dma_host_set,
+        .dma_setup              = ide_dma_setup,
+        .dma_exec_cmd           = ide_dma_exec_cmd,
+        .dma_start              = cs5536_dma_start,
+        .dma_end                = cs5536_dma_end,
+        .dma_test_irq           = ide_dma_test_irq,
+        .dma_lost_irq           = ide_dma_lost_irq,
+        .dma_timeout            = ide_dma_timeout,
+};
+
+static const struct ide_port_info cs5536_info = {
+        .name           = DRV_NAME,
+        .port_ops       = &cs5536_port_ops,
+        .dma_ops        = &cs5536_dma_ops,
+        .host_flags     = IDE_HFLAG_SINGLE,
+        .pio_mask       = ATA_PIO4,
+        .mwdma_mask     = ATA_MWDMA2,
+        .udma_mask      = ATA_UDMA5,
+};
+
+/**
+ *      cs5536_init_one
+ *      @dev: PCI device
+ *      @id: Entry in match table
+ */
+
+static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+{
+        u32 cfg;
+
+        if (use_msr)
+                printk(KERN_INFO DRV_NAME ": Using MSR regs instead of PCI\n");
+
+        cs5536_read(dev, CFG, &cfg);
+
+        if ((cfg & IDE_CFG_CHANEN) == 0) {
+                printk(KERN_ERR DRV_NAME ": disabled by BIOS\n");
+                return -ENODEV;
+        }
+
+        return ide_pci_init_one(dev, &cs5536_info, NULL);
+}
+
+static const struct pci_device_id cs5536_pci_tbl[] = {
+        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE), },
+        { },
+};
+
+static struct pci_driver cs5536_pci_driver = {
+        .name           = DRV_NAME,
+        .id_table       = cs5536_pci_tbl,
+        .probe          = cs5536_init_one,
+        .remove         = ide_pci_remove,
+        .suspend        = ide_pci_suspend,
+        .resume         = ide_pci_resume,
+};
+
+static int __init cs5536_init(void)
+{
+        return pci_register_driver(&cs5536_pci_driver);
+}
+
+static void __exit cs5536_exit(void)
+{
+        pci_unregister_driver(&cs5536_pci_driver);
+}
+
+MODULE_AUTHOR("Martin K. Petersen, Bartlomiej Zolnierkiewicz");
+MODULE_DESCRIPTION("low-level driver for the CS5536 IDE controller");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(pci, cs5536_pci_tbl);
+
+module_param_named(msr, use_msr, int, 0644);
+MODULE_PARM_DESC(msr, "Force using MSR to configure IDE function (Default: 0)");
+
+module_init(cs5536_init);
+module_exit(cs5536_exit);
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 97a35c667aee..415d7e24f2b6 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -534,7 +534,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
                 d.dma_ops = NULL;
         }
 
-        ret = ide_host_register(host, NULL, hws);
+        ret = ide_host_register(host, &d, hws);
         if (ret)
                 goto err_free;
 
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index d8f295bdad76..ec7d07fa570a 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -282,7 +282,7 @@ static int do_drive_get_GTF(ide_drive_t *drive,
         port = hwif->channel ? drive->dn - 2: drive->dn;
 
         DEBPRINT("ENTER: %s at %s, port#: %d, hard_port#: %d\n",
-                 hwif->name, dev->bus_id, port, hwif->channel);
+                 hwif->name, dev_name(dev), port, hwif->channel);
 
         if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) {
                 DEBPRINT("%s drive %d:%d not present\n",
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index cae69372cf45..0bfeb0c79d6e 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -787,6 +787,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                 if (blk_fs_request(rq)) {
                         ide_end_request(drive, 1, rq->nr_sectors);
                         return ide_stopped;
+                } else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) {
+                        ide_end_request(drive, 1, 1);
+                        return ide_stopped;
                 }
                 goto end_request;
         }
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index cc163319dfbd..9ee51adf567f 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -418,11 +418,14 @@ void ide_map_sg(ide_drive_t *drive, struct request *rq)
         ide_hwif_t *hwif = drive->hwif;
         struct scatterlist *sg = hwif->sg_table;
 
-        if (rq->cmd_type != REQ_TYPE_ATA_TASKFILE) {
-                hwif->sg_nents = blk_rq_map_sg(drive->queue, rq, sg);
-        } else {
+        if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) {
                 sg_init_one(sg, rq->buffer, rq->nr_sectors * SECTOR_SIZE);
                 hwif->sg_nents = 1;
+        } else if (!rq->bio) {
+                sg_init_one(sg, rq->data, rq->data_len);
+                hwif->sg_nents = 1;
+        } else {
+                hwif->sg_nents = blk_rq_map_sg(drive->queue, rq, sg);
         }
 }
 
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 0db1ed9f5fc2..ce0818a993f6 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1467,6 +1467,30 @@ struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
 }
 EXPORT_SYMBOL_GPL(ide_host_alloc);
 
+static void ide_port_free(ide_hwif_t *hwif)
+{
+        ide_port_free_devices(hwif);
+        ide_free_port_slot(hwif->index);
+        kfree(hwif);
+}
+
+static void ide_disable_port(ide_hwif_t *hwif)
+{
+        struct ide_host *host = hwif->host;
+        int i;
+
+        printk(KERN_INFO "%s: disabling port\n", hwif->name);
+
+        for (i = 0; i < MAX_HOST_PORTS; i++) {
+                if (host->ports[i] == hwif) {
+                        host->ports[i] = NULL;
+                        host->n_ports--;
+                }
+        }
+
+        ide_port_free(hwif);
+}
+
 int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
                       hw_regs_t **hws)
 {
@@ -1507,8 +1531,12 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
                         hwif->present = 1;
 
                 if (hwif->chipset != ide_4drives || !hwif->mate ||
-                    !hwif->mate->present)
-                        ide_register_port(hwif);
+                    !hwif->mate->present) {
+                        if (ide_register_port(hwif)) {
+                                ide_disable_port(hwif);
+                                continue;
+                        }
+                }
 
                 if (hwif->present)
                         ide_port_tune_devices(hwif);
@@ -1521,7 +1549,8 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
                 if (hwif_init(hwif) == 0) {
                         printk(KERN_INFO "%s: failed to initialize IDE "
                                          "interface\n", hwif->name);
-                        hwif->present = 0;
+                        device_unregister(&hwif->gendev);
+                        ide_disable_port(hwif);
                         continue;
                 }
 
@@ -1660,12 +1689,8 @@ void ide_host_free(struct ide_host *host)
         int i;
 
         ide_host_for_each_port(i, hwif, host) {
-                if (hwif == NULL)
-                        continue;
-
-                ide_port_free_devices(hwif);
-                ide_free_port_slot(hwif->index);
-                kfree(hwif);
+                if (hwif)
+                        ide_port_free(hwif);
         }
 
         kfree(host);
diff --git a/drivers/ide/qd65xx.c b/drivers/ide/qd65xx.c
index 5b2e3af43c4b..08c4fa35e9b1 100644
--- a/drivers/ide/qd65xx.c
+++ b/drivers/ide/qd65xx.c
@@ -16,7 +16,7 @@
 
 /*
  * Rewritten from the work of Colten Edwards <pje120@cs.usask.ca> by
- * Samuel Thibault <samuel.thibault@fnac.net>
+ * Samuel Thibault <samuel.thibault@ens-lyon.org>
  */
 
 #include <linux/module.h>
diff --git a/drivers/ide/qd65xx.h b/drivers/ide/qd65xx.h
index 6636f9665d16..d7e67a1a1dcc 100644
--- a/drivers/ide/qd65xx.h
+++ b/drivers/ide/qd65xx.h
@@ -4,7 +4,7 @@
 
 /*
  * Authors:     Petr Soucek <petr@ryston.cz>
- *              Samuel Thibault <samuel.thibault@fnac.net>
+ *              Samuel Thibault <samuel.thibault@ens-lyon.org>
  */
 
 /* truncates a in [b,c] */
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index 882f6f07c476..40b0812a045c 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -261,9 +261,9 @@ static int tx4939ide_build_dmatable(ide_drive_t *drive, struct request *rq)
                                 bcount = cur_len;
                         /*
                          * This workaround for zero count seems required.
-                         * (standard ide_build_dmatable do it too)
+                         * (standard ide_build_dmatable does it too)
                          */
-                        if ((bcount & 0xffff) == 0x0000)
+                        if (bcount == 0x10000)
                                 bcount = 0x8000;
                         *table++ = bcount & 0xffff;
                         *table++ = cur_addr;
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
index 703c3eeb20a8..6092fe3f409d 100644
--- a/drivers/ide/via82cxxx.c
+++ b/drivers/ide/via82cxxx.c
@@ -448,6 +448,11 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
                 d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS;
 #endif
 
+#ifdef CONFIG_AMIGAONE
+        if (machine_is(amigaone))
+                d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS;
+#endif
+
         d.udma_mask = via_config->udma_mask;
 
         vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index a329e6bd5d2d..3838bc4acaba 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -1823,6 +1823,10 @@ static int dv1394_open(struct inode *inode, struct file *file)
 
 #endif
 
+        printk(KERN_INFO "%s: NOTE, the dv1394 interface is unsupported "
+               "and will not be available in the new firewire driver stack. "
+               "Try libraw1394 based programs instead.\n", current->comm);
+
         return 0;
 }
 
@@ -2567,10 +2571,6 @@ static int __init dv1394_init_module(void)
 {
         int ret;
 
-        printk(KERN_WARNING
-               "NOTE: The dv1394 driver is unsupported and may be removed in a "
-               "future Linux release. Use raw1394 instead.\n");
-
         cdev_init(&dv1394_cdev, &dv1394_fops);
         dv1394_cdev.owner = THIS_MODULE;
         ret = cdev_add(&dv1394_cdev, IEEE1394_DV1394_DEV, 16);
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 1e3aea9eecf1..09658b218474 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -25,13 +25,13 @@ static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector)
 {
         dev_info_t *hash;
         linear_conf_t *conf = mddev_to_conf(mddev);
+        sector_t idx = sector >> conf->sector_shift;
 
         /*
          * sector_div(a,b) returns the remainer and sets a to a/b
          */
-        sector >>= conf->sector_shift;
-        (void)sector_div(sector, conf->spacing);
-        hash = conf->hash_table[sector];
+        (void)sector_div(idx, conf->spacing);
+        hash = conf->hash_table[idx];
 
         while (sector >= hash->num_sectors + hash->start_sector)
                 hash++;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 41e2509bf896..4495104f6c9f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1481,6 +1481,11 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
                 if (find_rdev_nr(mddev, rdev->desc_nr))
                         return -EBUSY;
         }
+        if (mddev->max_disks && rdev->desc_nr >= mddev->max_disks) {
+                printk(KERN_WARNING "md: %s: array is limited to %d devices\n",
+                       mdname(mddev), mddev->max_disks);
+                return -EBUSY;
+        }
         bdevname(rdev->bdev,b);
         while ( (s=strchr(b, '/')) != NULL)
                 *s = '!';
@@ -2441,6 +2446,15 @@ static void analyze_sbs(mddev_t * mddev)
 
         i = 0;
         rdev_for_each(rdev, tmp, mddev) {
+                if (rdev->desc_nr >= mddev->max_disks ||
+                    i > mddev->max_disks) {
+                        printk(KERN_WARNING
+                               "md: %s: %s: only %d devices permitted\n",
+                               mdname(mddev), bdevname(rdev->bdev, b),
+                               mddev->max_disks);
+                        kick_rdev_from_array(rdev);
+                        continue;
+                }
                 if (rdev != freshest)
                         if (super_types[mddev->major_version].
                             validate_super(mddev, rdev)) {
@@ -4614,13 +4628,6 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
          * noticed in interrupt contexts ...
          */
 
-        if (rdev->desc_nr == mddev->max_disks) {
-                printk(KERN_WARNING "%s: can not hot-add to full array!\n",
-                        mdname(mddev));
-                err = -EBUSY;
-                goto abort_unbind_export;
-        }
-
         rdev->raid_disk = -1;
 
         md_update_sb(mddev, 1);
@@ -4634,9 +4641,6 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
         md_new_event(mddev);
         return 0;
 
-abort_unbind_export:
-        unbind_rdev_from_array(rdev);
-
 abort_export:
         export_rdev(rdev);
         return err;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 7b4f5f7155d8..01e3cffd03b8 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1640,7 +1640,8 @@ static void raid1d(mddev_t *mddev)
                         }
 
                         bio = r1_bio->bios[r1_bio->read_disk];
-                        if ((disk=read_balance(conf, r1_bio)) == -1) {
+                        if ((disk=read_balance(conf, r1_bio)) == -1 ||
+                            disk == r1_bio->read_disk) {
                                 printk(KERN_ALERT "raid1: %s: unrecoverable I/O"
                                        " read error for block %llu\n",
                                        bdevname(bio->bi_bdev,b),
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 6098b626811f..47fee05eaefb 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -576,6 +576,7 @@ static int set_control(struct saa7146_fh *fh, struct v4l2_control *c)
                 vv->vflip = c->value;
                 break;
         default: {
+                mutex_unlock(&dev->lock);
                 return -EINVAL;
         }
         }
diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c
index 64379f2bf237..3ec28945c26f 100644
--- a/drivers/media/common/tuners/mxl5007t.c
+++ b/drivers/media/common/tuners/mxl5007t.c
@@ -657,7 +657,7 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status)
 {
         struct mxl5007t_state *state = fe->tuner_priv;
         int rf_locked, ref_locked;
-        s32 rf_input_level;
+        s32 rf_input_level = 0;
         int ret;
 
         if (fe->ops.i2c_gate_ctrl)
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 98ee16773ff2..7e3aeaa7370f 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -93,6 +93,9 @@ struct dvb_ca_slot {
         /* current state of the CAM */
         int slot_state;
 
+        /* mutex used for serializing access to one CI slot */
+        struct mutex slot_lock;
+
         /* Number of CAMCHANGES that have occurred since last processing */
         atomic_t camchange_count;
 
@@ -711,14 +714,20 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot, u8 * b
         dprintk("%s\n", __func__);
 
 
-        // sanity check
+        /* sanity check */
         if (bytes_write > ca->slot_info[slot].link_buf_size)
                 return -EINVAL;
 
-        /* check if interface is actually waiting for us to read from it, or if a read is in progress */
+        /* it is possible we are dealing with a single buffer implementation,
+           thus if there is data available for read or if there is even a read
+           already in progress, we do nothing but awake the kernel thread to
+           process the data if necessary. */
         if ((status = ca->pub->read_cam_control(ca->pub, slot, CTRLIF_STATUS)) < 0)
                 goto exitnowrite;
         if (status & (STATUSREG_DA | STATUSREG_RE)) {
+                if (status & STATUSREG_DA)
+                        dvb_ca_en50221_thread_wakeup(ca);
+
                 status = -EAGAIN;
                 goto exitnowrite;
         }
@@ -987,6 +996,8 @@ static int dvb_ca_en50221_thread(void *data)
                 /* go through all the slots processing them */
                 for (slot = 0; slot < ca->slot_count; slot++) {
 
+                        mutex_lock(&ca->slot_info[slot].slot_lock);
+
                         // check the cam status + deal with CAMCHANGEs
                         while (dvb_ca_en50221_check_camstatus(ca, slot)) {
                                 /* clear down an old CI slot if necessary */
@@ -1122,7 +1133,7 @@ static int dvb_ca_en50221_thread(void *data)
 
                         case DVB_CA_SLOTSTATE_RUNNING:
                                 if (!ca->open)
-                                        continue;
+                                        break;
 
                                 // poll slots for data
                                 pktcount = 0;
@@ -1146,6 +1157,8 @@ static int dvb_ca_en50221_thread(void *data)
                                 }
                                 break;
                         }
+
+                        mutex_unlock(&ca->slot_info[slot].slot_lock);
                 }
         }
 
@@ -1181,6 +1194,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file,
         switch (cmd) {
         case CA_RESET:
                 for (slot = 0; slot < ca->slot_count; slot++) {
+                        mutex_lock(&ca->slot_info[slot].slot_lock);
                         if (ca->slot_info[slot].slot_state != DVB_CA_SLOTSTATE_NONE) {
                                 dvb_ca_en50221_slot_shutdown(ca, slot);
                                 if (ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)
@@ -1188,6 +1202,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct inode *inode, struct file *file,
                                                                      slot,
                                                                      DVB_CA_EN50221_CAMCHANGE_INSERTED);
                         }
+                        mutex_unlock(&ca->slot_info[slot].slot_lock);
                 }
                 ca->next_read_slot = 0;
                 dvb_ca_en50221_thread_wakeup(ca);
@@ -1308,7 +1323,9 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file,
                                 goto exit;
                         }
 
+                        mutex_lock(&ca->slot_info[slot].slot_lock);
                         status = dvb_ca_en50221_write_data(ca, slot, fragbuf, fraglen + 2);
+                        mutex_unlock(&ca->slot_info[slot].slot_lock);
                         if (status == (fraglen + 2)) {
                                 written = 1;
                                 break;
@@ -1664,6 +1681,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
                 ca->slot_info[i].slot_state = DVB_CA_SLOTSTATE_NONE;
                 atomic_set(&ca->slot_info[i].camchange_count, 0);
                 ca->slot_info[i].camchange_type = DVB_CA_EN50221_CAMCHANGE_REMOVED;
+                mutex_init(&ca->slot_info[i].slot_lock);
         }
 
         if (signal_pending(current)) {
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.h b/drivers/media/dvb/dvb-core/dvb_ca_en50221.h
index 8467e63ddc0d..7df2e141187a 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.h
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.h
@@ -45,8 +45,10 @@ struct dvb_ca_en50221 {
         /* the module owning this structure */
         struct module* owner;
 
-        /* NOTE: the read_*, write_* and poll_slot_status functions must use locks as
-         * they may be called from several threads at once */
+        /* NOTE: the read_*, write_* and poll_slot_status functions will be
+         * called for different slots concurrently and need to use locks where
+         * and if appropriate. There will be no concurrent access to one slot.
+         */
 
         /* functions for accessing attribute memory on the CAM */
         int (*read_attribute_mem)(struct dvb_ca_en50221* ca, int slot, int address);
diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c
index b1a9c4cdec93..199ece0d4883 100644
--- a/drivers/media/dvb/dvb-usb/af9005-fe.c
+++ b/drivers/media/dvb/dvb-usb/af9005-fe.c
@@ -220,7 +220,7 @@ static int af9005_get_post_vit_ber(struct dvb_frontend *fe,
                                    u16 * abort_count)
 {
         u32 loc_cw_count = 0, loc_err_count;
-        u16 loc_abort_count;
+        u16 loc_abort_count = 0;
         int ret;
 
         ret =
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index e1e9aa5c6b84..6a97a40d3dfb 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -694,7 +694,12 @@ static int af9015_read_config(struct usb_device *udev)
 
         /* IR remote controller */
         req.addr = AF9015_EEPROM_IR_MODE;
-        ret = af9015_rw_udev(udev, &req);
+        /* first message will timeout often due to possible hw bug */
+        for (i = 0; i < 4; i++) {
+                ret = af9015_rw_udev(udev, &req);
+                if (!ret)
+                        break;
+        }
         if (ret)
                 goto error;
         deb_info("%s: IR mode:%d\n", __func__, val);
@@ -835,18 +840,19 @@ static int af9015_read_config(struct usb_device *udev)
         if (!dvb_usb_af9015_dual_mode)
                 af9015_config.dual_mode = 0;
 
-        /* set buffer size according to USB port speed */
+        /* Set adapter0 buffer size according to USB port speed, adapter1 buffer
+           size can be static because it is enabled only USB2.0 */
         for (i = 0; i < af9015_properties_count; i++) {
                 /* USB1.1 set smaller buffersize and disable 2nd adapter */
                 if (udev->speed == USB_SPEED_FULL) {
-                        af9015_properties[i].adapter->stream.u.bulk.buffersize =
-                                TS_USB11_MAX_PACKET_SIZE;
+                        af9015_properties[i].adapter[0].stream.u.bulk.buffersize
+                                = TS_USB11_MAX_PACKET_SIZE;
                         /* disable 2nd adapter because we don't have
                            PID-filters */
                         af9015_config.dual_mode = 0;
                 } else {
-                        af9015_properties[i].adapter->stream.u.bulk.buffersize =
-                                TS_USB20_MAX_PACKET_SIZE;
+                        af9015_properties[i].adapter[0].stream.u.bulk.buffersize
+                                = TS_USB20_MAX_PACKET_SIZE;
                 }
         }
 
@@ -1254,6 +1260,12 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                                         .type = USB_BULK,
                                         .count = 6,
                                         .endpoint = 0x85,
+                                        .u = {
+                                                .bulk = {
+                                                        .buffersize =
+                                                TS_USB20_MAX_PACKET_SIZE,
+                                                }
+                                        }
                                 },
                         }
                 },
@@ -1353,6 +1365,12 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                                         .type = USB_BULK,
                                         .count = 6,
                                         .endpoint = 0x85,
+                                        .u = {
+                                                .bulk = {
+                                                        .buffersize =
+                                                TS_USB20_MAX_PACKET_SIZE,
+                                                }
+                                        }
                                 },
                         }
                 },
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 391732788911..635d30a55078 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1393,6 +1393,9 @@ struct usb_device_id dib0700_usb_id_table[] = {
         { USB_DEVICE(USB_VID_ASUS,      USB_PID_ASUS_U3000H) },
 /* 40 */{ USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV801E) },
         { USB_DEVICE(USB_VID_PINNACLE,  USB_PID_PINNACLE_PCTV801E_SE) },
+        { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_T_EXPRESS) },
+        { USB_DEVICE(USB_VID_TERRATEC,
+                        USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2) },
         { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1537,7 +1540,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         {   "DiBcom STK7700D reference design",
                                 { &dib0700_usb_id_table[14], NULL },
                                 { NULL },
-                        }
+                        },
+
                 },
 
                 .rc_interval      = DEFAULT_RC_INTERVAL,
@@ -1557,7 +1561,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         },
                 },
 
-                .num_device_descs = 2,
+                .num_device_descs = 3,
                 .devices = {
                         {   "ASUS My Cinema U3000 Mini DVBT Tuner",
                                 { &dib0700_usb_id_table[23], NULL },
@@ -1566,6 +1570,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         {   "Yuan EC372S",
                                 { &dib0700_usb_id_table[31], NULL },
                                 { NULL },
+                        },
+                        {   "Terratec Cinergy T Express",
+                                { &dib0700_usb_id_table[42], NULL },
+                                { NULL },
                         }
                 },
 
@@ -1653,7 +1661,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         }
                 },
 
-                .num_device_descs = 4,
+                .num_device_descs = 5,
                 .devices = {
                         {   "DiBcom STK7070PD reference design",
                                 { &dib0700_usb_id_table[17], NULL },
@@ -1670,6 +1678,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         {   "Hauppauge Nova-TD-500 (84xxx)",
                                 { &dib0700_usb_id_table[36], NULL },
                                 { NULL },
+                        },
+                        {  "Terratec Cinergy DT USB XS Diversity",
+                                { &dib0700_usb_id_table[43], 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 a4fca3fca5ee..0db0c06ee6f2 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -162,8 +162,10 @@
 #define USB_PID_AVERMEDIA_A309                          0xa309
 #define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY        0x005a
+#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2      0x0081
 #define USB_PID_TERRATEC_CINERGY_HT_USB_XE              0x0058
 #define USB_PID_TERRATEC_CINERGY_HT_EXPRESS             0x0060
+#define USB_PID_TERRATEC_CINERGY_T_EXPRESS              0x0062
 #define USB_PID_TERRATEC_CINERGY_T_XXS                  0x0078
 #define USB_PID_PINNACLE_EXPRESSCARD_320CX              0x022e
 #define USB_PID_PINNACLE_PCTV2000E                      0x022c
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index ec4e08dbc699..1e81e713df63 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -646,7 +646,7 @@ static int drx_tune(struct drx397xD_state *s,
         u32 edi = 0, ebx = 0, ebp = 0, edx = 0;
         u16 v20 = 0, v1E = 0, v16 = 0, v14 = 0, v12 = 0, v10 = 0, v0E = 0;
 
-        int rc, df_tuner;
+        int rc, df_tuner = 0;
         int a, b, c, d;
         pr_debug("%s %d\n", __func__, s->config.d60);
 
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
index cf4d8936bb83..3e08d985d6e5 100644
--- a/drivers/media/dvb/frontends/s5h1409.c
+++ b/drivers/media/dvb/frontends/s5h1409.c
@@ -545,9 +545,6 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe,
 
         s5h1409_enable_modulation(fe, p->u.vsb.modulation);
 
-        /* Allow the demod to settle */
-        msleep(100);
-
         if (fe->ops.tuner_ops.set_params) {
                 if (fe->ops.i2c_gate_ctrl)
                         fe->ops.i2c_gate_ctrl(fe, 1);
@@ -562,6 +559,10 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe,
                 s5h1409_set_qam_interleave_mode(fe);
         }
 
+        /* Issue a reset to the demod so it knows to resync against the
+           newly tuned frequency */
+        s5h1409_softreset(fe);
+
         return 0;
 }
 
diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c
index 83dc7e12d5f0..a67d1775a43c 100644
--- a/drivers/media/dvb/frontends/stb0899_algo.c
+++ b/drivers/media/dvb/frontends/stb0899_algo.c
@@ -31,6 +31,8 @@ inline u32 stb0899_do_div(u64 n, u32 d)
         return n;
 }
 
+#if 0
+/* These functions are currently unused */
 /*
  * stb0899_calc_srate
  * Compute symbol rate
@@ -63,6 +65,7 @@ static u32 stb0899_get_srate(struct stb0899_state *state)
 
         return stb0899_calc_srate(internal->master_clk, sfr);
 }
+#endif
 
 /*
  * stb0899_set_srate
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 1638e1d9f538..83e9e7750c8c 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -470,6 +470,7 @@ static void frontend_init(struct budget *budget)
                 budget->dvb_frontend = dvb_attach(l64781_attach, &grundig_29504_401_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
                         budget->dvb_frontend->ops.tuner_ops.set_params = grundig_29504_401_tuner_set_params;
+                        budget->dvb_frontend->tuner_priv = NULL;
                         break;
                 }
                 break;
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 0aa96df80fc2..d91e0638448f 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1384,7 +1384,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec)
 static int ttusb_dec_init_stb(struct ttusb_dec *dec)
 {
         int result;
-        unsigned int mode, model, version;
+        unsigned int mode = 0, model = 0, version = 0;
 
         dprintk("%s\n", __func__);
 
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 0747dc8862b0..fdfc7bf86b9e 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -194,10 +194,10 @@ static int amradio_start(struct amradio_device *radio)
                 return retval;
         }
 
-        mutex_unlock(&radio->lock);
-
         radio->muted = 0;
 
+        mutex_unlock(&radio->lock);
+
         return retval;
 }
 
@@ -230,10 +230,10 @@ static int amradio_stop(struct amradio_device *radio)
                 return retval;
         }
 
-        mutex_unlock(&radio->lock);
-
         radio->muted = 1;
 
+        mutex_unlock(&radio->lock);
+
         return retval;
 }
 
@@ -284,10 +284,10 @@ static int amradio_setfreq(struct amradio_device *radio, int freq)
                 return retval;
         }
 
-        mutex_unlock(&radio->lock);
-
         radio->stereo = 0;
 
+        mutex_unlock(&radio->lock);
+
         return retval;
 }
 
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c
index 14bebf8a116f..87e91072627a 100644
--- a/drivers/media/video/cs5345.c
+++ b/drivers/media/video/cs5345.c
@@ -18,7 +18,6 @@
  */
 
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/i2c.h>
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 8f1db57bd1dd..bfe25841dbf4 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -1586,7 +1586,8 @@ static int mpeg_open(struct file *file)
         lock_kernel();
         list_for_each(list, &cx23885_devlist) {
                 h = list_entry(list, struct cx23885_dev, devlist);
-                if (h->v4l_device->minor == minor) {
+                if (h->v4l_device &&
+                    h->v4l_device->minor == minor) {
                         dev = h;
                         break;
                 }
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 2d81c4d04340..eaa11893bfe9 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -730,12 +730,13 @@ static int video_open(struct file *file)
         lock_kernel();
         list_for_each(list, &cx23885_devlist) {
                 h = list_entry(list, struct cx23885_dev, devlist);
-                if (h->video_dev->minor == minor) {
+                if (h->video_dev &&
+                    h->video_dev->minor == minor) {
                         dev  = h;
                         type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 }
                 if (h->vbi_dev &&
-                   h->vbi_dev->minor == minor) {
+                    h->vbi_dev->minor == minor) {
                         dev  = h;
                         type = V4L2_BUF_TYPE_VBI_CAPTURE;
                 }
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 88f2fd32bfe3..25eb3bec9e5d 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -1382,6 +1382,14 @@ static int cx25840_log_status(struct v4l2_subdev *sd)
 
 static int cx25840_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
+        /* ignore this command */
+        if (cmd == TUNER_SET_TYPE_ADDR || cmd == TUNER_SET_CONFIG)
+                return 0;
+
+        /* Old-style drivers rely on initialization on first use, so
+           call the init whenever a command is issued to this driver.
+           New-style drivers using v4l2_subdev should call init explicitly. */
+        cx25840_init(i2c_get_clientdata(client), 0);
         return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
 }
 
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 613dfea4ff3e..aef5297534af 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -614,34 +614,41 @@ static struct stv0288_config tevii_tuner_earda_config = {
         .set_ts_params = cx24116_set_ts_param,
 };
 
-static int dvb_register(struct cx8802_dev *dev)
+static int cx8802_alloc_frontends(struct cx8802_dev *dev)
 {
         struct cx88_core *core = dev->core;
-        struct videobuf_dvb_frontend *fe0, *fe1 = NULL;
-        int mfe_shared = 0; /* bus not shared by default */
+        struct videobuf_dvb_frontend *fe = NULL;
         int i;
 
-        if (0 != core->i2c_rc) {
-                printk(KERN_ERR "%s/2: no i2c-bus available, cannot attach dvb drivers\n", core->name);
-                goto frontend_detach;
-        }
-
-        if (!core->board.num_frontends)
-                return -EINVAL;
-
         mutex_init(&dev->frontends.lock);
         INIT_LIST_HEAD(&dev->frontends.felist);
 
+        if (!core->board.num_frontends)
+                return -ENODEV;
+
         printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__,
                          core->board.num_frontends);
         for (i = 1; i <= core->board.num_frontends; i++) {
-                fe0 = videobuf_dvb_alloc_frontend(&dev->frontends, i);
-                if (!fe0) {
+                fe = videobuf_dvb_alloc_frontend(&dev->frontends, i);
+                if (!fe) {
                         printk(KERN_ERR "%s() failed to alloc\n", __func__);
                         videobuf_dvb_dealloc_frontends(&dev->frontends);
-                        goto frontend_detach;
+                        return -ENOMEM;
                 }
         }
+        return 0;
+}
+
+static int dvb_register(struct cx8802_dev *dev)
+{
+        struct cx88_core *core = dev->core;
+        struct videobuf_dvb_frontend *fe0, *fe1 = NULL;
+        int mfe_shared = 0; /* bus not shared by default */
+
+        if (0 != core->i2c_rc) {
+                printk(KERN_ERR "%s/2: no i2c-bus available, cannot attach dvb drivers\n", core->name);
+                goto frontend_detach;
+        }
 
         /* Get the first frontend */
         fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
@@ -1243,6 +1250,8 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
         struct cx88_core *core = drv->core;
         struct cx8802_dev *dev = drv->core->dvbdev;
         int err;
+        struct videobuf_dvb_frontend *fe;
+        int i;
 
         dprintk( 1, "%s\n", __func__);
         dprintk( 1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n",
@@ -1258,39 +1267,34 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
         /* If vp3054 isn't enabled, a stub will just return 0 */
         err = vp3054_i2c_probe(dev);
         if (0 != err)
-                goto fail_probe;
+                goto fail_core;
 
         /* dvb stuff */
         printk(KERN_INFO "%s/2: cx2388x based DVB/ATSC card\n", core->name);
         dev->ts_gen_cntrl = 0x0c;
 
+        err = cx8802_alloc_frontends(dev);
+        if (err)
+                goto fail_core;
+
         err = -ENODEV;
-        if (core->board.num_frontends) {
-                struct videobuf_dvb_frontend *fe;
-                int i;
-
-                for (i = 1; i <= core->board.num_frontends; i++) {
-                        fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i);
-                        if (fe == NULL) {
-                                printk(KERN_ERR "%s() failed to get frontend(%d)\n",
+        for (i = 1; i <= core->board.num_frontends; i++) {
+                fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i);
+                if (fe == NULL) {
+                        printk(KERN_ERR "%s() failed to get frontend(%d)\n",
                                         __func__, i);
-                                goto fail_probe;
-                        }
-                        videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops,
+                        goto fail_probe;
+                }
+                videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops,
                                     &dev->pci->dev, &dev->slock,
                                     V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                     V4L2_FIELD_TOP,
                                     sizeof(struct cx88_buffer),
                                     dev);
-                        /* init struct videobuf_dvb */
-                        fe->dvb.name = dev->core->name;
-                }
-        } else {
-                /* no frontends allocated */
-                printk(KERN_ERR "%s/2 .num_frontends should be non-zero\n",
-                        core->name);
-                goto fail_core;
+                /* init struct videobuf_dvb */
+                fe->dvb.name = dev->core->name;
         }
+
         err = dvb_register(dev);
         if (err)
                 /* frontends/adapter de-allocated in dvb_register */
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 60a8b3187f14..6025fdd23344 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -336,8 +336,8 @@ struct cx88_core {
         /* config info -- dvb */
 #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
         int                        (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage);
-        void                       (*gate_ctrl)(struct cx88_core  *core, int open);
 #endif
+        void                       (*gate_ctrl)(struct cx88_core  *core, int open);
 
         /* state info */
         struct task_struct         *kthread;
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index 94378ccb7505..5d882a44e3ee 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -62,9 +62,15 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev)
 
         dprintk("Stopping isoc\n");
         for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
-                usb_unlink_urb(dev->adev.urb[i]);
+                if (!irqs_disabled())
+                        usb_kill_urb(dev->adev.urb[i]);
+                else
+                        usb_unlink_urb(dev->adev.urb[i]);
                 usb_free_urb(dev->adev.urb[i]);
                 dev->adev.urb[i] = NULL;
+
+                kfree(dev->adev.transfer_buffer[i]);
+                dev->adev.transfer_buffer[i] = NULL;
         }
 
         return 0;
@@ -389,11 +395,15 @@ static int snd_em28xx_capture_trigger(struct snd_pcm_substream *substream,
 static snd_pcm_uframes_t snd_em28xx_capture_pointer(struct snd_pcm_substream
                                                     *substream)
 {
-        struct em28xx *dev;
+       unsigned long flags;
 
+        struct em28xx *dev;
         snd_pcm_uframes_t hwptr_done;
+
         dev = snd_pcm_substream_chip(substream);
+       spin_lock_irqsave(&dev->adev.slock, flags);
         hwptr_done = dev->adev.hwptr_done_capture;
+       spin_unlock_irqrestore(&dev->adev.slock, flags);
 
         return hwptr_done;
 }
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index ef9bf008a924..3b3ca3f46d52 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -102,6 +102,18 @@ static struct em28xx_reg_seq em2880_msi_digivox_ad_analog[] = {
 /* Board  - EM2870 Kworld 355u
    Analog - No input analog */
 
+static struct em28xx_reg_seq kworld_330u_analog[] = {
+        {EM28XX_R08_GPIO,       0x6d,   ~EM_GPIO_4,     10},
+        {EM2880_R04_GPO,        0x00,   0xff,           10},
+        { -1,                   -1,     -1,             -1},
+};
+
+static struct em28xx_reg_seq kworld_330u_digital[] = {
+        {EM28XX_R08_GPIO,       0x6e,   ~EM_GPIO_4,     10},
+        {EM2880_R04_GPO,        0x08,   0xff,           10},
+        { -1,                   -1,     -1,             -1},
+};
+
 /* Callback for the most boards */
 static struct em28xx_reg_seq default_tuner_gpio[] = {
         {EM28XX_R08_GPIO,       EM_GPIO_4,      EM_GPIO_4,      10},
@@ -1177,29 +1189,33 @@ struct em28xx_board em28xx_boards[] = {
                         .gpio     = hauppauge_wintv_hvr_900_analog,
                 } },
         },
-        [EM2883_BOARD_KWORLD_HYBRID_A316] = {
+        [EM2883_BOARD_KWORLD_HYBRID_330U] = {
                 .name         = "Kworld PlusTV HD Hybrid 330",
                 .tuner_type   = TUNER_XC2028,
                 .tuner_gpio   = default_tuner_gpio,
                 .decoder      = EM28XX_TVP5150,
                 .mts_firmware = 1,
                 .has_dvb      = 1,
-                .dvb_gpio     = default_digital,
+                .dvb_gpio     = kworld_330u_digital,
+                .xclk             = EM28XX_XCLK_FREQUENCY_12MHZ,
+                .i2c_speed        = EM28XX_I2C_CLK_WAIT_ENABLE | EM28XX_I2C_EEPROM_ON_BOARD | EM28XX_I2C_EEPROM_KEY_VALID,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
                         .amux     = EM28XX_AMUX_VIDEO,
-                        .gpio     = default_analog,
+                        .gpio     = kworld_330u_analog,
+                        .aout     = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO,
                 }, {
                         .type     = EM28XX_VMUX_COMPOSITE1,
                         .vmux     = TVP5150_COMPOSITE1,
                         .amux     = EM28XX_AMUX_LINE_IN,
-                        .gpio     = hauppauge_wintv_hvr_900_analog,
+                        .gpio     = kworld_330u_analog,
+                        .aout     = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO,
                 }, {
                         .type     = EM28XX_VMUX_SVIDEO,
                         .vmux     = TVP5150_SVIDEO,
                         .amux     = EM28XX_AMUX_LINE_IN,
-                        .gpio     = hauppauge_wintv_hvr_900_analog,
+                        .gpio     = kworld_330u_analog,
                 } },
         },
         [EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU] = {
@@ -1249,7 +1265,7 @@ struct usb_device_id em28xx_id_table [] = {
         { USB_DEVICE(0xeb1a, 0xe310),
                         .driver_info = EM2880_BOARD_MSI_DIGIVOX_AD },
         { USB_DEVICE(0xeb1a, 0xa316),
-                        .driver_info = EM2883_BOARD_KWORLD_HYBRID_A316 },
+                        .driver_info = EM2883_BOARD_KWORLD_HYBRID_330U },
         { USB_DEVICE(0xeb1a, 0xe320),
                         .driver_info = EM2880_BOARD_MSI_DIGIVOX_AD_II },
         { USB_DEVICE(0xeb1a, 0xe323),
@@ -1526,6 +1542,10 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
                 /* FIXME: Better to specify the needed IF */
                 ctl->demod = XC3028_FE_DEFAULT;
                 break;
+        case EM2883_BOARD_KWORLD_HYBRID_330U:
+                ctl->demod = XC3028_FE_CHINA;
+                ctl->fname = XC2028_DEFAULT_FIRMWARE;
+                break;
         default:
                 ctl->demod = XC3028_FE_OREN538;
         }
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index eb5fb05fab22..94fb1b639a2e 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -438,6 +438,10 @@ int em28xx_audio_analog_set(struct em28xx *dev)
         if (dev->audio_mode.ac97 != EM28XX_NO_AC97) {
                 int vol;
 
+                em28xx_write_ac97(dev, AC97_POWER_DOWN_CTRL, 0x4200);
+                em28xx_write_ac97(dev, AC97_EXT_AUD_CTRL, 0x0031);
+                em28xx_write_ac97(dev, AC97_PCM_IN_SRATE, 0xbb80);
+
                 /* LSB: left channel - both channels with the same level */
                 vol = (0x1f - dev->volume) | ((0x1f - dev->volume) << 8);
 
@@ -454,6 +458,15 @@ int em28xx_audio_analog_set(struct em28xx *dev)
                                 em28xx_warn("couldn't setup AC97 register %d\n",
                                      outputs[i].reg);
                 }
+
+                if (dev->ctl_aoutput & EM28XX_AOUT_PCM_IN) {
+                        int sel = ac97_return_record_select(dev->ctl_aoutput);
+
+                        /* Use the same input for both left and right channels */
+                        sel |= (sel << 8);
+
+                        em28xx_write_ac97(dev, AC97_RECORD_SELECT, sel);
+                }
         }
 
         return ret;
@@ -847,8 +860,11 @@ void em28xx_uninit_isoc(struct em28xx *dev)
         for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
                 urb = dev->isoc_ctl.urb[i];
                 if (urb) {
-                        usb_kill_urb(urb);
-                        usb_unlink_urb(urb);
+                        if (!irqs_disabled())
+                                usb_kill_urb(urb);
+                        else
+                                usb_unlink_urb(urb);
+
                         if (dev->isoc_ctl.transfer_buffer[i]) {
                                 usb_buffer_free(dev->udev,
                                         urb->transfer_buffer_length,
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index d38cb21834d9..9ad8527b3fda 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -28,6 +28,7 @@
 
 #include "lgdt330x.h"
 #include "zl10353.h"
+#include "s5h1409.h"
 #ifdef EM28XX_DRX397XD_SUPPORT
 #include "drx397xD.h"
 #endif
@@ -232,6 +233,15 @@ static struct zl10353_config em28xx_zl10353_with_xc3028 = {
         .if2 = 45600,
 };
 
+static struct s5h1409_config em28xx_s5h1409_with_xc3028 = {
+        .demod_address = 0x32 >> 1,
+        .output_mode   = S5H1409_PARALLEL_OUTPUT,
+        .gpio          = S5H1409_GPIO_OFF,
+        .inversion     = S5H1409_INVERSION_OFF,
+        .status_mode   = S5H1409_DEMODLOCKING,
+        .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK
+};
+
 #ifdef EM28XX_DRX397XD_SUPPORT
 /* [TODO] djh - not sure yet what the device config needs to contain */
 static struct drx397xD_config em28xx_drx397xD_with_xc3028 = {
@@ -412,7 +422,6 @@ static int dvb_init(struct em28xx *dev)
         case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850:
         case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:
         case EM2880_BOARD_PINNACLE_PCTV_HD_PRO:
-        case EM2883_BOARD_KWORLD_HYBRID_A316:
         case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
                 dvb->frontend = dvb_attach(lgdt330x_attach,
                                            &em2880_lgdt3303_dev,
@@ -433,6 +442,15 @@ static int dvb_init(struct em28xx *dev)
                         goto out_free;
                 }
                 break;
+        case EM2883_BOARD_KWORLD_HYBRID_330U:
+                dvb->frontend = dvb_attach(s5h1409_attach,
+                                           &em28xx_s5h1409_with_xc3028,
+                                           &dev->i2c_adap);
+                if (attach_xc3028(0x61, dev) < 0) {
+                        result = -EINVAL;
+                        goto out_free;
+                }
+                break;
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:
 #ifdef EM28XX_DRX397XD_SUPPORT
                 /* We don't have the config structure properly populated, so
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 416b691c33c1..8e61b2ca9167 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -886,10 +886,10 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
         if (0 == INPUT(i)->type)
                 return -EINVAL;
 
-        mutex_lock(&dev->lock);
-
-        video_mux(dev, i);
+        dev->ctl_input = i;
 
+        mutex_lock(&dev->lock);
+        video_mux(dev, dev->ctl_input);
         mutex_unlock(&dev->lock);
         return 0;
 }
@@ -939,6 +939,12 @@ static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a)
         struct em28xx_fh   *fh  = priv;
         struct em28xx      *dev = fh->dev;
 
+
+        if (a->index >= MAX_EM28XX_INPUT)
+                return -EINVAL;
+        if (0 == INPUT(a->index)->type)
+                return -EINVAL;
+
         mutex_lock(&dev->lock);
 
         dev->ctl_ainput = INPUT(a->index)->amux;
@@ -1950,6 +1956,7 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
 
 int em28xx_register_analog_devices(struct em28xx *dev)
 {
+      u8 val;
         int ret;
 
         printk(KERN_INFO "%s: v4l2 driver version %d.%d.%d\n",
@@ -1957,34 +1964,34 @@ int em28xx_register_analog_devices(struct em28xx *dev)
                 (EM28XX_VERSION_CODE >> 16) & 0xff,
                 (EM28XX_VERSION_CODE >> 8) & 0xff, EM28XX_VERSION_CODE & 0xff);
 
+        /* set default norm */
+        dev->norm = em28xx_video_template.current_norm;
+        dev->width = norm_maxw(dev);
+        dev->height = norm_maxh(dev);
+        dev->interlaced = EM28XX_INTERLACED_DEFAULT;
+        dev->hscale = 0;
+        dev->vscale = 0;
+        dev->ctl_input = 0;
+
         /* Analog specific initialization */
         dev->format = &format[0];
-        video_mux(dev, 0);
+        video_mux(dev, dev->ctl_input);
+
+        /* Audio defaults */
+        dev->mute = 1;
+        dev->volume = 0x1f;
 
         /* enable vbi capturing */
 
 /*      em28xx_write_reg(dev, EM28XX_R0E_AUDIOSRC, 0xc0); audio register */
-/*      em28xx_write_reg(dev, EM28XX_R0F_XCLK, 0x80); clk register */
+       val = (u8)em28xx_read_reg(dev, EM28XX_R0F_XCLK);
+       em28xx_write_reg(dev, EM28XX_R0F_XCLK, (EM28XX_XCLK_AUDIO_UNMUTE | val));
         em28xx_write_reg(dev, EM28XX_R11_VINCTRL, 0x51);
 
-        dev->mute = 1;          /* maybe not the right place... */
-        dev->volume = 0x1f;
-
         em28xx_set_outfmt(dev);
         em28xx_colorlevels_set_default(dev);
         em28xx_compression_disable(dev);
 
-        /* set default norm */
-        dev->norm = em28xx_video_template.current_norm;
-        dev->width = norm_maxw(dev);
-        dev->height = norm_maxh(dev);
-        dev->interlaced = EM28XX_INTERLACED_DEFAULT;
-        dev->hscale = 0;
-        dev->vscale = 0;
-
-        /* FIXME: This is a very bad hack! Not all devices have TV on input 2 */
-        dev->ctl_input = 2;
-
         /* allocate and fill video video_device struct */
         dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video");
         if (!dev->vdev) {
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 6c6b94aa05b2..dd2cd36fb1bb 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -94,7 +94,7 @@
 #define EM2882_BOARD_KWORLD_VS_DVBT               54
 #define EM2882_BOARD_TERRATEC_HYBRID_XS           55
 #define EM2882_BOARD_PINNACLE_HYBRID_PRO          56
-#define EM2883_BOARD_KWORLD_HYBRID_A316           57
+#define EM2883_BOARD_KWORLD_HYBRID_330U                  57
 #define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU      58
 #define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850      60
 #define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2     61
@@ -300,13 +300,32 @@ enum em28xx_amux {
 };
 
 enum em28xx_aout {
+        /* AC97 outputs */
         EM28XX_AOUT_MASTER = 1 << 0,
         EM28XX_AOUT_LINE   = 1 << 1,
         EM28XX_AOUT_MONO   = 1 << 2,
         EM28XX_AOUT_LFE    = 1 << 3,
         EM28XX_AOUT_SURR   = 1 << 4,
+
+        /* PCM IN Mixer - used by AC97_RECORD_SELECT register */
+        EM28XX_AOUT_PCM_IN = 1 << 7,
+
+        /* Bits 10-8 are used to indicate the PCM IN record select */
+        EM28XX_AOUT_PCM_MIC_PCM = 0 << 8,
+        EM28XX_AOUT_PCM_CD      = 1 << 8,
+        EM28XX_AOUT_PCM_VIDEO   = 2 << 8,
+        EM28XX_AOUT_PCM_AUX     = 3 << 8,
+        EM28XX_AOUT_PCM_LINE    = 4 << 8,
+        EM28XX_AOUT_PCM_STEREO  = 5 << 8,
+        EM28XX_AOUT_PCM_MONO    = 6 << 8,
+        EM28XX_AOUT_PCM_PHONE   = 7 << 8,
 };
 
+static inline int ac97_return_record_select(int a_out)
+{
+        return (a_out & 0x700) >> 8;
+}
+
 struct em28xx_reg_seq {
         int reg;
         unsigned char val, mask;
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 5e36b9a4ae3e..2ed24527ecd6 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -423,7 +423,8 @@ static void destroy_urbs(struct gspca_dev *gspca_dev)
                         break;
 
                 gspca_dev->urb[i] = NULL;
-                usb_kill_urb(urb);
+                if (!gspca_dev->present)
+                        usb_kill_urb(urb);
                 if (urb->transfer_buffer != NULL)
                         usb_buffer_free(gspca_dev->dev,
                                         urb->transfer_buffer_length,
@@ -1950,7 +1951,6 @@ void gspca_disconnect(struct usb_interface *intf)
         struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
 
         gspca_dev->present = 0;
-        gspca_dev->streaming = 0;
 
         usb_set_intfdata(intf, NULL);
 
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index e8e5921cdc34..c46c990987f9 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -949,8 +949,10 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
         itv->instance = atomic_inc_return(&ivtv_instance) - 1;
 
         retval = v4l2_device_register(&dev->dev, &itv->device);
-        if (retval)
+        if (retval) {
+                kfree(itv);
                 return retval;
+        }
         /* "ivtv + PCI ID" is a bit of a mouthful, so use
            "ivtv + instance" instead. */
         snprintf(itv->device.name, sizeof(itv->device.name),
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 39fbc970f43d..0d810189dd87 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -62,7 +62,6 @@
 #include <linux/poll.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/version.h>
 #include <asm/io.h>
 
 #include "pwc.h"
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index d6848f7a503b..05221d47dd4c 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -149,7 +149,7 @@ static const struct i2c_reg_value saa7127_init_config_common[] = {
         { SAA7127_REG_COPYGEN_0,                        0x77 },
         { SAA7127_REG_COPYGEN_1,                        0x41 },
         { SAA7127_REG_COPYGEN_2,                        0x00 }, /* Macrovision enable/disable */
-        { SAA7127_REG_OUTPUT_PORT_CONTROL,              0x9e },
+        { SAA7127_REG_OUTPUT_PORT_CONTROL,              0xbf },
         { SAA7127_REG_GAIN_LUMINANCE_RGB,               0x00 },
         { SAA7127_REG_GAIN_COLORDIFF_RGB,               0x00 },
         { SAA7127_REG_INPUT_PORT_CONTROL_1,             0x80 }, /* for color bars */
@@ -488,12 +488,18 @@ static int saa7127_set_output_type(struct v4l2_subdev *sd, int output)
                 break;
 
         case SAA7127_OUTPUT_TYPE_COMPOSITE:
-                state->reg_2d = 0x08;   /* 00001000 CVBS only, RGB DAC's off (high impedance mode) */
+                if (state->ident == V4L2_IDENT_SAA7129)
+                        state->reg_2d = 0x20;   /* CVBS only */
+                else
+                        state->reg_2d = 0x08;   /* 00001000 CVBS only, RGB DAC's off (high impedance mode) */
                 state->reg_3a = 0x13;   /* by default switch YUV to RGB-matrix on */
                 break;
 
         case SAA7127_OUTPUT_TYPE_SVIDEO:
-                state->reg_2d = 0xff;   /* 11111111  croma -> R, luma -> CVBS + G + B */
+                if (state->ident == V4L2_IDENT_SAA7129)
+                        state->reg_2d = 0x18;   /* Y + C */
+                else
+                        state->reg_2d = 0xff;   /*11111111  croma -> R, luma -> CVBS + G + B */
                 state->reg_3a = 0x13;   /* by default switch YUV to RGB-matrix on */
                 break;
 
@@ -508,7 +514,10 @@ static int saa7127_set_output_type(struct v4l2_subdev *sd, int output)
                 break;
 
         case SAA7127_OUTPUT_TYPE_BOTH:
-                state->reg_2d = 0xbf;
+                if (state->ident == V4L2_IDENT_SAA7129)
+                        state->reg_2d = 0x38;
+                else
+                        state->reg_2d = 0xbf;
                 state->reg_3a = 0x13;   /* by default switch YUV to RGB-matrix on */
                 break;
 
@@ -731,24 +740,6 @@ static int saa7127_probe(struct i2c_client *client,
                 return -ENODEV;
         }
 
-        /* Configure Encoder */
-
-        v4l2_dbg(1, debug, sd, "Configuring encoder\n");
-        saa7127_write_inittab(sd, saa7127_init_config_common);
-        saa7127_set_std(sd, V4L2_STD_NTSC);
-        saa7127_set_output_type(sd, SAA7127_OUTPUT_TYPE_BOTH);
-        saa7127_set_vps(sd, &vbi);
-        saa7127_set_wss(sd, &vbi);
-        saa7127_set_cc(sd, &vbi);
-        saa7127_set_xds(sd, &vbi);
-        if (test_image == 1)
-                /* The Encoder has an internal Colorbar generator */
-                /* This can be used for debugging */
-                saa7127_set_input_type(sd, SAA7127_INPUT_TYPE_TEST_IMAGE);
-        else
-                saa7127_set_input_type(sd, SAA7127_INPUT_TYPE_NORMAL);
-        saa7127_set_video_enable(sd, 1);
-
         if (id->driver_data) {  /* Chip type is already known */
                 state->ident = id->driver_data;
         } else {                /* Needs detection */
@@ -770,6 +761,23 @@ static int saa7127_probe(struct i2c_client *client,
 
         v4l2_info(sd, "%s found @ 0x%x (%s)\n", client->name,
                         client->addr << 1, client->adapter->name);
+
+        v4l2_dbg(1, debug, sd, "Configuring encoder\n");
+        saa7127_write_inittab(sd, saa7127_init_config_common);
+        saa7127_set_std(sd, V4L2_STD_NTSC);
+        saa7127_set_output_type(sd, SAA7127_OUTPUT_TYPE_BOTH);
+        saa7127_set_vps(sd, &vbi);
+        saa7127_set_wss(sd, &vbi);
+        saa7127_set_cc(sd, &vbi);
+        saa7127_set_xds(sd, &vbi);
+        if (test_image == 1)
+                /* The Encoder has an internal Colorbar generator */
+                /* This can be used for debugging */
+                saa7127_set_input_type(sd, SAA7127_INPUT_TYPE_TEST_IMAGE);
+        else
+                saa7127_set_input_type(sd, SAA7127_INPUT_TYPE_NORMAL);
+        saa7127_set_video_enable(sd, 1);
+
         if (state->ident == V4L2_IDENT_SAA7129)
                 saa7127_write_inittab(sd, saa7129_init_config_extra);
         return 0;
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 26194a0ce927..c750d3dd57d2 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -1089,7 +1089,11 @@ static int saa7134_alsa_init(void)
 
         list_for_each(list,&saa7134_devlist) {
                 dev = list_entry(list, struct saa7134_dev, devlist);
-                alsa_device_init(dev);
+                if (dev->pci->device == PCI_DEVICE_ID_PHILIPS_SAA7130)
+                        printk(KERN_INFO "%s/alsa: %s doesn't support digital audio\n",
+                                dev->name, saa7134_boards[dev->board].name);
+                else
+                        alsa_device_init(dev);
         }
 
         if (dev == NULL)
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index dfbe08a9ad9b..99221d726edb 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -660,6 +660,10 @@ static int saa7134_hwinit1(struct saa7134_dev *dev)
 
         saa_writel(SAA7134_IRQ1, 0);
         saa_writel(SAA7134_IRQ2, 0);
+
+        /* Clear any stale IRQ reports */
+        saa_writel(SAA7134_IRQ_REPORT, saa_readl(SAA7134_IRQ_REPORT));
+
         mutex_init(&dev->lock);
         spin_lock_init(&dev->slock);
 
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c
index 454ad1dd7507..88c5e942f751 100644
--- a/drivers/media/video/saa717x.c
+++ b/drivers/media/video/saa717x.c
@@ -30,7 +30,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 56f0c0eb500f..00c6cbe06ab0 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -242,7 +242,7 @@ static int tda9875_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 static int tda9875_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
         struct tda9875 *t = to_state(sd);
-        int chvol=0, volume, balance, left, right;
+        int chvol = 0, volume = 0, balance = 0, left, right;
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_VOLUME:
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 3b0b84c2e451..78277abb733b 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -427,6 +427,9 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
         const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" };
 
         memset(tvee, 0, sizeof(*tvee));
+        tvee->tuner_type = TUNER_ABSENT;
+        tvee->tuner2_type = TUNER_ABSENT;
+
         done = len = beenhere = 0;
 
         /* Different eeprom start offsets for em28xx, cx2388x and cx23418 */
diff --git a/drivers/media/video/tvp514x.c b/drivers/media/video/tvp514x.c
index ac9aa40d09f6..8e23aa53c29a 100644
--- a/drivers/media/video/tvp514x.c
+++ b/drivers/media/video/tvp514x.c
@@ -1401,7 +1401,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
         decoder->pdata = client->dev.platform_data;
         if (!decoder->pdata) {
-                v4l_err(client, "No platform data\n!!");
+                v4l_err(client, "No platform data!!\n");
                 return -ENODEV;
         }
         /*
diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c
index 4f16effb530f..f4522bb08916 100644
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
@@ -21,7 +21,6 @@
  */
 
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/i2c.h>
diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c
index 4b712f69d1b7..a5fb74bf2407 100644
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
@@ -21,7 +21,6 @@
  * 02110-1301, USA.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/i2c.h>
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index 9907b9aff2b9..6b66ae4f430f 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -157,7 +157,7 @@ usbvision_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
         struct i2c_msg *pmsg;
         struct usb_usbvision *usbvision;
         int i, ret;
-        unsigned char addr;
+        unsigned char addr = 0;
 
         usbvision = (struct usb_usbvision *)i2c_get_adapdata(i2c_adap);
 
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index 2208165aa6f0..d2576f6391c0 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -1,7 +1,7 @@
 /*
  *      uvc_ctrl.c  --  USB Video Class driver - Controls
  *
- *      Copyright (C) 2005-2008
+ *      Copyright (C) 2005-2009
  *          Laurent Pinchart (laurent.pinchart@skynet.be)
  *
  *      This program is free software; you can redistribute it and/or modify
@@ -12,7 +12,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
@@ -29,7 +28,7 @@
 #define UVC_CTRL_DATA_BACKUP    1
 
 /* ------------------------------------------------------------------------
- * Control, formats, ...
+ * Controls
  */
 
 static struct uvc_control_info uvc_ctrls[] = {
@@ -635,7 +634,7 @@ static __s32 uvc_get_le_value(struct uvc_control_mapping *mapping,
                 mask = (1 << bits) - 1;
         }
 
-        /* Sign-extend the value if needed */
+        /* Sign-extend the value if needed. */
         if (mapping->data_type == UVC_CTRL_DATA_TYPE_SIGNED)
                 value |= -(value & (1 << (mapping->size - 1)));
 
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index 89d8bd10a852..b12873265cc5 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -1,7 +1,7 @@
 /*
  *      uvc_driver.c  --  USB Video Class driver
  *
- *      Copyright (C) 2005-2008
+ *      Copyright (C) 2005-2009
  *          Laurent Pinchart (laurent.pinchart@skynet.be)
  *
  *      This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/usb.h>
@@ -49,7 +48,7 @@ static unsigned int uvc_quirks_param;
 unsigned int uvc_trace_param;
 
 /* ------------------------------------------------------------------------
- * Control, formats, ...
+ * Video formats
  */
 
 static struct uvc_format_desc uvc_fmts[] = {
@@ -474,7 +473,7 @@ static int uvc_parse_format(struct uvc_device *dev,
 
                 /* Several UVC chipsets screw up dwMaxVideoFrameBufferSize
                  * completely. Observed behaviours range from setting the
-                 * value to 1.1x the actual frame size of hardwiring the
+                 * value to 1.1x the actual frame size to hardwiring the
                  * 16 low bits to 0. This results in a higher than necessary
                  * memory usage as well as a wrong image size information. For
                  * uncompressed formats this can be fixed by computing the
@@ -487,7 +486,7 @@ static int uvc_parse_format(struct uvc_device *dev,
                 /* Some bogus devices report dwMinFrameInterval equal to
                  * dwMaxFrameInterval and have dwFrameIntervalStep set to
                  * zero. Setting all null intervals to 1 fixes the problem and
-                 * some other divisions by zero which could happen.
+                 * some other divisions by zero that could happen.
                  */
                 for (i = 0; i < n; ++i) {
                         interval = get_unaligned_le32(&buffer[26+4*i]);
@@ -1200,13 +1199,13 @@ static void uvc_unregister_video(struct uvc_device *dev)
  * Scan the UVC descriptors to locate a chain starting at an Output Terminal
  * and containing the following units:
  *
- * - a USB Streaming Output Terminal
+ * - one Output Terminal (USB Streaming or Display)
  * - zero or one Processing Unit
  * - zero, one or mode single-input Selector Units
  * - zero or one multiple-input Selector Units, provided all inputs are
  *   connected to input terminals
  * - zero, one or mode single-input Extension Units
- * - one Camera Input Terminal, or one or more External terminals.
+ * - one or more Input Terminals (Camera, External or USB Streaming)
  *
  * A side forward scan is made on each detected entity to check for additional
  * extension units.
@@ -1531,10 +1530,6 @@ static int uvc_register_video(struct uvc_device *dev)
 
         /* Set the driver data before calling video_register_device, otherwise
          * uvc_v4l2_open might race us.
-         *
-         * FIXME: usb_set_intfdata hasn't been called so far. Is that a
-         *        problem ? Does any function which could be called here get
-         *        a pointer to the usb_interface ?
          */
         dev->video.vdev = vdev;
         video_set_drvdata(vdev, &dev->video);
@@ -1569,7 +1564,7 @@ void uvc_delete(struct kref *kref)
         struct uvc_device *dev = container_of(kref, struct uvc_device, kref);
         struct list_head *p, *n;
 
-        /* Unregister the video device */
+        /* Unregister the video device. */
         uvc_unregister_video(dev);
         usb_put_intf(dev->intf);
         usb_put_dev(dev->udev);
@@ -1612,7 +1607,7 @@ static int uvc_probe(struct usb_interface *intf,
                 uvc_trace(UVC_TRACE_PROBE, "Probing generic UVC device %s\n",
                                 udev->devpath);
 
-        /* Allocate memory for the device and initialize it */
+        /* Allocate memory for the device and initialize it. */
         if ((dev = kzalloc(sizeof *dev, GFP_KERNEL)) == NULL)
                 return -ENOMEM;
 
@@ -1633,14 +1628,14 @@ static int uvc_probe(struct usb_interface *intf,
                         le16_to_cpu(udev->descriptor.idVendor),
                         le16_to_cpu(udev->descriptor.idProduct));
 
-        /* Parse the Video Class control descriptor */
+        /* Parse the Video Class control descriptor. */
         if (uvc_parse_control(dev) < 0) {
                 uvc_trace(UVC_TRACE_PROBE, "Unable to parse UVC "
                         "descriptors.\n");
                 goto error;
         }
 
-        uvc_printk(KERN_INFO, "Found UVC %u.%02u device %s (%04x:%04x)\n",
+        uvc_printk(KERN_INFO, "Found UVC %u.%02x device %s (%04x:%04x)\n",
                 dev->uvc_version >> 8, dev->uvc_version & 0xff,
                 udev->product ? udev->product : "<unnamed>",
                 le16_to_cpu(udev->descriptor.idVendor),
@@ -1653,18 +1648,18 @@ static int uvc_probe(struct usb_interface *intf,
                         "linux-uvc-devel mailing list.\n");
         }
 
-        /* Initialize controls */
+        /* Initialize controls. */
         if (uvc_ctrl_init_device(dev) < 0)
                 goto error;
 
-        /* Register the video devices */
+        /* Register the video devices. */
         if (uvc_register_video(dev) < 0)
                 goto error;
 
-        /* Save our data pointer in the interface data */
+        /* Save our data pointer in the interface data. */
         usb_set_intfdata(intf, dev);
 
-        /* Initialize the interrupt URB */
+        /* Initialize the interrupt URB. */
         if ((ret = uvc_status_init(dev)) < 0) {
                 uvc_printk(KERN_INFO, "Unable to initialize the status "
                         "endpoint (%d), status interrupt will not be "
@@ -1839,24 +1834,24 @@ static struct usb_device_id uvc_ids[] = {
           .bInterfaceSubClass   = 1,
           .bInterfaceProtocol   = 0 },
         /* Apple Built-In iSight */
-        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                 | USB_DEVICE_ID_MATCH_INT_INFO,
           .idVendor             = 0x05ac,
           .idProduct            = 0x8501,
-          .bInterfaceClass      = USB_CLASS_VIDEO,
-          .bInterfaceSubClass   = 1,
-          .bInterfaceProtocol   = 0,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
           .driver_info          = UVC_QUIRK_PROBE_MINMAX
                                 | UVC_QUIRK_BUILTIN_ISIGHT },
         /* Genesys Logic USB 2.0 PC Camera */
-        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                 | USB_DEVICE_ID_MATCH_INT_INFO,
-          .idVendor             = 0x05e3,
-          .idProduct            = 0x0505,
-          .bInterfaceClass      = USB_CLASS_VIDEO,
-          .bInterfaceSubClass   = 1,
-          .bInterfaceProtocol   = 0,
-          .driver_info          = UVC_QUIRK_STREAM_NO_FID },
+          .idVendor             = 0x05e3,
+          .idProduct            = 0x0505,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_STREAM_NO_FID },
         /* MT6227 */
         { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                 | USB_DEVICE_ID_MATCH_INT_INFO,
diff --git a/drivers/media/video/uvc/uvc_isight.c b/drivers/media/video/uvc/uvc_isight.c
index 37bdefdbead5..436f462685a0 100644
--- a/drivers/media/video/uvc/uvc_isight.c
+++ b/drivers/media/video/uvc/uvc_isight.c
@@ -3,6 +3,8 @@
  *
  *      Copyright (C) 2006-2007
  *              Ivan N. Zlatev <contact@i-nz.net>
+ *      Copyright (C) 2008-2009
+ *              Laurent Pinchart <laurent.pinchart@skynet.be>
  *
  *      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/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c
index 42546342e97d..0155752e4a5a 100644
--- a/drivers/media/video/uvc/uvc_queue.c
+++ b/drivers/media/video/uvc/uvc_queue.c
@@ -1,7 +1,7 @@
 /*
  *      uvc_queue.c  --  USB Video Class driver - Buffers management
  *
- *      Copyright (C) 2005-2008
+ *      Copyright (C) 2005-2009
  *          Laurent Pinchart (laurent.pinchart@skynet.be)
  *
  *      This program is free software; you can redistribute it and/or modify
@@ -12,7 +12,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/mm.h>
 #include <linux/list.h>
 #include <linux/module.h>
@@ -37,22 +36,22 @@
  * to user space will return -EBUSY.
  *
  * Video buffers are managed using two queues. However, unlike most USB video
- * drivers which use an in queue and an out queue, we use a main queue which
- * holds all queued buffers (both 'empty' and 'done' buffers), and an irq
- * queue which holds empty buffers. This design (copied from video-buf)
- * minimizes locking in interrupt, as only one queue is shared between
- * interrupt and user contexts.
+ * drivers that use an in queue and an out queue, we use a main queue to hold
+ * all queued buffers (both 'empty' and 'done' buffers), and an irq queue to
+ * hold empty buffers. This design (copied from video-buf) minimizes locking
+ * in interrupt, as only one queue is shared between interrupt and user
+ * contexts.
  *
  * Use cases
  * ---------
  *
- * Unless stated otherwise, all operations which modify the irq buffers queue
+ * Unless stated otherwise, all operations that modify the irq buffers queue
  * are protected by the irq spinlock.
  *
  * 1. The user queues the buffers, starts streaming and dequeues a buffer.
  *
  *    The buffers are added to the main and irq queues. Both operations are
- *    protected by the queue lock, and the latert is protected by the irq
+ *    protected by the queue lock, and the later is protected by the irq
  *    spinlock as well.
  *
  *    The completion handler fetches a buffer from the irq queue and fills it
@@ -60,7 +59,7 @@
  *    returns immediately.
  *
  *    When the buffer is full, the completion handler removes it from the irq
- *    queue, marks it as ready (UVC_BUF_STATE_DONE) and wake its wait queue.
+ *    queue, marks it as ready (UVC_BUF_STATE_DONE) and wakes its wait queue.
  *    At that point, any process waiting on the buffer will be woken up. If a
  *    process tries to dequeue a buffer after it has been marked ready, the
  *    dequeing will succeed immediately.
@@ -91,8 +90,8 @@ void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type)
 /*
  * Allocate the video buffers.
  *
- * Pages are reserved to make sure they will not be swaped, as they will be
- * filled in URB completion handler.
+ * Pages are reserved to make sure they will not be swapped, as they will be
+ * filled in the URB completion handler.
  *
  * Buffers will be individually mapped, so they must all be page aligned.
  */
@@ -210,8 +209,8 @@ int uvc_query_buffer(struct uvc_video_queue *queue,
         __uvc_query_buffer(&queue->buffer[v4l2_buf->index], v4l2_buf);
 
 done:
-       mutex_unlock(&queue->mutex);
-       return ret;
+        mutex_unlock(&queue->mutex);
+        return ret;
 }
 
 /*
@@ -236,7 +235,7 @@ int uvc_queue_buffer(struct uvc_video_queue *queue,
         }
 
         mutex_lock(&queue->mutex);
-        if (v4l2_buf->index >= queue->count)  {
+        if (v4l2_buf->index >= queue->count) {
                 uvc_trace(UVC_TRACE_CAPTURE, "[E] Out of range index.\n");
                 ret = -EINVAL;
                 goto done;
@@ -429,7 +428,7 @@ done:
  * Cancel the video buffers queue.
  *
  * Cancelling the queue marks all buffers on the irq queue as erroneous,
- * wakes them up and remove them from the queue.
+ * wakes them up and removes them from the queue.
  *
  * If the disconnect parameter is set, further calls to uvc_queue_buffer will
  * fail with -ENODEV.
diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c
index 5d60b264d59a..c1e4ae27c613 100644
--- a/drivers/media/video/uvc/uvc_status.c
+++ b/drivers/media/video/uvc/uvc_status.c
@@ -1,7 +1,7 @@
 /*
  *      uvc_status.c  --  USB Video Class driver - Status endpoint
  *
- *      Copyright (C) 2007-2008
+ *      Copyright (C) 2007-2009
  *          Laurent Pinchart (laurent.pinchart@skynet.be)
  *
  *      This program is free software; you can redistribute it and/or modify
@@ -12,7 +12,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/input.h>
 #include <linux/usb.h>
 #include <linux/usb/input.h>
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index fa150fff2c10..d681519d0c8a 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -1,7 +1,7 @@
 /*
  *      uvc_v4l2.c  --  USB Video Class driver - V4L2 API
  *
- *      Copyright (C) 2005-2008
+ *      Copyright (C) 2005-2009
  *          Laurent Pinchart (laurent.pinchart@skynet.be)
  *
  *      This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@
  * must be grouped (for instance the Red Balance, Blue Balance and Do White
  * Balance V4L2 controls use the White Balance Component UVC control) or
  * otherwise translated. The approach we take here is to use a translation
- * table for the controls which can be mapped directly, and handle the others
+ * table for the controls that can be mapped directly, and handle the others
  * manually.
  */
 static int uvc_v4l2_query_menu(struct uvc_video_device *video,
@@ -189,7 +189,7 @@ static int uvc_v4l2_try_format(struct uvc_video_device *video,
                 probe->dwMaxVideoFrameSize =
                         video->streaming->ctrl.dwMaxVideoFrameSize;
 
-        /* Probe the device */
+        /* Probe the device. */
         if ((ret = uvc_probe_video(video, probe)) < 0)
                 goto done;
 
@@ -354,11 +354,11 @@ static int uvc_v4l2_set_streamparm(struct uvc_video_device *video,
  *
  * Each open instance of a UVC device can either be in a privileged or
  * unprivileged state. Only a single instance can be in a privileged state at
- * a given time. Trying to perform an operation which requires privileges will
+ * a given time. Trying to perform an operation that requires privileges will
  * automatically acquire the required privileges if possible, or return -EBUSY
  * otherwise. Privileges are dismissed when closing the instance.
  *
- * Operations which require privileges are:
+ * Operations that require privileges are:
  *
  * - VIDIOC_S_INPUT
  * - VIDIOC_S_PARM
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index e7c31995527f..9bc4705be78d 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -1,7 +1,7 @@
 /*
  *      uvc_video.c  --  USB Video Class driver - Video handling
  *
- *      Copyright (C) 2005-2008
+ *      Copyright (C) 2005-2009
  *          Laurent Pinchart (laurent.pinchart@skynet.be)
  *
  *      This program is free software; you can redistribute it and/or modify
@@ -12,7 +12,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/usb.h>
@@ -115,7 +114,7 @@ static int uvc_get_video_ctrl(struct uvc_video_device *video,
                 ctrl->wCompQuality = le16_to_cpup((__le16 *)data);
                 ret = 0;
                 goto out;
-        } else if (query == GET_DEF && probe == 1) {
+        } else if (query == GET_DEF && probe == 1 && ret != size) {
                 /* Many cameras don't support the GET_DEF request on their
                  * video probe control. Warn once and return, the caller will
                  * fall back to GET_CUR.
@@ -160,7 +159,7 @@ static int uvc_get_video_ctrl(struct uvc_video_device *video,
         }
 
         /* Some broken devices return a null or wrong dwMaxVideoFrameSize.
-         * Try to get the value from the format and frame descriptor.
+         * Try to get the value from the format and frame descriptors.
          */
         uvc_fixup_buffer_size(video, ctrl);
         ret = 0;
@@ -191,9 +190,6 @@ static int uvc_set_video_ctrl(struct uvc_video_device *video,
         *(__le16 *)&data[12] = cpu_to_le16(ctrl->wCompQuality);
         *(__le16 *)&data[14] = cpu_to_le16(ctrl->wCompWindowSize);
         *(__le16 *)&data[16] = cpu_to_le16(ctrl->wDelay);
-        /* Note: Some of the fields below are not required for IN devices (see
-         * UVC spec, 4.3.1.1), but we still copy them in case support for OUT
-         * devices is added in the future. */
         put_unaligned_le32(ctrl->dwMaxVideoFrameSize, &data[18]);
         put_unaligned_le32(ctrl->dwMaxPayloadTransferSize, &data[22]);
 
@@ -400,7 +396,7 @@ static int uvc_video_decode_start(struct uvc_video_device *video,
          *
          * Empty buffers (bytesused == 0) don't trigger end of frame detection
          * as it doesn't make sense to return an empty buffer. This also
-         * avoids detecting and of frame conditions at FID toggling if the
+         * avoids detecting end of frame conditions at FID toggling if the
          * previous payload had the EOF bit set.
          */
         if (fid != video->last_fid && buf->buf.bytesused != 0) {
@@ -453,6 +449,17 @@ static void uvc_video_decode_end(struct uvc_video_device *video,
         }
 }
 
+/* Video payload encoding is handled by uvc_video_encode_header() and
+ * uvc_video_encode_data(). Only bulk transfers are currently supported.
+ *
+ * uvc_video_encode_header is called at the start of a payload. It adds header
+ * data to the transfer buffer and returns the header size. As the only known
+ * UVC output device transfers a whole frame in a single payload, the EOF bit
+ * is always set in the header.
+ *
+ * uvc_video_encode_data is called for every URB and copies the data from the
+ * video buffer to the transfer buffer.
+ */
 static int uvc_video_encode_header(struct uvc_video_device *video,
                 struct uvc_buffer *buf, __u8 *data, int len)
 {
@@ -953,7 +960,7 @@ int uvc_video_suspend(struct uvc_video_device *video)
 }
 
 /*
- * Reconfigure the video interface and restart streaming if it was enable
+ * Reconfigure the video interface and restart streaming if it was enabled
  * before suspend.
  *
  * If an error occurs, disable the video queue. This will wake all pending
@@ -985,8 +992,8 @@ int uvc_video_resume(struct uvc_video_device *video)
  */
 
 /*
- * Initialize the UVC video device by retrieving the default format and
- * committing it.
+ * Initialize the UVC video device by switching to alternate setting 0 and
+ * retrieve the default format.
  *
  * Some cameras (namely the Fuji Finepix) set the format and frame
  * indexes to zero. The UVC standard doesn't clearly make this a spec
@@ -1014,7 +1021,7 @@ int uvc_video_init(struct uvc_video_device *video)
          */
         usb_set_interface(video->dev->udev, video->streaming->intfnum, 0);
 
-        /* Some webcams don't suport GET_DEF request on the probe control. We
+        /* Some webcams don't suport GET_DEF requests on the probe control. We
          * fall back to GET_CUR if GET_DEF fails.
          */
         if ((ret = uvc_get_video_ctrl(video, probe, 1, GET_DEF)) < 0 &&
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index bcf4361dc1bc..027947ea9b6e 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -72,149 +72,149 @@ struct uvc_xu_control {
  * UVC constants
  */
 
-#define SC_UNDEFINED                    0x00
-#define SC_VIDEOCONTROL                 0x01
-#define SC_VIDEOSTREAMING               0x02
-#define SC_VIDEO_INTERFACE_COLLECTION   0x03
+#define SC_UNDEFINED                    0x00
+#define SC_VIDEOCONTROL                 0x01
+#define SC_VIDEOSTREAMING               0x02
+#define SC_VIDEO_INTERFACE_COLLECTION   0x03
 
-#define PC_PROTOCOL_UNDEFINED           0x00
+#define PC_PROTOCOL_UNDEFINED           0x00
 
-#define CS_UNDEFINED                    0x20
-#define CS_DEVICE                       0x21
-#define CS_CONFIGURATION                0x22
-#define CS_STRING                       0x23
-#define CS_INTERFACE                    0x24
-#define CS_ENDPOINT                     0x25
+#define CS_UNDEFINED                    0x20
+#define CS_DEVICE                       0x21
+#define CS_CONFIGURATION                0x22
+#define CS_STRING                       0x23
+#define CS_INTERFACE                    0x24
+#define CS_ENDPOINT                     0x25
 
 /* VideoControl class specific interface descriptor */
-#define VC_DESCRIPTOR_UNDEFINED         0x00
-#define VC_HEADER                       0x01
-#define VC_INPUT_TERMINAL               0x02
-#define VC_OUTPUT_TERMINAL              0x03
-#define VC_SELECTOR_UNIT                0x04
-#define VC_PROCESSING_UNIT              0x05
-#define VC_EXTENSION_UNIT               0x06
+#define VC_DESCRIPTOR_UNDEFINED         0x00
+#define VC_HEADER                       0x01
+#define VC_INPUT_TERMINAL               0x02
+#define VC_OUTPUT_TERMINAL              0x03
+#define VC_SELECTOR_UNIT                0x04
+#define VC_PROCESSING_UNIT              0x05
+#define VC_EXTENSION_UNIT               0x06
 
 /* VideoStreaming class specific interface descriptor */
-#define VS_UNDEFINED                    0x00
-#define VS_INPUT_HEADER                 0x01
-#define VS_OUTPUT_HEADER                0x02
-#define VS_STILL_IMAGE_FRAME            0x03
-#define VS_FORMAT_UNCOMPRESSED          0x04
-#define VS_FRAME_UNCOMPRESSED           0x05
-#define VS_FORMAT_MJPEG                 0x06
-#define VS_FRAME_MJPEG                  0x07
-#define VS_FORMAT_MPEG2TS               0x0a
-#define VS_FORMAT_DV                    0x0c
-#define VS_COLORFORMAT                  0x0d
-#define VS_FORMAT_FRAME_BASED           0x10
-#define VS_FRAME_FRAME_BASED            0x11
-#define VS_FORMAT_STREAM_BASED          0x12
+#define VS_UNDEFINED                    0x00
+#define VS_INPUT_HEADER                 0x01
+#define VS_OUTPUT_HEADER                0x02
+#define VS_STILL_IMAGE_FRAME            0x03
+#define VS_FORMAT_UNCOMPRESSED          0x04
+#define VS_FRAME_UNCOMPRESSED           0x05
+#define VS_FORMAT_MJPEG                 0x06
+#define VS_FRAME_MJPEG                  0x07
+#define VS_FORMAT_MPEG2TS               0x0a
+#define VS_FORMAT_DV                    0x0c
+#define VS_COLORFORMAT                  0x0d
+#define VS_FORMAT_FRAME_BASED           0x10
+#define VS_FRAME_FRAME_BASED            0x11
+#define VS_FORMAT_STREAM_BASED          0x12
 
 /* Endpoint type */
-#define EP_UNDEFINED                    0x00
-#define EP_GENERAL                      0x01
-#define EP_ENDPOINT                     0x02
-#define EP_INTERRUPT                    0x03
+#define EP_UNDEFINED                    0x00
+#define EP_GENERAL                      0x01
+#define EP_ENDPOINT                     0x02
+#define EP_INTERRUPT                    0x03
 
 /* Request codes */
-#define RC_UNDEFINED                    0x00
-#define SET_CUR                         0x01
-#define GET_CUR                         0x81
-#define GET_MIN                         0x82
-#define GET_MAX                         0x83
-#define GET_RES                         0x84
-#define GET_LEN                         0x85
-#define GET_INFO                        0x86
-#define GET_DEF                         0x87
+#define RC_UNDEFINED                    0x00
+#define SET_CUR                         0x01
+#define GET_CUR                         0x81
+#define GET_MIN                         0x82
+#define GET_MAX                         0x83
+#define GET_RES                         0x84
+#define GET_LEN                         0x85
+#define GET_INFO                        0x86
+#define GET_DEF                         0x87
 
 /* VideoControl interface controls */
-#define VC_CONTROL_UNDEFINED            0x00
-#define VC_VIDEO_POWER_MODE_CONTROL     0x01
-#define VC_REQUEST_ERROR_CODE_CONTROL   0x02
+#define VC_CONTROL_UNDEFINED            0x00
+#define VC_VIDEO_POWER_MODE_CONTROL     0x01
+#define VC_REQUEST_ERROR_CODE_CONTROL   0x02
 
 /* Terminal controls */
-#define TE_CONTROL_UNDEFINED            0x00
+#define TE_CONTROL_UNDEFINED            0x00
 
 /* Selector Unit controls */
-#define SU_CONTROL_UNDEFINED            0x00
-#define SU_INPUT_SELECT_CONTROL         0x01
+#define SU_CONTROL_UNDEFINED            0x00
+#define SU_INPUT_SELECT_CONTROL         0x01
 
 /* Camera Terminal controls */
-#define CT_CONTROL_UNDEFINED                            0x00
-#define CT_SCANNING_MODE_CONTROL                        0x01
-#define CT_AE_MODE_CONTROL                              0x02
-#define CT_AE_PRIORITY_CONTROL                          0x03
-#define CT_EXPOSURE_TIME_ABSOLUTE_CONTROL               0x04
-#define CT_EXPOSURE_TIME_RELATIVE_CONTROL               0x05
-#define CT_FOCUS_ABSOLUTE_CONTROL                       0x06
-#define CT_FOCUS_RELATIVE_CONTROL                       0x07
-#define CT_FOCUS_AUTO_CONTROL                           0x08
-#define CT_IRIS_ABSOLUTE_CONTROL                        0x09
-#define CT_IRIS_RELATIVE_CONTROL                        0x0a
-#define CT_ZOOM_ABSOLUTE_CONTROL                        0x0b
-#define CT_ZOOM_RELATIVE_CONTROL                        0x0c
-#define CT_PANTILT_ABSOLUTE_CONTROL                     0x0d
-#define CT_PANTILT_RELATIVE_CONTROL                     0x0e
-#define CT_ROLL_ABSOLUTE_CONTROL                        0x0f
-#define CT_ROLL_RELATIVE_CONTROL                        0x10
-#define CT_PRIVACY_CONTROL                              0x11
+#define CT_CONTROL_UNDEFINED                            0x00
+#define CT_SCANNING_MODE_CONTROL                        0x01
+#define CT_AE_MODE_CONTROL                              0x02
+#define CT_AE_PRIORITY_CONTROL                          0x03
+#define CT_EXPOSURE_TIME_ABSOLUTE_CONTROL               0x04
+#define CT_EXPOSURE_TIME_RELATIVE_CONTROL               0x05
+#define CT_FOCUS_ABSOLUTE_CONTROL                       0x06
+#define CT_FOCUS_RELATIVE_CONTROL                       0x07
+#define CT_FOCUS_AUTO_CONTROL                           0x08
+#define CT_IRIS_ABSOLUTE_CONTROL                        0x09
+#define CT_IRIS_RELATIVE_CONTROL                        0x0a
+#define CT_ZOOM_ABSOLUTE_CONTROL                        0x0b
+#define CT_ZOOM_RELATIVE_CONTROL                        0x0c
+#define CT_PANTILT_ABSOLUTE_CONTROL                     0x0d
+#define CT_PANTILT_RELATIVE_CONTROL                     0x0e
+#define CT_ROLL_ABSOLUTE_CONTROL                        0x0f
+#define CT_ROLL_RELATIVE_CONTROL                        0x10
+#define CT_PRIVACY_CONTROL                              0x11
 
 /* Processing Unit controls */
-#define PU_CONTROL_UNDEFINED                            0x00
-#define PU_BACKLIGHT_COMPENSATION_CONTROL               0x01
-#define PU_BRIGHTNESS_CONTROL                           0x02
-#define PU_CONTRAST_CONTROL                             0x03
-#define PU_GAIN_CONTROL                                 0x04
-#define PU_POWER_LINE_FREQUENCY_CONTROL                 0x05
-#define PU_HUE_CONTROL                                  0x06
-#define PU_SATURATION_CONTROL                           0x07
-#define PU_SHARPNESS_CONTROL                            0x08
-#define PU_GAMMA_CONTROL                                0x09
-#define PU_WHITE_BALANCE_TEMPERATURE_CONTROL            0x0a
-#define PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL       0x0b
-#define PU_WHITE_BALANCE_COMPONENT_CONTROL              0x0c
-#define PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL         0x0d
-#define PU_DIGITAL_MULTIPLIER_CONTROL                   0x0e
-#define PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL             0x0f
-#define PU_HUE_AUTO_CONTROL                             0x10
-#define PU_ANALOG_VIDEO_STANDARD_CONTROL                0x11
-#define PU_ANALOG_LOCK_STATUS_CONTROL                   0x12
+#define PU_CONTROL_UNDEFINED                            0x00
+#define PU_BACKLIGHT_COMPENSATION_CONTROL               0x01
+#define PU_BRIGHTNESS_CONTROL                           0x02
+#define PU_CONTRAST_CONTROL                             0x03
+#define PU_GAIN_CONTROL                                 0x04
+#define PU_POWER_LINE_FREQUENCY_CONTROL                 0x05
+#define PU_HUE_CONTROL                                  0x06
+#define PU_SATURATION_CONTROL                           0x07
+#define PU_SHARPNESS_CONTROL                            0x08
+#define PU_GAMMA_CONTROL                                0x09
+#define PU_WHITE_BALANCE_TEMPERATURE_CONTROL            0x0a
+#define PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL       0x0b
+#define PU_WHITE_BALANCE_COMPONENT_CONTROL              0x0c
+#define PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL         0x0d
+#define PU_DIGITAL_MULTIPLIER_CONTROL                   0x0e
+#define PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL             0x0f
+#define PU_HUE_AUTO_CONTROL                             0x10
+#define PU_ANALOG_VIDEO_STANDARD_CONTROL                0x11
+#define PU_ANALOG_LOCK_STATUS_CONTROL                   0x12
 
 #define LXU_MOTOR_PANTILT_RELATIVE_CONTROL              0x01
 #define LXU_MOTOR_PANTILT_RESET_CONTROL                 0x02
 #define LXU_MOTOR_FOCUS_MOTOR_CONTROL                   0x03
 
 /* VideoStreaming interface controls */
-#define VS_CONTROL_UNDEFINED            0x00
-#define VS_PROBE_CONTROL                0x01
-#define VS_COMMIT_CONTROL               0x02
-#define VS_STILL_PROBE_CONTROL          0x03
-#define VS_STILL_COMMIT_CONTROL         0x04
-#define VS_STILL_IMAGE_TRIGGER_CONTROL  0x05
-#define VS_STREAM_ERROR_CODE_CONTROL    0x06
-#define VS_GENERATE_KEY_FRAME_CONTROL   0x07
-#define VS_UPDATE_FRAME_SEGMENT_CONTROL 0x08
-#define VS_SYNC_DELAY_CONTROL           0x09
-
-#define TT_VENDOR_SPECIFIC              0x0100
-#define TT_STREAMING                    0x0101
+#define VS_CONTROL_UNDEFINED            0x00
+#define VS_PROBE_CONTROL                0x01
+#define VS_COMMIT_CONTROL               0x02
+#define VS_STILL_PROBE_CONTROL          0x03
+#define VS_STILL_COMMIT_CONTROL         0x04
+#define VS_STILL_IMAGE_TRIGGER_CONTROL  0x05
+#define VS_STREAM_ERROR_CODE_CONTROL    0x06
+#define VS_GENERATE_KEY_FRAME_CONTROL   0x07
+#define VS_UPDATE_FRAME_SEGMENT_CONTROL 0x08
+#define VS_SYNC_DELAY_CONTROL           0x09
+
+#define TT_VENDOR_SPECIFIC              0x0100
+#define TT_STREAMING                    0x0101
 
 /* Input Terminal types */
-#define ITT_VENDOR_SPECIFIC             0x0200
-#define ITT_CAMERA                      0x0201
-#define ITT_MEDIA_TRANSPORT_INPUT       0x0202
+#define ITT_VENDOR_SPECIFIC             0x0200
+#define ITT_CAMERA                      0x0201
+#define ITT_MEDIA_TRANSPORT_INPUT       0x0202
 
 /* Output Terminal types */
-#define OTT_VENDOR_SPECIFIC             0x0300
-#define OTT_DISPLAY                     0x0301
-#define OTT_MEDIA_TRANSPORT_OUTPUT      0x0302
+#define OTT_VENDOR_SPECIFIC             0x0300
+#define OTT_DISPLAY                     0x0301
+#define OTT_MEDIA_TRANSPORT_OUTPUT      0x0302
 
 /* External Terminal types */
-#define EXTERNAL_VENDOR_SPECIFIC        0x0400
-#define COMPOSITE_CONNECTOR             0x0401
-#define SVIDEO_CONNECTOR                0x0402
-#define COMPONENT_CONNECTOR             0x0403
+#define EXTERNAL_VENDOR_SPECIFIC        0x0400
+#define COMPOSITE_CONNECTOR             0x0401
+#define SVIDEO_CONNECTOR                0x0402
+#define COMPONENT_CONNECTOR             0x0403
 
 #define UVC_TERM_INPUT                  0x0000
 #define UVC_TERM_OUTPUT                 0x8000
@@ -541,11 +541,11 @@ struct uvc_streaming {
 };
 
 enum uvc_buffer_state {
-        UVC_BUF_STATE_IDLE       = 0,
-        UVC_BUF_STATE_QUEUED     = 1,
-        UVC_BUF_STATE_ACTIVE     = 2,
-        UVC_BUF_STATE_DONE       = 3,
-        UVC_BUF_STATE_ERROR      = 4,
+        UVC_BUF_STATE_IDLE      = 0,
+        UVC_BUF_STATE_QUEUED    = 1,
+        UVC_BUF_STATE_ACTIVE    = 2,
+        UVC_BUF_STATE_DONE      = 3,
+        UVC_BUF_STATE_ERROR     = 4,
 };
 
 struct uvc_buffer {
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
index fbe9cc0d433a..21208805ea9b 100644
--- a/drivers/media/video/v4l2-subdev.c
+++ b/drivers/media/video/v4l2-subdev.c
@@ -28,13 +28,13 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
 {
         switch (cmd) {
         case VIDIOC_QUERYCTRL:
-                return v4l2_subdev_call(sd, core, querymenu, arg);
+                return v4l2_subdev_call(sd, core, queryctrl, arg);
         case VIDIOC_G_CTRL:
                 return v4l2_subdev_call(sd, core, g_ctrl, arg);
         case VIDIOC_S_CTRL:
                 return v4l2_subdev_call(sd, core, s_ctrl, arg);
         case VIDIOC_QUERYMENU:
-                return v4l2_subdev_call(sd, core, queryctrl, arg);
+                return v4l2_subdev_call(sd, core, querymenu, arg);
         case VIDIOC_LOG_STATUS:
                 return v4l2_subdev_call(sd, core, log_status);
         case VIDIOC_DBG_G_CHIP_IDENT:
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index 46b7ad477ceb..e873a916250f 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -349,7 +349,6 @@ struct card_info {
         u16 i2c_decoder, i2c_encoder;                   /* I2C types */
         u16 video_vfe, video_codec;                     /* videocodec types */
         u16 audio_chip;                                 /* audio type */
-        u16 vendor_id, device_id;       /* subsystem vendor/device ID */
 
         int inputs;             /* number of video inputs */
         struct input {
@@ -401,7 +400,6 @@ struct zoran {
         char name[32];          /* name of this device */
         struct pci_dev *pci_dev;        /* PCI device */
         unsigned char revision; /* revision of zr36057 */
-        unsigned int zr36057_adr;       /* bus address of IO mem returned by PCI BIOS */
         unsigned char __iomem *zr36057_mem;/* pointer to mapped IO memory */
 
         spinlock_t spinlock;    /* Spinlock */
@@ -490,16 +488,10 @@ struct zoran {
         wait_queue_head_t test_q;
 };
 
-/*The following should be done in more portable way. It depends on define
-  of _ALPHA_BUZ in the Makefile.*/
-
-#ifdef _ALPHA_BUZ
-#define btwrite(dat,adr)    writel((dat), zr->zr36057_adr+(adr))
-#define btread(adr)         readl(zr->zr36057_adr+(adr))
-#else
+/* There was something called _ALPHA_BUZ that used the PCI address instead of
+ * the kernel iomapped address for btread/btwrite.  */
 #define btwrite(dat,adr)    writel((dat), zr->zr36057_mem+(adr))
 #define btread(adr)         readl(zr->zr36057_mem+(adr))
-#endif
 
 #define btand(dat,adr)      btwrite((dat) & btread(adr), adr)
 #define btor(dat,adr)       btwrite((dat) | btread(adr), adr)
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 05f39195372e..5d2f090aa0f8 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -61,17 +61,17 @@
 
 extern const struct zoran_format zoran_formats[];
 
-static int card[BUZ_MAX] = { -1, -1, -1, -1 };
+static int card[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 };
 module_param_array(card, int, NULL, 0444);
-MODULE_PARM_DESC(card, "The type of card");
+MODULE_PARM_DESC(card, "Card type");
 
-static int encoder[BUZ_MAX] = { -1, -1, -1, -1 };
+static int encoder[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 };
 module_param_array(encoder, int, NULL, 0444);
-MODULE_PARM_DESC(encoder, "i2c TV encoder");
+MODULE_PARM_DESC(encoder, "Video encoder chip");
 
-static int decoder[BUZ_MAX] = { -1, -1, -1, -1 };
+static int decoder[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 };
 module_param_array(decoder, int, NULL, 0444);
-MODULE_PARM_DESC(decoder, "i2c TV decoder");
+MODULE_PARM_DESC(decoder, "Video decoder chip");
 
 /*
    The video mem address of the video card.
@@ -104,9 +104,9 @@ module_param(default_norm, int, 0444);
 MODULE_PARM_DESC(default_norm, "Default norm (0=PAL, 1=NTSC, 2=SECAM)");
 
 /* /dev/videoN, -1 for autodetect */
-static int video_nr[BUZ_MAX] = {-1, -1, -1, -1};
+static int video_nr[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 };
 module_param_array(video_nr, int, NULL, 0444);
-MODULE_PARM_DESC(video_nr, "video device number (-1=Auto)");
+MODULE_PARM_DESC(video_nr, "Video device number (-1=Auto)");
 
 /*
    Number and size of grab buffers for Video 4 Linux
@@ -153,9 +153,21 @@ MODULE_DESCRIPTION("Zoran-36057/36067 JPEG codec driver");
 MODULE_AUTHOR("Serguei Miridonov");
 MODULE_LICENSE("GPL");
 
+#define ZR_DEVICE(subven, subdev, data) { \
+        .vendor = PCI_VENDOR_ID_ZORAN, .device = PCI_DEVICE_ID_ZORAN_36057, \
+        .subvendor = (subven), .subdevice = (subdev), .driver_data = (data) }
+
+static struct pci_device_id zr36067_pci_tbl[] = {
+        ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC10PLUS, DC10plus),
+        ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC30PLUS, DC30plus),
+        ZR_DEVICE(PCI_VENDOR_ID_ELECTRONICDESIGNGMBH, PCI_DEVICE_ID_LML_33R10, LML33R10),
+        ZR_DEVICE(PCI_VENDOR_ID_IOMEGA, PCI_DEVICE_ID_IOMEGA_BUZ, BUZ),
+        ZR_DEVICE(PCI_ANY_ID, PCI_ANY_ID, NUM_CARDS),
+        {0}
+};
+MODULE_DEVICE_TABLE(pci, zr36067_pci_tbl);
 
-int zoran_num;                  /* number of Buzs in use */
-struct zoran *zoran[BUZ_MAX];
+static unsigned int zoran_num;          /* number of cards found */
 
 /* videocodec bus functions ZR36060 */
 static u32
@@ -472,8 +484,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
         }, {
                 .type = DC10plus,
                 .name = "DC10plus",
-                .vendor_id = PCI_VENDOR_ID_MIRO,
-                .device_id = PCI_DEVICE_ID_MIRO_DC10PLUS,
                 .i2c_decoder = I2C_DRIVERID_SAA7110,
                 .i2c_encoder = I2C_DRIVERID_ADV7175,
                 .video_codec = CODEC_TYPE_ZR36060,
@@ -531,8 +541,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
         }, {
                 .type = DC30plus,
                 .name = "DC30plus",
-                .vendor_id = PCI_VENDOR_ID_MIRO,
-                .device_id = PCI_DEVICE_ID_MIRO_DC30PLUS,
                 .i2c_decoder = I2C_DRIVERID_VPX3220,
                 .i2c_encoder = I2C_DRIVERID_ADV7175,
                 .video_codec = CODEC_TYPE_ZR36050,
@@ -589,8 +597,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
         }, {
                 .type = LML33R10,
                 .name = "LML33R10",
-                .vendor_id = PCI_VENDOR_ID_ELECTRONICDESIGNGMBH,
-                .device_id = PCI_DEVICE_ID_LML_33R10,
                 .i2c_decoder = I2C_DRIVERID_SAA7114,
                 .i2c_encoder = I2C_DRIVERID_ADV7170,
                 .video_codec = CODEC_TYPE_ZR36060,
@@ -618,8 +624,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
         }, {
                 .type = BUZ,
                 .name = "Buz",
-                .vendor_id = PCI_VENDOR_ID_IOMEGA,
-                .device_id = PCI_DEVICE_ID_IOMEGA_BUZ,
                 .i2c_decoder = I2C_DRIVERID_SAA7111A,
                 .i2c_encoder = I2C_DRIVERID_SAA7185B,
                 .video_codec = CODEC_TYPE_ZR36060,
@@ -649,8 +653,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
                 .name = "6-Eyes",
                 /* AverMedia chose not to brand the 6-Eyes. Thus it
                    can't be autodetected, and requires card=x. */
-                .vendor_id = -1,
-                .device_id = -1,
                 .i2c_decoder = I2C_DRIVERID_KS0127,
                 .i2c_encoder = I2C_DRIVERID_BT866,
                 .video_codec = CODEC_TYPE_ZR36060,
@@ -1138,7 +1140,8 @@ zr36057_init (struct zoran *zr)
         strcpy(zr->video_dev->name, ZR_DEVNAME(zr));
         err = video_register_device(zr->video_dev, VFL_TYPE_GRABBER, video_nr[zr->id]);
         if (err < 0)
-                goto exit_unregister;
+                goto exit_free;
+        video_set_drvdata(zr->video_dev, zr);
 
         zoran_init_hardware(zr);
         if (zr36067_debug > 2)
@@ -1153,19 +1156,19 @@ zr36057_init (struct zoran *zr)
         zr->initialized = 1;
         return 0;
 
-exit_unregister:
-        zoran_unregister_i2c(zr);
 exit_free:
         kfree(zr->stat_com);
         kfree(zr->video_dev);
         return err;
 }
 
-static void
-zoran_release (struct zoran *zr)
+static void __devexit zoran_remove(struct pci_dev *pdev)
 {
+        struct zoran *zr = pci_get_drvdata(pdev);
+
         if (!zr->initialized)
                 goto exit_free;
+
         /* unregister videocodec bus */
         if (zr->codec) {
                 struct videocodec_master *master = zr->codec->master_data;
@@ -1194,6 +1197,7 @@ zoran_release (struct zoran *zr)
         pci_disable_device(zr->pci_dev);
         video_unregister_device(zr->video_dev);
 exit_free:
+        pci_set_drvdata(pdev, NULL);
         kfree(zr);
 }
 
@@ -1256,338 +1260,329 @@ zoran_setup_videocodec (struct zoran *zr,
  *   Scan for a Buz card (actually for the PCI controller ZR36057),
  *   request the irq and map the io memory
  */
-static int __devinit
-find_zr36057 (void)
+static int __devinit zoran_probe(struct pci_dev *pdev,
+                                 const struct pci_device_id *ent)
 {
         unsigned char latency, need_latency;
         struct zoran *zr;
-        struct pci_dev *dev = NULL;
         int result;
         struct videocodec_master *master_vfe = NULL;
         struct videocodec_master *master_codec = NULL;
         int card_num;
         char *i2c_enc_name, *i2c_dec_name, *codec_name, *vfe_name;
+        unsigned int nr;
 
-        zoran_num = 0;
-        while (zoran_num < BUZ_MAX &&
-               (dev = pci_get_device(PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36057, dev)) != NULL) {
-                card_num = card[zoran_num];
-                zr = kzalloc(sizeof(struct zoran), GFP_KERNEL);
-                if (!zr) {
-                        dprintk(1,
-                                KERN_ERR
-                                "%s: find_zr36057() - kzalloc failed\n",
-                                ZORAN_NAME);
-                        continue;
-                }
-                zr->pci_dev = dev;
-                //zr->zr36057_mem = NULL;
-                zr->id = zoran_num;
-                snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)), "MJPEG[%u]", zr->id);
-                spin_lock_init(&zr->spinlock);
-                mutex_init(&zr->resource_lock);
-                if (pci_enable_device(dev))
-                        goto zr_free_mem;
-                zr->zr36057_adr = pci_resource_start(zr->pci_dev, 0);
-                pci_read_config_byte(zr->pci_dev, PCI_CLASS_REVISION,
-                                     &zr->revision);
-                if (zr->revision < 2) {
-                        dprintk(1,
-                                KERN_INFO
-                                "%s: Zoran ZR36057 (rev %d) irq: %d, memory: 0x%08x.\n",
-                                ZR_DEVNAME(zr), zr->revision, zr->pci_dev->irq,
-                                zr->zr36057_adr);
 
-                        if (card_num == -1) {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: find_zr36057() - no card specified, please use the card=X insmod option\n",
-                                        ZR_DEVNAME(zr));
-                                goto zr_free_mem;
-                        }
-                } else {
-                        int i;
-                        unsigned short ss_vendor, ss_device;
+        nr = zoran_num++;
+        if (nr >= BUZ_MAX) {
+                dprintk(1,
+                        KERN_ERR
+                        "%s: driver limited to %d card(s) maximum\n",
+                        ZORAN_NAME, BUZ_MAX);
+                return -ENOENT;
+        }
 
-                        ss_vendor = zr->pci_dev->subsystem_vendor;
-                        ss_device = zr->pci_dev->subsystem_device;
+        zr = kzalloc(sizeof(struct zoran), GFP_KERNEL);
+        if (!zr) {
+                dprintk(1,
+                        KERN_ERR
+                        "%s: find_zr36057() - kzalloc failed\n",
+                        ZORAN_NAME);
+                return -ENOMEM;
+        }
+        zr->pci_dev = pdev;
+        zr->id = nr;
+        snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)), "MJPEG[%u]", zr->id);
+        spin_lock_init(&zr->spinlock);
+        mutex_init(&zr->resource_lock);
+        if (pci_enable_device(pdev))
+                goto zr_free_mem;
+        pci_read_config_byte(zr->pci_dev, PCI_CLASS_REVISION, &zr->revision);
+
+        dprintk(1,
+                KERN_INFO
+                "%s: Zoran ZR360%c7 (rev %d), irq: %d, memory: 0x%08llx\n",
+                ZR_DEVNAME(zr), zr->revision < 2 ? '5' : '6', zr->revision,
+                zr->pci_dev->irq, (uint64_t)pci_resource_start(zr->pci_dev, 0));
+        if (zr->revision >= 2) {
+                dprintk(1,
+                        KERN_INFO
+                        "%s: Subsystem vendor=0x%04x id=0x%04x\n",
+                        ZR_DEVNAME(zr), zr->pci_dev->subsystem_vendor,
+                        zr->pci_dev->subsystem_device);
+        }
+
+        /* Use auto-detected card type? */
+        if (card[nr] == -1) {
+                if (zr->revision < 2) {
                         dprintk(1,
-                                KERN_INFO
-                                "%s: Zoran ZR36067 (rev %d) irq: %d, memory: 0x%08x\n",
-                                ZR_DEVNAME(zr), zr->revision, zr->pci_dev->irq,
-                                zr->zr36057_adr);
+                                KERN_ERR
+                                "%s: No card type specified, please use the card=X module parameter\n",
+                                ZR_DEVNAME(zr));
                         dprintk(1,
-                                KERN_INFO
-                                "%s: subsystem vendor=0x%04x id=0x%04x\n",
-                                ZR_DEVNAME(zr), ss_vendor, ss_device);
-                        if (card_num == -1) {
-                                dprintk(3,
-                                        KERN_DEBUG
-                                        "%s: find_zr36057() - trying to autodetect card type\n",
-                                        ZR_DEVNAME(zr));
-                                for (i=0;i<NUM_CARDS;i++) {
-                                        if (ss_vendor == zoran_cards[i].vendor_id &&
-                                            ss_device == zoran_cards[i].device_id) {
-                                                dprintk(3,
-                                                        KERN_DEBUG
-                                                        "%s: find_zr36057() - card %s detected\n",
-                                                        ZR_DEVNAME(zr),
-                                                        zoran_cards[i].name);
-                                                card_num = i;
-                                                break;
-                                        }
-                                }
-                                if (i == NUM_CARDS) {
-                                        dprintk(1,
-                                                KERN_ERR
-                                                "%s: find_zr36057() - unknown card\n",
-                                                ZR_DEVNAME(zr));
-                                        goto zr_free_mem;
-                                }
-                        }
-                }
-
-                if (card_num < 0 || card_num >= NUM_CARDS) {
-                        dprintk(2,
                                 KERN_ERR
-                                "%s: find_zr36057() - invalid cardnum %d\n",
-                                ZR_DEVNAME(zr), card_num);
+                                "%s: It is not possible to auto-detect ZR36057 based cards\n",
+                                ZR_DEVNAME(zr));
                         goto zr_free_mem;
                 }
 
-                /* even though we make this a non pointer and thus
-                 * theoretically allow for making changes to this struct
-                 * on a per-individual card basis at runtime, this is
-                 * strongly discouraged. This structure is intended to
-                 * keep general card information, no settings or anything */
-                zr->card = zoran_cards[card_num];
-                snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)),
-                         "%s[%u]", zr->card.name, zr->id);
-
-                zr->zr36057_mem = ioremap_nocache(zr->zr36057_adr, 0x1000);
-                if (!zr->zr36057_mem) {
+                card_num = ent->driver_data;
+                if (card_num >= NUM_CARDS) {
                         dprintk(1,
                                 KERN_ERR
-                                "%s: find_zr36057() - ioremap failed\n",
+                                "%s: Unknown card, try specifying card=X module parameter\n",
                                 ZR_DEVNAME(zr));
                         goto zr_free_mem;
                 }
-
-                result = request_irq(zr->pci_dev->irq,
-                                     zoran_irq,
-                                     IRQF_SHARED | IRQF_DISABLED,
-                                     ZR_DEVNAME(zr),
-                                     (void *) zr);
-                if (result < 0) {
-                        if (result == -EINVAL) {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: find_zr36057() - bad irq number or handler\n",
-                                        ZR_DEVNAME(zr));
-                        } else if (result == -EBUSY) {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: find_zr36057() - IRQ %d busy, change your PnP config in BIOS\n",
-                                        ZR_DEVNAME(zr), zr->pci_dev->irq);
-                        } else {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: find_zr36057() - can't assign irq, error code %d\n",
-                                        ZR_DEVNAME(zr), result);
-                        }
-                        goto zr_unmap;
-                }
-
-                /* set PCI latency timer */
-                pci_read_config_byte(zr->pci_dev, PCI_LATENCY_TIMER,
-                                     &latency);
-                need_latency = zr->revision > 1 ? 32 : 48;
-                if (latency != need_latency) {
-                        dprintk(2,
-                                KERN_INFO
-                                "%s: Changing PCI latency from %d to %d.\n",
-                                ZR_DEVNAME(zr), latency, need_latency);
-                        pci_write_config_byte(zr->pci_dev,
-                                              PCI_LATENCY_TIMER,
-                                              need_latency);
+                dprintk(3,
+                        KERN_DEBUG
+                        "%s: %s() - card %s detected\n",
+                        ZR_DEVNAME(zr), __func__, zoran_cards[card_num].name);
+        } else {
+                card_num = card[nr];
+                if (card_num >= NUM_CARDS || card_num < 0) {
+                        dprintk(1,
+                                KERN_ERR
+                                "%s: User specified card type %d out of range (0 .. %d)\n",
+                                ZR_DEVNAME(zr), card_num, NUM_CARDS - 1);
+                        goto zr_free_mem;
                 }
+        }
 
-                zr36057_restart(zr);
-                /* i2c */
-                dprintk(2, KERN_INFO "%s: Initializing i2c bus...\n",
-                        ZR_DEVNAME(zr));
+        /* even though we make this a non pointer and thus
+         * theoretically allow for making changes to this struct
+         * on a per-individual card basis at runtime, this is
+         * strongly discouraged. This structure is intended to
+         * keep general card information, no settings or anything */
+        zr->card = zoran_cards[card_num];
+        snprintf(ZR_DEVNAME(zr), sizeof(ZR_DEVNAME(zr)),
+                 "%s[%u]", zr->card.name, zr->id);
+
+        zr->zr36057_mem = pci_ioremap_bar(zr->pci_dev, 0);
+        if (!zr->zr36057_mem) {
+                dprintk(1,
+                        KERN_ERR
+                        "%s: %s() - ioremap failed\n",
+                        ZR_DEVNAME(zr), __func__);
+                goto zr_free_mem;
+        }
 
-                /* i2c decoder */
-                if (decoder[zr->id] != -1) {
-                        i2c_dec_name = i2cid_to_modulename(decoder[zr->id]);
-                        zr->card.i2c_decoder = decoder[zr->id];
-                } else if (zr->card.i2c_decoder != 0) {
-                        i2c_dec_name =
-                                i2cid_to_modulename(zr->card.i2c_decoder);
+        result = request_irq(zr->pci_dev->irq, zoran_irq,
+                             IRQF_SHARED | IRQF_DISABLED, ZR_DEVNAME(zr), zr);
+        if (result < 0) {
+                if (result == -EINVAL) {
+                        dprintk(1,
+                                KERN_ERR
+                                "%s: find_zr36057() - bad irq number or handler\n",
+                                ZR_DEVNAME(zr));
+                } else if (result == -EBUSY) {
+                        dprintk(1,
+                                KERN_ERR
+                                "%s: find_zr36057() - IRQ %d busy, change your PnP config in BIOS\n",
+                                ZR_DEVNAME(zr), zr->pci_dev->irq);
                 } else {
-                        i2c_dec_name = NULL;
+                        dprintk(1,
+                                KERN_ERR
+                                "%s: find_zr36057() - can't assign irq, error code %d\n",
+                                ZR_DEVNAME(zr), result);
                 }
+                goto zr_unmap;
+        }
 
-                if (i2c_dec_name) {
-                        if ((result = request_module(i2c_dec_name)) < 0) {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: failed to load module %s: %d\n",
-                                        ZR_DEVNAME(zr), i2c_dec_name, result);
-                        }
-                }
+        /* set PCI latency timer */
+        pci_read_config_byte(zr->pci_dev, PCI_LATENCY_TIMER,
+                             &latency);
+        need_latency = zr->revision > 1 ? 32 : 48;
+        if (latency != need_latency) {
+                dprintk(2,
+                        KERN_INFO
+                        "%s: Changing PCI latency from %d to %d\n",
+                        ZR_DEVNAME(zr), latency, need_latency);
+                pci_write_config_byte(zr->pci_dev, PCI_LATENCY_TIMER,
+                                      need_latency);
+        }
 
-                /* i2c encoder */
-                if (encoder[zr->id] != -1) {
-                        i2c_enc_name = i2cid_to_modulename(encoder[zr->id]);
-                        zr->card.i2c_encoder = encoder[zr->id];
-                } else if (zr->card.i2c_encoder != 0) {
-                        i2c_enc_name =
-                                i2cid_to_modulename(zr->card.i2c_encoder);
-                } else {
-                        i2c_enc_name = NULL;
-                }
+        zr36057_restart(zr);
+        /* i2c */
+        dprintk(2, KERN_INFO "%s: Initializing i2c bus...\n",
+                ZR_DEVNAME(zr));
+
+        /* i2c decoder */
+        if (decoder[zr->id] != -1) {
+                i2c_dec_name = i2cid_to_modulename(decoder[zr->id]);
+                zr->card.i2c_decoder = decoder[zr->id];
+        } else if (zr->card.i2c_decoder != 0) {
+                i2c_dec_name = i2cid_to_modulename(zr->card.i2c_decoder);
+        } else {
+                i2c_dec_name = NULL;
+        }
 
-                if (i2c_enc_name) {
-                        if ((result = request_module(i2c_enc_name)) < 0) {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: failed to load module %s: %d\n",
-                                        ZR_DEVNAME(zr), i2c_enc_name, result);
-                        }
+        if (i2c_dec_name) {
+                result = request_module(i2c_dec_name);
+                if (result < 0) {
+                        dprintk(1,
+                                KERN_ERR
+                                "%s: failed to load module %s: %d\n",
+                                ZR_DEVNAME(zr), i2c_dec_name, result);
                 }
+        }
+
+        /* i2c encoder */
+        if (encoder[zr->id] != -1) {
+                i2c_enc_name = i2cid_to_modulename(encoder[zr->id]);
+                zr->card.i2c_encoder = encoder[zr->id];
+        } else if (zr->card.i2c_encoder != 0) {
+                i2c_enc_name = i2cid_to_modulename(zr->card.i2c_encoder);
+        } else {
+                i2c_enc_name = NULL;
+        }
 
-                if (zoran_register_i2c(zr) < 0) {
+        if (i2c_enc_name) {
+                result = request_module(i2c_enc_name);
+                if (result < 0) {
                         dprintk(1,
                                 KERN_ERR
-                                "%s: find_zr36057() - can't initialize i2c bus\n",
-                                ZR_DEVNAME(zr));
-                        goto zr_free_irq;
+                                "%s: failed to load module %s: %d\n",
+                                ZR_DEVNAME(zr), i2c_enc_name, result);
                 }
+        }
 
-                dprintk(2,
-                        KERN_INFO "%s: Initializing videocodec bus...\n",
+        if (zoran_register_i2c(zr) < 0) {
+                dprintk(1,
+                        KERN_ERR
+                        "%s: find_zr36057() - can't initialize i2c bus\n",
                         ZR_DEVNAME(zr));
+                goto zr_free_irq;
+        }
 
-                if (zr->card.video_codec != 0 &&
-                    (codec_name =
-                     codecid_to_modulename(zr->card.video_codec)) != NULL) {
-                        if ((result = request_module(codec_name)) < 0) {
+        dprintk(2,
+                KERN_INFO "%s: Initializing videocodec bus...\n",
+                ZR_DEVNAME(zr));
+
+        if (zr->card.video_codec) {
+                codec_name = codecid_to_modulename(zr->card.video_codec);
+                if (codec_name) {
+                        result = request_module(codec_name);
+                        if (result) {
                                 dprintk(1,
                                         KERN_ERR
                                         "%s: failed to load modules %s: %d\n",
                                         ZR_DEVNAME(zr), codec_name, result);
                         }
                 }
-                if (zr->card.video_vfe != 0 &&
-                    (vfe_name =
-                     codecid_to_modulename(zr->card.video_vfe)) != NULL) {
-                        if ((result = request_module(vfe_name)) < 0) {
+        }
+        if (zr->card.video_vfe) {
+                vfe_name = codecid_to_modulename(zr->card.video_vfe);
+                if (vfe_name) {
+                        result = request_module(vfe_name);
+                        if (result < 0) {
                                 dprintk(1,
                                         KERN_ERR
                                         "%s: failed to load modules %s: %d\n",
                                         ZR_DEVNAME(zr), vfe_name, result);
                         }
                 }
+        }
 
-                /* reset JPEG codec */
-                jpeg_codec_sleep(zr, 1);
-                jpeg_codec_reset(zr);
-                /* video bus enabled */
-                /* display codec revision */
-                if (zr->card.video_codec != 0) {
-                        master_codec = zoran_setup_videocodec(zr,
-                                                              zr->card.video_codec);
-                        if (!master_codec)
-                                goto zr_unreg_i2c;
-                        zr->codec = videocodec_attach(master_codec);
-                        if (!zr->codec) {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: find_zr36057() - no codec found\n",
-                                        ZR_DEVNAME(zr));
-                                goto zr_free_codec;
-                        }
-                        if (zr->codec->type != zr->card.video_codec) {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: find_zr36057() - wrong codec\n",
-                                        ZR_DEVNAME(zr));
-                                goto zr_detach_codec;
-                        }
+        /* reset JPEG codec */
+        jpeg_codec_sleep(zr, 1);
+        jpeg_codec_reset(zr);
+        /* video bus enabled */
+        /* display codec revision */
+        if (zr->card.video_codec != 0) {
+                master_codec = zoran_setup_videocodec(zr, zr->card.video_codec);
+                if (!master_codec)
+                        goto zr_unreg_i2c;
+                zr->codec = videocodec_attach(master_codec);
+                if (!zr->codec) {
+                        dprintk(1,
+                                KERN_ERR
+                                "%s: find_zr36057() - no codec found\n",
+                                ZR_DEVNAME(zr));
+                        goto zr_free_codec;
                 }
-                if (zr->card.video_vfe != 0) {
-                        master_vfe = zoran_setup_videocodec(zr,
-                                                            zr->card.video_vfe);
-                        if (!master_vfe)
-                                goto zr_detach_codec;
-                        zr->vfe = videocodec_attach(master_vfe);
-                        if (!zr->vfe) {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: find_zr36057() - no VFE found\n",
-                                        ZR_DEVNAME(zr));
-                                goto zr_free_vfe;
-                        }
-                        if (zr->vfe->type != zr->card.video_vfe) {
-                                dprintk(1,
-                                        KERN_ERR
-                                        "%s: find_zr36057() = wrong VFE\n",
-                                        ZR_DEVNAME(zr));
-                                goto zr_detach_vfe;
-                        }
+                if (zr->codec->type != zr->card.video_codec) {
+                        dprintk(1,
+                                KERN_ERR
+                                "%s: find_zr36057() - wrong codec\n",
+                                ZR_DEVNAME(zr));
+                        goto zr_detach_codec;
+                }
+        }
+        if (zr->card.video_vfe != 0) {
+                master_vfe = zoran_setup_videocodec(zr, zr->card.video_vfe);
+                if (!master_vfe)
+                        goto zr_detach_codec;
+                zr->vfe = videocodec_attach(master_vfe);
+                if (!zr->vfe) {
+                        dprintk(1,
+                                KERN_ERR
+                                "%s: find_zr36057() - no VFE found\n",
+                                ZR_DEVNAME(zr));
+                        goto zr_free_vfe;
+                }
+                if (zr->vfe->type != zr->card.video_vfe) {
+                        dprintk(1,
+                                KERN_ERR
+                                "%s: find_zr36057() = wrong VFE\n",
+                                ZR_DEVNAME(zr));
+                        goto zr_detach_vfe;
                 }
-                /* Success so keep the pci_dev referenced */
-                pci_dev_get(zr->pci_dev);
-                zoran[zoran_num++] = zr;
-                continue;
-
-                // Init errors
-              zr_detach_vfe:
-                videocodec_detach(zr->vfe);
-              zr_free_vfe:
-                kfree(master_vfe);
-              zr_detach_codec:
-                videocodec_detach(zr->codec);
-              zr_free_codec:
-                kfree(master_codec);
-              zr_unreg_i2c:
-                zoran_unregister_i2c(zr);
-              zr_free_irq:
-                btwrite(0, ZR36057_SPGPPCR);
-                free_irq(zr->pci_dev->irq, zr);
-              zr_unmap:
-                iounmap(zr->zr36057_mem);
-              zr_free_mem:
-                kfree(zr);
-                continue;
         }
-        if (dev)        /* Clean up ref count on early exit */
-                pci_dev_put(dev);
 
-        if (zoran_num == 0) {
-                dprintk(1, KERN_INFO "No known MJPEG cards found.\n");
+        /* take care of Natoma chipset and a revision 1 zr36057 */
+        if ((pci_pci_problems & PCIPCI_NATOMA) && zr->revision <= 1) {
+                zr->jpg_buffers.need_contiguous = 1;
+                dprintk(1,
+                        KERN_INFO
+                        "%s: ZR36057/Natoma bug, max. buffer size is 128K\n",
+                        ZR_DEVNAME(zr));
         }
-        return zoran_num;
+
+        if (zr36057_init(zr) < 0)
+                goto zr_detach_vfe;
+
+        zoran_proc_init(zr);
+
+        pci_set_drvdata(pdev, zr);
+
+        return 0;
+
+zr_detach_vfe:
+        videocodec_detach(zr->vfe);
+zr_free_vfe:
+        kfree(master_vfe);
+zr_detach_codec:
+        videocodec_detach(zr->codec);
+zr_free_codec:
+        kfree(master_codec);
+zr_unreg_i2c:
+        zoran_unregister_i2c(zr);
+zr_free_irq:
+        btwrite(0, ZR36057_SPGPPCR);
+        free_irq(zr->pci_dev->irq, zr);
+zr_unmap:
+        iounmap(zr->zr36057_mem);
+zr_free_mem:
+        kfree(zr);
+
+        return -ENODEV;
 }
 
-static int __init
-init_dc10_cards (void)
+static struct pci_driver zoran_driver = {
+        .name = "zr36067",
+        .id_table = zr36067_pci_tbl,
+        .probe = zoran_probe,
+        .remove = zoran_remove,
+};
+
+static int __init zoran_init(void)
 {
-        int i;
+        int res;
 
-        memset(zoran, 0, sizeof(zoran));
         printk(KERN_INFO "Zoran MJPEG board driver version %d.%d.%d\n",
                MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION);
 
-        /* Look for cards */
-        if (find_zr36057() < 0) {
-                return -EIO;
-        }
-        if (zoran_num == 0)
-                return -ENODEV;
-        dprintk(1, KERN_INFO "%s: %d card(s) found\n", ZORAN_NAME,
-                zoran_num);
         /* check the parameters we have been given, adjust if necessary */
         if (v4l_nbufs < 2)
                 v4l_nbufs = 2;
@@ -1629,37 +1624,22 @@ init_dc10_cards (void)
                         ZORAN_NAME);
         }
 
-        /* take care of Natoma chipset and a revision 1 zr36057 */
-        for (i = 0; i < zoran_num; i++) {
-                struct zoran *zr = zoran[i];
-
-                if ((pci_pci_problems & PCIPCI_NATOMA) && zr->revision <= 1) {
-                        zr->jpg_buffers.need_contiguous = 1;
-                        dprintk(1,
-                                KERN_INFO
-                                "%s: ZR36057/Natoma bug, max. buffer size is 128K\n",
-                                ZR_DEVNAME(zr));
-                }
-
-                if (zr36057_init(zr) < 0) {
-                        for (i = 0; i < zoran_num; i++)
-                                zoran_release(zoran[i]);
-                        return -EIO;
-                }
-                zoran_proc_init(zr);
+        res = pci_register_driver(&zoran_driver);
+        if (res) {
+                dprintk(1,
+                        KERN_ERR
+                        "%s: Unable to register ZR36057 driver\n",
+                        ZORAN_NAME);
+                return res;
         }
 
         return 0;
 }
 
-static void __exit
-unload_dc10_cards (void)
+static void __exit zoran_exit(void)
 {
-        int i;
-
-        for (i = 0; i < zoran_num; i++)
-                zoran_release(zoran[i]);
+        pci_unregister_driver(&zoran_driver);
 }
 
-module_init(init_dc10_cards);
-module_exit(unload_dc10_cards);
+module_init(zoran_init);
+module_exit(zoran_exit);
diff --git a/drivers/media/video/zoran/zoran_card.h b/drivers/media/video/zoran/zoran_card.h
index e4dc9d29b404..4507bdc5e338 100644
--- a/drivers/media/video/zoran/zoran_card.h
+++ b/drivers/media/video/zoran/zoran_card.h
@@ -40,8 +40,6 @@ extern int zr36067_debug;
 
 /* Anybody who uses more than four? */
 #define BUZ_MAX 4
-extern int zoran_num;
-extern struct zoran *zoran[BUZ_MAX];
 
 extern struct video_device zoran_template;
 
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index b58b9dda715c..120ef235e63d 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1196,83 +1196,54 @@ zoran_close_end_session (struct file *file)
  *   Open a zoran card. Right now the flags stuff is just playing
  */
 
-static int
-zoran_open(struct file  *file)
+static int zoran_open(struct file *file)
 {
-        unsigned int minor = video_devdata(file)->minor;
-        struct zoran *zr = NULL;
+        struct zoran *zr = video_drvdata(file);
         struct zoran_fh *fh;
-        int i, res, first_open = 0, have_module_locks = 0;
+        int res, first_open = 0;
 
-        lock_kernel();
-        /* find the device */
-        for (i = 0; i < zoran_num; i++) {
-                if (zoran[i]->video_dev->minor == minor) {
-                        zr = zoran[i];
-                        break;
-                }
-        }
+        dprintk(2, KERN_INFO "%s: zoran_open(%s, pid=[%d]), users(-)=%d\n",
+                ZR_DEVNAME(zr), current->comm, task_pid_nr(current), zr->user + 1);
 
-        if (!zr) {
-                dprintk(1, KERN_ERR "%s: device not found!\n", ZORAN_NAME);
-                res = -ENODEV;
-                goto open_unlock_and_return;
-        }
+        lock_kernel();
 
         /* see fs/device.c - the kernel already locks during open(),
          * so locking ourselves only causes deadlocks */
         /*mutex_lock(&zr->resource_lock);*/
 
+        if (zr->user >= 2048) {
+                dprintk(1, KERN_ERR "%s: too many users (%d) on device\n",
+                        ZR_DEVNAME(zr), zr->user);
+                res = -EBUSY;
+                goto fail_unlock;
+        }
+
         if (!zr->decoder) {
                 dprintk(1,
                         KERN_ERR "%s: no TV decoder loaded for device!\n",
                         ZR_DEVNAME(zr));
                 res = -EIO;
-                goto open_unlock_and_return;
+                goto fail_unlock;
         }
 
-        /* try to grab a module lock */
-        if (!try_module_get(THIS_MODULE)) {
-                dprintk(1,
-                        KERN_ERR
-                        "%s: failed to acquire my own lock! PANIC!\n",
-                        ZR_DEVNAME(zr));
-                res = -ENODEV;
-                goto open_unlock_and_return;
-        }
         if (!try_module_get(zr->decoder->driver->driver.owner)) {
                 dprintk(1,
                         KERN_ERR
-                        "%s: failed to grab ownership of i2c decoder\n",
+                        "%s: failed to grab ownership of video decoder\n",
                         ZR_DEVNAME(zr));
                 res = -EIO;
-                module_put(THIS_MODULE);
-                goto open_unlock_and_return;
+                goto fail_unlock;
         }
         if (zr->encoder &&
             !try_module_get(zr->encoder->driver->driver.owner)) {
                 dprintk(1,
                         KERN_ERR
-                        "%s: failed to grab ownership of i2c encoder\n",
+                        "%s: failed to grab ownership of video encoder\n",
                         ZR_DEVNAME(zr));
                 res = -EIO;
-                module_put(zr->decoder->driver->driver.owner);
-                module_put(THIS_MODULE);
-                goto open_unlock_and_return;
+                goto fail_decoder;
         }
 
-        have_module_locks = 1;
-
-        if (zr->user >= 2048) {
-                dprintk(1, KERN_ERR "%s: too many users (%d) on device\n",
-                        ZR_DEVNAME(zr), zr->user);
-                res = -EBUSY;
-                goto open_unlock_and_return;
-        }
-
-        dprintk(1, KERN_INFO "%s: zoran_open(%s, pid=[%d]), users(-)=%d\n",
-                ZR_DEVNAME(zr), current->comm, task_pid_nr(current), zr->user);
-
         /* now, create the open()-specific file_ops struct */
         fh = kzalloc(sizeof(struct zoran_fh), GFP_KERNEL);
         if (!fh) {
@@ -1281,7 +1252,7 @@ zoran_open(struct file  *file)
                         "%s: zoran_open() - allocation of zoran_fh failed\n",
                         ZR_DEVNAME(zr));
                 res = -ENOMEM;
-                goto open_unlock_and_return;
+                goto fail_encoder;
         }
         /* used to be BUZ_MAX_WIDTH/HEIGHT, but that gives overflows
          * on norm-change! */
@@ -1292,9 +1263,8 @@ zoran_open(struct file  *file)
                         KERN_ERR
                         "%s: zoran_open() - allocation of overlay_mask failed\n",
                         ZR_DEVNAME(zr));
-                kfree(fh);
                 res = -ENOMEM;
-                goto open_unlock_and_return;
+                goto fail_fh;
         }
 
         if (zr->user++ == 0)
@@ -1319,22 +1289,19 @@ zoran_open(struct file  *file)
 
         return 0;
 
-open_unlock_and_return:
-        /* if we grabbed locks, release them accordingly */
-        if (have_module_locks) {
-                module_put(zr->decoder->driver->driver.owner);
-                if (zr->encoder) {
-                        module_put(zr->encoder->driver->driver.owner);
-                }
-                module_put(THIS_MODULE);
-        }
-
-        /* if there's no device found, we didn't obtain the lock either */
-        if (zr) {
-                /*mutex_unlock(&zr->resource_lock);*/
-        }
+fail_fh:
+        kfree(fh);
+fail_encoder:
+        if (zr->encoder)
+                module_put(zr->encoder->driver->driver.owner);
+fail_decoder:
+        module_put(zr->decoder->driver->driver.owner);
+fail_unlock:
         unlock_kernel();
 
+        dprintk(2, KERN_INFO "%s: open failed (%d), users(-)=%d\n",
+                ZR_DEVNAME(zr), res, zr->user);
+
         return res;
 }
 
@@ -1344,8 +1311,8 @@ zoran_close(struct file  *file)
         struct zoran_fh *fh = file->private_data;
         struct zoran *zr = fh->zr;
 
-        dprintk(1, KERN_INFO "%s: zoran_close(%s, pid=[%d]), users(+)=%d\n",
-                ZR_DEVNAME(zr), current->comm, task_pid_nr(current), zr->user);
+        dprintk(2, KERN_INFO "%s: zoran_close(%s, pid=[%d]), users(+)=%d\n",
+                ZR_DEVNAME(zr), current->comm, task_pid_nr(current), zr->user - 1);
 
         /* kernel locks (fs/device.c), so don't do that ourselves
          * (prevents deadlocks) */
@@ -1391,10 +1358,8 @@ zoran_close(struct file  *file)
 
         /* release locks on the i2c modules */
         module_put(zr->decoder->driver->driver.owner);
-        if (zr->encoder) {
-                 module_put(zr->encoder->driver->driver.owner);
-        }
-        module_put(THIS_MODULE);
+        if (zr->encoder)
+                module_put(zr->encoder->driver->driver.owner);
 
         /*mutex_unlock(&zr->resource_lock);*/
 
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 24508e28e3fb..ea9488e7ad6d 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -626,7 +626,6 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
         }
 
         if (client->irq) {
-                set_irq_handler(client->irq, handle_level_irq);
                 ret = request_irq(client->irq, pcf50633_irq,
                                 IRQF_TRIGGER_LOW, "pcf50633", pcf);
 
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 396d935012f2..1c484084ed4f 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -217,6 +217,7 @@ config DELL_LAPTOP
         depends on EXPERIMENTAL
         depends on BACKLIGHT_CLASS_DEVICE
         depends on RFKILL
+        depends on POWER_SUPPLY
         default n
         ---help---
         This driver adds support for rfkill and backlight control to Dell
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index bf5e4d065436..558bf3f2c276 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -35,7 +35,7 @@ struct ssc_device *ssc_request(unsigned int ssc_num)
 
         if (!ssc_valid) {
                 spin_unlock(&user_lock);
-                dev_dbg(&ssc->pdev->dev, "could not find requested device\n");
+                pr_err("ssc: ssc%d platform device is missing\n", ssc_num);
                 return ERR_PTR(-ENODEV);
         }
 
diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index 10c421b73eaf..f26667a7abf7 100644
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -207,7 +207,7 @@ static void ilo_ccb_close(struct pci_dev *pdev, struct ccb_data *data)
                   &device_ccb->recv_ctrl);
 
         /* give iLO some time to process stop request */
-        for (retries = 1000; retries > 0; retries--) {
+        for (retries = MAX_WAIT; retries > 0; retries--) {
                 doorbell_set(driver_ccb);
                 udelay(1);
                 if (!(ioread32(&device_ccb->send_ctrl) & (1 << CTRL_BITPOS_A))
@@ -309,7 +309,7 @@ static int ilo_ccb_open(struct ilo_hwinfo *hw, struct ccb_data *data, int slot)
         doorbell_clr(driver_ccb);
 
         /* make sure iLO is really handling requests */
-        for (i = 1000; i > 0; i--) {
+        for (i = MAX_WAIT; i > 0; i--) {
                 if (ilo_pkt_dequeue(hw, driver_ccb, SENDQ, &pkt_id, NULL, NULL))
                         break;
                 udelay(1);
@@ -326,7 +326,7 @@ static int ilo_ccb_open(struct ilo_hwinfo *hw, struct ccb_data *data, int slot)
 
         return 0;
 free:
-        pci_free_consistent(pdev, data->dma_size, data->dma_va, data->dma_pa);
+        ilo_ccb_close(pdev, data);
 out:
         return error;
 }
diff --git a/drivers/misc/hpilo.h b/drivers/misc/hpilo.h
index a281207696c1..b64a20ef07e3 100644
--- a/drivers/misc/hpilo.h
+++ b/drivers/misc/hpilo.h
@@ -19,6 +19,8 @@
 #define MAX_ILO_DEV     1
 /* max number of files */
 #define MAX_OPEN        (MAX_CCB * MAX_ILO_DEV)
+/* spin counter for open/close delay */
+#define MAX_WAIT        10000
 
 /*
  * Per device, used to track global memory allocations.
diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
index a5bd658c2e83..275b78896a73 100644
--- a/drivers/misc/sgi-xp/xpc.h
+++ b/drivers/misc/sgi-xp/xpc.h
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2004-2008 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2009 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 /*
@@ -514,7 +514,8 @@ struct xpc_channel_uv {
                                                 /* partition's notify mq */
 
         struct xpc_send_msg_slot_uv *send_msg_slots;
-        struct xpc_notify_mq_msg_uv *recv_msg_slots;
+        void *recv_msg_slots;   /* each slot will hold a xpc_notify_mq_msg_uv */
+                                /* structure plus the user's payload */
 
         struct xpc_fifo_head_uv msg_slot_free_list;
         struct xpc_fifo_head_uv recv_msg_list;  /* deliverable payloads */
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index f17f7d40ea2c..29c0502a96b2 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2008-2009 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 /*
@@ -1010,8 +1010,8 @@ xpc_allocate_recv_msg_slot_uv(struct xpc_channel *ch)
                         continue;
 
                 for (entry = 0; entry < nentries; entry++) {
-                        msg_slot = ch_uv->recv_msg_slots + entry *
-                            ch->entry_size;
+                        msg_slot = ch_uv->recv_msg_slots +
+                            entry * ch->entry_size;
 
                         msg_slot->hdr.msg_slot_number = entry;
                 }
@@ -1308,9 +1308,8 @@ xpc_handle_notify_mq_msg_uv(struct xpc_partition *part,
         /* we're dealing with a normal message sent via the notify_mq */
         ch_uv = &ch->sn.uv;
 
-        msg_slot = (struct xpc_notify_mq_msg_uv *)((u64)ch_uv->recv_msg_slots +
-                    (msg->hdr.msg_slot_number % ch->remote_nentries) *
-                    ch->entry_size);
+        msg_slot = ch_uv->recv_msg_slots +
+            (msg->hdr.msg_slot_number % ch->remote_nentries) * ch->entry_size;
 
         BUG_ON(msg->hdr.msg_slot_number != msg_slot->hdr.msg_slot_number);
         BUG_ON(msg_slot->hdr.size != 0);
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index 7957f525b2f4..6faefcffcb53 100644
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1999-2009 Silicon Graphics, Inc. All rights reserved.
  */
 
 /*
@@ -551,6 +551,7 @@ xpnet_init(void)
 
         netif_carrier_off(xpnet_device);
 
+        xpnet_device->netdev_ops = &xpnet_netdev_ops;
         xpnet_device->mtu = XPNET_DEF_MTU;
 
         /*
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 0efa390978bd..99d4b28d52ed 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -145,6 +145,16 @@ config MMC_IMX
 
           If unsure, say N.
 
+config MMC_MXC
+        tristate "Freescale i.MX2/3 Multimedia Card Interface support"
+        depends on ARCH_MXC
+        help
+          This selects the Freescale i.MX2/3 Multimedia card Interface.
+          If you have a i.MX platform with a Multimedia Card slot,
+          say Y or M here.
+
+          If unsure, say N.
+
 config MMC_TIFM_SD
         tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"
         depends on EXPERIMENTAL && PCI
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 98cab84829b8..dedec55861d9 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -9,6 +9,7 @@ endif
 obj-$(CONFIG_MMC_ARMMMCI)       += mmci.o
 obj-$(CONFIG_MMC_PXA)           += pxamci.o
 obj-$(CONFIG_MMC_IMX)           += imxmmc.o
+obj-$(CONFIG_MMC_MXC)           += mxcmmc.o
 obj-$(CONFIG_MMC_SDHCI)         += sdhci.o
 obj-$(CONFIG_MMC_SDHCI_PCI)     += sdhci-pci.o
 obj-$(CONFIG_MMC_RICOH_MMC)     += ricoh_mmc.o
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 1bcbdd6763ac..2909bbc8ad00 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -430,6 +430,8 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                                 clk = 255;
                         host->cclk = host->mclk / (2 * (clk + 1));
                 }
+                if (host->hw_designer == 0x80)
+                        clk |= MCI_FCEN; /* Bug fix in ST IP block */
                 clk |= MCI_CLK_ENABLE;
         }
 
@@ -440,15 +442,27 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
         case MMC_POWER_OFF:
                 break;
         case MMC_POWER_UP:
-                pwr |= MCI_PWR_UP;
-                break;
+                /* The ST version does not have this, fall through to POWER_ON */
+                if (host->hw_designer != 0x80) {
+                        pwr |= MCI_PWR_UP;
+                        break;
+                }
         case MMC_POWER_ON:
                 pwr |= MCI_PWR_ON;
                 break;
         }
 
-        if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN)
-                pwr |= MCI_ROD;
+        if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN) {
+                if (host->hw_designer != 0x80)
+                        pwr |= MCI_ROD;
+                else {
+                        /*
+                         * The ST Micro variant use the ROD bit for something
+                         * else and only has OD (Open Drain).
+                         */
+                        pwr |= MCI_OD;
+                }
+        }
 
         writel(clk, host->base + MMCICLOCK);
 
@@ -500,6 +514,12 @@ static int mmci_probe(struct amba_device *dev, void *id)
         }
 
         host = mmc_priv(mmc);
+        /* Bits 12 thru 19 is the designer */
+        host->hw_designer = (dev->periphid >> 12) & 0xff;
+        /* Bits 20 thru 23 is the revison */
+        host->hw_revision = (dev->periphid >> 20) & 0xf;
+        DBG(host, "designer ID = 0x%02x\n", host->hw_designer);
+        DBG(host, "revision = 0x%01x\n", host->hw_revision);
         host->clk = clk_get(&dev->dev, NULL);
         if (IS_ERR(host->clk)) {
                 ret = PTR_ERR(host->clk);
@@ -693,6 +713,15 @@ static struct amba_id mmci_ids[] = {
                 .id     = 0x00041181,
                 .mask   = 0x000fffff,
         },
+        /* ST Micro variants */
+        {
+                .id     = 0x00180180,
+                .mask   = 0x00ffffff,
+        },
+        {
+                .id     = 0x00280180,
+                .mask   = 0x00ffffff,
+        },
         { 0, 0 },
 };
 
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 0f39c490f022..0441bac1c0ec 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -11,13 +11,23 @@
 #define MCI_PWR_OFF             0x00
 #define MCI_PWR_UP              0x02
 #define MCI_PWR_ON              0x03
+#define MCI_DATA2DIREN          (1 << 2)
+#define MCI_CMDDIREN            (1 << 3)
+#define MCI_DATA0DIREN          (1 << 4)
+#define MCI_DATA31DIREN         (1 << 5)
 #define MCI_OD                  (1 << 6)
 #define MCI_ROD                 (1 << 7)
+/* The ST Micro version does not have ROD */
+#define MCI_FBCLKEN             (1 << 7)
+#define MCI_DATA74DIREN         (1 << 8)
 
 #define MMCICLOCK               0x004
 #define MCI_CLK_ENABLE          (1 << 8)
 #define MCI_CLK_PWRSAVE         (1 << 9)
 #define MCI_CLK_BYPASS          (1 << 10)
+#define MCI_WIDE_BUS            (1 << 11)
+/* HW flow control on the ST Micro version */
+#define MCI_FCEN                (1 << 13)
 
 #define MMCIARGUMENT            0x008
 #define MMCICOMMAND             0x00c
@@ -26,6 +36,10 @@
 #define MCI_CPSM_INTERRUPT      (1 << 8)
 #define MCI_CPSM_PENDING        (1 << 9)
 #define MCI_CPSM_ENABLE         (1 << 10)
+#define MCI_SDIO_SUSP           (1 << 11)
+#define MCI_ENCMD_COMPL         (1 << 12)
+#define MCI_NIEN                (1 << 13)
+#define MCI_CE_ATACMD           (1 << 14)
 
 #define MMCIRESPCMD             0x010
 #define MMCIRESPONSE0           0x014
@@ -39,6 +53,11 @@
 #define MCI_DPSM_DIRECTION      (1 << 1)
 #define MCI_DPSM_MODE           (1 << 2)
 #define MCI_DPSM_DMAENABLE      (1 << 3)
+#define MCI_DPSM_BLOCKSIZE      (1 << 4)
+#define MCI_DPSM_RWSTART        (1 << 8)
+#define MCI_DPSM_RWSTOP         (1 << 9)
+#define MCI_DPSM_RWMOD          (1 << 10)
+#define MCI_DPSM_SDIOEN         (1 << 11)
 
 #define MMCIDATACNT             0x030
 #define MMCISTATUS              0x034
@@ -63,6 +82,8 @@
 #define MCI_RXFIFOEMPTY         (1 << 19)
 #define MCI_TXDATAAVLBL         (1 << 20)
 #define MCI_RXDATAAVLBL         (1 << 21)
+#define MCI_SDIOIT              (1 << 22)
+#define MCI_CEATAEND            (1 << 23)
 
 #define MMCICLEAR               0x038
 #define MCI_CMDCRCFAILCLR       (1 << 0)
@@ -75,6 +96,8 @@
 #define MCI_CMDSENTCLR          (1 << 7)
 #define MCI_DATAENDCLR          (1 << 8)
 #define MCI_DATABLOCKENDCLR     (1 << 10)
+#define MCI_SDIOITC             (1 << 22)
+#define MCI_CEATAENDC           (1 << 23)
 
 #define MMCIMASK0               0x03c
 #define MCI_CMDCRCFAILMASK      (1 << 0)
@@ -98,6 +121,8 @@
 #define MCI_RXFIFOEMPTYMASK     (1 << 19)
 #define MCI_TXDATAAVLBLMASK     (1 << 20)
 #define MCI_RXDATAAVLBLMASK     (1 << 21)
+#define MCI_SDIOITMASK          (1 << 22)
+#define MCI_CEATAENDMASK        (1 << 23)
 
 #define MMCIMASK1               0x040
 #define MMCIFIFOCNT             0x048
@@ -136,6 +161,9 @@ struct mmci_host {
         u32                     pwr;
         struct mmc_platform_data *plat;
 
+        u8                      hw_designer;
+        u8                      hw_revision:4;
+
         struct timer_list       timer;
         unsigned int            oldstat;
 
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
new file mode 100644
index 000000000000..dda0be4e25dc
--- /dev/null
+++ b/drivers/mmc/host/mxcmmc.c
@@ -0,0 +1,880 @@
+/*
+ *  linux/drivers/mmc/host/mxcmmc.c - Freescale i.MX MMCI driver
+ *
+ *  This is a driver for the SDHC controller found in Freescale MX2/MX3
+ *  SoCs. It is basically the same hardware as found on MX1 (imxmmc.c).
+ *  Unlike the hardware found on MX1, this hardware just works and does
+ *  not need all the quirks found in imxmmc.c, hence the seperate driver.
+ *
+ *  Copyright (C) 2008 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
+ *  Copyright (C) 2006 Pavel Pisa, PiKRON <ppisa@pikron.com>
+ *
+ *  derived from pxamci.c by Russell King
+ *
+ * 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/module.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/blkdev.h>
+#include <linux/dma-mapping.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/card.h>
+#include <linux/delay.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+
+#include <asm/dma.h>
+#include <asm/irq.h>
+#include <asm/sizes.h>
+#include <mach/mmc.h>
+
+#ifdef CONFIG_ARCH_MX2
+#include <mach/dma-mx1-mx2.h>
+#define HAS_DMA
+#endif
+
+#define DRIVER_NAME "imx-mmc"
+
+#define MMC_REG_STR_STP_CLK             0x00
+#define MMC_REG_STATUS                  0x04
+#define MMC_REG_CLK_RATE                0x08
+#define MMC_REG_CMD_DAT_CONT            0x0C
+#define MMC_REG_RES_TO                  0x10
+#define MMC_REG_READ_TO                 0x14
+#define MMC_REG_BLK_LEN                 0x18
+#define MMC_REG_NOB                     0x1C
+#define MMC_REG_REV_NO                  0x20
+#define MMC_REG_INT_CNTR                0x24
+#define MMC_REG_CMD                     0x28
+#define MMC_REG_ARG                     0x2C
+#define MMC_REG_RES_FIFO                0x34
+#define MMC_REG_BUFFER_ACCESS           0x38
+
+#define STR_STP_CLK_RESET               (1 << 3)
+#define STR_STP_CLK_START_CLK           (1 << 1)
+#define STR_STP_CLK_STOP_CLK            (1 << 0)
+
+#define STATUS_CARD_INSERTION           (1 << 31)
+#define STATUS_CARD_REMOVAL             (1 << 30)
+#define STATUS_YBUF_EMPTY               (1 << 29)
+#define STATUS_XBUF_EMPTY               (1 << 28)
+#define STATUS_YBUF_FULL                (1 << 27)
+#define STATUS_XBUF_FULL                (1 << 26)
+#define STATUS_BUF_UND_RUN              (1 << 25)
+#define STATUS_BUF_OVFL                 (1 << 24)
+#define STATUS_SDIO_INT_ACTIVE          (1 << 14)
+#define STATUS_END_CMD_RESP             (1 << 13)
+#define STATUS_WRITE_OP_DONE            (1 << 12)
+#define STATUS_DATA_TRANS_DONE          (1 << 11)
+#define STATUS_READ_OP_DONE             (1 << 11)
+#define STATUS_WR_CRC_ERROR_CODE_MASK   (3 << 10)
+#define STATUS_CARD_BUS_CLK_RUN         (1 << 8)
+#define STATUS_BUF_READ_RDY             (1 << 7)
+#define STATUS_BUF_WRITE_RDY            (1 << 6)
+#define STATUS_RESP_CRC_ERR             (1 << 5)
+#define STATUS_CRC_READ_ERR             (1 << 3)
+#define STATUS_CRC_WRITE_ERR            (1 << 2)
+#define STATUS_TIME_OUT_RESP            (1 << 1)
+#define STATUS_TIME_OUT_READ            (1 << 0)
+#define STATUS_ERR_MASK                 0x2f
+
+#define CMD_DAT_CONT_CMD_RESP_LONG_OFF  (1 << 12)
+#define CMD_DAT_CONT_STOP_READWAIT      (1 << 11)
+#define CMD_DAT_CONT_START_READWAIT     (1 << 10)
+#define CMD_DAT_CONT_BUS_WIDTH_4        (2 << 8)
+#define CMD_DAT_CONT_INIT               (1 << 7)
+#define CMD_DAT_CONT_WRITE              (1 << 4)
+#define CMD_DAT_CONT_DATA_ENABLE        (1 << 3)
+#define CMD_DAT_CONT_RESPONSE_48BIT_CRC (1 << 0)
+#define CMD_DAT_CONT_RESPONSE_136BIT    (2 << 0)
+#define CMD_DAT_CONT_RESPONSE_48BIT     (3 << 0)
+
+#define INT_SDIO_INT_WKP_EN             (1 << 18)
+#define INT_CARD_INSERTION_WKP_EN       (1 << 17)
+#define INT_CARD_REMOVAL_WKP_EN         (1 << 16)
+#define INT_CARD_INSERTION_EN           (1 << 15)
+#define INT_CARD_REMOVAL_EN             (1 << 14)
+#define INT_SDIO_IRQ_EN                 (1 << 13)
+#define INT_DAT0_EN                     (1 << 12)
+#define INT_BUF_READ_EN                 (1 << 4)
+#define INT_BUF_WRITE_EN                (1 << 3)
+#define INT_END_CMD_RES_EN              (1 << 2)
+#define INT_WRITE_OP_DONE_EN            (1 << 1)
+#define INT_READ_OP_EN                  (1 << 0)
+
+struct mxcmci_host {
+        struct mmc_host         *mmc;
+        struct resource         *res;
+        void __iomem            *base;
+        int                     irq;
+        int                     detect_irq;
+        int                     dma;
+        int                     do_dma;
+        unsigned int            power_mode;
+        struct imxmmc_platform_data *pdata;
+
+        struct mmc_request      *req;
+        struct mmc_command      *cmd;
+        struct mmc_data         *data;
+
+        unsigned int            dma_nents;
+        unsigned int            datasize;
+        unsigned int            dma_dir;
+
+        u16                     rev_no;
+        unsigned int            cmdat;
+
+        struct clk              *clk;
+
+        int                     clock;
+
+        struct work_struct      datawork;
+};
+
+static inline int mxcmci_use_dma(struct mxcmci_host *host)
+{
+        return host->do_dma;
+}
+
+static void mxcmci_softreset(struct mxcmci_host *host)
+{
+        int i;
+
+        /* reset sequence */
+        writew(STR_STP_CLK_RESET, host->base + MMC_REG_STR_STP_CLK);
+        writew(STR_STP_CLK_RESET | STR_STP_CLK_START_CLK,
+                        host->base + MMC_REG_STR_STP_CLK);
+
+        for (i = 0; i < 8; i++)
+                writew(STR_STP_CLK_START_CLK, host->base + MMC_REG_STR_STP_CLK);
+
+        writew(0xff, host->base + MMC_REG_RES_TO);
+}
+
+static void mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
+{
+        unsigned int nob = data->blocks;
+        unsigned int blksz = data->blksz;
+        unsigned int datasize = nob * blksz;
+#ifdef HAS_DMA
+        struct scatterlist *sg;
+        int i;
+#endif
+        if (data->flags & MMC_DATA_STREAM)
+                nob = 0xffff;
+
+        host->data = data;
+        data->bytes_xfered = 0;
+
+        writew(nob, host->base + MMC_REG_NOB);
+        writew(blksz, host->base + MMC_REG_BLK_LEN);
+        host->datasize = datasize;
+
+#ifdef HAS_DMA
+        for_each_sg(data->sg, sg, data->sg_len, i) {
+                if (sg->offset & 3 || sg->length & 3) {
+                        host->do_dma = 0;
+                        return;
+                }
+        }
+
+        if (data->flags & MMC_DATA_READ) {
+                host->dma_dir = DMA_FROM_DEVICE;
+                host->dma_nents = dma_map_sg(mmc_dev(host->mmc), data->sg,
+                                             data->sg_len,  host->dma_dir);
+
+                imx_dma_setup_sg(host->dma, data->sg, host->dma_nents, datasize,
+                                 host->res->start + MMC_REG_BUFFER_ACCESS,
+                                 DMA_MODE_READ);
+        } else {
+                host->dma_dir = DMA_TO_DEVICE;
+                host->dma_nents = dma_map_sg(mmc_dev(host->mmc), data->sg,
+                                             data->sg_len,  host->dma_dir);
+
+                imx_dma_setup_sg(host->dma, data->sg, host->dma_nents, datasize,
+                                 host->res->start + MMC_REG_BUFFER_ACCESS,
+                                 DMA_MODE_WRITE);
+        }
+
+        wmb();
+
+        imx_dma_enable(host->dma);
+#endif /* HAS_DMA */
+}
+
+static int mxcmci_start_cmd(struct mxcmci_host *host, struct mmc_command *cmd,
+                unsigned int cmdat)
+{
+        WARN_ON(host->cmd != NULL);
+        host->cmd = cmd;
+
+        switch (mmc_resp_type(cmd)) {
+        case MMC_RSP_R1: /* short CRC, OPCODE */
+        case MMC_RSP_R1B:/* short CRC, OPCODE, BUSY */
+                cmdat |= CMD_DAT_CONT_RESPONSE_48BIT_CRC;
+                break;
+        case MMC_RSP_R2: /* long 136 bit + CRC */
+                cmdat |= CMD_DAT_CONT_RESPONSE_136BIT;
+                break;
+        case MMC_RSP_R3: /* short */
+                cmdat |= CMD_DAT_CONT_RESPONSE_48BIT;
+                break;
+        case MMC_RSP_NONE:
+                break;
+        default:
+                dev_err(mmc_dev(host->mmc), "unhandled response type 0x%x\n",
+                                mmc_resp_type(cmd));
+                cmd->error = -EINVAL;
+                return -EINVAL;
+        }
+
+        if (mxcmci_use_dma(host))
+                writel(INT_READ_OP_EN | INT_WRITE_OP_DONE_EN |
+                                INT_END_CMD_RES_EN,
+                                host->base + MMC_REG_INT_CNTR);
+        else
+                writel(INT_END_CMD_RES_EN, host->base + MMC_REG_INT_CNTR);
+
+        writew(cmd->opcode, host->base + MMC_REG_CMD);
+        writel(cmd->arg, host->base + MMC_REG_ARG);
+        writew(cmdat, host->base + MMC_REG_CMD_DAT_CONT);
+
+        return 0;
+}
+
+static void mxcmci_finish_request(struct mxcmci_host *host,
+                struct mmc_request *req)
+{
+        writel(0, host->base + MMC_REG_INT_CNTR);
+
+        host->req = NULL;
+        host->cmd = NULL;
+        host->data = NULL;
+
+        mmc_request_done(host->mmc, req);
+}
+
+static int mxcmci_finish_data(struct mxcmci_host *host, unsigned int stat)
+{
+        struct mmc_data *data = host->data;
+        int data_error;
+
+#ifdef HAS_DMA
+        if (mxcmci_use_dma(host)) {
+                imx_dma_disable(host->dma);
+                dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->dma_nents,
+                                host->dma_dir);
+        }
+#endif
+
+        if (stat & STATUS_ERR_MASK) {
+                dev_dbg(mmc_dev(host->mmc), "request failed. status: 0x%08x\n",
+                                stat);
+                if (stat & STATUS_CRC_READ_ERR) {
+                        data->error = -EILSEQ;
+                } else if (stat & STATUS_CRC_WRITE_ERR) {
+                        u32 err_code = (stat >> 9) & 0x3;
+                        if (err_code == 2) /* No CRC response */
+                                data->error = -ETIMEDOUT;
+                        else
+                                data->error = -EILSEQ;
+                } else if (stat & STATUS_TIME_OUT_READ) {
+                        data->error = -ETIMEDOUT;
+                } else {
+                        data->error = -EIO;
+                }
+        } else {
+                data->bytes_xfered = host->datasize;
+        }
+
+        data_error = data->error;
+
+        host->data = NULL;
+
+        return data_error;
+}
+
+static void mxcmci_read_response(struct mxcmci_host *host, unsigned int stat)
+{
+        struct mmc_command *cmd = host->cmd;
+        int i;
+        u32 a, b, c;
+
+        if (!cmd)
+                return;
+
+        if (stat & STATUS_TIME_OUT_RESP) {
+                dev_dbg(mmc_dev(host->mmc), "CMD TIMEOUT\n");
+                cmd->error = -ETIMEDOUT;
+        } else if (stat & STATUS_RESP_CRC_ERR && cmd->flags & MMC_RSP_CRC) {
+                dev_dbg(mmc_dev(host->mmc), "cmd crc error\n");
+                cmd->error = -EILSEQ;
+        }
+
+        if (cmd->flags & MMC_RSP_PRESENT) {
+                if (cmd->flags & MMC_RSP_136) {
+                        for (i = 0; i < 4; i++) {
+                                a = readw(host->base + MMC_REG_RES_FIFO);
+                                b = readw(host->base + MMC_REG_RES_FIFO);
+                                cmd->resp[i] = a << 16 | b;
+                        }
+                } else {
+                        a = readw(host->base + MMC_REG_RES_FIFO);
+                        b = readw(host->base + MMC_REG_RES_FIFO);
+                        c = readw(host->base + MMC_REG_RES_FIFO);
+                        cmd->resp[0] = a << 24 | b << 8 | c >> 8;
+                }
+        }
+}
+
+static int mxcmci_poll_status(struct mxcmci_host *host, u32 mask)
+{
+        u32 stat;
+        unsigned long timeout = jiffies + HZ;
+
+        do {
+                stat = readl(host->base + MMC_REG_STATUS);
+                if (stat & STATUS_ERR_MASK)
+                        return stat;
+                if (time_after(jiffies, timeout))
+                        return STATUS_TIME_OUT_READ;
+                if (stat & mask)
+                        return 0;
+                cpu_relax();
+        } while (1);
+}
+
+static int mxcmci_pull(struct mxcmci_host *host, void *_buf, int bytes)
+{
+        unsigned int stat;
+        u32 *buf = _buf;
+
+        while (bytes > 3) {
+                stat = mxcmci_poll_status(host,
+                                STATUS_BUF_READ_RDY | STATUS_READ_OP_DONE);
+                if (stat)
+                        return stat;
+                *buf++ = readl(host->base + MMC_REG_BUFFER_ACCESS);
+                bytes -= 4;
+        }
+
+        if (bytes) {
+                u8 *b = (u8 *)buf;
+                u32 tmp;
+
+                stat = mxcmci_poll_status(host,
+                                STATUS_BUF_READ_RDY | STATUS_READ_OP_DONE);
+                if (stat)
+                        return stat;
+                tmp = readl(host->base + MMC_REG_BUFFER_ACCESS);
+                memcpy(b, &tmp, bytes);
+        }
+
+        return 0;
+}
+
+static int mxcmci_push(struct mxcmci_host *host, void *_buf, int bytes)
+{
+        unsigned int stat;
+        u32 *buf = _buf;
+
+        while (bytes > 3) {
+                stat = mxcmci_poll_status(host, STATUS_BUF_WRITE_RDY);
+                if (stat)
+                        return stat;
+                writel(*buf++, host->base + MMC_REG_BUFFER_ACCESS);
+                bytes -= 4;
+        }
+
+        if (bytes) {
+                u8 *b = (u8 *)buf;
+                u32 tmp;
+
+                stat = mxcmci_poll_status(host, STATUS_BUF_WRITE_RDY);
+                if (stat)
+                        return stat;
+
+                memcpy(&tmp, b, bytes);
+                writel(tmp, host->base + MMC_REG_BUFFER_ACCESS);
+        }
+
+        stat = mxcmci_poll_status(host, STATUS_BUF_WRITE_RDY);
+        if (stat)
+                return stat;
+
+        return 0;
+}
+
+static int mxcmci_transfer_data(struct mxcmci_host *host)
+{
+        struct mmc_data *data = host->req->data;
+        struct scatterlist *sg;
+        int stat, i;
+
+        host->datasize = 0;
+
+        host->data = data;
+        host->datasize = 0;
+
+        if (data->flags & MMC_DATA_READ) {
+                for_each_sg(data->sg, sg, data->sg_len, i) {
+                        stat = mxcmci_pull(host, sg_virt(sg), sg->length);
+                        if (stat)
+                                return stat;
+                        host->datasize += sg->length;
+                }
+        } else {
+                for_each_sg(data->sg, sg, data->sg_len, i) {
+                        stat = mxcmci_push(host, sg_virt(sg), sg->length);
+                        if (stat)
+                                return stat;
+                        host->datasize += sg->length;
+                }
+                stat = mxcmci_poll_status(host, STATUS_WRITE_OP_DONE);
+                if (stat)
+                        return stat;
+        }
+        return 0;
+}
+
+static void mxcmci_datawork(struct work_struct *work)
+{
+        struct mxcmci_host *host = container_of(work, struct mxcmci_host,
+                                                  datawork);
+        int datastat = mxcmci_transfer_data(host);
+        mxcmci_finish_data(host, datastat);
+
+        if (host->req->stop) {
+                if (mxcmci_start_cmd(host, host->req->stop, 0)) {
+                        mxcmci_finish_request(host, host->req);
+                        return;
+                }
+        } else {
+                mxcmci_finish_request(host, host->req);
+        }
+}
+
+#ifdef HAS_DMA
+static void mxcmci_data_done(struct mxcmci_host *host, unsigned int stat)
+{
+        struct mmc_data *data = host->data;
+        int data_error;
+
+        if (!data)
+                return;
+
+        data_error = mxcmci_finish_data(host, stat);
+
+        mxcmci_read_response(host, stat);
+        host->cmd = NULL;
+
+        if (host->req->stop) {
+                if (mxcmci_start_cmd(host, host->req->stop, 0)) {
+                        mxcmci_finish_request(host, host->req);
+                        return;
+                }
+        } else {
+                mxcmci_finish_request(host, host->req);
+        }
+}
+#endif /* HAS_DMA */
+
+static void mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat)
+{
+        mxcmci_read_response(host, stat);
+        host->cmd = NULL;
+
+        if (!host->data && host->req) {
+                mxcmci_finish_request(host, host->req);
+                return;
+        }
+
+        /* For the DMA case the DMA engine handles the data transfer
+         * automatically. For non DMA we have to to it ourselves.
+         * Don't do it in interrupt context though.
+         */
+        if (!mxcmci_use_dma(host) && host->data)
+                schedule_work(&host->datawork);
+
+}
+
+static irqreturn_t mxcmci_irq(int irq, void *devid)
+{
+        struct mxcmci_host *host = devid;
+        u32 stat;
+
+        stat = readl(host->base + MMC_REG_STATUS);
+        writel(stat, host->base + MMC_REG_STATUS);
+
+        dev_dbg(mmc_dev(host->mmc), "%s: 0x%08x\n", __func__, stat);
+
+        if (stat & STATUS_END_CMD_RESP)
+                mxcmci_cmd_done(host, stat);
+#ifdef HAS_DMA
+        if (mxcmci_use_dma(host) &&
+                  (stat & (STATUS_DATA_TRANS_DONE | STATUS_WRITE_OP_DONE)))
+                mxcmci_data_done(host, stat);
+#endif
+        return IRQ_HANDLED;
+}
+
+static void mxcmci_request(struct mmc_host *mmc, struct mmc_request *req)
+{
+        struct mxcmci_host *host = mmc_priv(mmc);
+        unsigned int cmdat = host->cmdat;
+
+        WARN_ON(host->req != NULL);
+
+        host->req = req;
+        host->cmdat &= ~CMD_DAT_CONT_INIT;
+#ifdef HAS_DMA
+        host->do_dma = 1;
+#endif
+        if (req->data) {
+                mxcmci_setup_data(host, req->data);
+
+                cmdat |= CMD_DAT_CONT_DATA_ENABLE;
+
+                if (req->data->flags & MMC_DATA_WRITE)
+                        cmdat |= CMD_DAT_CONT_WRITE;
+        }
+
+        if (mxcmci_start_cmd(host, req->cmd, cmdat))
+                mxcmci_finish_request(host, req);
+}
+
+static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios)
+{
+        unsigned int divider;
+        int prescaler = 0;
+        unsigned int clk_in = clk_get_rate(host->clk);
+
+        while (prescaler <= 0x800) {
+                for (divider = 1; divider <= 0xF; divider++) {
+                        int x;
+
+                        x = (clk_in / (divider + 1));
+
+                        if (prescaler)
+                                x /= (prescaler * 2);
+
+                        if (x <= clk_ios)
+                                break;
+                }
+                if (divider < 0x10)
+                        break;
+
+                if (prescaler == 0)
+                        prescaler = 1;
+                else
+                        prescaler <<= 1;
+        }
+
+        writew((prescaler << 4) | divider, host->base + MMC_REG_CLK_RATE);
+
+        dev_dbg(mmc_dev(host->mmc), "scaler: %d divider: %d in: %d out: %d\n",
+                        prescaler, divider, clk_in, clk_ios);
+}
+
+static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+{
+        struct mxcmci_host *host = mmc_priv(mmc);
+#ifdef HAS_DMA
+        unsigned int blen;
+        /*
+         * use burstlen of 64 in 4 bit mode (--> reg value  0)
+         * use burstlen of 16 in 1 bit mode (--> reg value 16)
+         */
+        if (ios->bus_width == MMC_BUS_WIDTH_4)
+                blen = 0;
+        else
+                blen = 16;
+
+        imx_dma_config_burstlen(host->dma, blen);
+#endif
+        if (ios->bus_width == MMC_BUS_WIDTH_4)
+                host->cmdat |= CMD_DAT_CONT_BUS_WIDTH_4;
+        else
+                host->cmdat &= ~CMD_DAT_CONT_BUS_WIDTH_4;
+
+        if (host->power_mode != ios->power_mode) {
+                if (host->pdata && host->pdata->setpower)
+                        host->pdata->setpower(mmc_dev(mmc), ios->vdd);
+                host->power_mode = ios->power_mode;
+                if (ios->power_mode == MMC_POWER_ON)
+                        host->cmdat |= CMD_DAT_CONT_INIT;
+        }
+
+        if (ios->clock) {
+                mxcmci_set_clk_rate(host, ios->clock);
+                writew(STR_STP_CLK_START_CLK, host->base + MMC_REG_STR_STP_CLK);
+        } else {
+                writew(STR_STP_CLK_STOP_CLK, host->base + MMC_REG_STR_STP_CLK);
+        }
+
+        host->clock = ios->clock;
+}
+
+static irqreturn_t mxcmci_detect_irq(int irq, void *data)
+{
+        struct mmc_host *mmc = data;
+
+        dev_dbg(mmc_dev(mmc), "%s\n", __func__);
+
+        mmc_detect_change(mmc, msecs_to_jiffies(250));
+        return IRQ_HANDLED;
+}
+
+static int mxcmci_get_ro(struct mmc_host *mmc)
+{
+        struct mxcmci_host *host = mmc_priv(mmc);
+
+        if (host->pdata && host->pdata->get_ro)
+                return !!host->pdata->get_ro(mmc_dev(mmc));
+        /*
+         * Board doesn't support read only detection; let the mmc core
+         * decide what to do.
+         */
+        return -ENOSYS;
+}
+
+
+static const struct mmc_host_ops mxcmci_ops = {
+        .request        = mxcmci_request,
+        .set_ios        = mxcmci_set_ios,
+        .get_ro         = mxcmci_get_ro,
+};
+
+static int mxcmci_probe(struct platform_device *pdev)
+{
+        struct mmc_host *mmc;
+        struct mxcmci_host *host = NULL;
+        struct resource *r;
+        int ret = 0, irq;
+
+        printk(KERN_INFO "i.MX SDHC driver\n");
+
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        irq = platform_get_irq(pdev, 0);
+        if (!r || irq < 0)
+                return -EINVAL;
+
+        r = request_mem_region(r->start, resource_size(r), pdev->name);
+        if (!r)
+                return -EBUSY;
+
+        mmc = mmc_alloc_host(sizeof(struct mxcmci_host), &pdev->dev);
+        if (!mmc) {
+                ret = -ENOMEM;
+                goto out_release_mem;
+        }
+
+        mmc->ops = &mxcmci_ops;
+        mmc->caps = MMC_CAP_4_BIT_DATA;
+
+        /* MMC core transfer sizes tunable parameters */
+        mmc->max_hw_segs = 64;
+        mmc->max_phys_segs = 64;
+        mmc->max_blk_size = 2048;
+        mmc->max_blk_count = 65535;
+        mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
+        mmc->max_seg_size = mmc->max_seg_size;
+
+        host = mmc_priv(mmc);
+        host->base = ioremap(r->start, resource_size(r));
+        if (!host->base) {
+                ret = -ENOMEM;
+                goto out_free;
+        }
+
+        host->mmc = mmc;
+        host->pdata = pdev->dev.platform_data;
+
+        if (host->pdata && host->pdata->ocr_avail)
+                mmc->ocr_avail = host->pdata->ocr_avail;
+        else
+                mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
+
+        host->res = r;
+        host->irq = irq;
+
+        host->clk = clk_get(&pdev->dev, "sdhc_clk");
+        if (IS_ERR(host->clk)) {
+                ret = PTR_ERR(host->clk);
+                goto out_iounmap;
+        }
+        clk_enable(host->clk);
+
+        mxcmci_softreset(host);
+
+        host->rev_no = readw(host->base + MMC_REG_REV_NO);
+        if (host->rev_no != 0x400) {
+                ret = -ENODEV;
+                dev_err(mmc_dev(host->mmc), "wrong rev.no. 0x%08x. aborting.\n",
+                        host->rev_no);
+                goto out_clk_put;
+        }
+
+        mmc->f_min = clk_get_rate(host->clk) >> 7;
+        mmc->f_max = clk_get_rate(host->clk) >> 1;
+
+        /* recommended in data sheet */
+        writew(0x2db4, host->base + MMC_REG_READ_TO);
+
+        writel(0, host->base + MMC_REG_INT_CNTR);
+
+#ifdef HAS_DMA
+        host->dma = imx_dma_request_by_prio(DRIVER_NAME, DMA_PRIO_LOW);
+        if (host->dma < 0) {
+                dev_err(mmc_dev(host->mmc), "imx_dma_request_by_prio failed\n");
+                ret = -EBUSY;
+                goto out_clk_put;
+        }
+
+        r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+        if (!r) {
+                ret = -EINVAL;
+                goto out_free_dma;
+        }
+
+        ret = imx_dma_config_channel(host->dma,
+                                     IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_FIFO,
+                                     IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR,
+                                     r->start, 0);
+        if (ret) {
+                dev_err(mmc_dev(host->mmc), "failed to config DMA channel\n");
+                goto out_free_dma;
+        }
+#endif
+        INIT_WORK(&host->datawork, mxcmci_datawork);
+
+        ret = request_irq(host->irq, mxcmci_irq, 0, DRIVER_NAME, host);
+        if (ret)
+                goto out_free_dma;
+
+        platform_set_drvdata(pdev, mmc);
+
+        if (host->pdata && host->pdata->init) {
+                ret = host->pdata->init(&pdev->dev, mxcmci_detect_irq,
+                                host->mmc);
+                if (ret)
+                        goto out_free_irq;
+        }
+
+        mmc_add_host(mmc);
+
+        return 0;
+
+out_free_irq:
+        free_irq(host->irq, host);
+out_free_dma:
+#ifdef HAS_DMA
+        imx_dma_free(host->dma);
+#endif
+out_clk_put:
+        clk_disable(host->clk);
+        clk_put(host->clk);
+out_iounmap:
+        iounmap(host->base);
+out_free:
+        mmc_free_host(mmc);
+out_release_mem:
+        release_mem_region(host->res->start, resource_size(host->res));
+        return ret;
+}
+
+static int mxcmci_remove(struct platform_device *pdev)
+{
+        struct mmc_host *mmc = platform_get_drvdata(pdev);
+        struct mxcmci_host *host = mmc_priv(mmc);
+
+        platform_set_drvdata(pdev, NULL);
+
+        mmc_remove_host(mmc);
+
+        if (host->pdata && host->pdata->exit)
+                host->pdata->exit(&pdev->dev, mmc);
+
+        free_irq(host->irq, host);
+        iounmap(host->base);
+#ifdef HAS_DMA
+        imx_dma_free(host->dma);
+#endif
+        clk_disable(host->clk);
+        clk_put(host->clk);
+
+        release_mem_region(host->res->start, resource_size(host->res));
+        release_resource(host->res);
+
+        mmc_free_host(mmc);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int mxcmci_suspend(struct platform_device *dev, pm_message_t state)
+{
+        struct mmc_host *mmc = platform_get_drvdata(dev);
+        int ret = 0;
+
+        if (mmc)
+                ret = mmc_suspend_host(mmc, state);
+
+        return ret;
+}
+
+static int mxcmci_resume(struct platform_device *dev)
+{
+        struct mmc_host *mmc = platform_get_drvdata(dev);
+        struct mxcmci_host *host;
+        int ret = 0;
+
+        if (mmc) {
+                host = mmc_priv(mmc);
+                ret = mmc_resume_host(mmc);
+        }
+
+        return ret;
+}
+#else
+#define mxcmci_suspend  NULL
+#define mxcmci_resume   NULL
+#endif /* CONFIG_PM */
+
+static struct platform_driver mxcmci_driver = {
+        .probe          = mxcmci_probe,
+        .remove         = mxcmci_remove,
+        .suspend        = mxcmci_suspend,
+        .resume         = mxcmci_resume,
+        .driver         = {
+                .name           = DRIVER_NAME,
+                .owner          = THIS_MODULE,
+        }
+};
+
+static int __init mxcmci_init(void)
+{
+        return platform_driver_register(&mxcmci_driver);
+}
+
+static void __exit mxcmci_exit(void)
+{
+        platform_driver_unregister(&mxcmci_driver);
+}
+
+module_init(mxcmci_init);
+module_exit(mxcmci_exit);
+
+MODULE_DESCRIPTION("i.MX Multimedia Card Interface Driver");
+MODULE_AUTHOR("Sascha Hauer, Pengutronix");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imx-mmc");
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 3c5483b75da4..9702ad3774cf 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -180,7 +180,15 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)
         else
                 DALGN &= ~(1 << host->dma);
         DDADR(host->dma) = host->sg_dma;
-        DCSR(host->dma) = DCSR_RUN;
+
+        /*
+         * workaround for erratum #91:
+         * only start DMA now if we are doing a read,
+         * otherwise we wait until CMD/RESP has finished
+         * before starting DMA.
+         */
+        if (!cpu_is_pxa27x() || data->flags & MMC_DATA_READ)
+                DCSR(host->dma) = DCSR_RUN;
 }
 
 static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd, unsigned int cmdat)
@@ -251,23 +259,28 @@ static int pxamci_cmd_done(struct pxamci_host *host, unsigned int stat)
         if (stat & STAT_TIME_OUT_RESPONSE) {
                 cmd->error = -ETIMEDOUT;
         } else if (stat & STAT_RES_CRC_ERR && cmd->flags & MMC_RSP_CRC) {
-#ifdef CONFIG_PXA27x
                 /*
                  * workaround for erratum #42:
                  * Intel PXA27x Family Processor Specification Update Rev 001
                  * A bogus CRC error can appear if the msb of a 136 bit
                  * response is a one.
                  */
-                if (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000) {
+                if (cpu_is_pxa27x() &&
+                    (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000))
                         pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode);
-                } else
-#endif
-                cmd->error = -EILSEQ;
+                else
+                        cmd->error = -EILSEQ;
         }
 
         pxamci_disable_irq(host, END_CMD_RES);
         if (host->data && !cmd->error) {
                 pxamci_enable_irq(host, DATA_TRAN_DONE);
+                /*
+                 * workaround for erratum #91, if doing write
+                 * enable DMA late
+                 */
+                if (cpu_is_pxa27x() && host->data->flags & MMC_DATA_WRITE)
+                        DCSR(host->dma) = DCSR_RUN;
         } else {
                 pxamci_finish_request(host, host->mrq);
         }
diff --git a/drivers/mmc/host/ricoh_mmc.c b/drivers/mmc/host/ricoh_mmc.c
index be9e7b32b34e..f62790513322 100644
--- a/drivers/mmc/host/ricoh_mmc.c
+++ b/drivers/mmc/host/ricoh_mmc.c
@@ -196,7 +196,7 @@ static void __devexit ricoh_mmc_remove(struct pci_dev *pdev)
         pci_set_drvdata(pdev, NULL);
 }
 
-static int ricoh_mmc_suspend(struct pci_dev *pdev, pm_message_t state)
+static int ricoh_mmc_suspend_late(struct pci_dev *pdev, pm_message_t state)
 {
         struct pci_dev *fw_dev = NULL;
 
@@ -210,7 +210,7 @@ static int ricoh_mmc_suspend(struct pci_dev *pdev, pm_message_t state)
         return 0;
 }
 
-static int ricoh_mmc_resume(struct pci_dev *pdev)
+static int ricoh_mmc_resume_early(struct pci_dev *pdev)
 {
         struct pci_dev *fw_dev = NULL;
 
@@ -229,8 +229,8 @@ static struct pci_driver ricoh_mmc_driver = {
         .id_table =     pci_ids,
         .probe =        ricoh_mmc_probe,
         .remove =       __devexit_p(ricoh_mmc_remove),
-        .suspend =      ricoh_mmc_suspend,
-        .resume =       ricoh_mmc_resume,
+        .suspend_late = ricoh_mmc_suspend_late,
+        .resume_early = ricoh_mmc_resume_early,
 };
 
 /*****************************************************************************\
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 7df6bbf0e4d9..6f6a0f6dafd6 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -453,7 +453,7 @@ static struct platform_driver sa1100_mtd_driver = {
         .resume         = sa1100_mtd_resume,
         .shutdown       = sa1100_mtd_shutdown,
         .driver         = {
-                .name   = "flash",
+                .name   = "sa1100-mtd",
                 .owner  = THIS_MODULE,
         },
 };
@@ -474,4 +474,4 @@ module_exit(sa1100_mtd_exit);
 MODULE_AUTHOR("Nicolas Pitre");
 MODULE_DESCRIPTION("SA1100 CFI map driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:flash");
+MODULE_ALIAS("platform:sa1100-mtd");
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index d15d8b79d8e5..54b52e5b1821 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -646,7 +646,7 @@ static const struct net_device_ops etherh_netdev_ops = {
         .ndo_get_stats          = ei_get_stats,
         .ndo_set_multicast_list = ei_set_multicast_list,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_mac_address    = eth_set_mac_addr,
+        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_change_mtu         = eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = ei_poll,
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 840b3d1a22f5..bbbc3bb08aa5 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -806,7 +806,7 @@ static int cas_reset_mii_phy(struct cas *cp)
 
         cas_phy_write(cp, MII_BMCR, BMCR_RESET);
         udelay(100);
-        while (limit--) {
+        while (--limit) {
                 val = cas_phy_read(cp, MII_BMCR);
                 if ((val & BMCR_RESET) == 0)
                         break;
@@ -979,7 +979,7 @@ static void cas_phy_init(struct cas *cp)
                 writel(val, cp->regs + REG_PCS_MII_CTRL);
 
                 limit = STOP_TRIES;
-                while (limit-- > 0) {
+                while (--limit > 0) {
                         udelay(10);
                         if ((readl(cp->regs + REG_PCS_MII_CTRL) &
                              PCS_MII_RESET) == 0)
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 379a1324db4e..d31791f60292 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -2276,8 +2276,7 @@ no_mem:
                 } else if ((len = ntohl(r->len_cq)) != 0) {
                         struct sge_fl *fl;
 
-                        if (eth)
-                                lro = qs->lro_enabled && is_eth_tcp(rss_hi);
+                        lro &= eth && is_eth_tcp(rss_hi);
 
                         fl = (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0];
                         if (fl->use_pages) {
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index c986978ce761..6bd63cc67b3e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -940,7 +940,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 err = pci_enable_device(pdev);
         } else {
                 bars = pci_select_bars(pdev, IORESOURCE_MEM);
-                err = pci_enable_device(pdev);
+                err = pci_enable_device_mem(pdev);
         }
         if (err)
                 return err;
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 3f7eab42aef1..acae2d8cd688 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -351,6 +351,9 @@ static int gfar_probe(struct of_device *ofdev,
         /* Reset MAC layer */
         gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET);
 
+        /* We need to delay at least 3 TX clocks */
+        udelay(2);
+
         tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
         gfar_write(&priv->regs->maccfg1, tempval);
 
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index b1a83344acc7..eaa86897f5c3 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -312,7 +312,7 @@ extern const char gfar_driver_version[];
 #define ATTRELI_EI(x) (x)
 
 #define BD_LFLAG(flags) ((flags) << 16)
-#define BD_LENGTH_MASK          0x00ff
+#define BD_LENGTH_MASK          0x0000ffff
 
 /* TxBD status field bits */
 #define TXBD_READY              0x8000
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c
index c40cd8df2212..ac9d964e59ec 100644
--- a/drivers/net/ibm_newemac/phy.c
+++ b/drivers/net/ibm_newemac/phy.c
@@ -60,7 +60,7 @@ int emac_mii_reset_phy(struct mii_phy *phy)
 
         udelay(300);
 
-        while (limit--) {
+        while (--limit) {
                 val = phy_read(phy, MII_BMCR);
                 if (val >= 0 && (val & BMCR_RESET) == 0)
                         break;
@@ -84,7 +84,7 @@ int emac_mii_reset_gpcs(struct mii_phy *phy)
 
         udelay(300);
 
-        while (limit--) {
+        while (--limit) {
                 val = gpcs_phy_read(phy, MII_BMCR);
                 if (val >= 0 && (val & BMCR_RESET) == 0)
                         break;
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index f5e2e7235fcb..13ca73f96ec6 100644
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -699,11 +699,18 @@ static s32 igb_check_for_link_82575(struct e1000_hw *hw)
 
         /* SGMII link check is done through the PCS register. */
         if ((hw->phy.media_type != e1000_media_type_copper) ||
-            (igb_sgmii_active_82575(hw)))
+            (igb_sgmii_active_82575(hw))) {
                 ret_val = igb_get_pcs_speed_and_duplex_82575(hw, &speed,
                                                              &duplex);
-        else
+                /*
+                 * Use this flag to determine if link needs to be checked or
+                 * not.  If  we have link clear the flag so that we do not
+                 * continue to check for link.
+                 */
+                hw->mac.get_link_status = !hw->mac.serdes_has_link;
+        } else {
                 ret_val = igb_check_for_copper_link(hw);
+        }
 
         return ret_val;
 }
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
index 5a27825cc48a..aebef8e48e76 100644
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
@@ -300,11 +300,10 @@ struct igb_adapter {
 
 #define IGB_FLAG_HAS_MSI           (1 << 0)
 #define IGB_FLAG_MSI_ENABLE        (1 << 1)
-#define IGB_FLAG_HAS_DCA           (1 << 2)
-#define IGB_FLAG_DCA_ENABLED       (1 << 3)
-#define IGB_FLAG_IN_NETPOLL        (1 << 5)
-#define IGB_FLAG_QUAD_PORT_A       (1 << 6)
-#define IGB_FLAG_NEED_CTX_IDX      (1 << 7)
+#define IGB_FLAG_DCA_ENABLED       (1 << 2)
+#define IGB_FLAG_IN_NETPOLL        (1 << 3)
+#define IGB_FLAG_QUAD_PORT_A       (1 << 4)
+#define IGB_FLAG_NEED_CTX_IDX      (1 << 5)
 
 enum e1000_state_t {
         __IGB_TESTING,
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index b82b0fb2056c..a50db5398fa5 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -206,10 +206,11 @@ static int __init igb_init_module(void)
 
         global_quad_port_a = 0;
 
-        ret = pci_register_driver(&igb_driver);
 #ifdef CONFIG_IGB_DCA
         dca_register_notify(&dca_notifier);
 #endif
+
+        ret = pci_register_driver(&igb_driver);
         return ret;
 }
 
@@ -1156,11 +1157,10 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 
         /* set flags */
         switch (hw->mac.type) {
-        case e1000_82576:
         case e1000_82575:
-                adapter->flags |= IGB_FLAG_HAS_DCA;
                 adapter->flags |= IGB_FLAG_NEED_CTX_IDX;
                 break;
+        case e1000_82576:
         default:
                 break;
         }
@@ -1310,8 +1310,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 goto err_register;
 
 #ifdef CONFIG_IGB_DCA
-        if ((adapter->flags & IGB_FLAG_HAS_DCA) &&
-            (dca_add_requester(&pdev->dev) == 0)) {
+        if (dca_add_requester(&pdev->dev) == 0) {
                 adapter->flags |= IGB_FLAG_DCA_ENABLED;
                 dev_info(&pdev->dev, "DCA enabled\n");
                 /* Always use CB2 mode, difference is masked
@@ -1835,11 +1834,11 @@ static void igb_setup_rctl(struct igb_adapter *adapter)
         rctl |= E1000_RCTL_SECRC;
 
         /*
-         * disable store bad packets, long packet enable, and clear size bits.
+         * disable store bad packets and clear size bits.
          */
-        rctl &= ~(E1000_RCTL_SBP | E1000_RCTL_LPE | E1000_RCTL_SZ_256);
+        rctl &= ~(E1000_RCTL_SBP | E1000_RCTL_SZ_256);
 
-        if (adapter->netdev->mtu > ETH_DATA_LEN)
+        /* enable LPE when to prevent packets larger than max_frame_size */
                 rctl |= E1000_RCTL_LPE;
 
         /* Setup buffer sizes */
@@ -1865,7 +1864,7 @@ static void igb_setup_rctl(struct igb_adapter *adapter)
          */
         /* allocations using alloc_page take too long for regular MTU
          * so only enable packet split for jumbo frames */
-        if (rctl & E1000_RCTL_LPE) {
+        if (adapter->netdev->mtu > ETH_DATA_LEN) {
                 adapter->rx_ps_hdr_size = IGB_RXBUFFER_128;
                 srrctl |= adapter->rx_ps_hdr_size <<
                          E1000_SRRCTL_BSIZEHDRSIZE_SHIFT;
@@ -3473,19 +3472,16 @@ static int __igb_notify_dca(struct device *dev, void *data)
         struct e1000_hw *hw = &adapter->hw;
         unsigned long event = *(unsigned long *)data;
 
-        if (!(adapter->flags & IGB_FLAG_HAS_DCA))
-                goto out;
-
         switch (event) {
         case DCA_PROVIDER_ADD:
                 /* if already enabled, don't do it again */
                 if (adapter->flags & IGB_FLAG_DCA_ENABLED)
                         break;
-                adapter->flags |= IGB_FLAG_DCA_ENABLED;
                 /* Always use CB2 mode, difference is masked
                  * in the CB driver. */
                 wr32(E1000_DCA_CTRL, 2);
                 if (dca_add_requester(dev) == 0) {
+                        adapter->flags |= IGB_FLAG_DCA_ENABLED;
                         dev_info(&adapter->pdev->dev, "DCA enabled\n");
                         igb_setup_dca(adapter);
                         break;
@@ -3502,7 +3498,7 @@ static int __igb_notify_dca(struct device *dev, void *data)
                 }
                 break;
         }
-out:
+
         return 0;
 }
 
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index c38ed777f0a8..a6999403f37b 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -586,7 +586,7 @@ static int pcnet_config(struct pcmcia_device *link)
     }
 
     if ((link->conf.ConfigBase == 0x03c0)
-        && (link->manf_id == 0x149) && (link->card_id = 0xc1ab)) {
+        && (link->manf_id == 0x149) && (link->card_id == 0xc1ab)) {
         printk(KERN_INFO "pcnet_cs: this is an AX88190 card!\n");
         printk(KERN_INFO "pcnet_cs: use axnet_cs instead.\n");
         goto failed;
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index ec2314246682..335da4831ab3 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -2168,7 +2168,7 @@ static void gelic_wl_connected_event(struct gelic_wl_info *wl,
                 complete(&wl->assoc_done);
                 netif_carrier_on(port_to_netdev(wl_port(wl)));
         } else
-                pr_debug("%s: event %#lx under wpa\n",
+                pr_debug("%s: event %#llx under wpa\n",
                                  __func__, event);
 }
 
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index c1dadadfab18..e6fdce9206cc 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -787,12 +787,12 @@ struct mbox_params {
 
 struct flash_params {
         u8 dev_id_str[4];
-        u16 size;
-        u16 csum;
-        u16 ver;
-        u16 sub_dev_id;
+        __le16 size;
+        __le16 csum;
+        __le16 ver;
+        __le16 sub_dev_id;
         u8 mac_addr[6];
-        u16 res;
+        __le16 res;
 };
 
 
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 45421c8b6010..3d1d7b6e55aa 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -641,7 +641,7 @@ static void ql_enable_all_completion_interrupts(struct ql_adapter *qdev)
 
 }
 
-static int ql_read_flash_word(struct ql_adapter *qdev, int offset, u32 *data)
+static int ql_read_flash_word(struct ql_adapter *qdev, int offset, __le32 *data)
 {
         int status = 0;
         /* wait for reg to come ready */
@@ -656,8 +656,11 @@ static int ql_read_flash_word(struct ql_adapter *qdev, int offset, u32 *data)
                         FLASH_ADDR, FLASH_ADDR_RDY, FLASH_ADDR_ERR);
         if (status)
                 goto exit;
-        /* get the data */
-        *data = ql_read32(qdev, FLASH_DATA);
+         /* This data is stored on flash as an array of
+         * __le32.  Since ql_read32() returns cpu endian
+         * we need to swap it back.
+         */
+        *data = cpu_to_le32(ql_read32(qdev, FLASH_DATA));
 exit:
         return status;
 }
@@ -666,13 +669,20 @@ static int ql_get_flash_params(struct ql_adapter *qdev)
 {
         int i;
         int status;
-        u32 *p = (u32 *)&qdev->flash;
+        __le32 *p = (__le32 *)&qdev->flash;
+        u32 offset = 0;
+
+        /* Second function's parameters follow the first
+         * function's.
+         */
+        if (qdev->func)
+                offset = sizeof(qdev->flash) / sizeof(u32);
 
         if (ql_sem_spinlock(qdev, SEM_FLASH_MASK))
                 return -ETIMEDOUT;
 
         for (i = 0; i < sizeof(qdev->flash) / sizeof(u32); i++, p++) {
-                status = ql_read_flash_word(qdev, i, p);
+                status = ql_read_flash_word(qdev, i+offset, p);
                 if (status) {
                         QPRINTK(qdev, IFUP, ERR, "Error reading flash.\n");
                         goto exit;
@@ -3826,7 +3836,7 @@ static int qlge_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *ndev = pci_get_drvdata(pdev);
         struct ql_adapter *qdev = netdev_priv(ndev);
-        int err;
+        int err, i;
 
         netif_device_detach(ndev);
 
@@ -3836,6 +3846,9 @@ static int qlge_suspend(struct pci_dev *pdev, pm_message_t state)
                         return err;
         }
 
+        for (i = qdev->rss_ring_first_cq_id; i < qdev->rx_ring_count; i++)
+                netif_napi_del(&qdev->rx_ring[i].napi);
+
         err = pci_save_state(pdev);
         if (err)
                 return err;
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 101c00a7bb73..847e9bb0098f 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -676,9 +676,8 @@ static int efx_init_port(struct efx_nic *efx)
         rc = efx->phy_op->init(efx);
         if (rc)
                 return rc;
-        efx->phy_op->reconfigure(efx);
-
         mutex_lock(&efx->mac_lock);
+        efx->phy_op->reconfigure(efx);
         rc = falcon_switch_mac(efx);
         mutex_unlock(&efx->mac_lock);
         if (rc)
@@ -686,7 +685,7 @@ static int efx_init_port(struct efx_nic *efx)
         efx->mac_op->reconfigure(efx);
 
         efx->port_initialized = true;
-        efx->stats_enabled = true;
+        efx_stats_enable(efx);
         return 0;
 
 fail:
@@ -735,6 +734,7 @@ static void efx_fini_port(struct efx_nic *efx)
         if (!efx->port_initialized)
                 return;
 
+        efx_stats_disable(efx);
         efx->phy_op->fini(efx);
         efx->port_initialized = false;
 
@@ -1368,6 +1368,20 @@ static int efx_net_stop(struct net_device *net_dev)
         return 0;
 }
 
+void efx_stats_disable(struct efx_nic *efx)
+{
+        spin_lock(&efx->stats_lock);
+        ++efx->stats_disable_count;
+        spin_unlock(&efx->stats_lock);
+}
+
+void efx_stats_enable(struct efx_nic *efx)
+{
+        spin_lock(&efx->stats_lock);
+        --efx->stats_disable_count;
+        spin_unlock(&efx->stats_lock);
+}
+
 /* Context: process, dev_base_lock or RTNL held, non-blocking. */
 static struct net_device_stats *efx_net_stats(struct net_device *net_dev)
 {
@@ -1376,12 +1390,12 @@ static struct net_device_stats *efx_net_stats(struct net_device *net_dev)
         struct net_device_stats *stats = &net_dev->stats;
 
         /* Update stats if possible, but do not wait if another thread
-         * is updating them (or resetting the NIC); slightly stale
-         * stats are acceptable.
+         * is updating them or if MAC stats fetches are temporarily
+         * disabled; slightly stale stats are acceptable.
          */
         if (!spin_trylock(&efx->stats_lock))
                 return stats;
-        if (efx->stats_enabled) {
+        if (!efx->stats_disable_count) {
                 efx->mac_op->update_stats(efx);
                 falcon_update_nic_stats(efx);
         }
@@ -1629,16 +1643,12 @@ static void efx_unregister_netdev(struct efx_nic *efx)
 
 /* Tears down the entire software state and most of the hardware state
  * before reset.  */
-void efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd)
+void efx_reset_down(struct efx_nic *efx, enum reset_type method,
+                    struct ethtool_cmd *ecmd)
 {
         EFX_ASSERT_RESET_SERIALISED(efx);
 
-        /* The net_dev->get_stats handler is quite slow, and will fail
-         * if a fetch is pending over reset. Serialise against it. */
-        spin_lock(&efx->stats_lock);
-        efx->stats_enabled = false;
-        spin_unlock(&efx->stats_lock);
-
+        efx_stats_disable(efx);
         efx_stop_all(efx);
         mutex_lock(&efx->mac_lock);
         mutex_lock(&efx->spi_lock);
@@ -1646,6 +1656,8 @@ void efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd)
         efx->phy_op->get_settings(efx, ecmd);
 
         efx_fini_channels(efx);
+        if (efx->port_initialized && method != RESET_TYPE_INVISIBLE)
+                efx->phy_op->fini(efx);
 }
 
 /* This function will always ensure that the locks acquired in
@@ -1653,7 +1665,8 @@ void efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd)
  * that we were unable to reinitialise the hardware, and the
  * driver should be disabled. If ok is false, then the rx and tx
  * engines are not restarted, pending a RESET_DISABLE. */
-int efx_reset_up(struct efx_nic *efx, struct ethtool_cmd *ecmd, bool ok)
+int efx_reset_up(struct efx_nic *efx, enum reset_type method,
+                 struct ethtool_cmd *ecmd, bool ok)
 {
         int rc;
 
@@ -1665,6 +1678,15 @@ int efx_reset_up(struct efx_nic *efx, struct ethtool_cmd *ecmd, bool ok)
                 ok = false;
         }
 
+        if (efx->port_initialized && method != RESET_TYPE_INVISIBLE) {
+                if (ok) {
+                        rc = efx->phy_op->init(efx);
+                        if (rc)
+                                ok = false;
+                } else
+                        efx->port_initialized = false;
+        }
+
         if (ok) {
                 efx_init_channels(efx);
 
@@ -1677,7 +1699,7 @@ int efx_reset_up(struct efx_nic *efx, struct ethtool_cmd *ecmd, bool ok)
 
         if (ok) {
                 efx_start_all(efx);
-                efx->stats_enabled = true;
+                efx_stats_enable(efx);
         }
         return rc;
 }
@@ -1709,7 +1731,7 @@ static int efx_reset(struct efx_nic *efx)
 
         EFX_INFO(efx, "resetting (%d)\n", method);
 
-        efx_reset_down(efx, &ecmd);
+        efx_reset_down(efx, method, &ecmd);
 
         rc = falcon_reset_hw(efx, method);
         if (rc) {
@@ -1728,10 +1750,10 @@ static int efx_reset(struct efx_nic *efx)
 
         /* Leave device stopped if necessary */
         if (method == RESET_TYPE_DISABLE) {
-                efx_reset_up(efx, &ecmd, false);
+                efx_reset_up(efx, method, &ecmd, false);
                 rc = -EIO;
         } else {
-                rc = efx_reset_up(efx, &ecmd, true);
+                rc = efx_reset_up(efx, method, &ecmd, true);
         }
 
 out_disable:
@@ -1883,6 +1905,7 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type,
         efx->rx_checksum_enabled = true;
         spin_lock_init(&efx->netif_stop_lock);
         spin_lock_init(&efx->stats_lock);
+        efx->stats_disable_count = 1;
         mutex_init(&efx->mac_lock);
         efx->mac_op = &efx_dummy_mac_operations;
         efx->phy_op = &efx_dummy_phy_operations;
diff --git a/drivers/net/sfc/efx.h b/drivers/net/sfc/efx.h
index 0dd7a532c78a..55d0f131b0e9 100644
--- a/drivers/net/sfc/efx.h
+++ b/drivers/net/sfc/efx.h
@@ -36,13 +36,16 @@ extern void efx_process_channel_now(struct efx_channel *channel);
 extern void efx_flush_queues(struct efx_nic *efx);
 
 /* Ports */
+extern void efx_stats_disable(struct efx_nic *efx);
+extern void efx_stats_enable(struct efx_nic *efx);
 extern void efx_reconfigure_port(struct efx_nic *efx);
 extern void __efx_reconfigure_port(struct efx_nic *efx);
 
 /* Reset handling */
-extern void efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd);
-extern int efx_reset_up(struct efx_nic *efx, struct ethtool_cmd *ecmd,
-                        bool ok);
+extern void efx_reset_down(struct efx_nic *efx, enum reset_type method,
+                           struct ethtool_cmd *ecmd);
+extern int efx_reset_up(struct efx_nic *efx, enum reset_type method,
+                        struct ethtool_cmd *ecmd, bool ok);
 
 /* Global */
 extern void efx_schedule_reset(struct efx_nic *efx, enum reset_type type);
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index 53d259e90187..7b5924c039b3 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -219,9 +219,6 @@ int efx_ethtool_set_settings(struct net_device *net_dev,
         struct efx_nic *efx = netdev_priv(net_dev);
         int rc;
 
-        if (EFX_WORKAROUND_13963(efx) && !ecmd->autoneg)
-                return -EINVAL;
-
         /* Falcon GMAC does not support 1000Mbps HD */
         if (ecmd->speed == SPEED_1000 && ecmd->duplex != DUPLEX_FULL) {
                 EFX_LOG(efx, "rejecting unsupported 1000Mbps HD"
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 5b9f2d9cc4ed..d5378e60fcdd 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -824,10 +824,6 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue,
                             rx_ev_pause_frm ? " [PAUSE]" : "");
         }
 #endif
-
-        if (unlikely(rx_ev_eth_crc_err && EFX_WORKAROUND_10750(efx) &&
-                     efx->phy_type == PHY_TYPE_SFX7101))
-                tenxpress_crc_err(efx);
 }
 
 /* Handle receive events that are not in-order. */
@@ -1887,7 +1883,7 @@ static int falcon_reset_macs(struct efx_nic *efx)
 
         /* MAC stats will fail whilst the TX fifo is draining. Serialise
          * the drain sequence with the statistics fetch */
-        spin_lock(&efx->stats_lock);
+        efx_stats_disable(efx);
 
         falcon_read(efx, &reg, MAC0_CTRL_REG_KER);
         EFX_SET_OWORD_FIELD(reg, TXFIFO_DRAIN_EN_B0, 1);
@@ -1917,7 +1913,7 @@ static int falcon_reset_macs(struct efx_nic *efx)
                 udelay(10);
         }
 
-        spin_unlock(&efx->stats_lock);
+        efx_stats_enable(efx);
 
         /* If we've reset the EM block and the link is up, then
          * we'll have to kick the XAUI link so the PHY can recover */
@@ -2277,6 +2273,10 @@ int falcon_switch_mac(struct efx_nic *efx)
         struct efx_mac_operations *old_mac_op = efx->mac_op;
         efx_oword_t nic_stat;
         unsigned strap_val;
+        int rc = 0;
+
+        /* Don't try to fetch MAC stats while we're switching MACs */
+        efx_stats_disable(efx);
 
         /* Internal loopbacks override the phy speed setting */
         if (efx->loopback_mode == LOOPBACK_GMAC) {
@@ -2287,16 +2287,12 @@ int falcon_switch_mac(struct efx_nic *efx)
                 efx->link_fd = true;
         }
 
+        WARN_ON(!mutex_is_locked(&efx->mac_lock));
         efx->mac_op = (EFX_IS10G(efx) ?
                        &falcon_xmac_operations : &falcon_gmac_operations);
-        if (old_mac_op == efx->mac_op)
-                return 0;
-
-        WARN_ON(!mutex_is_locked(&efx->mac_lock));
-
-        /* Not all macs support a mac-level link state */
-        efx->mac_up = true;
 
+        /* Always push the NIC_STAT_REG setting even if the mac hasn't
+         * changed, because this function is run post online reset */
         falcon_read(efx, &nic_stat, NIC_STAT_REG);
         strap_val = EFX_IS10G(efx) ? 5 : 3;
         if (falcon_rev(efx) >= FALCON_REV_B0) {
@@ -2309,9 +2305,17 @@ int falcon_switch_mac(struct efx_nic *efx)
                 BUG_ON(EFX_OWORD_FIELD(nic_stat, STRAP_PINS) != strap_val);
         }
 
+        if (old_mac_op == efx->mac_op)
+                goto out;
 
         EFX_LOG(efx, "selected %cMAC\n", EFX_IS10G(efx) ? 'X' : 'G');
-        return falcon_reset_macs(efx);
+        /* Not all macs support a mac-level link state */
+        efx->mac_up = true;
+
+        rc = falcon_reset_macs(efx);
+out:
+        efx_stats_enable(efx);
+        return rc;
 }
 
 /* This call is responsible for hooking in the MAC and PHY operations */
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c
index f6a16428113d..f9e2f95c3b48 100644
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
@@ -15,6 +15,7 @@
 #include "net_driver.h"
 #include "mdio_10g.h"
 #include "boards.h"
+#include "workarounds.h"
 
 int mdio_clause45_reset_mmd(struct efx_nic *port, int mmd,
                             int spins, int spintime)
@@ -179,17 +180,12 @@ bool mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask)
                 return false;
         else if (efx_phy_mode_disabled(efx->phy_mode))
                 return false;
-        else if (efx->loopback_mode == LOOPBACK_PHYXS) {
+        else if (efx->loopback_mode == LOOPBACK_PHYXS)
                 mmd_mask &= ~(MDIO_MMDREG_DEVS_PHYXS |
                               MDIO_MMDREG_DEVS_PCS |
                               MDIO_MMDREG_DEVS_PMAPMD |
                               MDIO_MMDREG_DEVS_AN);
-                if (!mmd_mask) {
-                        reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_PHYXS,
-                                                 MDIO_PHYXS_STATUS2);
-                        return !(reg & (1 << MDIO_PHYXS_STATUS2_RX_FAULT_LBN));
-                }
-        } else if (efx->loopback_mode == LOOPBACK_PCS)
+        else if (efx->loopback_mode == LOOPBACK_PCS)
                 mmd_mask &= ~(MDIO_MMDREG_DEVS_PCS |
                               MDIO_MMDREG_DEVS_PMAPMD |
                               MDIO_MMDREG_DEVS_AN);
@@ -197,6 +193,13 @@ bool mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask)
                 mmd_mask &= ~(MDIO_MMDREG_DEVS_PMAPMD |
                               MDIO_MMDREG_DEVS_AN);
 
+        if (!mmd_mask) {
+                /* Use presence of XGMII faults in leui of link state */
+                reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_PHYXS,
+                                         MDIO_PHYXS_STATUS2);
+                return !(reg & (1 << MDIO_PHYXS_STATUS2_RX_FAULT_LBN));
+        }
+
         while (mmd_mask) {
                 if (mmd_mask & 1) {
                         /* Double reads because link state is latched, and a
@@ -263,7 +266,7 @@ void mdio_clause45_set_mmds_lpower(struct efx_nic *efx,
         }
 }
 
-static u32 mdio_clause45_get_an(struct efx_nic *efx, u16 addr, u32 xnp)
+static u32 mdio_clause45_get_an(struct efx_nic *efx, u16 addr)
 {
         int phy_id = efx->mii.phy_id;
         u32 result = 0;
@@ -278,9 +281,6 @@ static u32 mdio_clause45_get_an(struct efx_nic *efx, u16 addr, u32 xnp)
                 result |= ADVERTISED_100baseT_Half;
         if (reg & ADVERTISE_100FULL)
                 result |= ADVERTISED_100baseT_Full;
-        if (reg & LPA_RESV)
-                result |= xnp;
-
         return result;
 }
 
@@ -310,7 +310,7 @@ void mdio_clause45_get_settings(struct efx_nic *efx,
  */
 void mdio_clause45_get_settings_ext(struct efx_nic *efx,
                                     struct ethtool_cmd *ecmd,
-                                    u32 xnp, u32 xnp_lpa)
+                                    u32 npage_adv, u32 npage_lpa)
 {
         int phy_id = efx->mii.phy_id;
         int reg;
@@ -361,8 +361,8 @@ void mdio_clause45_get_settings_ext(struct efx_nic *efx,
                         ecmd->autoneg = AUTONEG_ENABLE;
                         ecmd->advertising |=
                                 ADVERTISED_Autoneg |
-                                mdio_clause45_get_an(efx,
-                                                     MDIO_AN_ADVERTISE, xnp);
+                                mdio_clause45_get_an(efx, MDIO_AN_ADVERTISE) |
+                                npage_adv;
                 } else
                         ecmd->autoneg = AUTONEG_DISABLE;
         } else
@@ -371,27 +371,30 @@ void mdio_clause45_get_settings_ext(struct efx_nic *efx,
         if (ecmd->autoneg) {
                 /* If AN is complete, report best common mode,
                  * otherwise report best advertised mode. */
-                u32 common = ecmd->advertising;
+                u32 modes = 0;
                 if (mdio_clause45_read(efx, phy_id, MDIO_MMD_AN,
                                        MDIO_MMDREG_STAT1) &
-                    (1 << MDIO_AN_STATUS_AN_DONE_LBN)) {
-                        common &= mdio_clause45_get_an(efx, MDIO_AN_LPA,
-                                                       xnp_lpa);
-                }
-                if (common & ADVERTISED_10000baseT_Full) {
+                    (1 << MDIO_AN_STATUS_AN_DONE_LBN))
+                        modes = (ecmd->advertising &
+                                 (mdio_clause45_get_an(efx, MDIO_AN_LPA) |
+                                  npage_lpa));
+                if (modes == 0)
+                        modes = ecmd->advertising;
+
+                if (modes & ADVERTISED_10000baseT_Full) {
                         ecmd->speed = SPEED_10000;
                         ecmd->duplex = DUPLEX_FULL;
-                } else if (common & (ADVERTISED_1000baseT_Full |
-                                     ADVERTISED_1000baseT_Half)) {
+                } else if (modes & (ADVERTISED_1000baseT_Full |
+                                    ADVERTISED_1000baseT_Half)) {
                         ecmd->speed = SPEED_1000;
-                        ecmd->duplex = !!(common & ADVERTISED_1000baseT_Full);
-                } else if (common & (ADVERTISED_100baseT_Full |
-                                     ADVERTISED_100baseT_Half)) {
+                        ecmd->duplex = !!(modes & ADVERTISED_1000baseT_Full);
+                } else if (modes & (ADVERTISED_100baseT_Full |
+                                    ADVERTISED_100baseT_Half)) {
                         ecmd->speed = SPEED_100;
-                        ecmd->duplex = !!(common & ADVERTISED_100baseT_Full);
+                        ecmd->duplex = !!(modes & ADVERTISED_100baseT_Full);
                 } else {
                         ecmd->speed = SPEED_10;
-                        ecmd->duplex = !!(common & ADVERTISED_10baseT_Full);
+                        ecmd->duplex = !!(modes & ADVERTISED_10baseT_Full);
                 }
         } else {
                 /* Report forced settings */
@@ -415,7 +418,7 @@ int mdio_clause45_set_settings(struct efx_nic *efx,
         int phy_id = efx->mii.phy_id;
         struct ethtool_cmd prev;
         u32 required;
-        int ctrl1_bits, reg;
+        int reg;
 
         efx->phy_op->get_settings(efx, &prev);
 
@@ -430,99 +433,83 @@ int mdio_clause45_set_settings(struct efx_nic *efx,
         if (prev.port != PORT_TP || ecmd->port != PORT_TP)
                 return -EINVAL;
 
-        /* Check that PHY supports these settings and work out the
-         * basic control bits */
-        if (ecmd->duplex) {
+        /* Check that PHY supports these settings */
+        if (ecmd->autoneg) {
+                required = SUPPORTED_Autoneg;
+        } else if (ecmd->duplex) {
                 switch (ecmd->speed) {
-                case SPEED_10:
-                        ctrl1_bits = BMCR_FULLDPLX;
-                        required = SUPPORTED_10baseT_Full;
-                        break;
-                case SPEED_100:
-                        ctrl1_bits = BMCR_SPEED100 | BMCR_FULLDPLX;
-                        required = SUPPORTED_100baseT_Full;
-                        break;
-                case SPEED_1000:
-                        ctrl1_bits = BMCR_SPEED1000 | BMCR_FULLDPLX;
-                        required = SUPPORTED_1000baseT_Full;
-                        break;
-                case SPEED_10000:
-                        ctrl1_bits = (BMCR_SPEED1000 | BMCR_SPEED100 |
-                                      BMCR_FULLDPLX);
-                        required = SUPPORTED_10000baseT_Full;
-                        break;
-                default:
-                        return -EINVAL;
+                case SPEED_10:  required = SUPPORTED_10baseT_Full;  break;
+                case SPEED_100: required = SUPPORTED_100baseT_Full; break;
+                default:        return -EINVAL;
                 }
         } else {
                 switch (ecmd->speed) {
-                case SPEED_10:
-                        ctrl1_bits = 0;
-                        required = SUPPORTED_10baseT_Half;
-                        break;
-                case SPEED_100:
-                        ctrl1_bits = BMCR_SPEED100;
-                        required = SUPPORTED_100baseT_Half;
-                        break;
-                case SPEED_1000:
-                        ctrl1_bits = BMCR_SPEED1000;
-                        required = SUPPORTED_1000baseT_Half;
-                        break;
-                default:
-                        return -EINVAL;
+                case SPEED_10:  required = SUPPORTED_10baseT_Half;  break;
+                case SPEED_100: required = SUPPORTED_100baseT_Half; break;
+                default:        return -EINVAL;
                 }
         }
-        if (ecmd->autoneg)
-                required |= SUPPORTED_Autoneg;
         required |= ecmd->advertising;
         if (required & ~prev.supported)
                 return -EINVAL;
 
-        /* Set the basic control bits */
-        reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_PMAPMD,
-                                 MDIO_MMDREG_CTRL1);
-        reg &= ~(BMCR_SPEED1000 | BMCR_SPEED100 | BMCR_FULLDPLX | 0x003c);
-        reg |= ctrl1_bits;
-        mdio_clause45_write(efx, phy_id, MDIO_MMD_PMAPMD, MDIO_MMDREG_CTRL1,
-                            reg);
-
-        /* Set the AN registers */
-        if (ecmd->autoneg != prev.autoneg ||
-            ecmd->advertising != prev.advertising) {
-                bool xnp = false;
-
-                if (efx->phy_op->set_xnp_advertise)
-                        xnp = efx->phy_op->set_xnp_advertise(efx,
-                                                             ecmd->advertising);
-
-                if (ecmd->autoneg) {
-                        reg = 0;
-                        if (ecmd->advertising & ADVERTISED_10baseT_Half)
-                                reg |= ADVERTISE_10HALF;
-                        if (ecmd->advertising & ADVERTISED_10baseT_Full)
-                                reg |= ADVERTISE_10FULL;
-                        if (ecmd->advertising & ADVERTISED_100baseT_Half)
-                                reg |= ADVERTISE_100HALF;
-                        if (ecmd->advertising & ADVERTISED_100baseT_Full)
-                                reg |= ADVERTISE_100FULL;
-                        if (xnp)
-                                reg |= ADVERTISE_RESV;
-                        mdio_clause45_write(efx, phy_id, MDIO_MMD_AN,
-                                            MDIO_AN_ADVERTISE, reg);
-                }
+        if (ecmd->autoneg) {
+                bool xnp = (ecmd->advertising & ADVERTISED_10000baseT_Full
+                            || EFX_WORKAROUND_13204(efx));
+
+                /* Set up the base page */
+                reg = ADVERTISE_CSMA;
+                if (ecmd->advertising & ADVERTISED_10baseT_Half)
+                        reg |= ADVERTISE_10HALF;
+                if (ecmd->advertising & ADVERTISED_10baseT_Full)
+                        reg |= ADVERTISE_10FULL;
+                if (ecmd->advertising & ADVERTISED_100baseT_Half)
+                        reg |= ADVERTISE_100HALF;
+                if (ecmd->advertising & ADVERTISED_100baseT_Full)
+                        reg |= ADVERTISE_100FULL;
+                if (xnp)
+                        reg |= ADVERTISE_RESV;
+                else if (ecmd->advertising & (ADVERTISED_1000baseT_Half |
+                                              ADVERTISED_1000baseT_Full))
+                        reg |= ADVERTISE_NPAGE;
+                reg |= efx_fc_advertise(efx->wanted_fc);
+                mdio_clause45_write(efx, phy_id, MDIO_MMD_AN,
+                                    MDIO_AN_ADVERTISE, reg);
+
+                /* Set up the (extended) next page if necessary */
+                if (efx->phy_op->set_npage_adv)
+                        efx->phy_op->set_npage_adv(efx, ecmd->advertising);
 
+                /* Enable and restart AN */
                 reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_AN,
                                          MDIO_MMDREG_CTRL1);
-                if (ecmd->autoneg)
-                        reg |= BMCR_ANENABLE | BMCR_ANRESTART;
-                else
-                        reg &= ~BMCR_ANENABLE;
+                reg |= BMCR_ANENABLE;
+                if (!(EFX_WORKAROUND_15195(efx) &&
+                      LOOPBACK_MASK(efx) & efx->phy_op->loopbacks))
+                        reg |= BMCR_ANRESTART;
                 if (xnp)
                         reg |= 1 << MDIO_AN_CTRL_XNP_LBN;
                 else
                         reg &= ~(1 << MDIO_AN_CTRL_XNP_LBN);
                 mdio_clause45_write(efx, phy_id, MDIO_MMD_AN,
                                     MDIO_MMDREG_CTRL1, reg);
+        } else {
+                /* Disable AN */
+                mdio_clause45_set_flag(efx, phy_id, MDIO_MMD_AN,
+                                       MDIO_MMDREG_CTRL1,
+                                       __ffs(BMCR_ANENABLE), false);
+
+                /* Set the basic control bits */
+                reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_PMAPMD,
+                                         MDIO_MMDREG_CTRL1);
+                reg &= ~(BMCR_SPEED1000 | BMCR_SPEED100 | BMCR_FULLDPLX |
+                         0x003c);
+                if (ecmd->speed == SPEED_100)
+                        reg |= BMCR_SPEED100;
+                if (ecmd->duplex)
+                        reg |= BMCR_FULLDPLX;
+                mdio_clause45_write(efx, phy_id, MDIO_MMD_PMAPMD,
+                                    MDIO_MMDREG_CTRL1, reg);
         }
 
         return 0;
diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/sfc/mdio_10g.h
index 09bf801d0569..8ba49773ce7e 100644
--- a/drivers/net/sfc/mdio_10g.h
+++ b/drivers/net/sfc/mdio_10g.h
@@ -155,7 +155,8 @@
 #define MDIO_AN_XNP                     22
 #define MDIO_AN_LPA_XNP                 25
 
-#define MDIO_AN_10GBT_ADVERTISE         32
+#define MDIO_AN_10GBT_CTRL              32
+#define MDIO_AN_10GBT_CTRL_ADV_10G_LBN  12
 #define MDIO_AN_10GBT_STATUS            (33)
 #define MDIO_AN_10GBT_STATUS_MS_FLT_LBN (15) /* MASTER/SLAVE config fault */
 #define MDIO_AN_10GBT_STATUS_MS_LBN     (14) /* MASTER/SLAVE config */
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 5f255f75754e..e019ad1fb9a0 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -566,7 +566,7 @@ struct efx_mac_operations {
  * @poll: Poll for hardware state. Serialised by the mac_lock.
  * @get_settings: Get ethtool settings. Serialised by the mac_lock.
  * @set_settings: Set ethtool settings. Serialised by the mac_lock.
- * @set_xnp_advertise: Set abilities advertised in Extended Next Page
+ * @set_npage_adv: Set abilities advertised in (Extended) Next Page
  *      (only needed where AN bit is set in mmds)
  * @num_tests: Number of PHY-specific tests/results
  * @test_names: Names of the tests/results
@@ -586,7 +586,7 @@ struct efx_phy_operations {
                               struct ethtool_cmd *ecmd);
         int (*set_settings) (struct efx_nic *efx,
                              struct ethtool_cmd *ecmd);
-        bool (*set_xnp_advertise) (struct efx_nic *efx, u32);
+        void (*set_npage_adv) (struct efx_nic *efx, u32);
         u32 num_tests;
         const char *const *test_names;
         int (*run_tests) (struct efx_nic *efx, int *results, unsigned flags);
@@ -754,8 +754,7 @@ union efx_multicast_hash {
  *      &struct net_device_stats.
  * @stats_buffer: DMA buffer for statistics
  * @stats_lock: Statistics update lock. Serialises statistics fetches
- * @stats_enabled: Temporarily disable statistics fetches.
- *      Serialised by @stats_lock
+ * @stats_disable_count: Nest count for disabling statistics fetches
  * @mac_op: MAC interface
  * @mac_address: Permanent MAC address
  * @phy_type: PHY type
@@ -837,7 +836,7 @@ struct efx_nic {
         struct efx_mac_stats mac_stats;
         struct efx_buffer stats_buffer;
         spinlock_t stats_lock;
-        bool stats_enabled;
+        unsigned int stats_disable_count;
 
         struct efx_mac_operations *mac_op;
         unsigned char mac_address[ETH_ALEN];
diff --git a/drivers/net/sfc/phy.h b/drivers/net/sfc/phy.h
index 58c493ef81bb..07e855c148bc 100644
--- a/drivers/net/sfc/phy.h
+++ b/drivers/net/sfc/phy.h
@@ -17,7 +17,6 @@ extern struct efx_phy_operations falcon_sfx7101_phy_ops;
 extern struct efx_phy_operations falcon_sft9001_phy_ops;
 
 extern void tenxpress_phy_blink(struct efx_nic *efx, bool blink);
-extern void tenxpress_crc_err(struct efx_nic *efx);
 
 /****************************************************************************
  * Exported functions from the driver for XFP optical PHYs
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index dba0d64d50cd..0a598084c513 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -665,6 +665,7 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests,
 {
         enum efx_loopback_mode loopback_mode = efx->loopback_mode;
         int phy_mode = efx->phy_mode;
+        enum reset_type reset_method = RESET_TYPE_INVISIBLE;
         struct ethtool_cmd ecmd;
         struct efx_channel *channel;
         int rc_test = 0, rc_reset = 0, rc;
@@ -718,21 +719,21 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests,
         mutex_unlock(&efx->mac_lock);
 
         /* free up all consumers of SRAM (including all the queues) */
-        efx_reset_down(efx, &ecmd);
+        efx_reset_down(efx, reset_method, &ecmd);
 
         rc = efx_test_chip(efx, tests);
         if (rc && !rc_test)
                 rc_test = rc;
 
         /* reset the chip to recover from the register test */
-        rc_reset = falcon_reset_hw(efx, RESET_TYPE_ALL);
+        rc_reset = falcon_reset_hw(efx, reset_method);
 
         /* Ensure that the phy is powered and out of loopback
          * for the bist and loopback tests */
         efx->phy_mode &= ~PHY_MODE_LOW_POWER;
         efx->loopback_mode = LOOPBACK_NONE;
 
-        rc = efx_reset_up(efx, &ecmd, rc_reset == 0);
+        rc = efx_reset_up(efx, reset_method, &ecmd, rc_reset == 0);
         if (rc && !rc_reset)
                 rc_reset = rc;
 
diff --git a/drivers/net/sfc/sfe4001.c b/drivers/net/sfc/sfe4001.c
index 16b80acb9992..cb25ae5b257a 100644
--- a/drivers/net/sfc/sfe4001.c
+++ b/drivers/net/sfc/sfe4001.c
@@ -186,19 +186,22 @@ static int sfn4111t_reset(struct efx_nic *efx)
 {
         efx_oword_t reg;
 
-        /* GPIO pins are also used for I2C, so block that temporarily */
+        /* GPIO 3 and the GPIO register are shared with I2C, so block that */
         mutex_lock(&efx->i2c_adap.bus_lock);
 
+        /* Pull RST_N (GPIO 2) low then let it up again, setting the
+         * FLASH_CFG_1 strap (GPIO 3) appropriately.  Only change the
+         * output enables; the output levels should always be 0 (low)
+         * and we rely on external pull-ups. */
         falcon_read(efx, &reg, GPIO_CTL_REG_KER);
         EFX_SET_OWORD_FIELD(reg, GPIO2_OEN, true);
-        EFX_SET_OWORD_FIELD(reg, GPIO2_OUT, false);
         falcon_write(efx, &reg, GPIO_CTL_REG_KER);
         msleep(1000);
-        EFX_SET_OWORD_FIELD(reg, GPIO2_OUT, true);
-        EFX_SET_OWORD_FIELD(reg, GPIO3_OEN, true);
-        EFX_SET_OWORD_FIELD(reg, GPIO3_OUT,
-                            !(efx->phy_mode & PHY_MODE_SPECIAL));
+        EFX_SET_OWORD_FIELD(reg, GPIO2_OEN, false);
+        EFX_SET_OWORD_FIELD(reg, GPIO3_OEN,
+                            !!(efx->phy_mode & PHY_MODE_SPECIAL));
         falcon_write(efx, &reg, GPIO_CTL_REG_KER);
+        msleep(1);
 
         mutex_unlock(&efx->i2c_adap.bus_lock);
 
@@ -232,12 +235,18 @@ static ssize_t set_phy_flash_cfg(struct device *dev,
         } else if (efx->state != STATE_RUNNING || netif_running(efx->net_dev)) {
                 err = -EBUSY;
         } else {
+                /* Reset the PHY, reconfigure the MAC and enable/disable
+                 * MAC stats accordingly. */
                 efx->phy_mode = new_mode;
+                if (new_mode & PHY_MODE_SPECIAL)
+                        efx_stats_disable(efx);
                 if (efx->board_info.type == EFX_BOARD_SFE4001)
                         err = sfe4001_poweron(efx);
                 else
                         err = sfn4111t_reset(efx);
                 efx_reconfigure_port(efx);
+                if (!(new_mode & PHY_MODE_SPECIAL))
+                        efx_stats_enable(efx);
         }
         rtnl_unlock();
 
@@ -326,6 +335,11 @@ int sfe4001_init(struct efx_nic *efx)
         efx->board_info.monitor = sfe4001_check_hw;
         efx->board_info.fini = sfe4001_fini;
 
+        if (efx->phy_mode & PHY_MODE_SPECIAL) {
+                /* PHY won't generate a 156.25 MHz clock and MAC stats fetch
+                 * will fail. */
+                efx_stats_disable(efx);
+        }
         rc = sfe4001_poweron(efx);
         if (rc)
                 goto fail_ioexp;
@@ -372,17 +386,25 @@ static void sfn4111t_fini(struct efx_nic *efx)
         i2c_unregister_device(efx->board_info.hwmon_client);
 }
 
-static struct i2c_board_info sfn4111t_hwmon_info = {
+static struct i2c_board_info sfn4111t_a0_hwmon_info = {
         I2C_BOARD_INFO("max6647", 0x4e),
         .irq            = -1,
 };
 
+static struct i2c_board_info sfn4111t_r5_hwmon_info = {
+        I2C_BOARD_INFO("max6646", 0x4d),
+        .irq            = -1,
+};
+
 int sfn4111t_init(struct efx_nic *efx)
 {
         int rc;
 
         efx->board_info.hwmon_client =
-                i2c_new_device(&efx->i2c_adap, &sfn4111t_hwmon_info);
+                i2c_new_device(&efx->i2c_adap,
+                               (efx->board_info.minor < 5) ?
+                               &sfn4111t_a0_hwmon_info :
+                               &sfn4111t_r5_hwmon_info);
         if (!efx->board_info.hwmon_client)
                 return -EIO;
 
@@ -394,8 +416,10 @@ int sfn4111t_init(struct efx_nic *efx)
         if (rc)
                 goto fail_hwmon;
 
-        if (efx->phy_mode & PHY_MODE_SPECIAL)
+        if (efx->phy_mode & PHY_MODE_SPECIAL) {
+                efx_stats_disable(efx);
                 sfn4111t_reset(efx);
+        }
 
         return 0;
 
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index 9ecb77da9545..f0efd246962c 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -67,6 +67,8 @@
 #define PMA_PMD_EXT_CLK312_WIDTH 1
 #define PMA_PMD_EXT_LPOWER_LBN  12
 #define PMA_PMD_EXT_LPOWER_WIDTH 1
+#define PMA_PMD_EXT_ROBUST_LBN  14
+#define PMA_PMD_EXT_ROBUST_WIDTH 1
 #define PMA_PMD_EXT_SSR_LBN     15
 #define PMA_PMD_EXT_SSR_WIDTH   1
 
@@ -177,35 +179,24 @@
 #define C22EXT_STATUS_LINK_LBN  2
 #define C22EXT_STATUS_LINK_WIDTH 1
 
-#define C22EXT_MSTSLV_REG       49162
-#define C22EXT_MSTSLV_1000_HD_LBN 10
-#define C22EXT_MSTSLV_1000_HD_WIDTH 1
-#define C22EXT_MSTSLV_1000_FD_LBN 11
-#define C22EXT_MSTSLV_1000_FD_WIDTH 1
+#define C22EXT_MSTSLV_CTRL                      49161
+#define C22EXT_MSTSLV_CTRL_ADV_1000_HD_LBN      8
+#define C22EXT_MSTSLV_CTRL_ADV_1000_FD_LBN      9
+
+#define C22EXT_MSTSLV_STATUS                    49162
+#define C22EXT_MSTSLV_STATUS_LP_1000_HD_LBN     10
+#define C22EXT_MSTSLV_STATUS_LP_1000_FD_LBN     11
 
 /* Time to wait between powering down the LNPGA and turning off the power
  * rails */
 #define LNPGA_PDOWN_WAIT        (HZ / 5)
 
-static int crc_error_reset_threshold = 100;
-module_param(crc_error_reset_threshold, int, 0644);
-MODULE_PARM_DESC(crc_error_reset_threshold,
-                 "Max number of CRC errors before XAUI reset");
-
 struct tenxpress_phy_data {
         enum efx_loopback_mode loopback_mode;
-        atomic_t bad_crc_count;
         enum efx_phy_mode phy_mode;
         int bad_lp_tries;
 };
 
-void tenxpress_crc_err(struct efx_nic *efx)
-{
-        struct tenxpress_phy_data *phy_data = efx->phy_data;
-        if (phy_data != NULL)
-                atomic_inc(&phy_data->bad_crc_count);
-}
-
 static ssize_t show_phy_short_reach(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
@@ -284,7 +275,9 @@ static int tenxpress_init(struct efx_nic *efx)
                                          PMA_PMD_XCONTROL_REG);
                 reg |= ((1 << PMA_PMD_EXT_GMII_EN_LBN) |
                         (1 << PMA_PMD_EXT_CLK_OUT_LBN) |
-                        (1 << PMA_PMD_EXT_CLK312_LBN));
+                        (1 << PMA_PMD_EXT_CLK312_LBN) |
+                        (1 << PMA_PMD_EXT_ROBUST_LBN));
+
                 mdio_clause45_write(efx, phy_id, MDIO_MMD_PMAPMD,
                                     PMA_PMD_XCONTROL_REG, reg);
                 mdio_clause45_set_flag(efx, phy_id, MDIO_MMD_C22EXT,
@@ -346,6 +339,7 @@ static int tenxpress_phy_init(struct efx_nic *efx)
         rc = tenxpress_init(efx);
         if (rc < 0)
                 goto fail;
+        mdio_clause45_set_pause(efx);
 
         if (efx->phy_type == PHY_TYPE_SFT9001B) {
                 rc = device_create_file(&efx->pci_dev->dev,
@@ -376,8 +370,8 @@ static int tenxpress_special_reset(struct efx_nic *efx)
 
         /* The XGMAC clock is driven from the SFC7101/SFT9001 312MHz clock, so
          * a special software reset can glitch the XGMAC sufficiently for stats
-         * requests to fail. Since we don't often special_reset, just lock. */
-        spin_lock(&efx->stats_lock);
+         * requests to fail. */
+        efx_stats_disable(efx);
 
         /* Initiate reset */
         reg = mdio_clause45_read(efx, efx->mii.phy_id,
@@ -392,17 +386,17 @@ static int tenxpress_special_reset(struct efx_nic *efx)
         rc = mdio_clause45_wait_reset_mmds(efx,
                                            TENXPRESS_REQUIRED_DEVS);
         if (rc < 0)
-                goto unlock;
+                goto out;
 
         /* Try and reconfigure the device */
         rc = tenxpress_init(efx);
         if (rc < 0)
-                goto unlock;
+                goto out;
 
         /* Wait for the XGXS state machine to churn */
         mdelay(10);
-unlock:
-        spin_unlock(&efx->stats_lock);
+out:
+        efx_stats_enable(efx);
         return rc;
 }
 
@@ -520,7 +514,7 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx)
 {
         struct tenxpress_phy_data *phy_data = efx->phy_data;
         struct ethtool_cmd ecmd;
-        bool phy_mode_change, loop_reset, loop_toggle, loopback;
+        bool phy_mode_change, loop_reset;
 
         if (efx->phy_mode & (PHY_MODE_OFF | PHY_MODE_SPECIAL)) {
                 phy_data->phy_mode = efx->phy_mode;
@@ -531,12 +525,10 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx)
 
         phy_mode_change = (efx->phy_mode == PHY_MODE_NORMAL &&
                            phy_data->phy_mode != PHY_MODE_NORMAL);
-        loopback = LOOPBACK_MASK(efx) & efx->phy_op->loopbacks;
-        loop_toggle = LOOPBACK_CHANGED(phy_data, efx, efx->phy_op->loopbacks);
         loop_reset = (LOOPBACK_OUT_OF(phy_data, efx, efx->phy_op->loopbacks) ||
                       LOOPBACK_CHANGED(phy_data, efx, 1 << LOOPBACK_GPHY));
 
-        if (loop_reset || loop_toggle || loopback || phy_mode_change) {
+        if (loop_reset || phy_mode_change) {
                 int rc;
 
                 efx->phy_op->get_settings(efx, &ecmd);
@@ -551,20 +543,6 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx)
                                 falcon_reset_xaui(efx);
                 }
 
-                if (efx->phy_type != PHY_TYPE_SFX7101) {
-                        /* Only change autoneg once, on coming out or
-                         * going into loopback */
-                        if (loop_toggle)
-                                ecmd.autoneg = !loopback;
-                        if (loopback) {
-                                ecmd.duplex = DUPLEX_FULL;
-                                if (efx->loopback_mode == LOOPBACK_GPHY)
-                                        ecmd.speed = SPEED_1000;
-                                else
-                                        ecmd.speed = SPEED_10000;
-                        }
-                }
-
                 rc = efx->phy_op->set_settings(efx, &ecmd);
                 WARN_ON(rc);
         }
@@ -623,13 +601,6 @@ static void tenxpress_phy_poll(struct efx_nic *efx)
 
         if (phy_data->phy_mode != PHY_MODE_NORMAL)
                 return;
-
-        if (EFX_WORKAROUND_10750(efx) &&
-            atomic_read(&phy_data->bad_crc_count) > crc_error_reset_threshold) {
-                EFX_ERR(efx, "Resetting XAUI due to too many CRC errors\n");
-                falcon_reset_xaui(efx);
-                atomic_set(&phy_data->bad_crc_count, 0);
-        }
 }
 
 static void tenxpress_phy_fini(struct efx_nic *efx)
@@ -772,107 +743,76 @@ reset:
         return rc;
 }
 
-static u32 tenxpress_get_xnp_lpa(struct efx_nic *efx)
+static void
+tenxpress_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
 {
-        int phy = efx->mii.phy_id;
-        u32 lpa = 0;
+        int phy_id = efx->mii.phy_id;
+        u32 adv = 0, lpa = 0;
         int reg;
 
         if (efx->phy_type != PHY_TYPE_SFX7101) {
-                reg = mdio_clause45_read(efx, phy, MDIO_MMD_C22EXT,
-                                         C22EXT_MSTSLV_REG);
-                if (reg & (1 << C22EXT_MSTSLV_1000_HD_LBN))
+                reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_C22EXT,
+                                         C22EXT_MSTSLV_CTRL);
+                if (reg & (1 << C22EXT_MSTSLV_CTRL_ADV_1000_FD_LBN))
+                        adv |= ADVERTISED_1000baseT_Full;
+                reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_C22EXT,
+                                         C22EXT_MSTSLV_STATUS);
+                if (reg & (1 << C22EXT_MSTSLV_STATUS_LP_1000_HD_LBN))
                         lpa |= ADVERTISED_1000baseT_Half;
-                if (reg & (1 << C22EXT_MSTSLV_1000_FD_LBN))
+                if (reg & (1 << C22EXT_MSTSLV_STATUS_LP_1000_FD_LBN))
                         lpa |= ADVERTISED_1000baseT_Full;
         }
-        reg = mdio_clause45_read(efx, phy, MDIO_MMD_AN, MDIO_AN_10GBT_STATUS);
+        reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_AN,
+                                 MDIO_AN_10GBT_CTRL);
+        if (reg & (1 << MDIO_AN_10GBT_CTRL_ADV_10G_LBN))
+                adv |= ADVERTISED_10000baseT_Full;
+        reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_AN,
+                                 MDIO_AN_10GBT_STATUS);
         if (reg & (1 << MDIO_AN_10GBT_STATUS_LP_10G_LBN))
                 lpa |= ADVERTISED_10000baseT_Full;
-        return lpa;
-}
 
-static void sfx7101_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
-{
-        mdio_clause45_get_settings_ext(efx, ecmd, ADVERTISED_10000baseT_Full,
-                                       tenxpress_get_xnp_lpa(efx));
-        ecmd->supported |= SUPPORTED_10000baseT_Full;
-        ecmd->advertising |= ADVERTISED_10000baseT_Full;
+        mdio_clause45_get_settings_ext(efx, ecmd, adv, lpa);
+
+        if (efx->phy_type != PHY_TYPE_SFX7101)
+                ecmd->supported |= (SUPPORTED_100baseT_Full |
+                                    SUPPORTED_1000baseT_Full);
+
+        /* In loopback, the PHY automatically brings up the correct interface,
+         * but doesn't advertise the correct speed. So override it */
+        if (efx->loopback_mode == LOOPBACK_GPHY)
+                ecmd->speed = SPEED_1000;
+        else if (LOOPBACK_MASK(efx) & efx->phy_op->loopbacks)
+                ecmd->speed = SPEED_10000;
 }
 
-static void sft9001_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
+static int tenxpress_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
 {
-        int phy_id = efx->mii.phy_id;
-        u32 xnp_adv = 0;
-        int reg;
-
-        reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_PMAPMD,
-                                 PMA_PMD_SPEED_ENABLE_REG);
-        if (EFX_WORKAROUND_13204(efx) && (reg & (1 << PMA_PMD_100TX_ADV_LBN)))
-                xnp_adv |= ADVERTISED_100baseT_Full;
-        if (reg & (1 << PMA_PMD_1000T_ADV_LBN))
-                xnp_adv |= ADVERTISED_1000baseT_Full;
-        if (reg & (1 << PMA_PMD_10000T_ADV_LBN))
-                xnp_adv |= ADVERTISED_10000baseT_Full;
-
-        mdio_clause45_get_settings_ext(efx, ecmd, xnp_adv,
-                                       tenxpress_get_xnp_lpa(efx));
-
-        ecmd->supported |= (SUPPORTED_100baseT_Half |
-                            SUPPORTED_100baseT_Full |
-                            SUPPORTED_1000baseT_Full);
+        if (!ecmd->autoneg)
+                return -EINVAL;
 
-        /* Use the vendor defined C22ext register for duplex settings */
-        if (ecmd->speed != SPEED_10000 && !ecmd->autoneg) {
-                reg = mdio_clause45_read(efx, phy_id, MDIO_MMD_C22EXT,
-                                         GPHY_XCONTROL_REG);
-                ecmd->duplex = (reg & (1 << GPHY_DUPLEX_LBN) ?
-                                DUPLEX_FULL : DUPLEX_HALF);
-        }
+        return mdio_clause45_set_settings(efx, ecmd);
 }
 
-static int sft9001_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
+static void sfx7101_set_npage_adv(struct efx_nic *efx, u32 advertising)
 {
-        int phy_id = efx->mii.phy_id;
-        int rc;
-
-        rc = mdio_clause45_set_settings(efx, ecmd);
-        if (rc)
-                return rc;
-
-        if (ecmd->speed != SPEED_10000 && !ecmd->autoneg)
-                mdio_clause45_set_flag(efx, phy_id, MDIO_MMD_C22EXT,
-                                       GPHY_XCONTROL_REG, GPHY_DUPLEX_LBN,
-                                       ecmd->duplex == DUPLEX_FULL);
-
-        return rc;
+        mdio_clause45_set_flag(efx, efx->mii.phy_id, MDIO_MMD_AN,
+                               MDIO_AN_10GBT_CTRL,
+                               MDIO_AN_10GBT_CTRL_ADV_10G_LBN,
+                               advertising & ADVERTISED_10000baseT_Full);
 }
 
-static bool sft9001_set_xnp_advertise(struct efx_nic *efx, u32 advertising)
+static void sft9001_set_npage_adv(struct efx_nic *efx, u32 advertising)
 {
-        int phy = efx->mii.phy_id;
-        int reg = mdio_clause45_read(efx, phy, MDIO_MMD_PMAPMD,
-                                     PMA_PMD_SPEED_ENABLE_REG);
-        bool enabled;
-
-        reg &= ~((1 << 2) | (1 << 3));
-        if (EFX_WORKAROUND_13204(efx) &&
-            (advertising & ADVERTISED_100baseT_Full))
-                reg |= 1 << PMA_PMD_100TX_ADV_LBN;
-        if (advertising & ADVERTISED_1000baseT_Full)
-                reg |= 1 << PMA_PMD_1000T_ADV_LBN;
-        if (advertising & ADVERTISED_10000baseT_Full)
-                reg |= 1 << PMA_PMD_10000T_ADV_LBN;
-        mdio_clause45_write(efx, phy, MDIO_MMD_PMAPMD,
-                            PMA_PMD_SPEED_ENABLE_REG, reg);
-
-        enabled = (advertising &
-                   (ADVERTISED_1000baseT_Half |
-                    ADVERTISED_1000baseT_Full |
-                    ADVERTISED_10000baseT_Full));
-        if (EFX_WORKAROUND_13204(efx))
-                enabled |= (advertising & ADVERTISED_100baseT_Full);
-        return enabled;
+        int phy_id = efx->mii.phy_id;
+
+        mdio_clause45_set_flag(efx, phy_id, MDIO_MMD_C22EXT,
+                               C22EXT_MSTSLV_CTRL,
+                               C22EXT_MSTSLV_CTRL_ADV_1000_FD_LBN,
+                               advertising & ADVERTISED_1000baseT_Full);
+        mdio_clause45_set_flag(efx, phy_id, MDIO_MMD_AN,
+                               MDIO_AN_10GBT_CTRL,
+                               MDIO_AN_10GBT_CTRL_ADV_10G_LBN,
+                               advertising & ADVERTISED_10000baseT_Full);
 }
 
 struct efx_phy_operations falcon_sfx7101_phy_ops = {
@@ -882,8 +822,9 @@ struct efx_phy_operations falcon_sfx7101_phy_ops = {
         .poll             = tenxpress_phy_poll,
         .fini             = tenxpress_phy_fini,
         .clear_interrupt  = efx_port_dummy_op_void,
-        .get_settings     = sfx7101_get_settings,
-        .set_settings     = mdio_clause45_set_settings,
+        .get_settings     = tenxpress_get_settings,
+        .set_settings     = tenxpress_set_settings,
+        .set_npage_adv    = sfx7101_set_npage_adv,
         .num_tests        = ARRAY_SIZE(sfx7101_test_names),
         .test_names       = sfx7101_test_names,
         .run_tests        = sfx7101_run_tests,
@@ -898,9 +839,9 @@ struct efx_phy_operations falcon_sft9001_phy_ops = {
         .poll             = tenxpress_phy_poll,
         .fini             = tenxpress_phy_fini,
         .clear_interrupt  = efx_port_dummy_op_void,
-        .get_settings     = sft9001_get_settings,
-        .set_settings     = sft9001_set_settings,
-        .set_xnp_advertise = sft9001_set_xnp_advertise,
+        .get_settings     = tenxpress_get_settings,
+        .set_settings     = tenxpress_set_settings,
+        .set_npage_adv    = sft9001_set_npage_adv,
         .num_tests        = ARRAY_SIZE(sft9001_test_names),
         .test_names       = sft9001_test_names,
         .run_tests        = sft9001_run_tests,
diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/sfc/workarounds.h
index 82e03e1d7371..78de68f4a95b 100644
--- a/drivers/net/sfc/workarounds.h
+++ b/drivers/net/sfc/workarounds.h
@@ -18,8 +18,8 @@
 #define EFX_WORKAROUND_ALWAYS(efx) 1
 #define EFX_WORKAROUND_FALCON_A(efx) (falcon_rev(efx) <= FALCON_REV_A1)
 #define EFX_WORKAROUND_10G(efx) EFX_IS10G(efx)
-#define EFX_WORKAROUND_SFX7101(efx) ((efx)->phy_type == PHY_TYPE_SFX7101)
-#define EFX_WORKAROUND_SFT9001A(efx) ((efx)->phy_type == PHY_TYPE_SFT9001A)
+#define EFX_WORKAROUND_SFT9001(efx) ((efx)->phy_type == PHY_TYPE_SFT9001A || \
+                                     (efx)->phy_type == PHY_TYPE_SFT9001B)
 
 /* XAUI resets if link not detected */
 #define EFX_WORKAROUND_5147 EFX_WORKAROUND_ALWAYS
@@ -29,8 +29,6 @@
 #define EFX_WORKAROUND_7884 EFX_WORKAROUND_10G
 /* TX pkt parser problem with <= 16 byte TXes */
 #define EFX_WORKAROUND_9141 EFX_WORKAROUND_ALWAYS
-/* Low rate CRC errors require XAUI reset */
-#define EFX_WORKAROUND_10750 EFX_WORKAROUND_SFX7101
 /* TX_EV_PKT_ERR can be caused by a dangling TX descriptor
  * or a PCIe error (bug 11028) */
 #define EFX_WORKAROUND_10727 EFX_WORKAROUND_ALWAYS
@@ -55,8 +53,8 @@
 #define EFX_WORKAROUND_8071 EFX_WORKAROUND_FALCON_A
 
 /* Need to send XNP pages for 100BaseT */
-#define EFX_WORKAROUND_13204 EFX_WORKAROUND_SFT9001A
-/* Need to keep AN enabled */
-#define EFX_WORKAROUND_13963 EFX_WORKAROUND_SFT9001A
+#define EFX_WORKAROUND_13204 EFX_WORKAROUND_SFT9001
+/* Don't restart AN in near-side loopback */
+#define EFX_WORKAROUND_15195 EFX_WORKAROUND_SFT9001
 
 #endif /* EFX_WORKAROUNDS_H */
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 3668e81e474d..994703cc0db3 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1403,9 +1403,6 @@ static int sky2_up(struct net_device *dev)
 
         }
 
-        if (netif_msg_ifup(sky2))
-                printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
-
         netif_carrier_off(dev);
 
         /* must be power of 2 */
@@ -1484,6 +1481,9 @@ static int sky2_up(struct net_device *dev)
         sky2_write32(hw, B0_IMSK, imask);
 
         sky2_set_multicast(dev);
+
+        if (netif_msg_ifup(sky2))
+                printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
         return 0;
 
 err_out:
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index bf3aa2a1effe..223cde0d43be 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -220,9 +220,9 @@ static void smc911x_reset(struct net_device *dev)
 
         /* make sure EEPROM has finished loading before setting GPIO_CFG */
         timeout=1000;
-        while ( timeout-- && (SMC_GET_E2P_CMD(lp) & E2P_CMD_EPC_BUSY_)) {
+        while (--timeout && (SMC_GET_E2P_CMD(lp) & E2P_CMD_EPC_BUSY_))
                 udelay(10);
-        }
+
         if (timeout == 0){
                 PRINTK("%s: smc911x_reset timeout waiting for EEPROM busy\n", dev->name);
                 return;
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index d801900a5036..a1e4b3895b33 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -498,7 +498,7 @@ static void smsc9420_check_mac_address(struct net_device *dev)
 static void smsc9420_stop_tx(struct smsc9420_pdata *pd)
 {
         u32 dmac_control, mac_cr, dma_intr_ena;
-        int timeOut = 1000;
+        int timeout = 1000;
 
         /* disable TX DMAC */
         dmac_control = smsc9420_reg_read(pd, DMAC_CONTROL);
@@ -506,13 +506,13 @@ static void smsc9420_stop_tx(struct smsc9420_pdata *pd)
         smsc9420_reg_write(pd, DMAC_CONTROL, dmac_control);
 
         /* Wait max 10ms for transmit process to stop */
-        while (timeOut--) {
+        while (--timeout) {
                 if (smsc9420_reg_read(pd, DMAC_STATUS) & DMAC_STS_TS_)
                         break;
                 udelay(10);
         }
 
-        if (!timeOut)
+        if (!timeout)
                 smsc_warn(IFDOWN, "TX DMAC failed to stop");
 
         /* ACK Tx DMAC stop bit */
@@ -596,7 +596,7 @@ static void smsc9420_free_rx_ring(struct smsc9420_pdata *pd)
 
 static void smsc9420_stop_rx(struct smsc9420_pdata *pd)
 {
-        int timeOut = 1000;
+        int timeout = 1000;
         u32 mac_cr, dmac_control, dma_intr_ena;
 
         /* mask RX DMAC interrupts */
@@ -617,13 +617,13 @@ static void smsc9420_stop_rx(struct smsc9420_pdata *pd)
         smsc9420_pci_flush_write(pd);
 
         /* wait up to 10ms for receive to stop */
-        while (timeOut--) {
+        while (--timeout) {
                 if (smsc9420_reg_read(pd, DMAC_STATUS) & DMAC_STS_RS_)
                         break;
                 udelay(10);
         }
 
-        if (!timeOut)
+        if (!timeout)
                 smsc_warn(IFDOWN, "RX DMAC did not stop! timeout.");
 
         /* ACK the Rx DMAC stop bit */
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 86c765d83de1..b17efa9cc530 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -148,7 +148,7 @@ static u16 __phy_read(struct gem *gp, int phy_addr, int reg)
         cmd |= (MIF_FRAME_TAMSB);
         writel(cmd, gp->regs + MIF_FRAME);
 
-        while (limit--) {
+        while (--limit) {
                 cmd = readl(gp->regs + MIF_FRAME);
                 if (cmd & MIF_FRAME_TALSB)
                         break;
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c
index 61843fd57525..78f8cee5fd74 100644
--- a/drivers/net/sungem_phy.c
+++ b/drivers/net/sungem_phy.c
@@ -79,7 +79,7 @@ static int reset_one_mii_phy(struct mii_phy* phy, int phy_id)
 
         udelay(100);
 
-        while (limit--) {
+        while (--limit) {
                 val = __phy_read(phy, phy_id, MII_BMCR);
                 if ((val & BMCR_RESET) == 0)
                         break;
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 6e8f377355fe..fe0c3f244562 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -227,7 +227,7 @@ static int qe_init(struct sunqe *qep, int from_irq)
         if (!(sbus_readb(mregs + MREGS_PHYCONFIG) & MREGS_PHYCONFIG_LTESTDIS)) {
                 int tries = 50;
 
-                while (tries--) {
+                while (--tries) {
                         u8 tmp;
 
                         mdelay(5);
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index 75461dbd4876..a9fd2b2ccaf6 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -1237,7 +1237,7 @@ static void tsi108_init_phy(struct net_device *dev)
         spin_lock_irqsave(&phy_lock, flags);
 
         tsi108_write_mii(data, MII_BMCR, BMCR_RESET);
-        while (i--){
+        while (--i) {
                 if(!(tsi108_read_mii(data, MII_BMCR) & BMCR_RESET))
                         break;
                 udelay(10);
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index d5d53b633cf8..0bf2114738be 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -392,7 +392,7 @@ static void de_rx (struct de_private *de)
         unsigned drop = 0;
         int rc;
 
-        while (rx_work--) {
+        while (--rx_work) {
                 u32 status, len;
                 dma_addr_t mapping;
                 struct sk_buff *skb, *copy_skb;
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 0d0fa91c0251..fe98acaead97 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -455,6 +455,7 @@ static const struct usb_device_id hso_ids[] = {
         {icon321_port_device(0x0af0, 0xd033)},  /* Icon-322 */
         {USB_DEVICE(0x0af0, 0x7301)},           /* GE40x */
         {USB_DEVICE(0x0af0, 0x7361)},           /* GE40x */
+        {USB_DEVICE(0x0af0, 0x7381)},           /* GE40x */
         {USB_DEVICE(0x0af0, 0x7401)},           /* GI 0401 */
         {USB_DEVICE(0x0af0, 0x7501)},           /* GTM 382 */
         {USB_DEVICE(0x0af0, 0x7601)},           /* GE40x */
@@ -462,7 +463,8 @@ static const struct usb_device_id hso_ids[] = {
         {USB_DEVICE(0x0af0, 0x7801)},
         {USB_DEVICE(0x0af0, 0x7901)},
         {USB_DEVICE(0x0af0, 0x7361)},
-        {icon321_port_device(0x0af0, 0xd051)},
+        {USB_DEVICE(0x0af0, 0xd057)},
+        {USB_DEVICE(0x0af0, 0xd055)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, hso_ids);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index b35c8813bef4..c01ea48da5fe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -4042,6 +4042,7 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
                 priv->is_open = 1;
         }
 
+        pci_save_state(pdev);
         pci_set_power_state(pdev, PCI_D3hot);
 
         return 0;
@@ -4052,6 +4053,7 @@ static int iwl_pci_resume(struct pci_dev *pdev)
         struct iwl_priv *priv = pci_get_drvdata(pdev);
 
         pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
 
         if (priv->is_open)
                 iwl_mac_start(priv->hw);
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 412f66bac1af..70a8b21ca39b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -480,6 +480,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv)
         priv->num_stations = 0;
         memset(priv->stations, 0, sizeof(priv->stations));
 
+        /* clean ucode key table bit map */
+        priv->ucode_key_table = 0;
+
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 }
 EXPORT_SYMBOL(iwl_clear_stations_table);
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 95d01984c80e..5b44d322b99f 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -8143,6 +8143,7 @@ static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state)
                 priv->is_open = 1;
         }
 
+        pci_save_state(pdev);
         pci_set_power_state(pdev, PCI_D3hot);
 
         return 0;
@@ -8153,6 +8154,7 @@ static int iwl3945_pci_resume(struct pci_dev *pdev)
         struct iwl3945_priv *priv = pci_get_drvdata(pdev);
 
         pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
 
         if (priv->is_open)
                 iwl3945_mac_start(priv->hw);
diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile
index e31fb91652ce..2aa117c8cd87 100644
--- a/drivers/pci/hotplug/Makefile
+++ b/drivers/pci/hotplug/Makefile
@@ -5,11 +5,15 @@
 obj-$(CONFIG_HOTPLUG_PCI)               += pci_hotplug.o
 obj-$(CONFIG_HOTPLUG_PCI_COMPAQ)        += cpqphp.o
 obj-$(CONFIG_HOTPLUG_PCI_IBM)           += ibmphp.o
+
+# pciehp should be linked before acpiphp in order to allow the native driver
+# to attempt to bind first. We can then fall back to generic support.
+
+obj-$(CONFIG_HOTPLUG_PCI_PCIE)          += pciehp.o
 obj-$(CONFIG_HOTPLUG_PCI_ACPI)          += acpiphp.o
 obj-$(CONFIG_HOTPLUG_PCI_ACPI_IBM)      += acpiphp_ibm.o
 obj-$(CONFIG_HOTPLUG_PCI_CPCI_ZT5550)   += cpcihp_zt5550.o
 obj-$(CONFIG_HOTPLUG_PCI_CPCI_GENERIC)  += cpcihp_generic.o
-obj-$(CONFIG_HOTPLUG_PCI_PCIE)          += pciehp.o
 obj-$(CONFIG_HOTPLUG_PCI_SHPC)          += shpchp.o
 obj-$(CONFIG_HOTPLUG_PCI_RPA)           += rpaphp.o
 obj-$(CONFIG_HOTPLUG_PCI_RPA_DLPAR)     += rpadlpar_io.o
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index b0e7de9e536d..d8649e127298 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -195,13 +195,13 @@ static void remove_slot_worker(struct work_struct *work)
  * Tries hard not to re-enable already existing devices;
  * also handles scanning of subfunctions.
  */
-static void pci_rescan_slot(struct pci_dev *temp)
+static int pci_rescan_slot(struct pci_dev *temp)
 {
         struct pci_bus *bus = temp->bus;
         struct pci_dev *dev;
         int func;
-        int retval;
         u8 hdr_type;
+        int count = 0;
 
         if (!pci_read_config_byte(temp, PCI_HEADER_TYPE, &hdr_type)) {
                 temp->hdr_type = hdr_type & 0x7f;
@@ -213,17 +213,12 @@ static void pci_rescan_slot(struct pci_dev *temp)
                                 dbg("New device on %s function %x:%x\n",
                                         bus->name, temp->devfn >> 3,
                                         temp->devfn & 7);
-                                retval = pci_bus_add_device(dev);
-                                if (retval)
-                                        dev_err(&dev->dev, "error adding "
-                                                "device, continuing.\n");
-                                else
-                                        add_slot(dev);
+                                count++;
                         }
                 }
                 /* multifunction device? */
                 if (!(hdr_type & 0x80))
-                        return;
+                        return count;
 
                 /* continue scanning for other functions */
                 for (func = 1, temp->devfn++; func < 8; func++, temp->devfn++) {
@@ -239,16 +234,13 @@ static void pci_rescan_slot(struct pci_dev *temp)
                                         dbg("New device on %s function %x:%x\n",
                                                 bus->name, temp->devfn >> 3,
                                                 temp->devfn & 7);
-                                        retval = pci_bus_add_device(dev);
-                                        if (retval)
-                                                dev_err(&dev->dev, "error adding "
-                                                        "device, continuing.\n");
-                                        else
-                                                add_slot(dev);
+                                        count++;
                                 }
                         }
                 }
         }
+
+        return count;
 }
 
 
@@ -262,6 +254,8 @@ static void pci_rescan_bus(const struct pci_bus *bus)
 {
         unsigned int devfn;
         struct pci_dev *dev;
+        int retval;
+        int found = 0;
         dev = alloc_pci_dev();
         if (!dev)
                 return;
@@ -270,7 +264,23 @@ static void pci_rescan_bus(const struct pci_bus *bus)
         dev->sysdata = bus->sysdata;
         for (devfn = 0; devfn < 0x100; devfn += 8) {
                 dev->devfn = devfn;
-                pci_rescan_slot(dev);
+                found += pci_rescan_slot(dev);
+        }
+
+        if (found) {
+                pci_bus_assign_resources(bus);
+                list_for_each_entry(dev, &bus->devices, bus_list) {
+                        /* Skip already-added devices */
+                        if (dev->is_added)
+                                        continue;
+                        retval = pci_bus_add_device(dev);
+                        if (retval)
+                                dev_err(&dev->dev,
+                                        "Error adding device, continuing\n");
+                        else
+                                add_slot(dev);
+                }
+                pci_bus_add_devices(bus);
         }
         kfree(dev);
 }
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 896a15d70f5b..44f15ff70c1d 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -103,6 +103,16 @@ static void msix_set_enable(struct pci_dev *dev, int enable)
         }
 }
 
+/*
+ * Essentially, this is ((1 << (1 << x)) - 1), but without the
+ * undefinedness of a << 32.
+ */
+static inline __attribute_const__ u32 msi_mask(unsigned x)
+{
+        static const u32 mask[] = { 1, 2, 4, 0xf, 0xff, 0xffff, 0xffffffff };
+        return mask[x];
+}
+
 static void msix_flush_writes(struct irq_desc *desc)
 {
         struct msi_desc *entry;
@@ -407,8 +417,7 @@ static int msi_capability_init(struct pci_dev *dev)
 
                 /* All MSIs are unmasked by default, Mask them all */
                 pci_read_config_dword(dev, base, &maskbits);
-                temp = (1 << multi_msi_capable(control));
-                temp = ((temp - 1) & ~temp);
+                temp = msi_mask((control & PCI_MSI_FLAGS_QMASK) >> 1);
                 maskbits |= temp;
                 pci_write_config_dword(dev, base, maskbits);
                 entry->msi_attrib.maskbits_mask = temp;
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 9de07b75b993..93eac1423585 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -355,6 +355,8 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
         int i = 0;
 
         if (drv && drv->suspend) {
+                pci_power_t prev = pci_dev->current_state;
+
                 pci_dev->state_saved = false;
 
                 i = drv->suspend(pci_dev, state);
@@ -365,8 +367,13 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
                 if (pci_dev->state_saved)
                         goto Fixup;
 
-                if (WARN_ON_ONCE(pci_dev->current_state != PCI_D0))
+                if (pci_dev->current_state != PCI_D0
+                    && pci_dev->current_state != PCI_UNKNOWN) {
+                        WARN_ONCE(pci_dev->current_state != prev,
+                                "PCI PM: Device state not saved by %pF\n",
+                                drv->suspend);
                         goto Fixup;
+                }
         }
 
         pci_save_state(pci_dev);
@@ -419,38 +426,24 @@ static int pci_legacy_resume(struct device *dev)
 static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev)
 {
         pci_restore_standard_config(pci_dev);
+        pci_dev->state_saved = false;
         pci_fixup_device(pci_fixup_resume_early, pci_dev);
 }
 
-static int pci_pm_default_resume(struct pci_dev *pci_dev)
+static void pci_pm_default_resume(struct pci_dev *pci_dev)
 {
         pci_fixup_device(pci_fixup_resume, pci_dev);
 
         if (!pci_is_bridge(pci_dev))
                 pci_enable_wake(pci_dev, PCI_D0, false);
-
-        return pci_pm_reenable_device(pci_dev);
-}
-
-static void pci_pm_default_suspend_generic(struct pci_dev *pci_dev)
-{
-        /* If device is enabled at this point, disable it */
-        pci_disable_enabled_device(pci_dev);
-        /*
-         * Save state with interrupts enabled, because in principle the bus the
-         * device is on may be put into a low power state after this code runs.
-         */
-        pci_save_state(pci_dev);
 }
 
 static void pci_pm_default_suspend(struct pci_dev *pci_dev)
 {
-        pci_pm_default_suspend_generic(pci_dev);
-
+        /* Disable non-bridge devices without PM support */
         if (!pci_is_bridge(pci_dev))
-                pci_prepare_to_sleep(pci_dev);
-
-        pci_fixup_device(pci_fixup_suspend, pci_dev);
+                pci_disable_enabled_device(pci_dev);
+        pci_save_state(pci_dev);
 }
 
 static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)
@@ -495,21 +488,49 @@ static void pci_pm_complete(struct device *dev)
 static int pci_pm_suspend(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
-        int error = 0;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_SUSPEND);
 
-        if (drv && drv->pm && drv->pm->suspend) {
-                error = drv->pm->suspend(dev);
-                suspend_report_result(drv->pm->suspend, error);
+        if (!pm) {
+                pci_pm_default_suspend(pci_dev);
+                goto Fixup;
         }
 
-        if (!error)
-                pci_pm_default_suspend(pci_dev);
+        pci_dev->state_saved = false;
 
-        return error;
+        if (pm->suspend) {
+                pci_power_t prev = pci_dev->current_state;
+                int error;
+
+                error = pm->suspend(dev);
+                suspend_report_result(pm->suspend, error);
+                if (error)
+                        return error;
+
+                if (pci_dev->state_saved)
+                        goto Fixup;
+
+                if (pci_dev->current_state != PCI_D0
+                    && pci_dev->current_state != PCI_UNKNOWN) {
+                        WARN_ONCE(pci_dev->current_state != prev,
+                                "PCI PM: State of device not saved by %pF\n",
+                                pm->suspend);
+                        goto Fixup;
+                }
+        }
+
+        if (!pci_dev->state_saved) {
+                pci_save_state(pci_dev);
+                if (!pci_is_bridge(pci_dev))
+                        pci_prepare_to_sleep(pci_dev);
+        }
+
+ Fixup:
+        pci_fixup_device(pci_fixup_suspend, pci_dev);
+
+        return 0;
 }
 
 static int pci_pm_suspend_noirq(struct device *dev)
@@ -552,18 +573,29 @@ static int pci_pm_resume_noirq(struct device *dev)
 static int pci_pm_resume(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
+        /*
+         * This is necessary for the suspend error path in which resume is
+         * called without restoring the standard config registers of the device.
+         */
+        if (pci_dev->state_saved)
+                pci_restore_standard_config(pci_dev);
+
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_resume(dev);
 
-        error = pci_pm_default_resume(pci_dev);
+        pci_pm_default_resume(pci_dev);
 
-        if (!error && drv && drv->pm && drv->pm->resume)
-                error = drv->pm->resume(dev);
+        if (pm) {
+                if (pm->resume)
+                        error = pm->resume(dev);
+        } else {
+                pci_pm_reenable_device(pci_dev);
+        }
 
-        return error;
+        return 0;
 }
 
 #else /* !CONFIG_SUSPEND */
@@ -580,21 +612,31 @@ static int pci_pm_resume(struct device *dev)
 static int pci_pm_freeze(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
-        int error = 0;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_FREEZE);
 
-        if (drv && drv->pm && drv->pm->freeze) {
-                error = drv->pm->freeze(dev);
-                suspend_report_result(drv->pm->freeze, error);
+        if (!pm) {
+                pci_pm_default_suspend(pci_dev);
+                return 0;
+        }
+
+        pci_dev->state_saved = false;
+
+        if (pm->freeze) {
+                int error;
+
+                error = pm->freeze(dev);
+                suspend_report_result(pm->freeze, error);
+                if (error)
+                        return error;
         }
 
-        if (!error)
-                pci_pm_default_suspend_generic(pci_dev);
+        if (!pci_dev->state_saved)
+                pci_save_state(pci_dev);
 
-        return error;
+        return 0;
 }
 
 static int pci_pm_freeze_noirq(struct device *dev)
@@ -637,16 +679,18 @@ static int pci_pm_thaw_noirq(struct device *dev)
 static int pci_pm_thaw(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_resume(dev);
 
-        pci_pm_reenable_device(pci_dev);
-
-        if (drv && drv->pm && drv->pm->thaw)
-                error =  drv->pm->thaw(dev);
+        if (pm) {
+                if (pm->thaw)
+                        error = pm->thaw(dev);
+        } else {
+                pci_pm_reenable_device(pci_dev);
+        }
 
         return error;
 }
@@ -654,19 +698,29 @@ static int pci_pm_thaw(struct device *dev)
 static int pci_pm_poweroff(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_HIBERNATE);
 
-        if (drv && drv->pm && drv->pm->poweroff) {
-                error = drv->pm->poweroff(dev);
-                suspend_report_result(drv->pm->poweroff, error);
+        if (!pm) {
+                pci_pm_default_suspend(pci_dev);
+                goto Fixup;
         }
 
-        if (!error)
-                pci_pm_default_suspend(pci_dev);
+        pci_dev->state_saved = false;
+
+        if (pm->poweroff) {
+                error = pm->poweroff(dev);
+                suspend_report_result(pm->poweroff, error);
+        }
+
+        if (!pci_dev->state_saved && !pci_is_bridge(pci_dev))
+                pci_prepare_to_sleep(pci_dev);
+
+ Fixup:
+        pci_fixup_device(pci_fixup_suspend, pci_dev);
 
         return error;
 }
@@ -707,16 +761,27 @@ static int pci_pm_restore_noirq(struct device *dev)
 static int pci_pm_restore(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
+        /*
+         * This is necessary for the hibernation error path in which restore is
+         * called without restoring the standard config registers of the device.
+         */
+        if (pci_dev->state_saved)
+                pci_restore_standard_config(pci_dev);
+
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_resume(dev);
 
-        error = pci_pm_default_resume(pci_dev);
+        pci_pm_default_resume(pci_dev);
 
-        if (!error && drv && drv->pm && drv->pm->restore)
-                error = drv->pm->restore(dev);
+        if (pm) {
+                if (pm->restore)
+                        error = pm->restore(dev);
+        } else {
+                pci_pm_reenable_device(pci_dev);
+        }
 
         return error;
 }
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index db7ec14fa719..dfc4e0ddf241 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -768,8 +768,8 @@ pci_read_rom(struct kobject *kobj, struct bin_attribute *bin_attr,
                 return -EINVAL;
         
         rom = pci_map_rom(pdev, &size); /* size starts out as PCI window size */
-        if (!rom)
-                return 0;
+        if (!rom || !size)
+                return -EIO;
                 
         if (off >= size)
                 count = 0;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 17bd9325a245..e3efe6b19ee7 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1393,35 +1393,35 @@ int pci_restore_standard_config(struct pci_dev *dev)
         pci_power_t prev_state;
         int error;
 
-        pci_restore_state(dev);
         pci_update_current_state(dev, PCI_D0);
 
         prev_state = dev->current_state;
         if (prev_state == PCI_D0)
-                return 0;
+                goto Restore;
 
         error = pci_raw_set_power_state(dev, PCI_D0, false);
         if (error)
                 return error;
 
-        if (pci_is_bridge(dev)) {
-                if (prev_state > PCI_D1)
-                        mdelay(PCI_PM_BUS_WAIT);
-        } else {
-                switch(prev_state) {
-                case PCI_D3cold:
-                case PCI_D3hot:
-                        mdelay(pci_pm_d3_delay);
-                        break;
-                case PCI_D2:
-                        udelay(PCI_PM_D2_DELAY);
-                        break;
-                }
+        /*
+         * This assumes that we won't get a bus in B2 or B3 from the BIOS, but
+         * we've made this assumption forever and it appears to be universally
+         * satisfied.
+         */
+        switch(prev_state) {
+        case PCI_D3cold:
+        case PCI_D3hot:
+                mdelay(pci_pm_d3_delay);
+                break;
+        case PCI_D2:
+                udelay(PCI_PM_D2_DELAY);
+                break;
         }
 
-        dev->current_state = PCI_D0;
+        pci_update_current_state(dev, PCI_D0);
 
-        return 0;
+ Restore:
+        return dev->state_saved ? pci_restore_state(dev) : 0;
 }
 
 /**
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 586b6f75910d..b0367f168af4 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -718,9 +718,9 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
 
         /*
          * All PCIe functions are in one slot, remove one function will remove
-         * the the whole slot, so just wait
+         * the whole slot, so just wait until we are the last function left.
          */
-        if (!list_empty(&parent->subordinate->devices))
+        if (!list_is_last(&pdev->bus_list, &parent->subordinate->devices))
                 goto out;
 
         /* All functions are removed, so just disable ASPM for the link */
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 99a914a027f8..f9b874eaeb9f 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -55,25 +55,13 @@ static int pcie_portdrv_suspend(struct pci_dev *dev, pm_message_t state)
 
 }
 
-static int pcie_portdrv_suspend_late(struct pci_dev *dev, pm_message_t state)
-{
-        return pci_save_state(dev);
-}
-
-static int pcie_portdrv_resume_early(struct pci_dev *dev)
-{
-        return pci_restore_state(dev);
-}
-
 static int pcie_portdrv_resume(struct pci_dev *dev)
 {
-        pcie_portdrv_restore_config(dev);
+        pci_set_master(dev);
         return pcie_port_device_resume(dev);
 }
 #else
 #define pcie_portdrv_suspend NULL
-#define pcie_portdrv_suspend_late NULL
-#define pcie_portdrv_resume_early NULL
 #define pcie_portdrv_resume NULL
 #endif
 
@@ -292,8 +280,6 @@ static struct pci_driver pcie_portdriver = {
         .remove         = pcie_portdrv_remove,
 
         .suspend        = pcie_portdrv_suspend,
-        .suspend_late   = pcie_portdrv_suspend_late,
-        .resume_early   = pcie_portdrv_resume_early,
         .resume         = pcie_portdrv_resume,
 
         .err_handler    = &pcie_portdrv_err_handler,
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 132a78159b60..29cbe47f219f 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -63,7 +63,7 @@ void pci_disable_rom(struct pci_dev *pdev)
  * The PCI window size could be much larger than the
  * actual image size.
  */
-size_t pci_get_rom_size(void __iomem *rom, size_t size)
+size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size)
 {
         void __iomem *image;
         int last_image;
@@ -72,8 +72,10 @@ size_t pci_get_rom_size(void __iomem *rom, size_t size)
         do {
                 void __iomem *pds;
                 /* Standard PCI ROMs start out with these bytes 55 AA */
-                if (readb(image) != 0x55)
+                if (readb(image) != 0x55) {
+                        dev_err(&pdev->dev, "Invalid ROM contents\n");
                         break;
+                }
                 if (readb(image + 1) != 0xAA)
                         break;
                 /* get the PCI data structure and check its signature */
@@ -159,7 +161,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
          * size is much larger than the actual size of the ROM.
          * True size is important if the ROM is going to be copied.
          */
-        *size = pci_get_rom_size(rom, *size);
+        *size = pci_get_rom_size(pdev, rom, *size);
         return rom;
 }
 
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 1a266d4ab5f1..94363115a42a 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -42,6 +42,7 @@ config ASUS_LAPTOP
         depends on LEDS_CLASS
         depends on NEW_LEDS
         depends on BACKLIGHT_CLASS_DEVICE
+        depends on INPUT
         ---help---
           This is the new Linux driver for Asus laptops. It may also support some
           MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 8fb8b3591048..56af6cf385b0 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -46,6 +46,7 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
 #include <asm/uaccess.h>
+#include <linux/input.h>
 
 #define ASUS_LAPTOP_VERSION "0.42"
 
@@ -181,6 +182,8 @@ struct asus_hotk {
         u8 light_level;         //light sensor level
         u8 light_switch;        //light sensor switch value
         u16 event_count[128];   //count for each event TODO make this better
+        struct input_dev *inputdev;
+        u16 *keycode_map;
 };
 
 /*
@@ -250,6 +253,37 @@ ASUS_LED(rled, "record");
 ASUS_LED(pled, "phone");
 ASUS_LED(gled, "gaming");
 
+struct key_entry {
+        char type;
+        u8 code;
+        u16 keycode;
+};
+
+enum { KE_KEY, KE_END };
+
+static struct key_entry asus_keymap[] = {
+        {KE_KEY, 0x30, KEY_VOLUMEUP},
+        {KE_KEY, 0x31, KEY_VOLUMEDOWN},
+        {KE_KEY, 0x32, KEY_MUTE},
+        {KE_KEY, 0x33, KEY_SWITCHVIDEOMODE},
+        {KE_KEY, 0x34, KEY_SWITCHVIDEOMODE},
+        {KE_KEY, 0x40, KEY_PREVIOUSSONG},
+        {KE_KEY, 0x41, KEY_NEXTSONG},
+        {KE_KEY, 0x43, KEY_STOP},
+        {KE_KEY, 0x45, KEY_PLAYPAUSE},
+        {KE_KEY, 0x50, KEY_EMAIL},
+        {KE_KEY, 0x51, KEY_WWW},
+        {KE_KEY, 0x5C, BTN_EXTRA},  /* Performance */
+        {KE_KEY, 0x5D, KEY_WLAN},
+        {KE_KEY, 0x61, KEY_SWITCHVIDEOMODE},
+        {KE_KEY, 0x6B, BTN_TOUCH}, /* Lock Mouse */
+        {KE_KEY, 0x82, KEY_CAMERA},
+        {KE_KEY, 0x8A, KEY_TV},
+        {KE_KEY, 0x95, KEY_MEDIA},
+        {KE_KEY, 0x99, KEY_PHONE},
+        {KE_END, 0},
+};
+
 /*
  * This function evaluates an ACPI method, given an int as parameter, the
  * method is searched within the scope of the handle, can be NULL. The output
@@ -720,8 +754,68 @@ static ssize_t store_gps(struct device *dev, struct device_attribute *attr,
         return store_status(buf, count, NULL, GPS_ON);
 }
 
+/*
+ * Hotkey functions
+ */
+static struct key_entry *asus_get_entry_by_scancode(int code)
+{
+        struct key_entry *key;
+
+        for (key = asus_keymap; key->type != KE_END; key++)
+                if (code == key->code)
+                        return key;
+
+        return NULL;
+}
+
+static struct key_entry *asus_get_entry_by_keycode(int code)
+{
+        struct key_entry *key;
+
+        for (key = asus_keymap; key->type != KE_END; key++)
+                if (code == key->keycode && key->type == KE_KEY)
+                        return key;
+
+        return NULL;
+}
+
+static int asus_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+{
+        struct key_entry *key = asus_get_entry_by_scancode(scancode);
+
+        if (key && key->type == KE_KEY) {
+                *keycode = key->keycode;
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
+static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode)
+{
+        struct key_entry *key;
+        int old_keycode;
+
+        if (keycode < 0 || keycode > KEY_MAX)
+                return -EINVAL;
+
+        key = asus_get_entry_by_scancode(scancode);
+        if (key && key->type == KE_KEY) {
+                old_keycode = key->keycode;
+                key->keycode = keycode;
+                set_bit(keycode, dev->keybit);
+                if (!asus_get_entry_by_keycode(old_keycode))
+                        clear_bit(old_keycode, dev->keybit);
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
 static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
 {
+        static struct key_entry *key;
+
         /* TODO Find a better way to handle events count. */
         if (!hotk)
                 return;
@@ -738,10 +832,24 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
                 lcd_blank(FB_BLANK_POWERDOWN);
         }
 
-        acpi_bus_generate_proc_event(hotk->device, event,
-                                hotk->event_count[event % 128]++);
-
-        return;
+        acpi_bus_generate_netlink_event(hotk->device->pnp.device_class,
+                                        dev_name(&hotk->device->dev), event,
+                                        hotk->event_count[event % 128]++);
+
+        if (hotk->inputdev) {
+                key = asus_get_entry_by_scancode(event);
+                if (!key)
+                        return ;
+
+                switch (key->type) {
+                case KE_KEY:
+                        input_report_key(hotk->inputdev, key->keycode, 1);
+                        input_sync(hotk->inputdev);
+                        input_report_key(hotk->inputdev, key->keycode, 0);
+                        input_sync(hotk->inputdev);
+                        break;
+                }
+        }
 }
 
 #define ASUS_CREATE_DEVICE_ATTR(_name)                                  \
@@ -959,6 +1067,38 @@ static int asus_hotk_get_info(void)
         return AE_OK;
 }
 
+static int asus_input_init(void)
+{
+        const struct key_entry *key;
+        int result;
+
+        hotk->inputdev = input_allocate_device();
+        if (!hotk->inputdev) {
+                printk(ASUS_INFO "Unable to allocate input device\n");
+                return 0;
+        }
+        hotk->inputdev->name = "Asus Laptop extra buttons";
+        hotk->inputdev->phys = ASUS_HOTK_FILE "/input0";
+        hotk->inputdev->id.bustype = BUS_HOST;
+        hotk->inputdev->getkeycode = asus_getkeycode;
+        hotk->inputdev->setkeycode = asus_setkeycode;
+
+        for (key = asus_keymap; key->type != KE_END; key++) {
+                switch (key->type) {
+                case KE_KEY:
+                        set_bit(EV_KEY, hotk->inputdev->evbit);
+                        set_bit(key->keycode, hotk->inputdev->keybit);
+                        break;
+                }
+        }
+        result = input_register_device(hotk->inputdev);
+        if (result) {
+                printk(ASUS_INFO "Unable to register input device\n");
+                input_free_device(hotk->inputdev);
+        }
+        return result;
+}
+
 static int asus_hotk_check(void)
 {
         int result = 0;
@@ -1044,7 +1184,7 @@ static int asus_hotk_add(struct acpi_device *device)
         /* GPS is on by default */
         write_status(NULL, 1, GPS_ON);
 
-      end:
+end:
         if (result) {
                 kfree(hotk->name);
                 kfree(hotk);
@@ -1091,10 +1231,17 @@ static void asus_led_exit(void)
         ASUS_LED_UNREGISTER(gled);
 }
 
+static void asus_input_exit(void)
+{
+        if (hotk->inputdev)
+                input_unregister_device(hotk->inputdev);
+}
+
 static void __exit asus_laptop_exit(void)
 {
         asus_backlight_exit();
         asus_led_exit();
+        asus_input_exit();
 
         acpi_bus_unregister_driver(&asus_hotk_driver);
         sysfs_remove_group(&asuspf_device->dev.kobj, &asuspf_attribute_group);
@@ -1216,6 +1363,10 @@ static int __init asus_laptop_init(void)
                 printk(ASUS_INFO "Brightness ignored, must be controlled by "
                        "ACPI video driver\n");
 
+        result = asus_input_init();
+        if (result)
+                goto fail_input;
+
         result = asus_led_init(dev);
         if (result)
                 goto fail_led;
@@ -1242,22 +1393,25 @@ static int __init asus_laptop_init(void)
 
         return 0;
 
-      fail_sysfs:
+fail_sysfs:
         platform_device_del(asuspf_device);
 
-      fail_platform_device2:
+fail_platform_device2:
         platform_device_put(asuspf_device);
 
-      fail_platform_device1:
+fail_platform_device1:
         platform_driver_unregister(&asuspf_driver);
 
-      fail_platform_driver:
+fail_platform_driver:
         asus_led_exit();
 
-      fail_led:
+fail_led:
+        asus_input_exit();
+
+fail_input:
         asus_backlight_exit();
 
-      fail_backlight:
+fail_backlight:
 
         return result;
 }
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index 1e74988c7b2d..d63f26e666a4 100644
--- a/drivers/platform/x86/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
@@ -143,6 +143,7 @@ struct asus_hotk {
                                                          S1300N, S5200N*/
                 A4S,            /* Z81sp */
                 F3Sa,           /* (Centrino) */
+                R1F,
                 END_MODEL
         } model;                /* Models currently supported */
         u16 event_count[128];   /* Count for each event TODO make this better */
@@ -420,7 +421,18 @@ static struct model_data model_conf[END_MODEL] = {
                 .display_get    = "\\ADVG",
                 .display_set    = "SDSP",
         },
-
+        {
+                .name = "R1F",
+                .mt_bt_switch = "BLED",
+                .mt_mled = "MLED",
+                .mt_wled = "WLED",
+                .mt_lcd_switch = "\\Q10",
+                .lcd_status = "\\GP06",
+                .brightness_set = "SPLV",
+                .brightness_get = "GPLV",
+                .display_set = "SDSP",
+                .display_get = "\\INFB"
+        }
 };
 
 /* procdir we use */
@@ -1165,6 +1177,8 @@ static int asus_model_match(char *model)
                 return W3V;
         else if (strncmp(model, "W5A", 3) == 0)
                 return W5A;
+        else if (strncmp(model, "R1F", 3) == 0)
+                return R1F;
         else if (strncmp(model, "A4S", 3) == 0)
                 return A4S;
         else if (strncmp(model, "F3Sa", 4) == 0)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 9d93cb971e59..786ed8661cb0 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -30,6 +30,7 @@
 #include <linux/uaccess.h>
 #include <linux/input.h>
 #include <linux/rfkill.h>
+#include <linux/pci.h>
 
 #define EEEPC_LAPTOP_VERSION    "0.1"
 
@@ -161,6 +162,10 @@ static struct key_entry eeepc_keymap[] = {
         {KE_KEY, 0x13, KEY_MUTE },
         {KE_KEY, 0x14, KEY_VOLUMEDOWN },
         {KE_KEY, 0x15, KEY_VOLUMEUP },
+        {KE_KEY, 0x1a, KEY_COFFEE },
+        {KE_KEY, 0x1b, KEY_ZOOM },
+        {KE_KEY, 0x1c, KEY_PROG2 },
+        {KE_KEY, 0x1d, KEY_PROG3 },
         {KE_KEY, 0x30, KEY_SWITCHVIDEOMODE },
         {KE_KEY, 0x31, KEY_SWITCHVIDEOMODE },
         {KE_KEY, 0x32, KEY_SWITCHVIDEOMODE },
@@ -510,7 +515,43 @@ static int eeepc_hotk_check(void)
 static void notify_brn(void)
 {
         struct backlight_device *bd = eeepc_backlight_device;
-        bd->props.brightness = read_brightness(bd);
+        if (bd)
+                bd->props.brightness = read_brightness(bd);
+}
+
+static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
+{
+        struct pci_dev *dev;
+        struct pci_bus *bus = pci_find_bus(0, 1);
+
+        if (event != ACPI_NOTIFY_BUS_CHECK)
+                return;
+
+        if (!bus) {
+                printk(EEEPC_WARNING "Unable to find PCI bus 1?\n");
+                return;
+        }
+
+        if (get_acpi(CM_ASL_WLAN) == 1) {
+                dev = pci_get_slot(bus, 0);
+                if (dev) {
+                        /* Device already present */
+                        pci_dev_put(dev);
+                        return;
+                }
+                dev = pci_scan_single_device(bus, 0);
+                if (dev) {
+                        pci_bus_assign_resources(bus);
+                        if (pci_bus_add_device(dev))
+                                printk(EEEPC_ERR "Unable to hotplug wifi\n");
+                }
+        } else {
+                dev = pci_get_slot(bus, 0);
+                if (dev) {
+                        pci_remove_bus_device(dev);
+                        pci_dev_put(dev);
+                }
+        }
 }
 
 static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
@@ -520,8 +561,9 @@ static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
                 return;
         if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX)
                 notify_brn();
-        acpi_bus_generate_proc_event(ehotk->device, event,
-                                     ehotk->event_count[event % 128]++);
+        acpi_bus_generate_netlink_event(ehotk->device->pnp.device_class,
+                                        dev_name(&ehotk->device->dev), event,
+                                        ehotk->event_count[event % 128]++);
         if (ehotk->inputdev) {
                 key = eepc_get_entry_by_scancode(event);
                 if (key) {
@@ -539,6 +581,45 @@ static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
         }
 }
 
+static int eeepc_register_rfkill_notifier(char *node)
+{
+        acpi_status status = AE_OK;
+        acpi_handle handle;
+
+        status = acpi_get_handle(NULL, node, &handle);
+
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_install_notify_handler(handle,
+                                                     ACPI_SYSTEM_NOTIFY,
+                                                     eeepc_rfkill_notify,
+                                                     NULL);
+                if (ACPI_FAILURE(status))
+                        printk(EEEPC_WARNING
+                               "Failed to register notify on %s\n", node);
+        } else
+                return -ENODEV;
+
+        return 0;
+}
+
+static void eeepc_unregister_rfkill_notifier(char *node)
+{
+        acpi_status status = AE_OK;
+        acpi_handle handle;
+
+        status = acpi_get_handle(NULL, node, &handle);
+
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_remove_notify_handler(handle,
+                                                     ACPI_SYSTEM_NOTIFY,
+                                                     eeepc_rfkill_notify);
+                if (ACPI_FAILURE(status))
+                        printk(EEEPC_ERR
+                               "Error removing rfkill notify handler %s\n",
+                                node);
+        }
+}
+
 static int eeepc_hotk_add(struct acpi_device *device)
 {
         acpi_status status = AE_OK;
@@ -558,7 +639,7 @@ static int eeepc_hotk_add(struct acpi_device *device)
         ehotk->device = device;
         result = eeepc_hotk_check();
         if (result)
-                goto end;
+                goto ehotk_fail;
         status = acpi_install_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
                                              eeepc_hotk_notify, ehotk);
         if (ACPI_FAILURE(status))
@@ -569,18 +650,25 @@ static int eeepc_hotk_add(struct acpi_device *device)
                                                            RFKILL_TYPE_WLAN);
 
                 if (!ehotk->eeepc_wlan_rfkill)
-                        goto end;
+                        goto wlan_fail;
 
                 ehotk->eeepc_wlan_rfkill->name = "eeepc-wlan";
                 ehotk->eeepc_wlan_rfkill->toggle_radio = eeepc_wlan_rfkill_set;
                 ehotk->eeepc_wlan_rfkill->get_state = eeepc_wlan_rfkill_state;
-                if (get_acpi(CM_ASL_WLAN) == 1)
+                if (get_acpi(CM_ASL_WLAN) == 1) {
                         ehotk->eeepc_wlan_rfkill->state =
                                 RFKILL_STATE_UNBLOCKED;
-                else
+                        rfkill_set_default(RFKILL_TYPE_WLAN,
+                                           RFKILL_STATE_UNBLOCKED);
+                } else {
                         ehotk->eeepc_wlan_rfkill->state =
                                 RFKILL_STATE_SOFT_BLOCKED;
-                rfkill_register(ehotk->eeepc_wlan_rfkill);
+                        rfkill_set_default(RFKILL_TYPE_WLAN,
+                                           RFKILL_STATE_SOFT_BLOCKED);
+                }
+                result = rfkill_register(ehotk->eeepc_wlan_rfkill);
+                if (result)
+                        goto wlan_fail;
         }
 
         if (get_acpi(CM_ASL_BLUETOOTH) != -1) {
@@ -588,27 +676,47 @@ static int eeepc_hotk_add(struct acpi_device *device)
                         rfkill_allocate(&device->dev, RFKILL_TYPE_BLUETOOTH);
 
                 if (!ehotk->eeepc_bluetooth_rfkill)
-                        goto end;
+                        goto bluetooth_fail;
 
                 ehotk->eeepc_bluetooth_rfkill->name = "eeepc-bluetooth";
                 ehotk->eeepc_bluetooth_rfkill->toggle_radio =
                         eeepc_bluetooth_rfkill_set;
                 ehotk->eeepc_bluetooth_rfkill->get_state =
                         eeepc_bluetooth_rfkill_state;
-                if (get_acpi(CM_ASL_BLUETOOTH) == 1)
+                if (get_acpi(CM_ASL_BLUETOOTH) == 1) {
                         ehotk->eeepc_bluetooth_rfkill->state =
                                 RFKILL_STATE_UNBLOCKED;
-                else
+                        rfkill_set_default(RFKILL_TYPE_BLUETOOTH,
+                                           RFKILL_STATE_UNBLOCKED);
+                } else {
                         ehotk->eeepc_bluetooth_rfkill->state =
                                 RFKILL_STATE_SOFT_BLOCKED;
-                rfkill_register(ehotk->eeepc_bluetooth_rfkill);
-        }
+                        rfkill_set_default(RFKILL_TYPE_BLUETOOTH,
+                                           RFKILL_STATE_SOFT_BLOCKED);
+                }
 
- end:
-        if (result) {
-                kfree(ehotk);
-                ehotk = NULL;
+                result = rfkill_register(ehotk->eeepc_bluetooth_rfkill);
+                if (result)
+                        goto bluetooth_fail;
         }
+
+        eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
+        eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
+
+        return 0;
+
+ bluetooth_fail:
+        if (ehotk->eeepc_bluetooth_rfkill)
+                rfkill_free(ehotk->eeepc_bluetooth_rfkill);
+        rfkill_unregister(ehotk->eeepc_wlan_rfkill);
+        ehotk->eeepc_wlan_rfkill = NULL;
+ wlan_fail:
+        if (ehotk->eeepc_wlan_rfkill)
+                rfkill_free(ehotk->eeepc_wlan_rfkill);
+ ehotk_fail:
+        kfree(ehotk);
+        ehotk = NULL;
+
         return result;
 }
 
@@ -622,6 +730,10 @@ static int eeepc_hotk_remove(struct acpi_device *device, int type)
                                             eeepc_hotk_notify);
         if (ACPI_FAILURE(status))
                 printk(EEEPC_ERR "Error removing notify handler\n");
+
+        eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
+        eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
+
         kfree(ehotk);
         return 0;
 }
@@ -737,13 +849,21 @@ static void eeepc_backlight_exit(void)
 {
         if (eeepc_backlight_device)
                 backlight_device_unregister(eeepc_backlight_device);
-        if (ehotk->inputdev)
-                input_unregister_device(ehotk->inputdev);
+        eeepc_backlight_device = NULL;
+}
+
+static void eeepc_rfkill_exit(void)
+{
         if (ehotk->eeepc_wlan_rfkill)
                 rfkill_unregister(ehotk->eeepc_wlan_rfkill);
         if (ehotk->eeepc_bluetooth_rfkill)
                 rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
-        eeepc_backlight_device = NULL;
+}
+
+static void eeepc_input_exit(void)
+{
+        if (ehotk->inputdev)
+                input_unregister_device(ehotk->inputdev);
 }
 
 static void eeepc_hwmon_exit(void)
@@ -762,6 +882,8 @@ static void eeepc_hwmon_exit(void)
 static void __exit eeepc_laptop_exit(void)
 {
         eeepc_backlight_exit();
+        eeepc_rfkill_exit();
+        eeepc_input_exit();
         eeepc_hwmon_exit();
         acpi_bus_unregister_driver(&eeepc_hotk_driver);
         sysfs_remove_group(&platform_device->dev.kobj,
@@ -865,6 +987,8 @@ fail_platform_driver:
 fail_hwmon:
         eeepc_backlight_exit();
 fail_backlight:
+        eeepc_input_exit();
+        eeepc_rfkill_exit();
         return result;
 }
 
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index de91ddab0a86..f41135f2fb29 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -463,9 +463,11 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
 
         return 0;
 register_wwan_err:
-        rfkill_unregister(bluetooth_rfkill);
+        if (bluetooth_rfkill)
+                rfkill_unregister(bluetooth_rfkill);
 register_bluetooth_error:
-        rfkill_unregister(wifi_rfkill);
+        if (wifi_rfkill)
+                rfkill_unregister(wifi_rfkill);
 add_sysfs_error:
         cleanup_sysfs(device);
         return err;
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index f30db367c82e..c47a44dcb702 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -507,7 +507,7 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc)
 
         hkey_num = result & 0xf;
 
-        if (hkey_num < 0 || hkey_num > ARRAY_SIZE(pcc->keymap)) {
+        if (hkey_num < 0 || hkey_num >= ARRAY_SIZE(pcc->keymap)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "hotkey number out of range: %d\n",
                                   hkey_num));
diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c
index 366565aba865..c175e38a4cd5 100644
--- a/drivers/regulator/bq24022.c
+++ b/drivers/regulator/bq24022.c
@@ -152,11 +152,7 @@ static void __exit bq24022_exit(void)
         platform_driver_unregister(&bq24022_driver);
 }
 
-/*
- * make sure this is probed before gpio_vbus and pda_power,
- * but after asic3 or other GPIO expander drivers.
- */
-subsys_initcall(bq24022_init);
+module_init(bq24022_init);
 module_exit(bq24022_exit);
 
 MODULE_AUTHOR("Philipp Zabel");
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index 7aa35248181b..5056e23e4414 100644
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -1435,7 +1435,7 @@ int wm8350_register_led(struct wm8350 *wm8350, int lednum, int dcdc, int isink,
         struct platform_device *pdev;
         int ret;
 
-        if (lednum > ARRAY_SIZE(wm8350->pmic.led) || lednum < 0) {
+        if (lednum >= ARRAY_SIZE(wm8350->pmic.led) || lednum < 0) {
                 dev_err(wm8350->dev, "Invalid LED index %d\n", lednum);
                 return -ENODEV;
         }
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index cced4d108319..81450fbd8b12 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -241,6 +241,12 @@ config RTC_DRV_M41T80_WDT
           If you say Y here you will get support for the
           watchdog timer in the ST M41T60 and M41T80 RTC chips series.
 
+config RTC_DRV_DM355EVM
+        tristate "TI DaVinci DM355 EVM RTC"
+        depends on MFD_DM355EVM_MSP
+        help
+          Supports the RTC firmware in the MSP430 on the DM355 EVM.
+
 config RTC_DRV_TWL92330
         boolean "TI TWL92330/Menelaus"
         depends on MENELAUS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 6e28021abb9d..0e697aa51caa 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_RTC_DRV_AT91SAM9)	+= rtc-at91sam9.o
 obj-$(CONFIG_RTC_DRV_AU1XXX)    += rtc-au1xxx.o
 obj-$(CONFIG_RTC_DRV_BFIN)      += rtc-bfin.o
 obj-$(CONFIG_RTC_DRV_CMOS)      += rtc-cmos.o
+obj-$(CONFIG_RTC_DRV_DM355EVM)  += rtc-dm355evm.o
 obj-$(CONFIG_RTC_DRV_DS1216)    += rtc-ds1216.o
 obj-$(CONFIG_RTC_DRV_DS1286)    += rtc-ds1286.o
 obj-$(CONFIG_RTC_DRV_DS1302)    += rtc-ds1302.o
diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
new file mode 100644
index 000000000000..58d4e18530da
--- /dev/null
+++ b/drivers/rtc/rtc-dm355evm.c
@@ -0,0 +1,175 @@
+/*
+ * rtc-dm355evm.c - access battery-backed counter in MSP430 firmware
+ *
+ * Copyright (c) 2008 by David Brownell
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+
+#include <linux/i2c/dm355evm_msp.h>
+
+
+/*
+ * The MSP430 firmware on the DM355 EVM uses a watch crystal to feed
+ * a 1 Hz counter.  When a backup battery is supplied, that makes a
+ * reasonable RTC for applications where alarms and non-NTP drift
+ * compensation aren't important.
+ *
+ * The only real glitch is the inability to read or write all four
+ * counter bytes atomically:  the count may increment in the middle
+ * of an operation, causing trouble when the LSB rolls over.
+ *
+ * This driver was tested with firmware revision A4.
+ */
+union evm_time {
+        u8      bytes[4];
+        u32     value;
+};
+
+static int dm355evm_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        union evm_time  time;
+        int             status;
+        int             tries = 0;
+
+        do {
+                /*
+                 * Read LSB(0) to MSB(3) bytes.  Defend against the counter
+                 * rolling over by re-reading until the value is stable,
+                 * and assuming the four reads take at most a few seconds.
+                 */
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_0);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[0] == status)
+                        break;
+                time.bytes[0] = status;
+
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_1);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[1] == status)
+                        break;
+                time.bytes[1] = status;
+
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_2);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[2] == status)
+                        break;
+                time.bytes[2] = status;
+
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_3);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[3] == status)
+                        break;
+                time.bytes[3] = status;
+
+        } while (++tries < 5);
+
+        dev_dbg(dev, "read timestamp %08x\n", time.value);
+
+        rtc_time_to_tm(le32_to_cpu(time.value), tm);
+        return 0;
+}
+
+static int dm355evm_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        union evm_time  time;
+        unsigned long   value;
+        int             status;
+
+        rtc_tm_to_time(tm, &value);
+        time.value = cpu_to_le32(value);
+
+        dev_dbg(dev, "write timestamp %08x\n", time.value);
+
+        /*
+         * REVISIT handle non-atomic writes ... maybe just retry until
+         * byte[1] sticks (no rollover)?
+         */
+        status = dm355evm_msp_write(time.bytes[0], DM355EVM_MSP_RTC_0);
+        if (status < 0)
+                return status;
+
+        status = dm355evm_msp_write(time.bytes[1], DM355EVM_MSP_RTC_1);
+        if (status < 0)
+                return status;
+
+        status = dm355evm_msp_write(time.bytes[2], DM355EVM_MSP_RTC_2);
+        if (status < 0)
+                return status;
+
+        status = dm355evm_msp_write(time.bytes[3], DM355EVM_MSP_RTC_3);
+        if (status < 0)
+                return status;
+
+        return 0;
+}
+
+static struct rtc_class_ops dm355evm_rtc_ops = {
+        .read_time      = dm355evm_rtc_read_time,
+        .set_time       = dm355evm_rtc_set_time,
+};
+
+/*----------------------------------------------------------------------*/
+
+static int __devinit dm355evm_rtc_probe(struct platform_device *pdev)
+{
+        struct rtc_device *rtc;
+
+        rtc = rtc_device_register(pdev->name,
+                                  &pdev->dev, &dm355evm_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc)) {
+                dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
+                        PTR_ERR(rtc));
+                return PTR_ERR(rtc);
+        }
+        platform_set_drvdata(pdev, rtc);
+
+        return 0;
+}
+
+static int __devexit dm355evm_rtc_remove(struct platform_device *pdev)
+{
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
+
+        rtc_device_unregister(rtc);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+
+/*
+ * I2C is used to talk to the MSP430, but this platform device is
+ * exposed by an MFD driver that manages I2C communications.
+ */
+static struct platform_driver rtc_dm355evm_driver = {
+        .probe          = dm355evm_rtc_probe,
+        .remove         = __devexit_p(dm355evm_rtc_remove),
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "rtc-dm355evm",
+        },
+};
+
+static int __init dm355evm_rtc_init(void)
+{
+        return platform_driver_register(&rtc_dm355evm_driver);
+}
+module_init(dm355evm_rtc_init);
+
+static void __exit dm355evm_rtc_exit(void)
+{
+        platform_driver_unregister(&rtc_dm355evm_driver);
+}
+module_exit(dm355evm_rtc_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c
index e54b5c619bdf..e01b955db077 100644
--- a/drivers/rtc/rtc-ds1390.c
+++ b/drivers/rtc/rtc-ds1390.c
@@ -122,7 +122,6 @@ static const struct rtc_class_ops ds1390_rtc_ops = {
 
 static int __devinit ds1390_probe(struct spi_device *spi)
 {
-        struct rtc_device *rtc;
         unsigned char tmp;
         struct ds1390 *chip;
         int res;
diff --git a/drivers/usb/host/whci/asl.c b/drivers/usb/host/whci/asl.c
index 577c0d29849d..2291c5f5af51 100644
--- a/drivers/usb/host/whci/asl.c
+++ b/drivers/usb/host/whci/asl.c
@@ -170,12 +170,17 @@ void asl_stop(struct whc *whc)
 void asl_update(struct whc *whc, uint32_t wusbcmd)
 {
         struct wusbhc *wusbhc = &whc->wusbhc;
+        long t;
 
         mutex_lock(&wusbhc->mutex);
         if (wusbhc->active) {
                 whc_write_wusbcmd(whc, wusbcmd, wusbcmd);
-                wait_event(whc->async_list_wq,
-                           (le_readl(whc->base + WUSBCMD) & WUSBCMD_ASYNC_UPDATED) == 0);
+                t = wait_event_timeout(
+                        whc->async_list_wq,
+                        (le_readl(whc->base + WUSBCMD) & WUSBCMD_ASYNC_UPDATED) == 0,
+                        msecs_to_jiffies(1000));
+                if (t == 0)
+                        whc_hw_error(whc, "ASL update timeout");
         }
         mutex_unlock(&wusbhc->mutex);
 }
diff --git a/drivers/usb/host/whci/hw.c b/drivers/usb/host/whci/hw.c
index d498e7203217..6afa2e379160 100644
--- a/drivers/usb/host/whci/hw.c
+++ b/drivers/usb/host/whci/hw.c
@@ -87,3 +87,18 @@ out:
 
         return ret;
 }
+
+/**
+ * whc_hw_error - recover from a hardware error
+ * @whc:    the WHCI HC that broke.
+ * @reason: a description of the failure.
+ *
+ * Recover from broken hardware with a full reset.
+ */
+void whc_hw_error(struct whc *whc, const char *reason)
+{
+        struct wusbhc *wusbhc = &whc->wusbhc;
+
+        dev_err(&whc->umc->dev, "hardware error: %s\n", reason);
+        wusbhc_reset_all(wusbhc);
+}
diff --git a/drivers/usb/host/whci/pzl.c b/drivers/usb/host/whci/pzl.c
index 2ae5abf69a6a..7dc85a0bee7c 100644
--- a/drivers/usb/host/whci/pzl.c
+++ b/drivers/usb/host/whci/pzl.c
@@ -183,12 +183,17 @@ void pzl_stop(struct whc *whc)
 void pzl_update(struct whc *whc, uint32_t wusbcmd)
 {
         struct wusbhc *wusbhc = &whc->wusbhc;
+        long t;
 
         mutex_lock(&wusbhc->mutex);
         if (wusbhc->active) {
                 whc_write_wusbcmd(whc, wusbcmd, wusbcmd);
-                wait_event(whc->periodic_list_wq,
-                           (le_readl(whc->base + WUSBCMD) & WUSBCMD_PERIODIC_UPDATED) == 0);
+                t = wait_event_timeout(
+                        whc->periodic_list_wq,
+                        (le_readl(whc->base + WUSBCMD) & WUSBCMD_PERIODIC_UPDATED) == 0,
+                        msecs_to_jiffies(1000));
+                if (t == 0)
+                        whc_hw_error(whc, "PZL update timeout");
         }
         mutex_unlock(&wusbhc->mutex);
 }
diff --git a/drivers/usb/host/whci/whcd.h b/drivers/usb/host/whci/whcd.h
index 0f3540f04f53..d3543a181dc9 100644
--- a/drivers/usb/host/whci/whcd.h
+++ b/drivers/usb/host/whci/whcd.h
@@ -137,6 +137,7 @@ void whc_clean_up(struct whc *whc);
 /* hw.c */
 void whc_write_wusbcmd(struct whc *whc, u32 mask, u32 val);
 int whc_do_gencmd(struct whc *whc, u32 cmd, u32 params, void *addr, size_t len);
+void whc_hw_error(struct whc *whc, const char *reason);
 
 /* wusb.c */
 int whc_wusbhc_start(struct wusbhc *wusbhc);
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index e2e7e4bc8463..8e18141bb2e0 100644
--- a/drivers/usb/wusbcore/devconnect.c
+++ b/drivers/usb/wusbcore/devconnect.c
@@ -386,6 +386,7 @@ static void __wusbhc_dev_disconnect(struct wusbhc *wusbhc,
                           | USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED);
         port->change |= USB_PORT_STAT_C_CONNECTION | USB_PORT_STAT_C_ENABLE;
         if (wusb_dev) {
+                dev_dbg(wusbhc->dev, "disconnecting device from port %d\n", wusb_dev->port_idx);
                 if (!list_empty(&wusb_dev->cack_node))
                         list_del_init(&wusb_dev->cack_node);
                 /* For the one in cack_add() */
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c
index 3937bf6f8cef..9fe4246cecb9 100644
--- a/drivers/usb/wusbcore/rh.c
+++ b/drivers/usb/wusbcore/rh.c
@@ -100,6 +100,9 @@ static int wusbhc_rh_port_reset(struct wusbhc *wusbhc, u8 port_idx)
         struct wusb_port *port = wusb_port_by_idx(wusbhc, port_idx);
         struct wusb_dev *wusb_dev = port->wusb_dev;
 
+        if (wusb_dev == NULL)
+                return -ENOTCONN;
+
         port->status |= USB_PORT_STAT_RESET;
         port->change |= USB_PORT_STAT_C_RESET;
 
diff --git a/drivers/uwb/allocator.c b/drivers/uwb/allocator.c
index c8185e6b0cd5..c13cec7dcbc5 100644
--- a/drivers/uwb/allocator.c
+++ b/drivers/uwb/allocator.c
@@ -15,7 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/uwb.h>
 
diff --git a/drivers/uwb/drp.c b/drivers/uwb/drp.c
index 2b4f9406789d..4f5ca99a04b9 100644
--- a/drivers/uwb/drp.c
+++ b/drivers/uwb/drp.c
@@ -66,14 +66,14 @@ static void uwb_rc_set_drp_cmd_done(struct uwb_rc *rc, void *arg,
         } else
                 dev_err(&rc->uwb_dev.dev, "SET-DRP-IE: timeout\n");
 
-        spin_lock(&rc->rsvs_lock);
+        spin_lock_bh(&rc->rsvs_lock);
         if (rc->set_drp_ie_pending > 1) {
                 rc->set_drp_ie_pending = 0;
                 uwb_rsv_queue_update(rc);       
         } else {
                 rc->set_drp_ie_pending = 0;     
         }
-        spin_unlock(&rc->rsvs_lock);
+        spin_unlock_bh(&rc->rsvs_lock);
 }
 
 /**
diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c
index ec6eecb32f30..6b76f4bb4cc7 100644
--- a/drivers/uwb/rsv.c
+++ b/drivers/uwb/rsv.c
@@ -114,7 +114,8 @@ void uwb_rsv_dump(char *text, struct uwb_rsv *rsv)
                 devaddr = rsv->target.devaddr;
         uwb_dev_addr_print(target, sizeof(target), &devaddr);
 
-        dev_dbg(dev, "rsv %s -> %s: %s\n", owner, target, uwb_rsv_state_str(rsv->state));
+        dev_dbg(dev, "rsv %s %s -> %s: %s\n",
+                text, owner, target, uwb_rsv_state_str(rsv->state));
 }
 
 static void uwb_rsv_release(struct kref *kref)
@@ -511,8 +512,7 @@ void uwb_rsv_remove(struct uwb_rsv *rsv)
 
         if (uwb_rsv_is_owner(rsv))
                 uwb_rsv_put_stream(rsv);
-        
-        del_timer_sync(&rsv->timer);
+
         uwb_dev_put(rsv->owner);
         if (rsv->target.type == UWB_RSV_TARGET_DEV)
                 uwb_dev_put(rsv->target.dev);
@@ -870,7 +870,7 @@ void uwb_rsv_queue_update(struct uwb_rc *rc)
  */
 void uwb_rsv_sched_update(struct uwb_rc *rc)
 {
-        spin_lock(&rc->rsvs_lock);
+        spin_lock_bh(&rc->rsvs_lock);
         if (!delayed_work_pending(&rc->rsv_update_work)) {
                 if (rc->set_drp_ie_pending > 0) {
                         rc->set_drp_ie_pending++;
@@ -879,7 +879,7 @@ void uwb_rsv_sched_update(struct uwb_rc *rc)
                 uwb_rsv_queue_update(rc);
         }
 unlock:
-        spin_unlock(&rc->rsvs_lock);
+        spin_unlock_bh(&rc->rsvs_lock);
 }
 
 /*
@@ -943,13 +943,22 @@ void uwb_rsv_remove_all(struct uwb_rc *rc)
 
         mutex_lock(&rc->rsvs_mutex);
         list_for_each_entry_safe(rsv, t, &rc->reservations, rc_node) {
-                uwb_rsv_remove(rsv);
+                if (rsv->state != UWB_RSV_STATE_NONE)
+                        uwb_rsv_set_state(rsv, UWB_RSV_STATE_NONE);
+                del_timer_sync(&rsv->timer);
         }
         /* Cancel any postponed update. */
         rc->set_drp_ie_pending = 0;
         mutex_unlock(&rc->rsvs_mutex);
 
         cancel_delayed_work_sync(&rc->rsv_update_work);
+        flush_workqueue(rc->rsv_workq);
+
+        mutex_lock(&rc->rsvs_mutex);
+        list_for_each_entry_safe(rsv, t, &rc->reservations, rc_node) {
+                uwb_rsv_remove(rsv);
+        }
+        mutex_unlock(&rc->rsvs_mutex);
 }
 
 void uwb_rsv_init(struct uwb_rc *rc)
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index db16112cf197..e6e299feb51b 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1475,7 +1475,7 @@ static int aty128fb_set_par(struct fb_info *info)
         aty128_set_pll(&par->pll, par);
         aty128_set_fifo(&par->fifo_reg, par);
 
-        config = aty_ld_le32(CONFIG_CNTL) & ~3;
+        config = aty_ld_le32(CNFG_CNTL) & ~3;
 
 #if defined(__BIG_ENDIAN)
         if (par->crtc.bpp == 32)
@@ -1484,7 +1484,7 @@ static int aty128fb_set_par(struct fb_info *info)
                 config |= 1;    /* make aperture do 16 bit swapping */
 #endif
 
-        aty_st_le32(CONFIG_CNTL, config);
+        aty_st_le32(CNFG_CNTL, config);
         aty_st_8(CRTC_EXT_CNTL + 1, 0); /* turn the video back on */
 
         info->fix.line_length = (par->crtc.vxres * par->crtc.bpp) >> 3;
@@ -1875,7 +1875,7 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
         u32 dac;
 
         /* Get the chip revision */
-        chip_rev = (aty_ld_le32(CONFIG_CNTL) >> 16) & 0x1F;
+        chip_rev = (aty_ld_le32(CNFG_CNTL) >> 16) & 0x1F;
 
         strcpy(video_card, "Rage128 XX ");
         video_card[8] = ent->device >> 8;
@@ -2057,7 +2057,7 @@ static int __devinit aty128_probe(struct pci_dev *pdev, const struct pci_device_
 
         /* Grab memory size from the card */
         // How does this relate to the resource length from the PCI hardware?
-        par->vram_size = aty_ld_le32(CONFIG_MEMSIZE) & 0x03FFFFFF;
+        par->vram_size = aty_ld_le32(CNFG_MEMSIZE) & 0x03FFFFFF;
 
         /* Virtualize the framebuffer */
         info->screen_base = ioremap(fb_addr, par->vram_size);
@@ -2374,6 +2374,8 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
         /* Set the chip into the appropriate suspend mode (we use D2,
          * D3 would require a complete re-initialisation of the chip,
          * including PCI config registers, clocks, AGP configuration, ...)
+         *
+         * For resume, the core will have already brought us back to D0
          */
         if (suspend) {
                 /* Make sure CRTC2 is reset. Remove that the day we decide to
@@ -2391,17 +2393,9 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
                 aty_st_le32(BUS_CNTL1, 0x00000010);
                 aty_st_le32(MEM_POWER_MISC, 0x0c830000);
                 mdelay(100);
-                pci_read_config_word(pdev, par->pm_reg+PCI_PM_CTRL, &pwr_command);
+
                 /* Switch PCI power management to D2 */
-                pci_write_config_word(pdev, par->pm_reg+PCI_PM_CTRL,
-                        (pwr_command & ~PCI_PM_CTRL_STATE_MASK) | 2);
-                pci_read_config_word(pdev, par->pm_reg+PCI_PM_CTRL, &pwr_command);
-        } else {
-                /* Switch back PCI power management to D0 */
-                mdelay(100);
-                pci_write_config_word(pdev, par->pm_reg+PCI_PM_CTRL, 0);
-                pci_read_config_word(pdev, par->pm_reg+PCI_PM_CTRL, &pwr_command);
-                mdelay(100);
+                pci_set_power_state(pdev, PCI_D2);
         }
 }
 
@@ -2410,6 +2404,12 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(pdev);
         struct aty128fb_par *par = info->par;
 
+        /* Because we may change PCI D state ourselves, we need to
+         * first save the config space content so the core can
+         * restore it properly on resume.
+         */
+        pci_save_state(pdev);
+
         /* We don't do anything but D2, for now we return 0, but
          * we may want to change that. How do we know if the BIOS
          * can properly take care of D3 ? Also, with swsusp, we
@@ -2476,6 +2476,11 @@ static int aty128_do_resume(struct pci_dev *pdev)
         if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
+        /* PCI state will have been restored by the core, so
+         * we should be in D0 now with our config space fully
+         * restored
+         */
+
         /* Wakeup chip */
         aty128_set_suspend(par, 0);
         par->asleep = 0;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index cc6b470073da..1207c208a30b 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -135,7 +135,7 @@
 #if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || \
 defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_FB_ATY_BACKLIGHT)
 static const u32 lt_lcd_regs[] = {
-        CONFIG_PANEL_LG,
+        CNFG_PANEL_LG,
         LCD_GEN_CNTL_LG,
         DSTN_CONTROL_LG,
         HFB_PITCH_ADDR_LG,
@@ -446,7 +446,7 @@ static int __devinit correct_chipset(struct atyfb_par *par)
         par->pll_limits.ecp_max = aty_chips[i].ecp_max;
         par->features = aty_chips[i].features;
 
-        chip_id = aty_ld_le32(CONFIG_CHIP_ID, par);
+        chip_id = aty_ld_le32(CNFG_CHIP_ID, par);
         type = chip_id & CFG_CHIP_TYPE;
         rev = (chip_id & CFG_CHIP_REV) >> 24;
 
@@ -629,7 +629,7 @@ static void aty_get_crtc(const struct atyfb_par *par, struct crtc *crtc)
                     crtc->lcd_index = aty_ld_le32(LCD_INDEX, par);
                     aty_st_le32(LCD_INDEX, crtc->lcd_index, par);
                 }
-                crtc->lcd_config_panel = aty_ld_lcd(CONFIG_PANEL, par);
+                crtc->lcd_config_panel = aty_ld_lcd(CNFG_PANEL, par);
                 crtc->lcd_gen_cntl = aty_ld_lcd(LCD_GEN_CNTL, par);
 
 
@@ -676,7 +676,7 @@ static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc)
                 aty_st_le32(CRTC_GEN_CNTL, crtc->gen_cntl & ~(CRTC_EXT_DISP_EN | CRTC_EN), par);
 
                 /* update non-shadow registers first */
-                aty_st_lcd(CONFIG_PANEL, crtc->lcd_config_panel, par);
+                aty_st_lcd(CNFG_PANEL, crtc->lcd_config_panel, par);
                 aty_st_lcd(LCD_GEN_CNTL, crtc->lcd_gen_cntl &
                         ~(CRTC_RW_SELECT | SHADOW_EN | SHADOW_RW_EN), par);
 
@@ -858,7 +858,7 @@ static int aty_var_to_crtc(const struct fb_info *info,
                 if (!M64_HAS(MOBIL_BUS))
                         crtc->lcd_index |= CRTC2_DISPLAY_DIS;
 
-                crtc->lcd_config_panel = aty_ld_lcd(CONFIG_PANEL, par) | 0x4000;
+                crtc->lcd_config_panel = aty_ld_lcd(CNFG_PANEL, par) | 0x4000;
                 crtc->lcd_gen_cntl = aty_ld_lcd(LCD_GEN_CNTL, par) & ~CRTC_RW_SELECT;
 
                 crtc->lcd_gen_cntl &=
@@ -1978,7 +1978,7 @@ static int aty_power_mgmt(int sleep, struct atyfb_par *par)
 
         return timeout ? 0 : -EIO;
 }
-#endif
+#endif /* CONFIG_PPC_PMAC */
 
 static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -2002,9 +2002,15 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         par->asleep = 1;
         par->lock_blank = 1;
 
+        /* Because we may change PCI D state ourselves, we need to
+         * first save the config space content so the core can
+         * restore it properly on resume.
+         */
+        pci_save_state(pdev);
+
 #ifdef CONFIG_PPC_PMAC
         /* Set chip to "suspend" mode */
-        if (aty_power_mgmt(1, par)) {
+        if (machine_is(powermac) && aty_power_mgmt(1, par)) {
                 par->asleep = 0;
                 par->lock_blank = 0;
                 atyfb_blank(FB_BLANK_UNBLANK, info);
@@ -2047,11 +2053,15 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
 
         acquire_console_sem();
 
+        /* PCI state will have been restored by the core, so
+         * we should be in D0 now with our config space fully
+         * restored
+         */
+
 #ifdef CONFIG_PPC_PMAC
-        if (pdev->dev.power.power_state.event == 2)
+        if (machine_is(powermac) &&
+            pdev->dev.power.power_state.event == PM_EVENT_SUSPEND)
                 aty_power_mgmt(0, par);
-#else
-        pci_set_power_state(pdev, PCI_D0);
 #endif
 
         aty_resume_chip(info);
@@ -2254,7 +2264,7 @@ static int __devinit aty_init(struct fb_info *info)
         if (!M64_HAS(INTEGRATED)) {
                 u32 stat0;
                 u8 dac_type, dac_subtype, clk_type;
-                stat0 = aty_ld_le32(CONFIG_STAT0, par);
+                stat0 = aty_ld_le32(CNFG_STAT0, par);
                 par->bus_type = (stat0 >> 0) & 0x07;
                 par->ram_type = (stat0 >> 3) & 0x07;
                 ramname = aty_gx_ram[par->ram_type];
@@ -2324,7 +2334,7 @@ static int __devinit aty_init(struct fb_info *info)
                 par->dac_ops = &aty_dac_ct;
                 par->pll_ops = &aty_pll_ct;
                 par->bus_type = PCI;
-                par->ram_type = (aty_ld_le32(CONFIG_STAT0, par) & 0x07);
+                par->ram_type = (aty_ld_le32(CNFG_STAT0, par) & 0x07);
                 ramname = aty_ct_ram[par->ram_type];
                 /* for many chips, the mclk is 67 MHz for SDRAM, 63 MHz otherwise */
                 if (par->pll_limits.mclk == 67 && par->ram_type < SDRAM)
@@ -2433,7 +2443,7 @@ static int __devinit aty_init(struct fb_info *info)
                 }
 
         if (M64_HAS(MAGIC_VRAM_SIZE)) {
-                if (aty_ld_le32(CONFIG_STAT1, par) & 0x40000000)
+                if (aty_ld_le32(CNFG_STAT1, par) & 0x40000000)
                         info->fix.smem_len += 0x400000;
         }
 
@@ -2946,7 +2956,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                  * Fix PROMs idea of MEM_CNTL settings...
                  */
                 mem = aty_ld_le32(MEM_CNTL, par);
-                chip_id = aty_ld_le32(CONFIG_CHIP_ID, par);
+                chip_id = aty_ld_le32(CNFG_CHIP_ID, par);
                 if (((chip_id & CFG_CHIP_TYPE) == VT_CHIP_ID) && !((chip_id >> 24) & 1)) {
                         switch (mem & 0x0f) {
                         case 3:
@@ -2964,7 +2974,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                         default:
                                 break;
                         }
-                        if ((aty_ld_le32(CONFIG_STAT0, par) & 7) >= SDRAM)
+                        if ((aty_ld_le32(CNFG_STAT0, par) & 7) >= SDRAM)
                                 mem &= ~(0x00700000);
                 }
                 mem &= ~(0xcf80e000);   /* Turn off all undocumented bits. */
@@ -3572,7 +3582,7 @@ static int __init atyfb_atari_probe(void)
                 }
 
                 /* Fake pci_id for correct_chipset() */
-                switch (aty_ld_le32(CONFIG_CHIP_ID, par) & CFG_CHIP_TYPE) {
+                switch (aty_ld_le32(CNFG_CHIP_ID, par) & CFG_CHIP_TYPE) {
                 case 0x00d7:
                         par->pci_id = PCI_CHIP_MACH64GX;
                         break;
diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c
index c50c7cf26fe9..2745b8539485 100644
--- a/drivers/video/aty/mach64_ct.c
+++ b/drivers/video/aty/mach64_ct.c
@@ -8,6 +8,9 @@
 #include <asm/io.h>
 #include <video/mach64.h>
 #include "atyfb.h"
+#ifdef CONFIG_PPC
+#include <asm/machdep.h>
+#endif
 
 #undef DEBUG
 
@@ -536,6 +539,14 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info,
         pll->ct.xclk_post_div_real = postdividers[xpost_div];
         pll->ct.mclk_fb_div = q * pll->ct.xclk_post_div_real / 8;
 
+#ifdef CONFIG_PPC
+        if (machine_is(powermac)) {
+                /* Override PLL_EXT_CNTL & 0x07. */
+                pll->ct.xclk_post_div = xpost_div;
+                pll->ct.xclk_ref_div = 1;
+        }
+#endif
+
 #ifdef DEBUG
         pllmclk = (1000000 * pll->ct.mclk_fb_mult * pll->ct.mclk_fb_div) /
                         (par->ref_clk_per * pll->ct.pll_ref_div);
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index d0f1a7fc2c9d..16bb7e3c0310 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -1936,8 +1936,8 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo)
         OUTREG(CRTC_GEN_CNTL, save_crtc_gen_cntl | CRTC_DISP_REQ_EN_B);
         mdelay(100);
 
-        aper_base = INREG(CONFIG_APER_0_BASE);
-        aper_size = INREG(CONFIG_APER_SIZE);
+        aper_base = INREG(CNFG_APER_0_BASE);
+        aper_size = INREG(CNFG_APER_SIZE);
 
 #ifdef SET_MC_FB_FROM_APERTURE
         /* Set framebuffer to be at the same address as set in PCI BAR */
@@ -2024,11 +2024,11 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
                      ~CRTC_H_CUTOFF_ACTIVE_EN);
           }
         } else {
-          tmp = INREG(CONFIG_MEMSIZE);
+          tmp = INREG(CNFG_MEMSIZE);
         }
 
         /* mem size is bits [28:0], mask off the rest */
-        rinfo->video_ram = tmp & CONFIG_MEMSIZE_MASK;
+        rinfo->video_ram = tmp & CNFG_MEMSIZE_MASK;
 
         /*
          * Hack to get around some busted production M6's
@@ -2228,7 +2228,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
          */
         rinfo->errata = 0;
         if (rinfo->family == CHIP_FAMILY_R300 &&
-            (INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK)
+            (INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK)
             == CFG_ATI_REV_A11)
                 rinfo->errata |= CHIP_ERRATA_R300_CG;
 
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 675abdafc2d8..ca5f0dc28546 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -333,7 +333,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
         if (!rinfo->has_CRTC2) {
                 tmp = INPLL(pllSCLK_CNTL);
 
-                if ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) > CFG_ATI_REV_A13)
+                if ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) > CFG_ATI_REV_A13)
                     tmp &= ~(SCLK_CNTL__FORCE_CP        | SCLK_CNTL__FORCE_RB);
                 tmp &= ~(SCLK_CNTL__FORCE_HDP           | SCLK_CNTL__FORCE_DISP1 |
                          SCLK_CNTL__FORCE_TOP           | SCLK_CNTL__FORCE_SE   |
@@ -468,9 +468,9 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
 
         /*RAGE_6::A11 A12 A12N1 A13, RV250::A11 A12, R300*/
         if ((rinfo->family == CHIP_FAMILY_RV250 &&
-             ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) ||
+             ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) ||
             ((rinfo->family == CHIP_FAMILY_RV100) &&
-             ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) <= CFG_ATI_REV_A13))) {
+             ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) <= CFG_ATI_REV_A13))) {
                 tmp |= SCLK_CNTL__FORCE_CP;
                 tmp |= SCLK_CNTL__FORCE_VIP;
         }
@@ -486,7 +486,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
                 /* RV200::A11 A12 RV250::A11 A12 */
                 if (((rinfo->family == CHIP_FAMILY_RV200) ||
                      (rinfo->family == CHIP_FAMILY_RV250)) &&
-                    ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13))
+                    ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13))
                         tmp |= SCLK_MORE_CNTL__FORCEON;
 
                 OUTPLL(pllSCLK_MORE_CNTL, tmp);
@@ -497,7 +497,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
         /* RV200::A11 A12, RV250::A11 A12 */
         if (((rinfo->family == CHIP_FAMILY_RV200) ||
              (rinfo->family == CHIP_FAMILY_RV250)) &&
-            ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) {
+            ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) {
                 tmp = INPLL(pllPLL_PWRMGT_CNTL);
                 tmp |= PLL_PWRMGT_CNTL__TCL_BYPASS_DISABLE;
                 OUTPLL(pllPLL_PWRMGT_CNTL, tmp);
@@ -702,7 +702,7 @@ static void radeon_pm_restore_regs(struct radeonfb_info *rinfo)
         OUTREG(DISPLAY_BASE_ADDR, rinfo->save_regs[31]);
         OUTREG(MC_AGP_LOCATION, rinfo->save_regs[32]);
         OUTREG(CRTC2_DISPLAY_BASE_ADDR, rinfo->save_regs[33]);
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
 
         OUTREG(DISP_MISC_CNTL, rinfo->save_regs[9]);
         OUTREG(DISP_PWR_MAN, rinfo->save_regs[10]);
@@ -1723,7 +1723,7 @@ static void radeon_reinitialize_M10(struct radeonfb_info *rinfo)
         OUTREG(CRTC2_DISPLAY_BASE_ADDR, rinfo->save_regs[33]);
         OUTREG(MC_FB_LOCATION, rinfo->save_regs[30]);
         OUTREG(OV0_BASE_ADDR, rinfo->save_regs[80]);
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
         OUTREG(BUS_CNTL, rinfo->save_regs[36]);
         OUTREG(BUS_CNTL1, rinfo->save_regs[14]);
         OUTREG(MPP_TB_CONFIG, rinfo->save_regs[37]);
@@ -1961,7 +1961,7 @@ static void radeon_pm_m9p_reconfigure_mc(struct radeonfb_info *rinfo)
         OUTMC(rinfo, ixMC_CHP_IO_CNTL_B1, rinfo->save_regs[68] /*0x141555ff*/);
         OUTMC(rinfo, ixMC_IMP_CNTL_0, rinfo->save_regs[71] /*0x00009249*/);
         OUTREG(MC_IND_INDEX, 0);
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
 
         mdelay(20);
 }
@@ -2361,7 +2361,7 @@ static void radeon_reinitialize_QW(struct radeonfb_info *rinfo)
         OUTMC(rinfo, ixMC_IMP_CNTL_0, 0x00009249);
         OUTREG(MC_IND_INDEX, 0);
 
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
 
         radeon_pm_full_reset_sdram(rinfo);
 
@@ -2509,9 +2509,7 @@ static void radeon_reinitialize_QW(struct radeonfb_info *rinfo)
 
 static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
 {
-        u16 pwr_cmd;
         u32 tmp;
-        int i;
 
         if (!rinfo->pm_reg)
                 return;
@@ -2557,32 +2555,14 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
                         }
                 }
 
-                for (i = 0; i < 64; ++i)
-                        pci_read_config_dword(rinfo->pdev, i * 4,
-                                              &rinfo->cfg_save[i]);
-
                 /* Switch PCI power management to D2. */
                 pci_disable_device(rinfo->pdev);
-                for (;;) {
-                        pci_read_config_word(
-                                rinfo->pdev, rinfo->pm_reg+PCI_PM_CTRL,
-                                &pwr_cmd);
-                        if (pwr_cmd & 2)
-                                break;                  
-                        pci_write_config_word(
-                                rinfo->pdev, rinfo->pm_reg+PCI_PM_CTRL,
-                                (pwr_cmd & ~PCI_PM_CTRL_STATE_MASK) | 2);
-                        mdelay(500);
-                }
+                pci_save_state(rinfo->pdev);
+                pci_set_power_state(rinfo->pdev, PCI_D2);
         } else {
                 printk(KERN_DEBUG "radeonfb (%s): switching to D0 state...\n",
                        pci_name(rinfo->pdev));
 
-                /* Switch back PCI powermanagment to D0 */
-                mdelay(200);
-                pci_write_config_word(rinfo->pdev, rinfo->pm_reg+PCI_PM_CTRL, 0);
-                mdelay(500);
-
                 if (rinfo->family <= CHIP_FAMILY_RV250) {
                         /* Reset the SDRAM controller  */
                         radeon_pm_full_reset_sdram(rinfo);
@@ -2598,37 +2578,10 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
         }
 }
 
-static int radeon_restore_pci_cfg(struct radeonfb_info *rinfo)
-{
-        int i;
-        static u32 radeon_cfg_after_resume[64];
-
-        for (i = 0; i < 64; ++i)
-                pci_read_config_dword(rinfo->pdev, i * 4,
-                                      &radeon_cfg_after_resume[i]);
-
-        if (radeon_cfg_after_resume[PCI_BASE_ADDRESS_0/4]
-            == rinfo->cfg_save[PCI_BASE_ADDRESS_0/4])
-                return 0;       /* assume everything is ok */
-
-        for (i = PCI_BASE_ADDRESS_0/4; i < 64; ++i) {
-                if (radeon_cfg_after_resume[i] != rinfo->cfg_save[i])
-                        pci_write_config_dword(rinfo->pdev, i * 4,
-                                               rinfo->cfg_save[i]);
-        }
-        pci_write_config_word(rinfo->pdev, PCI_CACHE_LINE_SIZE,
-                              rinfo->cfg_save[PCI_CACHE_LINE_SIZE/4]);
-        pci_write_config_word(rinfo->pdev, PCI_COMMAND,
-                              rinfo->cfg_save[PCI_COMMAND/4]);
-        return 1;
-}
-
-
 int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
         struct radeonfb_info *rinfo = info->par;
-        int i;
 
         if (mesg.event == pdev->dev.power.power_state.event)
                 return 0;
@@ -2674,6 +2627,11 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
         pmac_suspend_agp_for_card(pdev);
 #endif /* CONFIG_PPC_PMAC */
 
+        /* It's unclear whether or when the generic code will do that, so let's
+         * do it ourselves. We save state before we do any power management
+         */
+        pci_save_state(pdev);
+
         /* If we support wakeup from poweroff, we save all regs we can including cfg
          * space
          */
@@ -2698,9 +2656,6 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
                         mdelay(20);
                         OUTREG(LVDS_GEN_CNTL, INREG(LVDS_GEN_CNTL) & ~(LVDS_DIGON));
                 }
-                // FIXME: Use PCI layer
-                for (i = 0; i < 64; ++i)
-                        pci_read_config_dword(pdev, i * 4, &rinfo->cfg_save[i]);
                 pci_disable_device(pdev);
         }
         /* If we support D2, we go to it (should be fixed later with a flag forcing
@@ -2717,6 +2672,13 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
         return 0;
 }
 
+static int radeon_check_power_loss(struct radeonfb_info *rinfo)
+{
+        return rinfo->save_regs[4] != INPLL(CLK_PIN_CNTL) ||
+               rinfo->save_regs[2] != INPLL(MCLK_CNTL) ||
+               rinfo->save_regs[3] != INPLL(SCLK_CNTL);
+}
+
 int radeonfb_pci_resume(struct pci_dev *pdev)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
@@ -2735,20 +2697,13 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
         printk(KERN_DEBUG "radeonfb (%s): resuming from state: %d...\n",
                pci_name(pdev), pdev->dev.power.power_state.event);
 
-
-        if (pci_enable_device(pdev)) {
-                rc = -ENODEV;
-                printk(KERN_ERR "radeonfb (%s): can't enable PCI device !\n",
-                       pci_name(pdev));
-                goto bail;
-        }
-        pci_set_master(pdev);
-
+        /* PCI state will have been restored by the core, so
+         * we should be in D0 now with our config space fully
+         * restored
+         */
         if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
-                /* Wakeup chip. Check from config space if we were powered off
-                 * (todo: additionally, check CLK_PIN_CNTL too)
-                 */
-                if ((rinfo->pm_mode & radeon_pm_off) && radeon_restore_pci_cfg(rinfo)) {
+                /* Wakeup chip */
+                if ((rinfo->pm_mode & radeon_pm_off) && radeon_check_power_loss(rinfo)) {
                         if (rinfo->reinit_func != NULL)
                                 rinfo->reinit_func(rinfo);
                         else {
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 3ea1b00fdd22..7351e66c7f54 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -361,8 +361,6 @@ struct radeonfb_info {
 #ifdef CONFIG_FB_RADEON_I2C
         struct radeon_i2c_chan  i2c[4];
 #endif
-
-        u32                     cfg_save[64];
 };
 
 
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 363b3cb2f01b..63d759498165 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_BACKLIGHT_OMAP1)	+= omap1_bl.o
 obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 obj-$(CONFIG_BACKLIGHT_PWM)     += pwm_bl.o
-obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x.o
+obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x_bl.o
 obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
 obj-$(CONFIG_BACKLIGHT_TOSA)    += tosa_bl.o
 obj-$(CONFIG_BACKLIGHT_SAHARA)  += kb3886_bl.o
diff --git a/drivers/video/backlight/da903x.c b/drivers/video/backlight/da903x_bl.c
index 93bb4340cc64..93bb4340cc64 100644
--- a/drivers/video/backlight/da903x.c
+++ b/drivers/video/backlight/da903x_bl.c
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index 91b78e691505..f53b9f1d6aba 100644
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -250,10 +250,6 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
         int rc, size = cmap->len * sizeof(u16);
         struct fb_cmap umap;
 
-        if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
-                                !info->fbops->fb_setcmap))
-                return -EINVAL;
-
         memset(&umap, 0, sizeof(struct fb_cmap));
         rc = fb_alloc_cmap(&umap, cmap->len, cmap->transp != NULL);
         if (rc)
@@ -262,11 +258,23 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
             copy_from_user(umap.green, cmap->green, size) ||
             copy_from_user(umap.blue, cmap->blue, size) ||
             (cmap->transp && copy_from_user(umap.transp, cmap->transp, size))) {
-                fb_dealloc_cmap(&umap);
-                return -EFAULT;
+                rc = -EFAULT;
+                goto out;
         }
         umap.start = cmap->start;
+        if (!lock_fb_info(info)) {
+                rc = -ENODEV;
+                goto out;
+        }
+        if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
+                                !info->fbops->fb_setcmap)) {
+                rc = -EINVAL;
+                goto out1;
+        }
         rc = fb_set_cmap(&umap, info);
+out1:
+        unlock_fb_info(info);
+out:
         fb_dealloc_cmap(&umap);
         return rc;
 }
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 756efeb91abc..cfd9dce1ce0b 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1013,132 +1013,139 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
         struct fb_var_screeninfo var;
         struct fb_fix_screeninfo fix;
         struct fb_con2fbmap con2fb;
+        struct fb_cmap cmap_from;
         struct fb_cmap_user cmap;
         struct fb_event event;
         void __user *argp = (void __user *)arg;
         long ret = 0;
 
-        fb = info->fbops;
-        if (!fb)
-                return -ENODEV;
-
         switch (cmd) {
         case FBIOGET_VSCREENINFO:
-                ret = copy_to_user(argp, &info->var,
-                                    sizeof(var)) ? -EFAULT : 0;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                var = info->var;
+                unlock_fb_info(info);
+
+                ret = copy_to_user(argp, &var, sizeof(var)) ? -EFAULT : 0;
                 break;
         case FBIOPUT_VSCREENINFO:
-                if (copy_from_user(&var, argp, sizeof(var))) {
-                        ret =  -EFAULT;
-                        break;
-                }
+                if (copy_from_user(&var, argp, sizeof(var)))
+                        return -EFAULT;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
                 acquire_console_sem();
                 info->flags |= FBINFO_MISC_USEREVENT;
                 ret = fb_set_var(info, &var);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
                 release_console_sem();
-                if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
+                unlock_fb_info(info);
+                if (!ret && copy_to_user(argp, &var, sizeof(var)))
                         ret = -EFAULT;
                 break;
         case FBIOGET_FSCREENINFO:
-                ret = copy_to_user(argp, &info->fix,
-                                    sizeof(fix)) ? -EFAULT : 0;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                fix = info->fix;
+                unlock_fb_info(info);
+
+                ret = copy_to_user(argp, &fix, sizeof(fix)) ? -EFAULT : 0;
                 break;
         case FBIOPUTCMAP:
                 if (copy_from_user(&cmap, argp, sizeof(cmap)))
-                        ret = -EFAULT;
-                else
-                        ret = fb_set_user_cmap(&cmap, info);
+                        return -EFAULT;
+                ret = fb_set_user_cmap(&cmap, info);
                 break;
         case FBIOGETCMAP:
                 if (copy_from_user(&cmap, argp, sizeof(cmap)))
-                        ret = -EFAULT;
-                else
-                        ret = fb_cmap_to_user(&info->cmap, &cmap);
+                        return -EFAULT;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                cmap_from = info->cmap;
+                unlock_fb_info(info);
+                ret = fb_cmap_to_user(&cmap_from, &cmap);
                 break;
         case FBIOPAN_DISPLAY:
-                if (copy_from_user(&var, argp, sizeof(var))) {
-                        ret = -EFAULT;
-                        break;
-                }
+                if (copy_from_user(&var, argp, sizeof(var)))
+                        return -EFAULT;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
                 acquire_console_sem();
                 ret = fb_pan_display(info, &var);
                 release_console_sem();
+                unlock_fb_info(info);
                 if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
-                        ret = -EFAULT;
+                        return -EFAULT;
                 break;
         case FBIO_CURSOR:
                 ret = -EINVAL;
                 break;
         case FBIOGET_CON2FBMAP:
                 if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
-                        ret = -EFAULT;
-                else if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
-                        ret = -EINVAL;
-                else {
-                        con2fb.framebuffer = -1;
-                        event.info = info;
-                        event.data = &con2fb;
-                        fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP,
-                                                                &event);
-                        ret = copy_to_user(argp, &con2fb,
-                                    sizeof(con2fb)) ? -EFAULT : 0;
-                }
+                        return -EFAULT;
+                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
+                        return -EINVAL;
+                con2fb.framebuffer = -1;
+                event.data = &con2fb;
+
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                event.info = info;
+                fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
+                unlock_fb_info(info);
+
+                ret = copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0;
                 break;
         case FBIOPUT_CON2FBMAP:
-                if (copy_from_user(&con2fb, argp, sizeof(con2fb))) {
-                        ret = -EFAULT;
-                        break;
-                }
-                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) {
-                        ret = -EINVAL;
-                        break;
-                }
-                if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX) {
-                        ret = -EINVAL;
-                        break;
-                }
+                if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
+                        return -EFAULT;
+                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
+                        return -EINVAL;
+                if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
+                        return -EINVAL;
                 if (!registered_fb[con2fb.framebuffer])
                         request_module("fb%d", con2fb.framebuffer);
                 if (!registered_fb[con2fb.framebuffer]) {
                         ret = -EINVAL;
                         break;
                 }
-                event.info = info;
                 event.data = &con2fb;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                event.info = info;
                 ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
                                               &event);
+                unlock_fb_info(info);
                 break;
         case FBIOBLANK:
+                if (!lock_fb_info(info))
+                        return -ENODEV;
                 acquire_console_sem();
                 info->flags |= FBINFO_MISC_USEREVENT;
                 ret = fb_blank(info, arg);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
                 release_console_sem();
-                break;;
+                unlock_fb_info(info);
+                break;
         default:
-                if (fb->fb_ioctl == NULL)
-                        ret = -ENOTTY;
-                else
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                fb = info->fbops;
+                if (fb->fb_ioctl)
                         ret = fb->fb_ioctl(info, cmd, arg);
+                else
+                        ret = -ENOTTY;
+                unlock_fb_info(info);
         }
         return ret;
 }
 
 static long fb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-__acquires(&info->lock)
-__releases(&info->lock)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
-        struct fb_info *info;
-        long ret;
+        struct fb_info *info = registered_fb[fbidx];
 
-        info = registered_fb[fbidx];
-        mutex_lock(&info->lock);
-        ret = do_fb_ioctl(info, cmd, arg);
-        mutex_unlock(&info->lock);
-        return ret;
+        return do_fb_ioctl(info, cmd, arg);
 }
 
 #ifdef CONFIG_COMPAT
@@ -1257,8 +1264,6 @@ static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd,
 
 static long fb_compat_ioctl(struct file *file, unsigned int cmd,
                             unsigned long arg)
-__acquires(&info->lock)
-__releases(&info->lock)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
@@ -1266,7 +1271,6 @@ __releases(&info->lock)
         struct fb_ops *fb = info->fbops;
         long ret = -ENOIOCTLCMD;
 
-        mutex_lock(&info->lock);
         switch(cmd) {
         case FBIOGET_VSCREENINFO:
         case FBIOPUT_VSCREENINFO:
@@ -1292,7 +1296,6 @@ __releases(&info->lock)
                         ret = fb->fb_compat_ioctl(info, cmd, arg);
                 break;
         }
-        mutex_unlock(&info->lock);
         return ret;
 }
 #endif
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index bef6b45e8a5c..330aacbdec1f 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -192,7 +192,7 @@ static irqreturn_t vp_interrupt(int irq, void *opaque)
                 drv = container_of(vp_dev->vdev.dev.driver,
                                    struct virtio_driver, driver);
 
-                if (drv->config_changed)
+                if (drv && drv->config_changed)
                         drv->config_changed(&vp_dev->vdev);
         }
 
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 2ba8f95516a0..efa4b363ce72 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -498,7 +498,7 @@ static ssize_t store_target_kb(struct sys_device *dev,
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        target_bytes = memparse(buf, &endchar);
+        target_bytes = simple_strtoull(buf, &endchar, 0) * 1024;
 
         balloon_set_new_target(target_bytes >> PAGE_SHIFT);
 
@@ -508,8 +508,39 @@ static ssize_t store_target_kb(struct sys_device *dev,
 static SYSDEV_ATTR(target_kb, S_IRUGO | S_IWUSR,
                    show_target_kb, store_target_kb);
 
+
+static ssize_t show_target(struct sys_device *dev, struct sysdev_attribute *attr,
+                              char *buf)
+{
+        return sprintf(buf, "%llu\n",
+                       (u64)balloon_stats.target_pages << PAGE_SHIFT);
+}
+
+static ssize_t store_target(struct sys_device *dev,
+                            struct sysdev_attribute *attr,
+                            const char *buf,
+                            size_t count)
+{
+        char *endchar;
+        unsigned long long target_bytes;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+
+        target_bytes = memparse(buf, &endchar);
+
+        balloon_set_new_target(target_bytes >> PAGE_SHIFT);
+
+        return count;
+}
+
+static SYSDEV_ATTR(target, S_IRUGO | S_IWUSR,
+                   show_target, store_target);
+
+
 static struct sysdev_attribute *balloon_attrs[] = {
         &attr_target_kb,
+        &attr_target,
 };
 
 static struct attribute *balloon_info_attrs[] = {