161 files changed, 1989 insertions, 1726 deletions

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 1423b0c0cd2e..a0a178dd189c 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -174,6 +174,15 @@ static int acpi_battery_get_property(struct power_supply *psy,
                 break;
         case POWER_SUPPLY_PROP_CURRENT_NOW:
                 val->intval = battery->current_now * 1000;
+                /* if power units are mW, convert to mA by
+                   dividing by current voltage (mV/1000) */
+                if (!battery->power_unit) {
+                        if (battery->voltage_now) {
+                                val->intval /= battery->voltage_now;
+                                val->intval *= 1000;
+                        } else
+                                val->intval = -1;
+                }
                 break;
         case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
         case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index ea92bac42c53..09c69806c1fc 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -176,16 +176,6 @@ static int __init dmi_enable_osi_linux(const struct dmi_system_id *d)
         acpi_dmi_osi_linux(1, d);       /* enable */
         return 0;
 }
-static int __init dmi_disable_osi_linux(const struct dmi_system_id *d)
-{
-        acpi_dmi_osi_linux(0, d);       /* disable */
-        return 0;
-}
-static int __init dmi_unknown_osi_linux(const struct dmi_system_id *d)
-{
-        acpi_dmi_osi_linux(-1, d);      /* unknown */
-        return 0;
-}
 static int __init dmi_disable_osi_vista(const struct dmi_system_id *d)
 {
         printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
@@ -193,295 +183,21 @@ static int __init dmi_disable_osi_vista(const struct dmi_system_id *d)
         return 0;
 }
 
-/*
- * Most BIOS that invoke OSI(Linux) do nothing with it.
- * But some cause Linux to break.
- * Only a couple use it to make Linux run better.
- *
- * Thus, Linux should continue to disable OSI(Linux) by default,
- * should continue to discourage BIOS writers from using it, and
- * should whitelist the few existing systems that require it.
- *
- * If it appears clear a vendor isn't using OSI(Linux)
- * for anything constructive, blacklist them by name to disable
- * unnecessary dmesg warnings on all of their products.
- */
-
 static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
-        /*
-         * Disable OSI(Linux) warnings on all "Acer, inc."
-         *
-         * _OSI(Linux) disables the latest Windows BIOS code:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3100"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5050"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5580"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 3010"),
-         * _OSI(Linux) effect unknown:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Ferrari 5000"),
-         */
-        /*
-         * note that dmi_check_system() uses strstr()
-         * to match sub-strings rather than !strcmp(),
-         * so "Acer" below matches "Acer, inc." above.
-         */
-        /*
-         * Disable OSI(Linux) warnings on all "Acer"
-         *
-         * _OSI(Linux) effect unknown:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7720Z"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 5520"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 6460"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 7510"),
-         *
-         * _OSI(Linux) is a NOP:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5315"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Extensa 5220"),
-         */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Acer",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                },
-        },
-        /*
-         * Disable OSI(Linux) warnings on all "Apple Computer, Inc."
-         * Disable OSI(Linux) warnings on all "Apple Inc."
-         *
-         * _OSI(Linux) confirmed to be a NOP:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "MacBook1,1"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "MacBook2,1"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro2,2"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3,1"),
-         * _OSI(Linux) effect unknown:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "MacPro2,1"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro1,1"),
-         */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Apple",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Apple"),
-                },
-        },
-        /*
-         * Disable OSI(Linux) warnings on all "BenQ"
-         *
-         * _OSI(Linux) confirmed to be a NOP:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Joybook S31"),
-         */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "BenQ",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "BenQ"),
-                },
-        },
-        /*
-         * Disable OSI(Linux) warnings on all "Clevo Co."
-         *
-         * _OSI(Linux) confirmed to be a NOP:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "M570RU"),
-         */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Clevo",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Clevo Co."),
-                },
-        },
-        /*
-         * Disable OSI(Linux) warnings on all "COMPAL"
-         *
-         * _OSI(Linux) confirmed to be a NOP:
-         * DMI_MATCH(DMI_BOARD_NAME, "HEL8X"),
-         * _OSI(Linux) unknown effect:
-         * DMI_MATCH(DMI_BOARD_NAME, "IFL91"),
-         */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Compal",
-        .matches = {
-                     DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
-                },
-        },
-        { /* OSI(Linux) touches USB, unknown side-effect */
-        .callback = dmi_disable_osi_linux,
-        .ident = "Dell Dimension 5150",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "Dell DM051"),
-                },
-        },
-        { /* OSI(Linux) is a NOP */
-        .callback = dmi_disable_osi_linux,
-        .ident = "Dell i1501",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1501"),
-                },
-        },
-        { /* OSI(Linux) effect unknown */
-        .callback = dmi_unknown_osi_linux,
-        .ident = "Dell Latitude D830",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "Latitude D830"),
-                },
-        },
-        { /* OSI(Linux) effect unknown */
-        .callback = dmi_unknown_osi_linux,
-        .ident = "Dell OptiPlex GX620",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex GX620"),
-                },
-        },
-        { /* OSI(Linux) causes some USB initialization to not run */
-        .callback = dmi_unknown_osi_linux,
-        .ident = "Dell OptiPlex 755",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 755"),
-                },
-        },
-        { /* OSI(Linux) effect unknown */
-        .callback = dmi_unknown_osi_linux,
-        .ident = "Dell PE 1900",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 1900"),
-                },
-        },
-        { /* OSI(Linux) is a NOP */
-        .callback = dmi_unknown_osi_linux,
-        .ident = "Dell PE 1950",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 1950"),
-                },
-        },
-        { /* OSI(Linux) is a NOP */
-        .callback = dmi_disable_osi_linux,
-        .ident = "Dell PE R200",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R200"),
-                },
-        },
-        { /* OSI(Linux) touches USB */
-        .callback = dmi_disable_osi_linux,
-        .ident = "Dell PR 390",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation 390"),
-                },
-        },
-        { /* OSI(Linux) touches USB */
-        .callback = dmi_unknown_osi_linux,
-        .ident = "Dell PR 390",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation 690"),
-                },
-        },
-        { /* OSI(Linux) unknown - ASL looks benign, but may effect dock/SMM */
-        .callback = dmi_unknown_osi_linux,
-        .ident = "Dell PR M4300",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "Precision M4300"),
-                },
-        },
-        { /* OSI(Linux) is a NOP */
-        .callback = dmi_disable_osi_linux,
-        .ident = "Dell Vostro 1000",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "Vostro   1000"),
-                },
-        },
-        { /* OSI(Linux) effect unknown */
-        .callback = dmi_unknown_osi_linux,
-        .ident = "Dell PE SC440",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge SC440"),
-                },
-        },
-        { /* OSI(Linux) effect unknown */
-        .callback = dmi_unknown_osi_linux,
-        .ident = "Dialogue Flybook V5",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Dialogue Technology Corporation"),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "Flybook V5"),
-                },
-        },
-        /*
-         * Disable OSI(Linux) warnings on all "FUJITSU SIEMENS"
-         *
-         * _OSI(Linux) disables latest Windows BIOS code:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 2510"),
-         * _OSI(Linux) confirmed to be a NOP:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pi 1536"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pi 1556"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 1546"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile V5505"),
-         * _OSI(Linux) unknown effect:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Amilo M1425"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Amilo Si 1520"),
-         */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Fujitsu Siemens",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                },
-        },
         {
         .callback = dmi_disable_osi_vista,
         .ident = "Fujitsu Siemens",
         .matches = {
                      DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile V5505"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile V5505"),
                 },
         },
+
         /*
-         * Disable OSI(Linux) warnings on all "Hewlett-Packard"
-         *
-         * _OSI(Linux) confirmed to be a NOP:
-         * .ident = "HP Pavilion tx 1000"
-         * DMI_MATCH(DMI_BOARD_NAME, "30BF"),
-         * .ident = "HP Pavilion dv2000"
-         * DMI_MATCH(DMI_BOARD_NAME, "30B5"),
-         * .ident = "HP Pavilion dv5000",
-         * DMI_MATCH(DMI_BOARD_NAME, "30A7"),
-         * .ident = "HP Pavilion dv6300 30BC",
-         * DMI_MATCH(DMI_BOARD_NAME, "30BC"),
-         * .ident = "HP Pavilion dv6000",
-         * DMI_MATCH(DMI_BOARD_NAME, "30B7"),
-         * DMI_MATCH(DMI_BOARD_NAME, "30B8"),
-         * .ident = "HP Pavilion dv9000",
-         * DMI_MATCH(DMI_BOARD_NAME, "30B9"),
-         * .ident = "HP Pavilion dv9500",
-         * DMI_MATCH(DMI_BOARD_NAME, "30CB"),
-         * .ident = "HP/Compaq Presario C500",
-         * DMI_MATCH(DMI_BOARD_NAME, "30C6"),
-         * .ident = "HP/Compaq Presario F500",
-         * DMI_MATCH(DMI_BOARD_NAME, "30D3"),
-         * _OSI(Linux) unknown effect:
-         * .ident = "HP Pavilion dv6500",
-         * DMI_MATCH(DMI_BOARD_NAME, "30D0"),
+         * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
+         * Linux ignores it, except for the machines enumerated below.
          */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Hewlett-Packard",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                },
-        },
+
         /*
          * Lenovo has a mix of systems OSI(Linux) situations
          * and thus we can not wildcard the vendor.
@@ -519,113 +235,6 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                      DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),
                 },
         },
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Lenovo 3000 V100",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                     DMI_MATCH(DMI_PRODUCT_VERSION, "LENOVO3000 V100"),
-                },
-        },
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Lenovo 3000 N100",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                     DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"),
-                },
-        },
-        /*
-         * Disable OSI(Linux) warnings on all "LG Electronics"
-         *
-         * _OSI(Linux) confirmed to be a NOP:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "P1-J150B"),
-         * with DMI_MATCH(DMI_BOARD_NAME, "ROCKY"),
-         *
-         * unknown:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "S1-MDGDG"),
-         * with DMI_MATCH(DMI_BOARD_NAME, "ROCKY"),
-         */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "LG",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"),
-                },
-        },
-        /* NEC - OSI(Linux) effect unknown */
-        {
-        .callback = dmi_unknown_osi_linux,
-        .ident = "NEC VERSA M360",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "NEC Computers SAS"),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "NEC VERSA M360"),
-                },
-        },
-        /* Panasonic */
-        {
-        .callback = dmi_unknown_osi_linux,
-        .ident = "Panasonic",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
-                        /* Toughbook CF-52 */
-                     DMI_MATCH(DMI_PRODUCT_NAME, "CF-52CCABVBG"),
-                },
-        },
-        /*
-         * Disable OSI(Linux) warnings on all "Samsung Electronics"
-         *
-         * OSI(Linux) disables PNP0C32 and other BIOS code for Windows:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "R40P/R41P"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "R59P/R60P/R61P"),
-         */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Samsung",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
-                },
-        },
-        /*
-         * Disable OSI(Linux) warnings on all "Sony Corporation"
-         *
-         * _OSI(Linux) is a NOP:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NR11S_S"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SZ38GP_C"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SZ650N"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-TZ21MN_N"),
-         * _OSI(Linux) unknown effect:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ11M"),
-         */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Sony",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                },
-        },
-        /*
-         * Disable OSI(Linux) warnings on all "TOSHIBA"
-         *
-         * _OSI(Linux) breaks sound (bugzilla 7787):
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P100"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P105"),
-         * _OSI(Linux) is a NOP:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A100"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A210"),
-         * _OSI(Linux) unknown effect:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A135"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A200"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P205"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite U305"),
-         */
-        {
-        .callback = dmi_disable_osi_linux,
-        .ident = "Toshiba",
-        .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                },
-        },
         {}
 };
 
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index cf41f9fc24a7..30f3ef236ecb 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -219,7 +219,8 @@ static void gpe_transaction(struct acpi_ec *ec, u8 status)
         goto unlock;
 err:
         /* false interrupt, state didn't change */
-        ++ec->curr->irq_count;
+        if (in_interrupt())
+                ++ec->curr->irq_count;
 unlock:
         spin_unlock_irqrestore(&ec->curr_lock, flags);
 }
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 4be252145cb4..c8111424dcb8 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -35,7 +35,6 @@
 #include <linux/interrupt.h>
 #include <linux/kmod.h>
 #include <linux/delay.h>
-#include <linux/dmi.h>
 #include <linux/workqueue.h>
 #include <linux/nmi.h>
 #include <linux/acpi.h>
@@ -97,54 +96,44 @@ static DEFINE_SPINLOCK(acpi_res_lock);
 static char osi_additional_string[OSI_STRING_LENGTH_MAX];
 
 /*
- * "Ode to _OSI(Linux)"
+ * The story of _OSI(Linux)
  *
- * osi_linux -- Control response to BIOS _OSI(Linux) query.
+ * From pre-history through Linux-2.6.22,
+ * Linux responded TRUE upon a BIOS OSI(Linux) query.
  *
- * As Linux evolves, the features that it supports change.
- * So an OSI string such as "Linux" is not specific enough
- * to be useful across multiple versions of Linux.  It
- * doesn't identify any particular feature, interface,
- * or even any particular version of Linux...
+ * Unfortunately, reference BIOS writers got wind of this
+ * and put OSI(Linux) in their example code, quickly exposing
+ * this string as ill-conceived and opening the door to
+ * an un-bounded number of BIOS incompatibilities.
  *
- * Unfortunately, Linux-2.6.22 and earlier responded "yes"
- * to a BIOS _OSI(Linux) query.  When
- * a reference mobile BIOS started using it, its use
- * started to spread to many vendor platforms.
- * As it is not supportable, we need to halt that spread.
+ * For example, OSI(Linux) was used on resume to re-POST a
+ * video card on one system, because Linux at that time
+ * could not do a speedy restore in its native driver.
+ * But then upon gaining quick native restore capability,
+ * Linux has no way to tell the BIOS to skip the time-consuming
+ * POST -- putting Linux at a permanent performance disadvantage.
+ * On another system, the BIOS writer used OSI(Linux)
+ * to infer native OS support for IPMI!  On other systems,
+ * OSI(Linux) simply got in the way of Linux claiming to
+ * be compatible with other operating systems, exposing
+ * BIOS issues such as skipped device initialization.
  *
- * Today, most BIOS references to _OSI(Linux) are noise --
- * they have no functional effect and are just dead code
- * carried over from the reference BIOS.
- *
- * The next most common case is that _OSI(Linux) harms Linux,
- * usually by causing the BIOS to follow paths that are
- * not tested during Windows validation.
- *
- * Finally, there is a short list of platforms
- * where OSI(Linux) benefits Linux.
- *
- * In Linux-2.6.23, OSI(Linux) is first disabled by default.
- * DMI is used to disable the dmesg warning about OSI(Linux)
- * on platforms where it is known to have no effect.
- * But a dmesg warning remains for systems where
- * we do not know if OSI(Linux) is good or bad for the system.
- * DMI is also used to enable OSI(Linux) for the machines
- * that are known to need it.
+ * So "Linux" turned out to be a really poor chose of
+ * OSI string, and from Linux-2.6.23 onward we respond FALSE.
  *
  * BIOS writers should NOT query _OSI(Linux) on future systems.
- * It will be ignored by default, and to get Linux to
- * not ignore it will require a kernel source update to
- * add a DMI entry, or a boot-time "acpi_osi=Linux" invocation.
+ * Linux will complain on the console when it sees it, and return FALSE.
+ * To get Linux to return TRUE for your system  will require
+ * a kernel source update to add a DMI entry,
+ * or boot with "acpi_osi=Linux"
  */
-#define OSI_LINUX_ENABLE 0
 
 static struct osi_linux {
         unsigned int    enable:1;
         unsigned int    dmi:1;
         unsigned int    cmdline:1;
         unsigned int    known:1;
-} osi_linux = { OSI_LINUX_ENABLE, 0, 0, 0};
+} osi_linux = { 0, 0, 0, 0};
 
 static void __init acpi_request_region (struct acpi_generic_address *addr,
         unsigned int length, char *desc)
@@ -1296,34 +1285,6 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)
         return (AE_OK);
 }
 
-/**
- *      acpi_dmi_dump - dump DMI slots needed for blacklist entry
- *
- *      Returns 0 on success
- */
-static int acpi_dmi_dump(void)
-{
-
-        if (!dmi_available)
-                return -1;
-
-        printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n",
-                dmi_get_system_info(DMI_SYS_VENDOR));
-        printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n",
-                dmi_get_system_info(DMI_PRODUCT_NAME));
-        printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n",
-                dmi_get_system_info(DMI_PRODUCT_VERSION));
-        printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n",
-                dmi_get_system_info(DMI_BOARD_NAME));
-        printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n",
-                dmi_get_system_info(DMI_BIOS_VENDOR));
-        printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n",
-                dmi_get_system_info(DMI_BIOS_DATE));
-
-        return 0;
-}
-
-
 /******************************************************************************
  *
  * FUNCTION:    acpi_os_validate_interface
@@ -1350,21 +1311,6 @@ acpi_os_validate_interface (char *interface)
                         osi_linux.cmdline ? " via cmdline" :
                         osi_linux.dmi ? " via DMI" : "");
 
-                if (!osi_linux.dmi) {
-                        if (acpi_dmi_dump())
-                                printk(KERN_NOTICE PREFIX
-                                        "[please extract dmidecode output]\n");
-                        printk(KERN_NOTICE PREFIX
-                                "Please send DMI info above to "
-                                "linux-acpi@vger.kernel.org\n");
-                }
-                if (!osi_linux.known && !osi_linux.cmdline) {
-                        printk(KERN_NOTICE PREFIX
-                                "If \"acpi_osi=%sLinux\" works better, "
-                                "please notify linux-acpi@vger.kernel.org\n",
-                                osi_linux.enable ? "!" : "");
-                }
-
                 if (osi_linux.enable)
                         return AE_OK;
         }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index bd5253ee5c85..39b7233c3485 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -751,16 +751,6 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
         if (!acpi_match_device_ids(device, button_device_ids))
                 device->wakeup.flags.run_wake = 1;
 
-        /*
-         * Don't set Power button GPE as run_wake
-         * if Fixed Power button is used
-         */
-        if (!strcmp(device->pnp.hardware_id, "PNP0C0C") &&
-                !(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) {
-                device->wakeup.flags.run_wake = 0;
-                device->wakeup.flags.valid = 0;
-        }
-
       end:
         if (ACPI_FAILURE(status))
                 device->flags.wake_capable = 0;
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 80c0868d0480..28a691cc625e 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -90,6 +90,18 @@ 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;
+
 /**
  *      acpi_pm_disable_gpes - Disable the GPEs.
  */
@@ -235,7 +247,11 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
         }
 
         /* If ACPI is not enabled by the BIOS, we need to enable it here. */
-        acpi_enable();
+        if (set_sci_en_on_resume)
+                acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1);
+        else
+                acpi_enable();
+
         /* Reprogram control registers and execute _BFS */
         acpi_leave_sleep_state_prep(acpi_state);
 
@@ -323,6 +339,12 @@ static int __init init_old_suspend_ordering(const struct dmi_system_id *d)
         return 0;
 }
 
+static int __init init_set_sci_en_on_resume(const struct dmi_system_id *d)
+{
+        set_sci_en_on_resume = true;
+        return 0;
+}
+
 static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
         {
         .callback = init_old_suspend_ordering,
@@ -340,6 +362,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"),
                 },
         },
+        {
+        .callback = init_set_sci_en_on_resume,
+        .ident = "Apple MacBook 1,1",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Apple Computer, Inc."),
+                DMI_MATCH(DMI_PRODUCT_NAME, "MacBook1,1"),
+                },
+        },
+        {
+        .callback = init_set_sci_en_on_resume,
+        .ident = "Apple MacMini 1,1",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Apple Computer, Inc."),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Macmini1,1"),
+                },
+        },
         {},
 };
 #endif /* CONFIG_SUSPEND */
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 66aac06f2ac5..25f531d892de 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -848,8 +848,6 @@ static int __init toshiba_acpi_init(void)
         ret = input_register_polled_device(toshiba_acpi.poll_dev);
         if (ret) {
                 printk(MY_ERR "unable to register kill-switch input device\n");
-                rfkill_free(toshiba_acpi.rfk_dev);
-                toshiba_acpi.rfk_dev = NULL;
                 toshiba_acpi_exit();
                 return ret;
         }
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index e827be36ee8d..f844941089bb 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -259,34 +259,26 @@ acpi_evaluate_integer(acpi_handle handle,
                       struct acpi_object_list *arguments, unsigned long long *data)
 {
         acpi_status status = AE_OK;
-        union acpi_object *element;
+        union acpi_object element;
         struct acpi_buffer buffer = { 0, NULL };
 
-
         if (!data)
                 return AE_BAD_PARAMETER;
 
-        element = kzalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
-        if (!element)
-                return AE_NO_MEMORY;
-
         buffer.length = sizeof(union acpi_object);
-        buffer.pointer = element;
+        buffer.pointer = &element;
         status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
         if (ACPI_FAILURE(status)) {
                 acpi_util_eval_error(handle, pathname, status);
-                kfree(element);
                 return status;
         }
 
-        if (element->type != ACPI_TYPE_INTEGER) {
+        if (element.type != ACPI_TYPE_INTEGER) {
                 acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
-                kfree(element);
                 return AE_BAD_DATA;
         }
 
-        *data = element->integer.value;
-        kfree(element);
+        *data = element.integer.value;
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%llu]\n", *data));
 
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 8e37be19bbf5..d6d97d8f3fa4 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1066,6 +1066,21 @@ static int piix_broken_suspend(void)
                 if (dmi_find_device(DMI_DEV_TYPE_OEM_STRING, oemstrs[i], NULL))
                         return 1;
 
+        /* TECRA M4 sometimes forgets its identify and reports bogus
+         * DMI information.  As the bogus information is a bit
+         * generic, match as many entries as possible.  This manual
+         * matching is necessary because dmi_system_id.matches is
+         * limited to four entries.
+         */
+        if (!strcmp(dmi_get_system_info(DMI_SYS_VENDOR), "TOSHIBA") &&
+            !strcmp(dmi_get_system_info(DMI_PRODUCT_NAME), "000000") &&
+            !strcmp(dmi_get_system_info(DMI_PRODUCT_VERSION), "000000") &&
+            !strcmp(dmi_get_system_info(DMI_PRODUCT_SERIAL), "000000") &&
+            !strcmp(dmi_get_system_info(DMI_BOARD_VENDOR), "TOSHIBA") &&
+            !strcmp(dmi_get_system_info(DMI_BOARD_NAME), "Portable PC") &&
+            !strcmp(dmi_get_system_info(DMI_BOARD_VERSION), "Version A0"))
+                return 1;
+
         return 0;
 }
 
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 4214bfb13bbd..5e2eb740df46 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2492,6 +2492,13 @@ int ata_dev_configure(struct ata_device *dev)
                 }
         }
 
+        if ((dev->horkage & ATA_HORKAGE_FIRMWARE_WARN) && print_info) {
+                ata_dev_printk(dev, KERN_WARNING, "WARNING: device requires "
+                               "firmware update to be fully functional.\n");
+                ata_dev_printk(dev, KERN_WARNING, "         contact the vendor "
+                               "or visit http://ata.wiki.kernel.org.\n");
+        }
+
         return 0;
 
 err_out_nosup:
@@ -4042,6 +4049,20 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "ST380817AS",         "3.42",         ATA_HORKAGE_NONCQ },
         { "ST3160023AS",        "3.42",         ATA_HORKAGE_NONCQ },
 
+        /* Seagate NCQ + FLUSH CACHE firmware bug */
+        { "ST31500341AS",       "9JU138",       ATA_HORKAGE_NONCQ |
+                                                ATA_HORKAGE_FIRMWARE_WARN },
+        { "ST31000333AS",       "9FZ136",       ATA_HORKAGE_NONCQ |
+                                                ATA_HORKAGE_FIRMWARE_WARN },
+        { "ST3640623AS",        "9FZ164",       ATA_HORKAGE_NONCQ |
+                                                ATA_HORKAGE_FIRMWARE_WARN },
+        { "ST3640323AS",        "9FZ134",       ATA_HORKAGE_NONCQ |
+                                                ATA_HORKAGE_FIRMWARE_WARN },
+        { "ST3320813AS",        "9FZ182",       ATA_HORKAGE_NONCQ |
+                                                ATA_HORKAGE_FIRMWARE_WARN },
+        { "ST3320613AS",        "9FZ162",       ATA_HORKAGE_NONCQ |
+                                                ATA_HORKAGE_FIRMWARE_WARN },
+
         /* Blacklist entries taken from Silicon Image 3124/3132
            Windows driver .inf file - also several Linux problem reports */
         { "HTS541060G9SA00",    "MB3OC60D",     ATA_HORKAGE_NONCQ, },
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index f8b3ffc8ae9e..c2e6fb9f2ef9 100644
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -39,9 +39,11 @@
 #define RB500_CF_MAXPORTS       1
 #define RB500_CF_IO_DELAY       400
 
-#define RB500_CF_REG_CMD        0x0800
+#define RB500_CF_REG_BASE       0x0800
+#define RB500_CF_REG_ERR        0x080D
 #define RB500_CF_REG_CTRL       0x080E
-#define RB500_CF_REG_DATA       0x0C00
+/* 32bit buffered data register offset */
+#define RB500_CF_REG_DBUF32     0x0C00
 
 struct rb532_cf_info {
         void __iomem    *iobase;
@@ -72,11 +74,12 @@ static void rb532_pata_exec_command(struct ata_port *ap,
         rb532_pata_finish_io(ap);
 }
 
-static void rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
+static unsigned int rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
                                 unsigned int buflen, int write_data)
 {
         struct ata_port *ap = adev->link->ap;
         void __iomem *ioaddr = ap->ioaddr.data_addr;
+        int retlen = buflen;
 
         if (write_data) {
                 for (; buflen > 0; buflen--, buf++)
@@ -87,6 +90,7 @@ static void rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
         }
 
         rb532_pata_finish_io(adev->link->ap);
+        return retlen;
 }
 
 static void rb532_pata_freeze(struct ata_port *ap)
@@ -146,13 +150,14 @@ static void rb532_pata_setup_ports(struct ata_host *ah)
         ap->pio_mask    = 0x1f; /* PIO4 */
         ap->flags       = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;
 
-        ap->ioaddr.cmd_addr     = info->iobase + RB500_CF_REG_CMD;
+        ap->ioaddr.cmd_addr     = info->iobase + RB500_CF_REG_BASE;
         ap->ioaddr.ctl_addr     = info->iobase + RB500_CF_REG_CTRL;
         ap->ioaddr.altstatus_addr = info->iobase + RB500_CF_REG_CTRL;
 
         ata_sff_std_ports(&ap->ioaddr);
 
-        ap->ioaddr.data_addr    = info->iobase + RB500_CF_REG_DATA;
+        ap->ioaddr.data_addr    = info->iobase + RB500_CF_REG_DBUF32;
+        ap->ioaddr.error_addr   = info->iobase + RB500_CF_REG_ERR;
 }
 
 static __devinit int rb532_pata_driver_probe(struct platform_device *pdev)
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 615412364e99..6b969f8c684f 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -2705,7 +2705,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_
 
         /* XXX DEV_LABEL is a guess */
         if (!request_region(iobase, HRZ_IO_EXTENT, DEV_LABEL)) {
-                return -EINVAL;
+                err = -EINVAL;
                 goto out_disable;
         }
 
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index ecab9e67d47a..29e1dfafb7c6 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -194,7 +194,7 @@ struct ace_device {
         int in_irq;
 
         /* Details of hardware device */
-        unsigned long physaddr;
+        resource_size_t physaddr;
         void __iomem *baseaddr;
         int irq;
         int bus_width;          /* 0 := 8 bit; 1 := 16 bit */
@@ -628,8 +628,8 @@ static void ace_fsm_dostate(struct ace_device *ace)
 
                 /* Okay, it's a data request, set it up for transfer */
                 dev_dbg(ace->dev,
-                        "request: sec=%lx hcnt=%lx, ccnt=%x, dir=%i\n",
-                        req->sector, req->hard_nr_sectors,
+                        "request: sec=%llx hcnt=%lx, ccnt=%x, dir=%i\n",
+                        (unsigned long long) req->sector, req->hard_nr_sectors,
                         req->current_nr_sectors, rq_data_dir(req));
 
                 ace->req = req;
@@ -935,7 +935,8 @@ static int __devinit ace_setup(struct ace_device *ace)
         int rc;
 
         dev_dbg(ace->dev, "ace_setup(ace=0x%p)\n", ace);
-        dev_dbg(ace->dev, "physaddr=0x%lx irq=%i\n", ace->physaddr, ace->irq);
+        dev_dbg(ace->dev, "physaddr=0x%llx irq=%i\n",
+                (unsigned long long)ace->physaddr, ace->irq);
 
         spin_lock_init(&ace->lock);
         init_completion(&ace->id_completion);
@@ -1017,8 +1018,8 @@ static int __devinit ace_setup(struct ace_device *ace)
         /* Print the identification */
         dev_info(ace->dev, "Xilinx SystemACE revision %i.%i.%i\n",
                  (version >> 12) & 0xf, (version >> 8) & 0x0f, version & 0xff);
-        dev_dbg(ace->dev, "physaddr 0x%lx, mapped to 0x%p, irq=%i\n",
-                ace->physaddr, ace->baseaddr, ace->irq);
+        dev_dbg(ace->dev, "physaddr 0x%llx, mapped to 0x%p, irq=%i\n",
+                (unsigned long long) ace->physaddr, ace->baseaddr, ace->irq);
 
         ace->media_change = 1;
         ace_revalidate_disk(ace->gd);
@@ -1035,8 +1036,8 @@ err_alloc_disk:
 err_blk_initq:
         iounmap(ace->baseaddr);
 err_ioremap:
-        dev_info(ace->dev, "xsysace: error initializing device at 0x%lx\n",
-               ace->physaddr);
+        dev_info(ace->dev, "xsysace: error initializing device at 0x%llx\n",
+                 (unsigned long long) ace->physaddr);
         return -ENOMEM;
 }
 
@@ -1059,7 +1060,7 @@ static void __devexit ace_teardown(struct ace_device *ace)
 }
 
 static int __devinit
-ace_alloc(struct device *dev, int id, unsigned long physaddr,
+ace_alloc(struct device *dev, int id, resource_size_t physaddr,
           int irq, int bus_width)
 {
         struct ace_device *ace;
@@ -1119,7 +1120,7 @@ static void __devexit ace_free(struct device *dev)
 
 static int __devinit ace_probe(struct platform_device *dev)
 {
-        unsigned long physaddr = 0;
+        resource_size_t physaddr = 0;
         int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */
         int id = dev->id;
         int irq = NO_IRQ;
@@ -1165,7 +1166,7 @@ static int __devinit
 ace_of_probe(struct of_device *op, const struct of_device_id *match)
 {
         struct resource res;
-        unsigned long physaddr;
+        resource_size_t physaddr;
         const u32 *id;
         int irq, bus_width, rc;
 
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 0f004b65ec03..03f95ec08f59 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -27,7 +27,7 @@
 static int uninorth_rev;
 static int is_u3;
 
-static char __devinitdata *aperture = NULL;
+static char *aperture = NULL;
 
 static int uninorth_fetch_size(void)
 {
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 44e5d60f517e..4b10770fa937 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -3739,7 +3739,7 @@ static int stli_getbrdnr(void)
  *      do is go probing around in the usual places hoping we can find it.
  */
 
-static int stli_findeisabrds(void)
+static int __init stli_findeisabrds(void)
 {
         struct stlibrd *brdp;
         unsigned int iobase, eid, i;
@@ -3935,7 +3935,7 @@ static struct stlibrd *stli_allocbrd(void)
  *      can find.
  */
 
-static int stli_initbrds(void)
+static int __init stli_initbrds(void)
 {
         struct stlibrd *brdp, *nxtbrdp;
         struct stlconf conf;
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 59f472143f08..1412a8d1e58d 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1795,12 +1795,15 @@ retry_open:
         }
 #endif
         if (device == MKDEV(TTYAUX_MAJOR, 1)) {
-                driver = tty_driver_kref_get(console_device(&index));
-                if (driver) {
-                        /* Don't let /dev/console block */
-                        filp->f_flags |= O_NONBLOCK;
-                        noctty = 1;
-                        goto got_driver;
+                struct tty_driver *console_driver = console_device(&index);
+                if (console_driver) {
+                        driver = tty_driver_kref_get(console_driver);
+                        if (driver) {
+                                /* Don't let /dev/console block */
+                                filp->f_flags |= O_NONBLOCK;
+                                noctty = 1;
+                                goto got_driver;
+                        }
                 }
                 mutex_unlock(&tty_mutex);
                 return -ENODEV;
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index ed132fe55d3d..d16131949097 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -626,7 +626,7 @@ static int __devinit hwicap_setup(struct device *dev, int id,
         if (!request_mem_region(drvdata->mem_start,
                                         drvdata->mem_size, DRIVER_NAME)) {
                 dev_err(dev, "Couldn't lock memory region at %Lx\n",
-                        regs_res->start);
+                        (unsigned long long) regs_res->start);
                 retval = -EBUSY;
                 goto failed1;
         }
@@ -645,9 +645,10 @@ static int __devinit hwicap_setup(struct device *dev, int id,
         mutex_init(&drvdata->sem);
         drvdata->is_open = 0;
 
-        dev_info(dev, "ioremap %lx to %p with size %Lx\n",
-                 (unsigned long int)drvdata->mem_start,
-                        drvdata->base_address, drvdata->mem_size);
+        dev_info(dev, "ioremap %llx to %p with size %llx\n",
+                 (unsigned long long) drvdata->mem_start,
+                 drvdata->base_address,
+                 (unsigned long long) drvdata->mem_size);
 
         cdev_init(&drvdata->cdev, &hwicap_fops);
         drvdata->cdev.owner = THIS_MODULE;
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index b6ad3ac5916e..24607669a52b 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -1357,7 +1357,7 @@ static int hw_supports(struct device *dev, __be32 desc_hdr_template)
         return ret;
 }
 
-static int __devexit talitos_remove(struct of_device *ofdev)
+static int talitos_remove(struct of_device *ofdev)
 {
         struct device *dev = &ofdev->dev;
         struct talitos_private *priv = dev_get_drvdata(dev);
@@ -1622,7 +1622,7 @@ static struct of_platform_driver talitos_driver = {
         .name = "talitos",
         .match_table = talitos_match,
         .probe = talitos_probe,
-        .remove = __devexit_p(talitos_remove),
+        .remove = talitos_remove,
 };
 
 static int __init talitos_init(void)
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index e43bdc43a1bf..ebb037b78758 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -182,8 +182,6 @@ static struct pci_dev *mci_pdev;	/* init dev: in case that AGP code has
                                          * already registered driver
                                          */
 
-static int i82875p_registered = 1;
-
 static struct edac_pci_ctl_info *i82875p_pci;
 
 static void i82875p_get_error_info(struct mem_ctl_info *mci,
@@ -295,6 +293,7 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
                                 "%s(): pci_bus_add_device() Failed\n",
                                 __func__);
                 }
+                pci_bus_assign_resources(dev->bus);
         }
 
         *ovrfl_pdev = dev;
@@ -409,6 +408,9 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
                 goto fail0;
         }
 
+        /* Keeps mci available after edac_mc_del_mc() till edac_mc_free() */
+        kobject_get(&mci->edac_mci_kobj);
+
         debugf3("%s(): init mci\n", __func__);
         mci->dev = &pdev->dev;
         mci->mtype_cap = MEM_FLAG_DDR;
@@ -451,6 +453,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
         return 0;
 
 fail1:
+        kobject_put(&mci->edac_mci_kobj);
         edac_mc_free(mci);
 
 fail0:
@@ -578,12 +581,11 @@ static void __exit i82875p_exit(void)
 {
         debugf3("%s()\n", __func__);
 
+        i82875p_remove_one(mci_pdev);
+        pci_dev_put(mci_pdev);
+
         pci_unregister_driver(&i82875p_driver);
 
-        if (!i82875p_registered) {
-                i82875p_remove_one(mci_pdev);
-                pci_dev_put(mci_pdev);
-        }
 }
 
 module_init(i82875p_init);
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 97df6dac3a82..e54403ee59e7 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -372,6 +372,11 @@ static const struct {
         },
         /* iPod mini */ {
                 .firmware_revision      = 0x0a2700,
+                .model                  = 0x000022,
+                .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
+        },
+        /* iPod mini */ {
+                .firmware_revision      = 0x0a2700,
                 .model                  = 0x000023,
                 .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
         },
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 3ab1e9cc4692..996097acb5e7 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -305,6 +305,8 @@ static void drm_cleanup(struct drm_device * dev)
                 return;
         }
 
+        drm_vblank_cleanup(dev);
+
         drm_lastclose(dev);
 
         if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 15c8dabc3e97..1e787f894b3c 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -94,7 +94,7 @@ static void vblank_disable_fn(unsigned long arg)
         }
 }
 
-static void drm_vblank_cleanup(struct drm_device *dev)
+void drm_vblank_cleanup(struct drm_device *dev)
 {
         /* Bail if the driver didn't call drm_vblank_init() */
         if (dev->num_crtcs == 0)
@@ -278,8 +278,6 @@ int drm_irq_uninstall(struct drm_device * dev)
 
         free_irq(dev->pdev->irq, dev);
 
-        drm_vblank_cleanup(dev);
-
         return 0;
 }
 EXPORT_SYMBOL(drm_irq_uninstall);
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 0d215e38606a..ba89b42f790a 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -856,6 +856,13 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 
         spin_lock_init(&dev_priv->user_irq_lock);
 
+        ret = drm_vblank_init(dev, I915_NUM_PIPE);
+
+        if (ret) {
+                (void) i915_driver_unload(dev);
+                return ret;
+        }
+
         return ret;
 }
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ef1c0b8f8d07..0a4f39b9a0ec 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -47,6 +47,8 @@ enum pipe {
         PIPE_B,
 };
 
+#define I915_NUM_PIPE   2
+
 /* Interface history:
  *
  * 1.1: Original.
@@ -132,6 +134,7 @@ typedef struct drm_i915_private {
         int user_irq_refcount;
         /** Cached value of IMR to avoid reads in updating the bitfield */
         u32 irq_mask_reg;
+        u32 pipestat[2];
 
         int tex_lru_log_granularity;
         int allow_batchbuffer;
@@ -147,6 +150,7 @@ typedef struct drm_i915_private {
         u32 saveDSPBCNTR;
         u32 saveDSPARB;
         u32 saveRENDERSTANDBY;
+        u32 saveHWS;
         u32 savePIPEACONF;
         u32 savePIPEBCONF;
         u32 savePIPEASRC;
@@ -446,6 +450,13 @@ extern int i915_vblank_swap(struct drm_device *dev, void *data,
                             struct drm_file *file_priv);
 extern void i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask);
 
+void
+i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);
+
+void
+i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);
+
+
 /* i915_mem.c */
 extern int i915_mem_alloc(struct drm_device *dev, void *data,
                           struct drm_file *file_priv);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6b4a2bd20640..d58ddef468f8 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -31,6 +31,8 @@
 #include "i915_drv.h"
 #include <linux/swap.h>
 
+#define I915_GEM_GPU_DOMAINS    (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT))
+
 static int
 i915_gem_object_set_domain(struct drm_gem_object *obj,
                             uint32_t read_domains,
@@ -83,20 +85,14 @@ int
 i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
                             struct drm_file *file_priv)
 {
-        drm_i915_private_t *dev_priv = dev->dev_private;
         struct drm_i915_gem_get_aperture *args = data;
-        struct drm_i915_gem_object *obj_priv;
 
         if (!(dev->driver->driver_features & DRIVER_GEM))
                 return -ENODEV;
 
         args->aper_size = dev->gtt_total;
-        args->aper_available_size = args->aper_size;
-
-        list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) {
-                if (obj_priv->pin_count > 0)
-                        args->aper_available_size -= obj_priv->obj->size;
-        }
+        args->aper_available_size = (args->aper_size -
+                                     atomic_read(&dev->pin_memory));
 
         return 0;
 }
@@ -1870,17 +1866,6 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
 
         for (i = 0; i < args->buffer_count; i++) {
                 struct drm_gem_object *obj = object_list[i];
-                struct drm_i915_gem_object *obj_priv = obj->driver_private;
-
-                if (obj_priv->gtt_space == NULL) {
-                        /* We evicted the buffer in the process of validating
-                         * our set of buffers in.  We could try to recover by
-                         * kicking them everything out and trying again from
-                         * the start.
-                         */
-                        ret = -ENOMEM;
-                        goto err;
-                }
 
                 /* make sure all previous memory operations have passed */
                 ret = i915_gem_object_set_domain(obj,
@@ -2299,29 +2284,52 @@ i915_gem_idle(struct drm_device *dev)
 
         i915_gem_retire_requests(dev);
 
-        /* Active and flushing should now be empty as we've
-         * waited for a sequence higher than any pending execbuffer
-         */
-        BUG_ON(!list_empty(&dev_priv->mm.active_list));
-        BUG_ON(!list_empty(&dev_priv->mm.flushing_list));
+        if (!dev_priv->mm.wedged) {
+                /* Active and flushing should now be empty as we've
+                 * waited for a sequence higher than any pending execbuffer
+                 */
+                WARN_ON(!list_empty(&dev_priv->mm.active_list));
+                WARN_ON(!list_empty(&dev_priv->mm.flushing_list));
+                /* Request should now be empty as we've also waited
+                 * for the last request in the list
+                 */
+                WARN_ON(!list_empty(&dev_priv->mm.request_list));
+        }
 
-        /* Request should now be empty as we've also waited
-         * for the last request in the list
+        /* Empty the active and flushing lists to inactive.  If there's
+         * anything left at this point, it means that we're wedged and
+         * nothing good's going to happen by leaving them there.  So strip
+         * the GPU domains and just stuff them onto inactive.
          */
-        BUG_ON(!list_empty(&dev_priv->mm.request_list));
+        while (!list_empty(&dev_priv->mm.active_list)) {
+                struct drm_i915_gem_object *obj_priv;
+
+                obj_priv = list_first_entry(&dev_priv->mm.active_list,
+                                            struct drm_i915_gem_object,
+                                            list);
+                obj_priv->obj->write_domain &= ~I915_GEM_GPU_DOMAINS;
+                i915_gem_object_move_to_inactive(obj_priv->obj);
+        }
+
+        while (!list_empty(&dev_priv->mm.flushing_list)) {
+                struct drm_i915_gem_object *obj_priv;
+
+                obj_priv = list_first_entry(&dev_priv->mm.flushing_list,
+                                            struct drm_i915_gem_object,
+                                            list);
+                obj_priv->obj->write_domain &= ~I915_GEM_GPU_DOMAINS;
+                i915_gem_object_move_to_inactive(obj_priv->obj);
+        }
 
-        /* Move all buffers out of the GTT. */
+
+        /* Move all inactive buffers out of the GTT. */
         ret = i915_gem_evict_from_list(dev, &dev_priv->mm.inactive_list);
+        WARN_ON(!list_empty(&dev_priv->mm.inactive_list));
         if (ret) {
                 mutex_unlock(&dev->struct_mutex);
                 return ret;
         }
 
-        BUG_ON(!list_empty(&dev_priv->mm.active_list));
-        BUG_ON(!list_empty(&dev_priv->mm.flushing_list));
-        BUG_ON(!list_empty(&dev_priv->mm.inactive_list));
-        BUG_ON(!list_empty(&dev_priv->mm.request_list));
-
         i915_gem_cleanup_ringbuffer(dev);
         mutex_unlock(&dev->struct_mutex);
 
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 82752d6177a4..69b9a42da95e 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -33,11 +33,23 @@
 
 #define MAX_NOPID ((u32)~0)
 
-/** These are the interrupts used by the driver */
-#define I915_INTERRUPT_ENABLE_MASK (I915_USER_INTERRUPT |               \
-                                    I915_ASLE_INTERRUPT |               \
-                                    I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | \
-                                    I915_DISPLAY_PIPE_B_EVENT_INTERRUPT)
+/**
+ * Interrupts that are always left unmasked.
+ *
+ * Since pipe events are edge-triggered from the PIPESTAT register to IIR,
+ * we leave them always unmasked in IMR and then control enabling them through
+ * PIPESTAT alone.
+ */
+#define I915_INTERRUPT_ENABLE_FIX (I915_ASLE_INTERRUPT | \
+                                   I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |  \
+                                   I915_DISPLAY_PIPE_B_EVENT_INTERRUPT)
+
+/** Interrupts that we mask and unmask at runtime. */
+#define I915_INTERRUPT_ENABLE_VAR (I915_USER_INTERRUPT)
+
+/** These are all of the interrupts used by the driver */
+#define I915_INTERRUPT_ENABLE_MASK (I915_INTERRUPT_ENABLE_FIX | \
+                                    I915_INTERRUPT_ENABLE_VAR)
 
 void
 i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask)
@@ -59,6 +71,41 @@ i915_disable_irq(drm_i915_private_t *dev_priv, u32 mask)
         }
 }
 
+static inline u32
+i915_pipestat(int pipe)
+{
+        if (pipe == 0)
+                return PIPEASTAT;
+        if (pipe == 1)
+                return PIPEBSTAT;
+        BUG();
+}
+
+void
+i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask)
+{
+        if ((dev_priv->pipestat[pipe] & mask) != mask) {
+                u32 reg = i915_pipestat(pipe);
+
+                dev_priv->pipestat[pipe] |= mask;
+                /* Enable the interrupt, clear any pending status */
+                I915_WRITE(reg, dev_priv->pipestat[pipe] | (mask >> 16));
+                (void) I915_READ(reg);
+        }
+}
+
+void
+i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask)
+{
+        if ((dev_priv->pipestat[pipe] & mask) != 0) {
+                u32 reg = i915_pipestat(pipe);
+
+                dev_priv->pipestat[pipe] &= ~mask;
+                I915_WRITE(reg, dev_priv->pipestat[pipe]);
+                (void) I915_READ(reg);
+        }
+}
+
 /**
  * i915_pipe_enabled - check if a pipe is enabled
  * @dev: DRM device
@@ -121,80 +168,102 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 {
         struct drm_device *dev = (struct drm_device *) arg;
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u32 iir;
+        u32 iir, new_iir;
         u32 pipea_stats, pipeb_stats;
+        u32 vblank_status;
+        u32 vblank_enable;
         int vblank = 0;
+        unsigned long irqflags;
+        int irq_received;
+        int ret = IRQ_NONE;
 
         atomic_inc(&dev_priv->irq_received);
 
-        if (dev->pdev->msi_enabled)
-                I915_WRITE(IMR, ~0);
         iir = I915_READ(IIR);
 
-        if (iir == 0) {
-                if (dev->pdev->msi_enabled) {
-                        I915_WRITE(IMR, dev_priv->irq_mask_reg);
-                        (void) I915_READ(IMR);
-                }
-                return IRQ_NONE;
+        if (IS_I965G(dev)) {
+                vblank_status = I915_START_VBLANK_INTERRUPT_STATUS;
+                vblank_enable = PIPE_START_VBLANK_INTERRUPT_ENABLE;
+        } else {
+                vblank_status = I915_VBLANK_INTERRUPT_STATUS;
+                vblank_enable = I915_VBLANK_INTERRUPT_ENABLE;
         }
 
-        /*
-         * Clear the PIPE(A|B)STAT regs before the IIR otherwise
-         * we may get extra interrupts.
-         */
-        if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {
+        for (;;) {
+                irq_received = iir != 0;
+
+                /* Can't rely on pipestat interrupt bit in iir as it might
+                 * have been cleared after the pipestat interrupt was received.
+                 * It doesn't set the bit in iir again, but it still produces
+                 * interrupts (for non-MSI).
+                 */
+                spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
                 pipea_stats = I915_READ(PIPEASTAT);
-                if (!(dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_A))
-                        pipea_stats &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |
-                                         PIPE_VBLANK_INTERRUPT_ENABLE);
-                else if (pipea_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
-                                        PIPE_VBLANK_INTERRUPT_STATUS)) {
+                pipeb_stats = I915_READ(PIPEBSTAT);
+                /*
+                 * Clear the PIPE(A|B)STAT regs before the IIR
+                 */
+                if (pipea_stats & 0x8000ffff) {
+                        I915_WRITE(PIPEASTAT, pipea_stats);
+                        irq_received = 1;
+                }
+
+                if (pipeb_stats & 0x8000ffff) {
+                        I915_WRITE(PIPEBSTAT, pipeb_stats);
+                        irq_received = 1;
+                }
+                spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
+
+                if (!irq_received)
+                        break;
+
+                ret = IRQ_HANDLED;
+
+                I915_WRITE(IIR, iir);
+                new_iir = I915_READ(IIR); /* Flush posted writes */
+
+                if (dev_priv->sarea_priv)
+                        dev_priv->sarea_priv->last_dispatch =
+                                READ_BREADCRUMB(dev_priv);
+
+                if (iir & I915_USER_INTERRUPT) {
+                        dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
+                        DRM_WAKEUP(&dev_priv->irq_queue);
+                }
+
+                if (pipea_stats & vblank_status) {
                         vblank++;
                         drm_handle_vblank(dev, 0);
                 }
 
-                I915_WRITE(PIPEASTAT, pipea_stats);
-        }
-        if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {
-                pipeb_stats = I915_READ(PIPEBSTAT);
-                /* Ack the event */
-                I915_WRITE(PIPEBSTAT, pipeb_stats);
-
-                /* The vblank interrupt gets enabled even if we didn't ask for
-                   it, so make sure it's shut down again */
-                if (!(dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B))
-                        pipeb_stats &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |
-                                         PIPE_VBLANK_INTERRUPT_ENABLE);
-                else if (pipeb_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
-                                        PIPE_VBLANK_INTERRUPT_STATUS)) {
+                if (pipeb_stats & vblank_status) {
                         vblank++;
                         drm_handle_vblank(dev, 1);
                 }
 
-                if (pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS)
+                if ((pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS) ||
+                    (iir & I915_ASLE_INTERRUPT))
                         opregion_asle_intr(dev);
-                I915_WRITE(PIPEBSTAT, pipeb_stats);
-        }
-
-        I915_WRITE(IIR, iir);
-        if (dev->pdev->msi_enabled)
-                I915_WRITE(IMR, dev_priv->irq_mask_reg);
-        (void) I915_READ(IIR); /* Flush posted writes */
-
-        if (dev_priv->sarea_priv)
-                dev_priv->sarea_priv->last_dispatch =
-                        READ_BREADCRUMB(dev_priv);
 
-        if (iir & I915_USER_INTERRUPT) {
-                dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
-                DRM_WAKEUP(&dev_priv->irq_queue);
+                /* With MSI, interrupts are only generated when iir
+                 * transitions from zero to nonzero.  If another bit got
+                 * set while we were handling the existing iir bits, then
+                 * we would never get another interrupt.
+                 *
+                 * This is fine on non-MSI as well, as if we hit this path
+                 * we avoid exiting the interrupt handler only to generate
+                 * another one.
+                 *
+                 * Note that for MSI this could cause a stray interrupt report
+                 * if an interrupt landed in the time between writing IIR and
+                 * the posting read.  This should be rare enough to never
+                 * trigger the 99% of 100,000 interrupts test for disabling
+                 * stray interrupts.
+                 */
+                iir = new_iir;
         }
 
-        if (iir & I915_ASLE_INTERRUPT)
-                opregion_asle_intr(dev);
-
-        return IRQ_HANDLED;
+        return ret;
 }
 
 static int i915_emit_irq(struct drm_device * dev)
@@ -330,48 +399,16 @@ int i915_irq_wait(struct drm_device *dev, void *data,
 int i915_enable_vblank(struct drm_device *dev, int pipe)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u32     pipestat_reg = 0;
-        u32     pipestat;
-        u32     interrupt = 0;
         unsigned long irqflags;
 
-        switch (pipe) {
-        case 0:
-                pipestat_reg = PIPEASTAT;
-                interrupt = I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
-                break;
-        case 1:
-                pipestat_reg = PIPEBSTAT;
-                interrupt = I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
-                break;
-        default:
-                DRM_ERROR("tried to enable vblank on non-existent pipe %d\n",
-                          pipe);
-                return 0;
-        }
-
         spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
-        /* Enabling vblank events in IMR comes before PIPESTAT write, or
-         * there's a race where the PIPESTAT vblank bit gets set to 1, so
-         * the OR of enabled PIPESTAT bits goes to 1, so the PIPExEVENT in
-         * ISR flashes to 1, but the IIR bit doesn't get set to 1 because
-         * IMR masks it.  It doesn't ever get set after we clear the masking
-         * in IMR because the ISR bit is edge, not level-triggered, on the
-         * OR of PIPESTAT bits.
-         */
-        i915_enable_irq(dev_priv, interrupt);
-        pipestat = I915_READ(pipestat_reg);
         if (IS_I965G(dev))
-                pipestat |= PIPE_START_VBLANK_INTERRUPT_ENABLE;
+                i915_enable_pipestat(dev_priv, pipe,
+                                     PIPE_START_VBLANK_INTERRUPT_ENABLE);
         else
-                pipestat |= PIPE_VBLANK_INTERRUPT_ENABLE;
-        /* Clear any stale interrupt status */
-        pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |
-                     PIPE_VBLANK_INTERRUPT_STATUS);
-        I915_WRITE(pipestat_reg, pipestat);
-        (void) I915_READ(pipestat_reg); /* Posting read */
+                i915_enable_pipestat(dev_priv, pipe,
+                                     PIPE_VBLANK_INTERRUPT_ENABLE);
         spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
-
         return 0;
 }
 
@@ -381,37 +418,12 @@ int i915_enable_vblank(struct drm_device *dev, int pipe)
 void i915_disable_vblank(struct drm_device *dev, int pipe)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u32     pipestat_reg = 0;
-        u32     pipestat;
-        u32     interrupt = 0;
         unsigned long irqflags;
 
-        switch (pipe) {
-        case 0:
-                pipestat_reg = PIPEASTAT;
-                interrupt = I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
-                break;
-        case 1:
-                pipestat_reg = PIPEBSTAT;
-                interrupt = I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
-                break;
-        default:
-                DRM_ERROR("tried to disable vblank on non-existent pipe %d\n",
-                          pipe);
-                return;
-                break;
-        }
-
         spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
-        i915_disable_irq(dev_priv, interrupt);
-        pipestat = I915_READ(pipestat_reg);
-        pipestat &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |
-                      PIPE_VBLANK_INTERRUPT_ENABLE);
-        /* Clear any stale interrupt status */
-        pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |
-                     PIPE_VBLANK_INTERRUPT_STATUS);
-        I915_WRITE(pipestat_reg, pipestat);
-        (void) I915_READ(pipestat_reg); /* Posting read */
+        i915_disable_pipestat(dev_priv, pipe,
+                              PIPE_VBLANK_INTERRUPT_ENABLE |
+                              PIPE_START_VBLANK_INTERRUPT_ENABLE);
         spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
 }
 
@@ -476,32 +488,35 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 
         I915_WRITE(HWSTAM, 0xeffe);
+        I915_WRITE(PIPEASTAT, 0);
+        I915_WRITE(PIPEBSTAT, 0);
         I915_WRITE(IMR, 0xffffffff);
         I915_WRITE(IER, 0x0);
+        (void) I915_READ(IER);
 }
 
 int i915_driver_irq_postinstall(struct drm_device *dev)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        int ret, num_pipes = 2;
-
-        /* Set initial unmasked IRQs to just the selected vblank pipes. */
-        dev_priv->irq_mask_reg = ~0;
-
-        ret = drm_vblank_init(dev, num_pipes);
-        if (ret)
-                return ret;
 
         dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
-        dev_priv->irq_mask_reg &= ~I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT;
-        dev_priv->irq_mask_reg &= ~I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT;
 
         dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
 
-        dev_priv->irq_mask_reg &= I915_INTERRUPT_ENABLE_MASK;
+        /* Unmask the interrupts that we always want on. */
+        dev_priv->irq_mask_reg = ~I915_INTERRUPT_ENABLE_FIX;
+
+        dev_priv->pipestat[0] = 0;
+        dev_priv->pipestat[1] = 0;
+
+        /* Disable pipe interrupt enables, clear pending pipe status */
+        I915_WRITE(PIPEASTAT, I915_READ(PIPEASTAT) & 0x8000ffff);
+        I915_WRITE(PIPEBSTAT, I915_READ(PIPEBSTAT) & 0x8000ffff);
+        /* Clear pending interrupt status */
+        I915_WRITE(IIR, I915_READ(IIR));
 
-        I915_WRITE(IMR, dev_priv->irq_mask_reg);
         I915_WRITE(IER, I915_INTERRUPT_ENABLE_MASK);
+        I915_WRITE(IMR, dev_priv->irq_mask_reg);
         (void) I915_READ(IER);
 
         opregion_enable_asle(dev);
@@ -513,7 +528,6 @@ int i915_driver_irq_postinstall(struct drm_device *dev)
 void i915_driver_irq_uninstall(struct drm_device * dev)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u32 temp;
 
         if (!dev_priv)
                 return;
@@ -521,13 +535,12 @@ void i915_driver_irq_uninstall(struct drm_device * dev)
         dev_priv->vblank_pipe = 0;
 
         I915_WRITE(HWSTAM, 0xffffffff);
+        I915_WRITE(PIPEASTAT, 0);
+        I915_WRITE(PIPEBSTAT, 0);
         I915_WRITE(IMR, 0xffffffff);
         I915_WRITE(IER, 0x0);
 
-        temp = I915_READ(PIPEASTAT);
-        I915_WRITE(PIPEASTAT, temp);
-        temp = I915_READ(PIPEBSTAT);
-        I915_WRITE(PIPEBSTAT, temp);
-        temp = I915_READ(IIR);
-        I915_WRITE(IIR, temp);
+        I915_WRITE(PIPEASTAT, I915_READ(PIPEASTAT) & 0x8000ffff);
+        I915_WRITE(PIPEBSTAT, I915_READ(PIPEBSTAT) & 0x8000ffff);
+        I915_WRITE(IIR, I915_READ(IIR));
 }
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c
index 1787a0c7e3ab..13ae731a33db 100644
--- a/drivers/gpu/drm/i915/i915_opregion.c
+++ b/drivers/gpu/drm/i915/i915_opregion.c
@@ -235,17 +235,15 @@ void opregion_enable_asle(struct drm_device *dev)
         struct opregion_asle *asle = dev_priv->opregion.asle;
 
         if (asle) {
-                u32 pipeb_stats = I915_READ(PIPEBSTAT);
                 if (IS_MOBILE(dev)) {
-                        /* Many devices trigger events with a write to the
-                           legacy backlight controller, so we need to ensure
-                           that it's able to generate interrupts */
-                        I915_WRITE(PIPEBSTAT, pipeb_stats |=
-                                   I915_LEGACY_BLC_EVENT_ENABLE);
-                        i915_enable_irq(dev_priv, I915_ASLE_INTERRUPT |
-                                        I915_DISPLAY_PIPE_B_EVENT_INTERRUPT);
-                } else
-                        i915_enable_irq(dev_priv, I915_ASLE_INTERRUPT);
+                        unsigned long irqflags;
+
+                        spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
+                        i915_enable_pipestat(dev_priv, 1,
+                                             I915_LEGACY_BLC_EVENT_ENABLE);
+                        spin_unlock_irqrestore(&dev_priv->user_irq_lock,
+                                               irqflags);
+                }
 
                 asle->tche = ASLE_ALS_EN | ASLE_BLC_EN | ASLE_PFIT_EN |
                         ASLE_PFMB_EN;
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 5ddc6e595c0c..5d84027ee8f3 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -244,6 +244,9 @@ int i915_save_state(struct drm_device *dev)
         if (IS_I965G(dev) && IS_MOBILE(dev))
                 dev_priv->saveRENDERSTANDBY = I915_READ(MCHBAR_RENDER_STANDBY);
 
+        /* Hardware status page */
+        dev_priv->saveHWS = I915_READ(HWS_PGA);
+
         /* Display arbitration control */
         dev_priv->saveDSPARB = I915_READ(DSPARB);
 
@@ -373,6 +376,9 @@ int i915_restore_state(struct drm_device *dev)
         if (IS_I965G(dev) && IS_MOBILE(dev))
                 I915_WRITE(MCHBAR_RENDER_STANDBY, dev_priv->saveRENDERSTANDBY);
 
+        /* Hardware status page */
+        I915_WRITE(HWS_PGA, dev_priv->saveHWS);
+
         /* Display arbitration */
         I915_WRITE(DSPARB, dev_priv->saveDSPARB);
 
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c
index c1d12dbfa8d8..b49c5ff29585 100644
--- a/drivers/gpu/drm/mga/mga_dma.c
+++ b/drivers/gpu/drm/mga/mga_dma.c
@@ -396,6 +396,7 @@ int mga_freelist_put(struct drm_device * dev, struct drm_buf * buf)
 int mga_driver_load(struct drm_device * dev, unsigned long flags)
 {
         drm_mga_private_t *dev_priv;
+        int ret;
 
         dev_priv = drm_alloc(sizeof(drm_mga_private_t), DRM_MEM_DRIVER);
         if (!dev_priv)
@@ -415,6 +416,13 @@ int mga_driver_load(struct drm_device * dev, unsigned long flags)
         dev->types[7] = _DRM_STAT_PRIMARY;
         dev->types[8] = _DRM_STAT_SECONDARY;
 
+        ret = drm_vblank_init(dev, 1);
+
+        if (ret) {
+                (void) mga_driver_unload(dev);
+                return ret;
+        }
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
index bab42f41188b..daa6041a483a 100644
--- a/drivers/gpu/drm/mga/mga_irq.c
+++ b/drivers/gpu/drm/mga/mga_irq.c
@@ -152,11 +152,6 @@ void mga_driver_irq_preinstall(struct drm_device * dev)
 int mga_driver_irq_postinstall(struct drm_device *dev)
 {
         drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
-        int ret;
-
-        ret = drm_vblank_init(dev, 1);
-        if (ret)
-                return ret;
 
         DRM_INIT_WAITQUEUE(&dev_priv->fence_queue);
 
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index 3265d53ba91f..601f4c0e5da5 100644
--- a/drivers/gpu/drm/r128/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c
@@ -45,6 +45,7 @@ static struct drm_driver driver = {
             DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
             DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
         .dev_priv_size = sizeof(drm_r128_buf_priv_t),
+        .load = r128_driver_load,
         .preclose = r128_driver_preclose,
         .lastclose = r128_driver_lastclose,
         .get_vblank_counter = r128_get_vblank_counter,
@@ -84,6 +85,11 @@ static struct drm_driver driver = {
         .patchlevel = DRIVER_PATCHLEVEL,
 };
 
+int r128_driver_load(struct drm_device * dev, unsigned long flags)
+{
+        return drm_vblank_init(dev, 1);
+}
+
 static int __init r128_init(void)
 {
         driver.num_ioctls = r128_max_ioctl;
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
index 5898b274279d..797a26c42dab 100644
--- a/drivers/gpu/drm/r128/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
@@ -159,6 +159,7 @@ extern void r128_driver_irq_preinstall(struct drm_device * dev);
 extern int r128_driver_irq_postinstall(struct drm_device *dev);
 extern void r128_driver_irq_uninstall(struct drm_device * dev);
 extern void r128_driver_lastclose(struct drm_device * dev);
+extern int r128_driver_load(struct drm_device * dev, unsigned long flags);
 extern void r128_driver_preclose(struct drm_device * dev,
                                  struct drm_file *file_priv);
 
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
index d7349012a680..69810fb8ac49 100644
--- a/drivers/gpu/drm/r128/r128_irq.c
+++ b/drivers/gpu/drm/r128/r128_irq.c
@@ -102,7 +102,7 @@ void r128_driver_irq_preinstall(struct drm_device * dev)
 
 int r128_driver_irq_postinstall(struct drm_device *dev)
 {
-        return drm_vblank_init(dev, 1);
+        return 0;
 }
 
 void r128_driver_irq_uninstall(struct drm_device * dev)
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index abdc1ae38467..dcebb4bee7aa 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -1757,6 +1757,12 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
         if (ret != 0)
                 return ret;
 
+        ret = drm_vblank_init(dev, 2);
+        if (ret) {
+                radeon_driver_unload(dev);
+                return ret;
+        }
+
         DRM_DEBUG("%s card detected\n",
                   ((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
         return ret;
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
index 5079f7054a2f..97c0599fdb1e 100644
--- a/drivers/gpu/drm/radeon/radeon_irq.c
+++ b/drivers/gpu/drm/radeon/radeon_irq.c
@@ -337,15 +337,10 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
 {
         drm_radeon_private_t *dev_priv =
             (drm_radeon_private_t *) dev->dev_private;
-        int ret;
 
         atomic_set(&dev_priv->swi_emitted, 0);
         DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
 
-        ret = drm_vblank_init(dev, 2);
-        if (ret)
-                return ret;
-
         dev->max_vblank_count = 0x001fffff;
 
         radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
index 665d319b927b..c248c1d37268 100644
--- a/drivers/gpu/drm/via/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c
@@ -314,7 +314,6 @@ int via_driver_irq_postinstall(struct drm_device *dev)
         if (!dev_priv)
                 return -EINVAL;
 
-        drm_vblank_init(dev, 1);
         status = VIA_READ(VIA_REG_INTERRUPT);
         VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL
                   | dev_priv->irq_enable_mask);
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c
index a967556be014..2c4f0b485792 100644
--- a/drivers/gpu/drm/via/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c
@@ -107,8 +107,17 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset)
         ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
         if (ret) {
                 drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
+                return ret;
         }
-        return ret;
+
+        ret = drm_vblank_init(dev, 1);
+        if (ret) {
+                drm_sman_takedown(&dev_priv->sman);
+                drm_free(dev_priv, sizeof(drm_via_private_t), DRM_MEM_DRIVER);
+                return ret;
+        }
+
+        return 0;
 }
 
 int via_driver_unload(struct drm_device *dev)
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 9b97795e45ad..aa28aed0e46c 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -400,12 +400,12 @@ static const struct hid_device_id apple_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
                         APPLE_RDESC_JIS },
-        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
-        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
                         APPLE_ISO_KEYBOARD },
-        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
                 .driver_data = APPLE_HAS_FN },
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 147ec591a806..40df3e1b4bd1 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1241,9 +1241,9 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },
@@ -1266,6 +1266,9 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
         { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
@@ -1420,7 +1423,6 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },
         { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },
@@ -1436,7 +1438,6 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB) },
@@ -1576,9 +1577,6 @@ static const struct hid_device_id hid_mouse_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
         { }
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d70075dd3d81..39289699c32f 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -163,6 +163,7 @@
 
 #define USB_VENDOR_ID_GAMERON           0x0810
 #define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR  0x0001
+#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR  0x0002
 
 #define USB_VENDOR_ID_GENERAL_TOUCH     0x0dfc
 
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c
index acd815586182..46941f979b9d 100644
--- a/drivers/hid/hid-pl.c
+++ b/drivers/hid/hid-pl.c
@@ -178,6 +178,8 @@ err:
 static const struct hid_device_id pl_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR),
                 .driver_data = 1 }, /* Twin USB Joystick */
+        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR),
+                .driver_data = 1 }, /* Twin USB Joystick */
         { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */
         { }
 };
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index d746bf8284dd..606369ea24ca 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -796,7 +796,6 @@ static int usbhid_start(struct hid_device *hid)
         if (insize > HID_MAX_BUFFER_SIZE)
                 insize = HID_MAX_BUFFER_SIZE;
 
-        mutex_lock(&usbhid->setup);
         if (hid_alloc_buffers(dev, hid)) {
                 ret = -ENOMEM;
                 goto fail;
@@ -876,7 +875,6 @@ static int usbhid_start(struct hid_device *hid)
         hid_dump_device(hid);
 
         set_bit(HID_STARTED, &usbhid->iofl);
-        mutex_unlock(&usbhid->setup);
 
         return 0;
 
@@ -888,7 +886,6 @@ fail:
         usbhid->urbout = NULL;
         usbhid->urbctrl = NULL;
         hid_free_buffers(dev, hid);
-        mutex_unlock(&usbhid->setup);
         return ret;
 }
 
@@ -899,7 +896,6 @@ static void usbhid_stop(struct hid_device *hid)
         if (WARN_ON(!usbhid))
                 return;
 
-        mutex_lock(&usbhid->setup);
         clear_bit(HID_STARTED, &usbhid->iofl);
         spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
         set_bit(HID_DISCONNECTED, &usbhid->iofl);
@@ -928,7 +924,6 @@ static void usbhid_stop(struct hid_device *hid)
         usbhid->urbout = NULL;
 
         hid_free_buffers(hid_to_usb_dev(hid), hid);
-        mutex_unlock(&usbhid->setup);
 }
 
 static struct hid_ll_driver usb_hid_driver = {
@@ -1016,7 +1011,6 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         hid->driver_data = usbhid;
         usbhid->hid = hid;
-        mutex_init(&usbhid->setup); /* needed on suspend/resume */
 
         ret = hid_add_device(hid);
         if (ret) {
@@ -1051,18 +1045,14 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
         struct hid_device *hid = usb_get_intfdata (intf);
         struct usbhid_device *usbhid = hid->driver_data;
 
-        mutex_lock(&usbhid->setup);
-        if (!test_bit(HID_STARTED, &usbhid->iofl)) {
-                mutex_unlock(&usbhid->setup);
+        if (!test_bit(HID_STARTED, &usbhid->iofl))
                 return 0;
-        }
 
         spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
         set_bit(HID_SUSPENDED, &usbhid->iofl);
         spin_unlock_irq(&usbhid->inlock);
         del_timer_sync(&usbhid->io_retry);
         usb_kill_urb(usbhid->urbin);
-        mutex_unlock(&usbhid->setup);
         dev_dbg(&intf->dev, "suspend\n");
         return 0;
 }
@@ -1073,16 +1063,12 @@ static int hid_resume(struct usb_interface *intf)
         struct usbhid_device *usbhid = hid->driver_data;
         int status;
 
-        mutex_lock(&usbhid->setup);
-        if (!test_bit(HID_STARTED, &usbhid->iofl)) {
-                mutex_unlock(&usbhid->setup);
+        if (!test_bit(HID_STARTED, &usbhid->iofl))
                 return 0;
-        }
 
         clear_bit(HID_SUSPENDED, &usbhid->iofl);
         usbhid->retry_delay = 0;
         status = hid_start_in(hid);
-        mutex_unlock(&usbhid->setup);
         dev_dbg(&intf->dev, "resume status %d\n", status);
         return status;
 }
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index 55973ff54008..332abcdf9956 100644
--- a/drivers/hid/usbhid/usbhid.h
+++ b/drivers/hid/usbhid/usbhid.h
@@ -74,7 +74,6 @@ struct usbhid_device {
         dma_addr_t outbuf_dma;                                          /* Output buffer dma */
         spinlock_t outlock;                                             /* Output fifo spinlock */
 
-        struct mutex setup;
         unsigned long iofl;                                             /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */
         struct timer_list io_retry;                                     /* Retry timer */
         unsigned long stop_retry;                                       /* Time to give up, in jiffies */
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index f7dce8b9f64b..086c2a5cef0b 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -1564,3 +1564,4 @@ module_exit(applesmc_exit);
 MODULE_AUTHOR("Nicolas Boichat");
 MODULE_DESCRIPTION("Apple SMC");
 MODULE_LICENSE("GPL v2");
+MODULE_DEVICE_TABLE(dmi, applesmc_whitelist);
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 59ba2086d2f9..a257cd5cd134 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -189,8 +189,6 @@ static void i2c_parport_attach (struct parport *port)
         if (adapter_parm[type].init.val)
                 line_set(port, 1, &adapter_parm[type].init);
 
-        parport_release(adapter->pdev);
-
         if (i2c_bit_add_bus(&adapter->adapter) < 0) {
                 printk(KERN_ERR "i2c-parport: Unable to register with I2C\n");
                 goto ERROR1;
@@ -202,6 +200,7 @@ static void i2c_parport_attach (struct parport *port)
         return;
 
 ERROR1:
+        parport_release(adapter->pdev);
         parport_unregister_device(adapter->pdev);
 ERROR0:
         kfree(adapter);
@@ -221,6 +220,7 @@ static void i2c_parport_detach (struct parport *port)
                         if (adapter_parm[type].init.val)
                                 line_set(port, 0, &adapter_parm[type].init);
                                 
+                        parport_release(adapter->pdev);
                         parport_unregister_device(adapter->pdev);
                         if (prev)
                                 prev->next = adapter->next;
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 28902ebd5539..e0d56ef2bcb0 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb.h>
@@ -33,7 +34,10 @@
 #include <linux/workqueue.h>
 
 #include <asm/irq.h>
+#include <asm/mach-types.h>
+
 #include <mach/usb.h>
+#include <mach/mux.h>
 
 
 #ifndef DEBUG
@@ -88,14 +92,9 @@ struct isp1301 {
 
 /*-------------------------------------------------------------------------*/
 
-#ifdef  CONFIG_MACH_OMAP_H2
-
 /* board-specific PM hooks */
 
-#include <asm/gpio.h>
-#include <mach/mux.h>
-#include <asm/mach-types.h>
-
+#if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3)
 
 #if     defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE)
 
@@ -135,6 +134,33 @@ static inline void notresponding(struct isp1301 *isp)
 
 #endif
 
+#if defined(CONFIG_MACH_OMAP_H4)
+
+static void enable_vbus_draw(struct isp1301 *isp, unsigned mA)
+{
+        /* H4 controls this by DIP switch S2.4; no soft control.
+         * ON means the charger is always enabled.  Leave it OFF
+         * unless the OTG port is used only in B-peripheral mode.
+         */
+}
+
+static void enable_vbus_source(struct isp1301 *isp)
+{
+        /* this board won't supply more than 8mA vbus power.
+         * some boards can switch a 100ma "unit load" (or more).
+         */
+}
+
+
+/* products will deliver OTG messages with LEDs, GUI, etc */
+static inline void notresponding(struct isp1301 *isp)
+{
+        printk(KERN_NOTICE "OTG device not responding.\n");
+}
+
+
+#endif
+
 /*-------------------------------------------------------------------------*/
 
 static struct i2c_driver isp1301_driver;
@@ -334,8 +360,7 @@ static int gadget_suspend(struct isp1301 *isp)
  * NOTE: guaranteeing certain response times might mean we shouldn't
  * share keventd's work queue; a realtime task might be safest.
  */
-void
-isp1301_defer_work(struct isp1301 *isp, int work)
+static void isp1301_defer_work(struct isp1301 *isp, int work)
 {
         int status;
 
@@ -512,7 +537,6 @@ static void update_otg1(struct isp1301 *isp, u8 int_src)
         otg_ctrl &= ~OTG_XCEIV_INPUTS;
         otg_ctrl &= ~(OTG_ID|OTG_ASESSVLD|OTG_VBUSVLD);
 
-
         if (int_src & INTR_SESS_VLD)
                 otg_ctrl |= OTG_ASESSVLD;
         else if (isp->otg.state == OTG_STATE_A_WAIT_VFALL) {
@@ -886,11 +910,11 @@ static int otg_probe(struct platform_device *dev)
 
 static int otg_remove(struct platform_device *dev)
 {
-        otg_dev = 0;
+        otg_dev = NULL;
         return 0;
 }
 
-struct platform_driver omap_otg_driver = {
+static struct platform_driver omap_otg_driver = {
         .probe          = otg_probe,
         .remove         = otg_remove,
         .driver         = {
@@ -1212,6 +1236,8 @@ static void isp1301_release(struct device *dev)
 
         isp = dev_get_drvdata(dev);
 
+        /* FIXME -- not with a "new style" driver, it doesn't!! */
+
         /* ugly -- i2c hijacks our memory hook to wait_for_completion() */
         if (isp->i2c_release)
                 isp->i2c_release(dev);
@@ -1233,7 +1259,7 @@ static int __exit isp1301_remove(struct i2c_client *i2c)
         otg_unbind(isp);
 #endif
         if (machine_is_omap_h2())
-                omap_free_gpio(2);
+                gpio_free(2);
 
         isp->timer.data = 0;
         set_bit(WORK_STOP, &isp->todo);
@@ -1241,7 +1267,7 @@ static int __exit isp1301_remove(struct i2c_client *i2c)
         flush_scheduled_work();
 
         put_device(&i2c->dev);
-        the_transceiver = 0;
+        the_transceiver = NULL;
 
         return 0;
 }
@@ -1295,7 +1321,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host)
         if (!host) {
                 omap_writew(0, OTG_IRQ_EN);
                 power_down(isp);
-                isp->otg.host = 0;
+                isp->otg.host = NULL;
                 return 0;
         }
 
@@ -1344,7 +1370,9 @@ static int
 isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
 {
         struct isp1301  *isp = container_of(otg, struct isp1301, otg);
+#ifndef CONFIG_USB_OTG
         u32 l;
+#endif
 
         if (!otg || isp != the_transceiver)
                 return -ENODEV;
@@ -1354,7 +1382,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
                 if (!isp->otg.default_a)
                         enable_vbus_draw(isp, 0);
                 usb_gadget_vbus_disconnect(isp->otg.gadget);
-                isp->otg.gadget = 0;
+                isp->otg.gadget = NULL;
                 power_down(isp);
                 return 0;
         }
@@ -1379,7 +1407,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget)
         power_up(isp);
         isp->otg.state = OTG_STATE_B_IDLE;
 
-        if (machine_is_omap_h2())
+        if (machine_is_omap_h2() || machine_is_omap_h3())
                 isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0);
 
         isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING,
@@ -1499,7 +1527,8 @@ isp1301_start_hnp(struct otg_transceiver *dev)
 
 /*-------------------------------------------------------------------------*/
 
-static int __init isp1301_probe(struct i2c_client *i2c)
+static int __init
+isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
 {
         int                     status;
         struct isp1301          *isp;
@@ -1647,7 +1676,7 @@ module_init(isp_init);
 static void __exit isp_exit(void)
 {
         if (the_transceiver)
-                otg_set_transceiver(0);
+                otg_set_transceiver(NULL);
         i2c_del_driver(&isp1301_driver);
 }
 module_exit(isp_exit);
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 5a485c22660a..c6a63f46bc15 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -631,7 +631,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
 
         /* detach any active clients. This must be done first, because
          * it can fail; in which case we give up. */
-        list_for_each_entry_safe(client, _n, &adap->clients, list) {
+        list_for_each_entry_safe_reverse(client, _n, &adap->clients, list) {
                 struct i2c_driver       *driver;
 
                 driver = client->driver;
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
index e56c7b72f9e2..45d2356bb725 100644
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -591,7 +591,7 @@ static int __init ali15x3_ide_init(void)
 
 static void __exit ali15x3_ide_exit(void)
 {
-        return pci_unregister_driver(&alim15x3_pci_driver);
+        pci_unregister_driver(&alim15x3_pci_driver);
 }
 
 module_init(ali15x3_ide_init);
diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
index 81ec73134eda..c6bcd3014a29 100644
--- a/drivers/ide/amd74xx.c
+++ b/drivers/ide/amd74xx.c
@@ -3,7 +3,7 @@
  * IDE driver for Linux.
  *
  * Copyright (c) 2000-2002 Vojtech Pavlik
- * Copyright (c) 2007 Bartlomiej Zolnierkiewicz
+ * Copyright (c) 2007-2008 Bartlomiej Zolnierkiewicz
  *
  * Based on the work of:
  *      Andre Hedrick
@@ -263,6 +263,15 @@ static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_
                         d.udma_mask = ATA_UDMA5;
         }
 
+        /*
+         * It seems that on some nVidia controllers using AltStatus
+         * register can be unreliable so default to Status register
+         * if the device is in Compatibility Mode.
+         */
+        if (dev->vendor == PCI_VENDOR_ID_NVIDIA &&
+            ide_pci_is_in_compatibility_mode(dev))
+                d.host_flags |= IDE_HFLAG_BROKEN_ALTSTATUS;
+
         printk(KERN_INFO "%s %s: UDMA%s controller\n",
                 d.name, pci_name(dev), amd_dma[fls(d.udma_mask) - 1]);
 
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 2d848010499d..81f70caeb40f 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -419,7 +419,7 @@ static void icside_setup_ports(hw_regs_t *hw, void __iomem *base,
         hw->chipset = ide_acorn;
 }
 
-static int __init
+static int __devinit
 icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
         void __iomem *base;
@@ -473,7 +473,7 @@ static const struct ide_port_info icside_v6_port_info __initdata = {
         .swdma_mask             = ATA_SWDMA2,
 };
 
-static int __init
+static int __devinit
 icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 {
         void __iomem *ioc_base, *easi_base;
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 7162d67562af..7d275b2af3eb 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -132,10 +132,14 @@ int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)
 }
 EXPORT_SYMBOL(ide_end_request);
 
-static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 stat, u8 error)
+static void ide_complete_power_step(ide_drive_t *drive, struct request *rq)
 {
         struct request_pm_state *pm = rq->data;
 
+#ifdef DEBUG_PM
+        printk(KERN_INFO "%s: complete_power_step(step: %d)\n",
+                drive->name, pm->pm_step);
+#endif
         if (drive->media != ide_disk)
                 return;
 
@@ -172,7 +176,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                 /* Not supported? Switch to next step now. */
                 if (ata_id_flush_enabled(drive->id) == 0 ||
                     (drive->dev_flags & IDE_DFLAG_WCACHE) == 0) {
-                        ide_complete_power_step(drive, rq, 0, 0);
+                        ide_complete_power_step(drive, rq);
                         return ide_stopped;
                 }
                 if (ata_id_flush_ext_enabled(drive->id))
@@ -191,7 +195,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                 if (drive->media != ide_disk)
                         pm->pm_step = IDE_PM_RESTORE_DMA;
                 else
-                        ide_complete_power_step(drive, rq, 0, 0);
+                        ide_complete_power_step(drive, rq);
                 return ide_stopped;
         case IDE_PM_IDLE:               /* Resume step 2 (idle) */
                 args->tf.command = ATA_CMD_IDLEIMMEDIATE;
@@ -204,10 +208,8 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                  */
                 if (drive->hwif->dma_ops == NULL)
                         break;
-                /*
-                 * TODO: respect IDE_DFLAG_USING_DMA
-                 */
-                ide_set_dma(drive);
+                if (drive->dev_flags & IDE_DFLAG_USING_DMA)
+                        ide_set_dma(drive);
                 break;
         }
 
@@ -322,11 +324,8 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
                 }
         } else if (blk_pm_request(rq)) {
                 struct request_pm_state *pm = rq->data;
-#ifdef DEBUG_PM
-                printk("%s: complete_power_step(step: %d, stat: %x, err: %x)\n",
-                        drive->name, rq->pm->pm_step, stat, err);
-#endif
-                ide_complete_power_step(drive, rq, stat, err);
+
+                ide_complete_power_step(drive, rq);
                 if (pm->pm_step == IDE_PM_COMPLETED)
                         ide_complete_pm_request(drive, rq);
                 return;
@@ -804,7 +803,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
                         struct request_pm_state *pm = rq->data;
 #ifdef DEBUG_PM
                         printk("%s: start_power_step(step: %d)\n",
-                                drive->name, rq->pm->pm_step);
+                                drive->name, pm->pm_step);
 #endif
                         startstop = ide_start_power_step(drive, rq);
                         if (startstop == ide_stopped &&
@@ -967,14 +966,13 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
         ide_startstop_t startstop;
         int             loops = 0;
 
-        /* for atari only: POSSIBLY BROKEN HERE(?) */
-        ide_get_lock(ide_intr, hwgroup);
-
         /* caller must own ide_lock */
         BUG_ON(!irqs_disabled());
 
         while (!hwgroup->busy) {
                 hwgroup->busy = 1;
+                /* for atari only */
+                ide_get_lock(ide_intr, hwgroup);
                 drive = choose_drive(hwgroup);
                 if (drive == NULL) {
                         int sleeping = 0;
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 5d6ba14e211d..c41c3b9b6f02 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -457,18 +457,14 @@ int drive_is_ready (ide_drive_t *drive)
         if (drive->waiting_for_dma)
                 return hwif->dma_ops->dma_test_irq(drive);
 
-#if 0
-        /* need to guarantee 400ns since last command was issued */
-        udelay(1);
-#endif
-
         /*
          * We do a passive status test under shared PCI interrupts on
          * cards that truly share the ATA side interrupt, but may also share
          * an interrupt with another pci card/device.  We make no assumptions
          * about possible isa-pnp and pci-pnp issues yet.
          */
-        if (hwif->io_ports.ctl_addr)
+        if (hwif->io_ports.ctl_addr &&
+            (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0)
                 stat = hwif->tp_ops->read_altstatus(hwif);
         else
                 /* Note: this may clear a pending IRQ!! */
@@ -610,6 +606,7 @@ static const struct drive_list_entry ivb_list[] = {
         { "TSSTcorp CDDVDW SH-S202N"    , "SB01"        },
         { "TSSTcorp CDDVDW SH-S202H"    , "SB00"        },
         { "TSSTcorp CDDVDW SH-S202H"    , "SB01"        },
+        { "SAMSUNG SP0822N"             , "WA100-10"    },
         { NULL                          , NULL          }
 };
 
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 1649ea54f76c..c55bdbd22314 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -266,7 +266,8 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
         /* take a deep breath */
         msleep(50);
 
-        if (io_ports->ctl_addr) {
+        if (io_ports->ctl_addr &&
+            (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) {
                 a = tp_ops->read_altstatus(hwif);
                 s = tp_ops->read_status(hwif);
                 if ((a ^ s) & ~ATA_IDX)
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index 918ffc4fc8ac..272543a42a43 100644
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -46,10 +46,6 @@ static DEFINE_RWLOCK(hl_irqs_lock);
 
 static DEFINE_RWLOCK(addr_space_lock);
 
-/* addr_space list will have zero and max already included as bounds */
-static struct hpsb_address_ops dummy_ops = { NULL, NULL, NULL, NULL };
-static struct hpsb_address_serve dummy_zero_addr, dummy_max_addr;
-
 
 static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl,
                                             struct hpsb_host *host)
@@ -481,20 +477,23 @@ int hpsb_unregister_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,
         return retval;
 }
 
+static struct hpsb_address_ops dummy_ops;
+
+/* dummy address spaces as lower and upper bounds of the host's a.s. list */
 static void init_hpsb_highlevel(struct hpsb_host *host)
 {
-        INIT_LIST_HEAD(&dummy_zero_addr.host_list);
-        INIT_LIST_HEAD(&dummy_zero_addr.hl_list);
-        INIT_LIST_HEAD(&dummy_max_addr.host_list);
-        INIT_LIST_HEAD(&dummy_max_addr.hl_list);
+        INIT_LIST_HEAD(&host->dummy_zero_addr.host_list);
+        INIT_LIST_HEAD(&host->dummy_zero_addr.hl_list);
+        INIT_LIST_HEAD(&host->dummy_max_addr.host_list);
+        INIT_LIST_HEAD(&host->dummy_max_addr.hl_list);
 
-        dummy_zero_addr.op = dummy_max_addr.op = &dummy_ops;
+        host->dummy_zero_addr.op = host->dummy_max_addr.op = &dummy_ops;
 
-        dummy_zero_addr.start = dummy_zero_addr.end = 0;
-        dummy_max_addr.start = dummy_max_addr.end = ((u64) 1) << 48;
+        host->dummy_zero_addr.start = host->dummy_zero_addr.end = 0;
+        host->dummy_max_addr.start = host->dummy_max_addr.end = ((u64) 1) << 48;
 
-        list_add_tail(&dummy_zero_addr.host_list, &host->addr_space);
-        list_add_tail(&dummy_max_addr.host_list, &host->addr_space);
+        list_add_tail(&host->dummy_zero_addr.host_list, &host->addr_space);
+        list_add_tail(&host->dummy_max_addr.host_list, &host->addr_space);
 }
 
 void highlevel_add_host(struct hpsb_host *host)
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h
index e4e8aeb4d778..dd229950acca 100644
--- a/drivers/ieee1394/hosts.h
+++ b/drivers/ieee1394/hosts.h
@@ -13,6 +13,7 @@ struct module;
 
 #include "ieee1394_types.h"
 #include "csr.h"
+#include "highlevel.h"
 
 struct hpsb_packet;
 struct hpsb_iso;
@@ -72,6 +73,9 @@ struct hpsb_host {
         struct { DECLARE_BITMAP(map, 64); } tl_pool[ALL_NODES];
 
         struct csr_control csr;
+
+        struct hpsb_address_serve dummy_zero_addr;
+        struct hpsb_address_serve dummy_max_addr;
 };
 
 enum devctl_cmd {
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index c52f6e6e8af2..a373c18cf7b8 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -402,6 +402,11 @@ static const struct {
         },
         /* iPod mini */ {
                 .firmware_revision      = 0x0a2700,
+                .model_id               = 0x000022,
+                .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
+        },
+        /* iPod mini */ {
+                .firmware_revision      = 0x0a2700,
                 .model_id               = 0x000023,
                 .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
         },
@@ -890,12 +895,13 @@ static void sbp2_host_reset(struct hpsb_host *host)
                 return;
 
         read_lock_irqsave(&sbp2_hi_logical_units_lock, flags);
+
         list_for_each_entry(lu, &hi->logical_units, lu_list)
-                if (likely(atomic_read(&lu->state) !=
-                           SBP2LU_STATE_IN_SHUTDOWN)) {
-                        atomic_set(&lu->state, SBP2LU_STATE_IN_RESET);
+                if (atomic_cmpxchg(&lu->state,
+                                   SBP2LU_STATE_RUNNING, SBP2LU_STATE_IN_RESET)
+                    == SBP2LU_STATE_RUNNING)
                         scsi_block_requests(lu->shost);
-                }
+
         read_unlock_irqrestore(&sbp2_hi_logical_units_lock, flags);
 }
 
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h
index 4df887af66a5..7fc35cf0cddf 100644
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
@@ -163,7 +163,8 @@ struct ehca_mod_qp_parm {
 /* struct for tracking if cqes have been reported to the application */
 struct ehca_qmap_entry {
         u16 app_wr_id;
-        u16 reported;
+        u8 reported;
+        u8 cqe_req;
 };
 
 struct ehca_queue_map {
@@ -171,6 +172,7 @@ struct ehca_queue_map {
         unsigned int entries;
         unsigned int tail;
         unsigned int left_to_poll;
+        unsigned int next_wqe_idx;   /* Idx to first wqe to be flushed */
 };
 
 struct ehca_qp {
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index bb02a86aa526..bec7e0249358 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -994,8 +994,7 @@ static int ehca_mem_notifier(struct notifier_block *nb,
                         if (printk_timed_ratelimit(&ehca_dmem_warn_time,
                                                    30 * 1000))
                                 ehca_gen_err("DMEM operations are not allowed"
-                                             "as long as an ehca adapter is"
-                                             "attached to the LPAR");
+                                             "in conjunction with eHCA");
                         return NOTIFY_BAD;
                 }
         }
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 9e05ee2db39b..cadbf0cdd910 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -435,9 +435,13 @@ static void reset_queue_map(struct ehca_queue_map *qmap)
 {
         int i;
 
-        qmap->tail = 0;
-        for (i = 0; i < qmap->entries; i++)
+        qmap->tail = qmap->entries - 1;
+        qmap->left_to_poll = 0;
+        qmap->next_wqe_idx = 0;
+        for (i = 0; i < qmap->entries; i++) {
                 qmap->map[i].reported = 1;
+                qmap->map[i].cqe_req = 0;
+        }
 }
 
 /*
@@ -1121,6 +1125,7 @@ static int calc_left_cqes(u64 wqe_p, struct ipz_queue *ipz_queue,
         void *wqe_v;
         u64 q_ofs;
         u32 wqe_idx;
+        unsigned int tail_idx;
 
         /* convert real to abs address */
         wqe_p = wqe_p & (~(1UL << 63));
@@ -1133,12 +1138,17 @@ static int calc_left_cqes(u64 wqe_p, struct ipz_queue *ipz_queue,
                 return -EFAULT;
         }
 
+        tail_idx = (qmap->tail + 1) % qmap->entries;
         wqe_idx = q_ofs / ipz_queue->qe_size;
-        if (wqe_idx < qmap->tail)
-                qmap->left_to_poll = (qmap->entries - qmap->tail) + wqe_idx;
-        else
-                qmap->left_to_poll = wqe_idx - qmap->tail;
 
+        /* check all processed wqes, whether a cqe is requested or not */
+        while (tail_idx != wqe_idx) {
+                if (qmap->map[tail_idx].cqe_req)
+                        qmap->left_to_poll++;
+                tail_idx = (tail_idx + 1) % qmap->entries;
+        }
+        /* save index in queue, where we have to start flushing */
+        qmap->next_wqe_idx = wqe_idx;
         return 0;
 }
 
@@ -1185,10 +1195,14 @@ static int check_for_left_cqes(struct ehca_qp *my_qp, struct ehca_shca *shca)
         } else {
                 spin_lock_irqsave(&my_qp->send_cq->spinlock, flags);
                 my_qp->sq_map.left_to_poll = 0;
+                my_qp->sq_map.next_wqe_idx = (my_qp->sq_map.tail + 1) %
+                                                my_qp->sq_map.entries;
                 spin_unlock_irqrestore(&my_qp->send_cq->spinlock, flags);
 
                 spin_lock_irqsave(&my_qp->recv_cq->spinlock, flags);
                 my_qp->rq_map.left_to_poll = 0;
+                my_qp->rq_map.next_wqe_idx = (my_qp->rq_map.tail + 1) %
+                                                my_qp->rq_map.entries;
                 spin_unlock_irqrestore(&my_qp->recv_cq->spinlock, flags);
         }
 
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c
index 64928079eafa..00a648f4316c 100644
--- a/drivers/infiniband/hw/ehca/ehca_reqs.c
+++ b/drivers/infiniband/hw/ehca/ehca_reqs.c
@@ -179,6 +179,7 @@ static inline int ehca_write_swqe(struct ehca_qp *qp,
 
         qmap_entry->app_wr_id = get_app_wr_id(send_wr->wr_id);
         qmap_entry->reported = 0;
+        qmap_entry->cqe_req = 0;
 
         switch (send_wr->opcode) {
         case IB_WR_SEND:
@@ -203,8 +204,10 @@ static inline int ehca_write_swqe(struct ehca_qp *qp,
 
         if ((send_wr->send_flags & IB_SEND_SIGNALED ||
             qp->init_attr.sq_sig_type == IB_SIGNAL_ALL_WR)
-            && !hidden)
+            && !hidden) {
                 wqe_p->wr_flag |= WQE_WRFLAG_REQ_SIGNAL_COM;
+                qmap_entry->cqe_req = 1;
+        }
 
         if (send_wr->opcode == IB_WR_SEND_WITH_IMM ||
             send_wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) {
@@ -569,6 +572,7 @@ static int internal_post_recv(struct ehca_qp *my_qp,
                 qmap_entry = &my_qp->rq_map.map[rq_map_idx];
                 qmap_entry->app_wr_id = get_app_wr_id(cur_recv_wr->wr_id);
                 qmap_entry->reported = 0;
+                qmap_entry->cqe_req = 1;
 
                 wqe_cnt++;
         } /* eof for cur_recv_wr */
@@ -706,27 +710,34 @@ repoll:
                 goto repoll;
         wc->qp = &my_qp->ib_qp;
 
+        qmap_tail_idx = get_app_wr_id(cqe->work_request_id);
+        if (!(cqe->w_completion_flags & WC_SEND_RECEIVE_BIT))
+                /* We got a send completion. */
+                qmap = &my_qp->sq_map;
+        else
+                /* We got a receive completion. */
+                qmap = &my_qp->rq_map;
+
+        /* advance the tail pointer */
+        qmap->tail = qmap_tail_idx;
+
         if (is_error) {
                 /*
                  * set left_to_poll to 0 because in error state, we will not
                  * get any additional CQEs
                  */
-                ehca_add_to_err_list(my_qp, 1);
+                my_qp->sq_map.next_wqe_idx = (my_qp->sq_map.tail + 1) %
+                                                my_qp->sq_map.entries;
                 my_qp->sq_map.left_to_poll = 0;
+                ehca_add_to_err_list(my_qp, 1);
 
+                my_qp->rq_map.next_wqe_idx = (my_qp->rq_map.tail + 1) %
+                                                my_qp->rq_map.entries;
+                my_qp->rq_map.left_to_poll = 0;
                 if (HAS_RQ(my_qp))
                         ehca_add_to_err_list(my_qp, 0);
-                my_qp->rq_map.left_to_poll = 0;
         }
 
-        qmap_tail_idx = get_app_wr_id(cqe->work_request_id);
-        if (!(cqe->w_completion_flags & WC_SEND_RECEIVE_BIT))
-                /* We got a send completion. */
-                qmap = &my_qp->sq_map;
-        else
-                /* We got a receive completion. */
-                qmap = &my_qp->rq_map;
-
         qmap_entry = &qmap->map[qmap_tail_idx];
         if (qmap_entry->reported) {
                 ehca_warn(cq->device, "Double cqe on qp_num=%#x",
@@ -738,10 +749,6 @@ repoll:
         wc->wr_id = replace_wr_id(cqe->work_request_id, qmap_entry->app_wr_id);
         qmap_entry->reported = 1;
 
-        /* this is a proper completion, we need to advance the tail pointer */
-        if (++qmap->tail == qmap->entries)
-                qmap->tail = 0;
-
         /* if left_to_poll is decremented to 0, add the QP to the error list */
         if (qmap->left_to_poll > 0) {
                 qmap->left_to_poll--;
@@ -805,13 +812,14 @@ static int generate_flush_cqes(struct ehca_qp *my_qp, struct ib_cq *cq,
         else
                 qmap = &my_qp->rq_map;
 
-        qmap_entry = &qmap->map[qmap->tail];
+        qmap_entry = &qmap->map[qmap->next_wqe_idx];
 
         while ((nr < num_entries) && (qmap_entry->reported == 0)) {
                 /* generate flush CQE */
+
                 memset(wc, 0, sizeof(*wc));
 
-                offset = qmap->tail * ipz_queue->qe_size;
+                offset = qmap->next_wqe_idx * ipz_queue->qe_size;
                 wqe = (struct ehca_wqe *)ipz_qeit_calc(ipz_queue, offset);
                 if (!wqe) {
                         ehca_err(cq->device, "Invalid wqe offset=%#lx on "
@@ -850,11 +858,12 @@ static int generate_flush_cqes(struct ehca_qp *my_qp, struct ib_cq *cq,
 
                 wc->qp = &my_qp->ib_qp;
 
-                /* mark as reported and advance tail pointer */
+                /* mark as reported and advance next_wqe pointer */
                 qmap_entry->reported = 1;
-                if (++qmap->tail == qmap->entries)
-                        qmap->tail = 0;
-                qmap_entry = &qmap->map[qmap->tail];
+                qmap->next_wqe_idx++;
+                if (qmap->next_wqe_idx == qmap->entries)
+                        qmap->next_wqe_idx = 0;
+                qmap_entry = &qmap->map[qmap->next_wqe_idx];
 
                 wc++; nr++;
         }
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index d0866a3636e2..18308494a195 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -343,6 +343,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
 {
         struct mlx4_ib_dev *dev = to_mdev(ibcq->device);
         struct mlx4_ib_cq *cq = to_mcq(ibcq);
+        struct mlx4_mtt mtt;
         int outst_cqe;
         int err;
 
@@ -376,10 +377,13 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
                         goto out;
         }
 
+        mtt = cq->buf.mtt;
+
         err = mlx4_cq_resize(dev->dev, &cq->mcq, entries, &cq->resize_buf->buf.mtt);
         if (err)
                 goto err_buf;
 
+        mlx4_mtt_cleanup(dev->dev, &mtt);
         if (ibcq->uobject) {
                 cq->buf      = cq->resize_buf->buf;
                 cq->ibcq.cqe = cq->resize_buf->cqe;
@@ -406,6 +410,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
         goto out;
 
 err_buf:
+        mlx4_mtt_cleanup(dev->dev, &cq->resize_buf->buf.mtt);
         if (!ibcq->uobject)
                 mlx4_ib_free_cq_buf(dev, &cq->resize_buf->buf,
                                     cq->resize_buf->cqe);
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
index 6790e975a98c..bc4e40f3ede7 100644
--- a/drivers/input/ff-memless.c
+++ b/drivers/input/ff-memless.c
@@ -397,8 +397,9 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value)
 {
         struct ml_device *ml = dev->ff->private;
         struct ml_effect_state *state = &ml->states[effect_id];
+        unsigned long flags;
 
-        spin_lock_bh(&ml->timer_lock);
+        spin_lock_irqsave(&ml->timer_lock, flags);
 
         if (value > 0) {
                 debug("initiated play");
@@ -424,7 +425,7 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value)
                 ml_play_effects(ml);
         }
 
-        spin_unlock_bh(&ml->timer_lock);
+        spin_unlock_irqrestore(&ml->timer_lock, flags);
 
         return 0;
 }
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 22016ca15351..379b7ff354ec 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -824,7 +824,7 @@ static void atkbd_disconnect(struct serio *serio)
         atkbd_disable(atkbd);
 
         /* make sure we don't have a command in flight */
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&atkbd->event_work);
 
         sysfs_remove_group(&serio->dev.kobj, &atkbd_attribute_group);
         input_unregister_device(atkbd->dev);
@@ -868,6 +868,22 @@ static void atkbd_hp_keymap_fixup(struct atkbd *atkbd)
 }
 
 /*
+ * Inventec system with broken key release on volume keys
+ */
+static void atkbd_inventec_keymap_fixup(struct atkbd *atkbd)
+{
+        const unsigned int forced_release_keys[] = {
+                0xae, 0xb0,
+        };
+        int i;
+
+        if (atkbd->set == 2)
+                for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)
+                        __set_bit(forced_release_keys[i],
+                                  atkbd->force_release_mask);
+}
+
+/*
  * atkbd_set_keycode_table() initializes keyboard's keycode table
  * according to the selected scancode set
  */
@@ -1468,6 +1484,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                 .callback = atkbd_setup_fixup,
                 .driver_data = atkbd_hp_keymap_fixup,
         },
+        {
+                .ident = "Inventec Symphony",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "INVENTEC"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"),
+                },
+                .callback = atkbd_setup_fixup,
+                .driver_data = atkbd_inventec_keymap_fixup,
+        },
         { }
 };
 
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index bce160f4349b..86457feccfc4 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -42,7 +42,7 @@
 
 static char *phone = "kip1000";
 module_param(phone, charp, S_IRUSR);
-MODULE_PARM_DESC(phone, "Phone name {kip1000, gtalk, usbph01}");
+MODULE_PARM_DESC(phone, "Phone name {kip1000, gtalk, usbph01, atcom}");
 
 enum {
         /* HID Registers */
@@ -258,6 +258,37 @@ static unsigned short keymap_usbph01(int scancode)
         }
 }
 
+/*
+ * Keymap for ATCom AU-100
+ * http://www.atcom.cn/En_products_AU100.html
+ * http://www.packetizer.com/products/au100/
+ * http://www.voip-info.org/wiki/view/AU-100
+ *
+ * Contributed by daniel@gimpelevich.san-francisco.ca.us
+ */
+static unsigned short keymap_atcom(int scancode)
+{
+        switch (scancode) {                             /* phone key:   */
+        case 0x82: return KEY_NUMERIC_0;                /*   0          */
+        case 0x11: return KEY_NUMERIC_1;                /*   1          */
+        case 0x12: return KEY_NUMERIC_2;                /*   2          */
+        case 0x14: return KEY_NUMERIC_3;                /*   3          */
+        case 0x21: return KEY_NUMERIC_4;                /*   4          */
+        case 0x22: return KEY_NUMERIC_5;                /*   5          */
+        case 0x24: return KEY_NUMERIC_6;                /*   6          */
+        case 0x41: return KEY_NUMERIC_7;                /*   7          */
+        case 0x42: return KEY_NUMERIC_8;                /*   8          */
+        case 0x44: return KEY_NUMERIC_9;                /*   9          */
+        case 0x84: return KEY_NUMERIC_POUND;            /*   #          */
+        case 0x81: return KEY_NUMERIC_STAR;             /*   *          */
+        case 0x18: return KEY_ENTER;                    /*   pickup     */
+        case 0x28: return KEY_ESC;                      /*   hangup     */
+        case 0x48: return KEY_LEFT;                     /* left arrow   */
+        case 0x88: return KEY_RIGHT;                    /* right arrow  */
+        default:   return special_keymap(scancode);
+        }
+}
+
 static unsigned short (*keymap)(int) = keymap_kip1000;
 
 /*
@@ -840,6 +871,10 @@ static int __init cm109_select_keymap(void)
                 keymap = keymap_usbph01;
                 printk(KERN_INFO KBUILD_MODNAME ": "
                         "Keymap for Allied-Telesis Corega USBPH01 phone loaded\n");
+        } else if (!strcasecmp(phone, "atcom")) {
+                keymap = keymap_atcom;
+                printk(KERN_INFO KBUILD_MODNAME ": "
+                        "Keymap for ATCom AU-100 phone loaded\n");
         } else {
                 printk(KERN_ERR KBUILD_MODNAME ": "
                         "Unsupported phone: %s\n", phone);
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c
index e82d34201e97..88f04bf2ad6c 100644
--- a/drivers/input/mouse/hgpk.c
+++ b/drivers/input/mouse/hgpk.c
@@ -125,7 +125,7 @@ static void hgpk_spewing_hack(struct psmouse *psmouse,
  */
 static int hgpk_validate_byte(unsigned char *packet)
 {
-        return (packet[0] & 0x0C) == 0x08;
+        return (packet[0] & 0x0C) != 0x08;
 }
 
 static void hgpk_process_packet(struct psmouse *psmouse)
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index eec375cd10e6..29e686388a2c 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -337,6 +337,20 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "2656"),
                 },
         },
+        {
+                .ident = "Dell XPS M1530",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "XPS M1530"),
+                },
+        },
+        {
+                .ident = "Compal HEL80I",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "COMPAL"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "HEL80I"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
index ca62ec639f8f..677680e9f54f 100644
--- a/drivers/input/tablet/wacom.h
+++ b/drivers/input/tablet/wacom.h
@@ -66,6 +66,7 @@
  *                 - Support Intuos3 4x6
  *      v1.47 (pc) - Added support for Bamboo
  *      v1.48 (pc) - Added support for Bamboo1, BambooFun, and Cintiq 12WX
+ *      v1.49 (pc) - Added support for USB Tablet PC (0x90, 0x93, and 0x9A)
  */
 
 /*
@@ -86,7 +87,7 @@
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v1.48"
+#define DRIVER_VERSION "v1.49"
 #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
 #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver"
 #define DRIVER_LICENSE "GPL"
@@ -103,15 +104,15 @@ struct wacom {
         struct usb_device *usbdev;
         struct usb_interface *intf;
         struct urb *irq;
-        struct wacom_wac * wacom_wac;
+        struct wacom_wac *wacom_wac;
         struct mutex lock;
         unsigned int open:1;
         char phys[32];
 };
 
 struct wacom_combo {
-        struct wacom * wacom;
-        struct urb * urb;
+        struct wacom *wacom;
+        struct urb *urb;
 };
 
 extern int wacom_wac_irq(struct wacom_wac * wacom_wac, void * wcombo);
@@ -132,7 +133,7 @@ extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wa
 extern void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern __u16 wacom_le16_to_cpu(unsigned char *data);
 extern __u16 wacom_be16_to_cpu(unsigned char *data);
-extern struct wacom_features * get_wacom_feature(const struct usb_device_id *id);
-extern const struct usb_device_id * get_device_table(void);
+extern struct wacom_features *get_wacom_feature(const struct usb_device_id *id);
+extern const struct usb_device_id *get_device_table(void);
 
 #endif
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 09e227aa0d49..484496daa0f3 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -14,8 +14,41 @@
 #include "wacom.h"
 #include "wacom_wac.h"
 
+/* defines to get HID report descriptor */
+#define HID_DEVICET_HID         (USB_TYPE_CLASS | 0x01)
+#define HID_DEVICET_REPORT      (USB_TYPE_CLASS | 0x02)
+#define HID_USAGE_UNDEFINED             0x00
+#define HID_USAGE_PAGE                  0x05
+#define HID_USAGE_PAGE_DIGITIZER        0x0d
+#define HID_USAGE_PAGE_DESKTOP          0x01
+#define HID_USAGE                       0x09
+#define HID_USAGE_X                     0x30
+#define HID_USAGE_Y                     0x31
+#define HID_USAGE_X_TILT                0x3d
+#define HID_USAGE_Y_TILT                0x3e
+#define HID_USAGE_FINGER                0x22
+#define HID_USAGE_STYLUS                0x20
+#define HID_COLLECTION                  0xc0
+
+enum {
+        WCM_UNDEFINED = 0,
+        WCM_DESKTOP,
+        WCM_DIGITIZER,
+};
+
+struct hid_descriptor {
+        struct usb_descriptor_header header;
+        __le16   bcdHID;
+        u8       bCountryCode;
+        u8       bNumDescriptors;
+        u8       bDescriptorType;
+        __le16   wDescriptorLength;
+} __attribute__ ((packed));
+
+/* defines to get/set USB message */
 #define USB_REQ_GET_REPORT      0x01
 #define USB_REQ_SET_REPORT      0x09
+#define WAC_HID_FEATURE_REPORT  0x03
 
 static int usb_get_report(struct usb_interface *intf, unsigned char type,
                                 unsigned char id, void *buf, int size)
@@ -80,25 +113,21 @@ static void wacom_sys_irq(struct urb *urb)
 void wacom_report_key(void *wcombo, unsigned int key_type, int key_data)
 {
         input_report_key(get_input_dev((struct wacom_combo *)wcombo), key_type, key_data);
-        return;
 }
 
 void wacom_report_abs(void *wcombo, unsigned int abs_type, int abs_data)
 {
         input_report_abs(get_input_dev((struct wacom_combo *)wcombo), abs_type, abs_data);
-        return;
 }
 
 void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data)
 {
         input_report_rel(get_input_dev((struct wacom_combo *)wcombo), rel_type, rel_data);
-        return;
 }
 
 void wacom_input_event(void *wcombo, unsigned int type, unsigned int code, int value)
 {
         input_event(get_input_dev((struct wacom_combo *)wcombo), type, code, value);
-        return;
 }
 
 __u16 wacom_be16_to_cpu(unsigned char *data)
@@ -118,7 +147,6 @@ __u16 wacom_le16_to_cpu(unsigned char *data)
 void wacom_input_sync(void *wcombo)
 {
         input_sync(get_input_dev((struct wacom_combo *)wcombo));
-        return;
 }
 
 static int wacom_open(struct input_dev *dev)
@@ -160,7 +188,7 @@ static void wacom_close(struct input_dev *dev)
 
 void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_1) |
+        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_1) |
                 BIT_MASK(BTN_5);
         input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
 }
@@ -170,7 +198,7 @@ void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
         input_dev->evbit[0] |= BIT_MASK(EV_MSC);
         input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
         input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);
-        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) |
+        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) |
                 BIT_MASK(BTN_4);
 }
 
@@ -178,7 +206,7 @@ void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
         input_dev->evbit[0] |= BIT_MASK(EV_REL);
         input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);
-        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
+        input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_LEFT) |
                 BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
         input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
                 BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_STYLUS2);
@@ -188,7 +216,7 @@ void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
         input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);
-        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) |
+        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) |
                 BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);
         input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
         input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
@@ -196,14 +224,14 @@ void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 
 void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_4) |
+        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_4) |
                 BIT_MASK(BTN_5) | BIT_MASK(BTN_6) | BIT_MASK(BTN_7);
         input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
 }
 
 void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9);
+        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9);
 }
 
 void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
@@ -211,7 +239,7 @@ void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
         input_dev->evbit[0] |= BIT_MASK(EV_MSC) | BIT_MASK(EV_REL);
         input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
         input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);
-        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
+        input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_LEFT) |
                 BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE) |
                 BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA);
         input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
@@ -228,8 +256,7 @@ void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 
 void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_STYLUS2) |
-                BIT_MASK(BTN_TOOL_RUBBER);
+        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_STYLUS2);
 }
 
 void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
@@ -237,15 +264,129 @@ void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
         input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER);
 }
 
+static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hid_desc,
+                           struct wacom_wac *wacom_wac)
+{
+        struct usb_device *dev = interface_to_usbdev(intf);
+        struct wacom_features *features = wacom_wac->features;
+        char limit = 0, result = 0;
+        int i = 0, usage = WCM_UNDEFINED, finger = 0, pen = 0;
+        unsigned char *report;
+
+        report = kzalloc(hid_desc->wDescriptorLength, GFP_KERNEL);
+        if (!report)
+                return -ENOMEM;
+
+        /* retrive report descriptors */
+        do {
+                result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+                        USB_REQ_GET_DESCRIPTOR,
+                        USB_RECIP_INTERFACE | USB_DIR_IN,
+                        HID_DEVICET_REPORT << 8,
+                        intf->altsetting[0].desc.bInterfaceNumber, /* interface */
+                        report,
+                        hid_desc->wDescriptorLength,
+                        5000); /* 5 secs */
+        } while (result < 0 && limit++ < 5);
+
+        if (result < 0)
+                goto out;
+
+        for (i = 0; i < hid_desc->wDescriptorLength; i++) {
+
+                switch (report[i]) {
+                case HID_USAGE_PAGE:
+                        switch (report[i + 1]) {
+                        case HID_USAGE_PAGE_DIGITIZER:
+                                usage = WCM_DIGITIZER;
+                                i++;
+                                break;
+
+                        case HID_USAGE_PAGE_DESKTOP:
+                                usage = WCM_DESKTOP;
+                                i++;
+                                break;
+                        }
+                        break;
+
+                case HID_USAGE:
+                        switch (report[i + 1]) {
+                        case HID_USAGE_X:
+                                if (usage == WCM_DESKTOP) {
+                                        if (finger) {
+                                                features->touch_x_max =
+                                                        features->touch_y_max =
+                                                        wacom_le16_to_cpu(&report[i + 3]);
+                                                features->x_max =
+                                                        wacom_le16_to_cpu(&report[i + 6]);
+                                                i += 7;
+                                        } else if (pen) {
+                                                features->x_max =
+                                                        wacom_le16_to_cpu(&report[i + 3]);
+                                                i += 4;
+                                        }
+                                } else if (usage == WCM_DIGITIZER) {
+                                        /* max pressure isn't reported
+                                        features->pressure_max = (unsigned short)
+                                                        (report[i+4] << 8  | report[i + 3]);
+                                        */
+                                        features->pressure_max = 255;
+                                        i += 4;
+                                }
+                                break;
+
+                        case HID_USAGE_Y:
+                                if (usage == WCM_DESKTOP)
+                                        features->y_max =
+                                                wacom_le16_to_cpu(&report[i + 3]);
+                                i += 4;
+                                break;
+
+                        case HID_USAGE_FINGER:
+                                finger = 1;
+                                i++;
+                                break;
+
+                        case HID_USAGE_STYLUS:
+                                pen = 1;
+                                i++;
+                                break;
+
+                        case HID_USAGE_UNDEFINED:
+                                if (usage == WCM_DESKTOP && finger) /* capacity */
+                                        features->pressure_max =
+                                                wacom_le16_to_cpu(&report[i + 3]);
+                                i += 4;
+                                break;
+                        }
+                        break;
+
+                case HID_COLLECTION:
+                        /* reset UsagePage ans Finger */
+                        finger = usage = 0;
+                        break;
+                }
+        }
+
+        result = 0;
+
+ out:
+        kfree(report);
+        return result;
+}
+
 static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         struct usb_device *dev = interface_to_usbdev(intf);
+        struct usb_host_interface *interface = intf->cur_altsetting;
         struct usb_endpoint_descriptor *endpoint;
         struct wacom *wacom;
         struct wacom_wac *wacom_wac;
+        struct wacom_features *features;
         struct input_dev *input_dev;
         int error = -ENOMEM;
         char rep_data[2], limit = 0;
+        struct hid_descriptor *hid_desc;
 
         wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
         wacom_wac = kzalloc(sizeof(struct wacom_wac), GFP_KERNEL);
@@ -268,8 +409,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         usb_make_path(dev, wacom->phys, sizeof(wacom->phys));
         strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
 
-        wacom_wac->features = get_wacom_feature(id);
-        BUG_ON(wacom_wac->features->pktlen > 10);
+        wacom_wac->features = features = get_wacom_feature(id);
+        BUG_ON(features->pktlen > 10);
 
         input_dev->name = wacom_wac->features->name;
         wacom->wacom_wac = wacom_wac;
@@ -282,18 +423,37 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         input_dev->open = wacom_open;
         input_dev->close = wacom_close;
 
+        endpoint = &intf->cur_altsetting->endpoint[0].desc;
+
+        /* TabletPC need to retrieve the physical and logical maximum from report descriptor */
+        if (wacom_wac->features->type == TABLETPC) {
+                if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) {
+                        if (usb_get_extra_descriptor(&interface->endpoint[0],
+                                                     HID_DEVICET_REPORT, &hid_desc)) {
+                                printk("wacom: can not retrive extra class descriptor\n");
+                                goto fail2;
+                        }
+                }
+                error = wacom_parse_hid(intf, hid_desc, wacom_wac);
+                if (error)
+                        goto fail2;
+        }
+
         input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
         input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) |
                 BIT_MASK(BTN_TOUCH) | BIT_MASK(BTN_STYLUS);
-        input_set_abs_params(input_dev, ABS_X, 0, wacom_wac->features->x_max, 4, 0);
-        input_set_abs_params(input_dev, ABS_Y, 0, wacom_wac->features->y_max, 4, 0);
-        input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom_wac->features->pressure_max, 0, 0);
+        input_set_abs_params(input_dev, ABS_X, 0, features->x_max, 4, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, features->y_max, 4, 0);
+        input_set_abs_params(input_dev, ABS_PRESSURE, 0, features->pressure_max, 0, 0);
+        if (features->type == TABLETPC) {
+                input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_DOUBLETAP);
+                input_set_abs_params(input_dev, ABS_RX, 0, features->touch_x_max, 4, 0);
+                input_set_abs_params(input_dev, ABS_RY, 0, features->touch_y_max, 4, 0);
+        }
         input_dev->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC);
 
         wacom_init_input_dev(input_dev, wacom_wac);
 
-        endpoint = &intf->cur_altsetting->endpoint[0].desc;
-
         usb_fill_int_urb(wacom->irq, dev,
                          usb_rcvintpipe(dev, endpoint->bEndpointAddress),
                          wacom_wac->data, wacom_wac->features->pktlen,
@@ -305,13 +465,22 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         if (error)
                 goto fail3;
 
-        /* Ask the tablet to report tablet data. Repeat until it succeeds */
-        do {
-                rep_data[0] = 2;
-                rep_data[1] = 2;
-                usb_set_report(intf, 3, 2, rep_data, 2);
-                usb_get_report(intf, 3, 2, rep_data, 2);
-        } while (rep_data[1] != 2 && limit++ < 5);
+        /*
+         * Ask the tablet to report tablet data if it is not a Tablet PC.
+         * Repeat until it succeeds
+         */
+        if (wacom_wac->features->type != TABLETPC) {
+                do {
+                        rep_data[0] = 2;
+                        rep_data[1] = 2;
+                        error = usb_set_report(intf, WAC_HID_FEATURE_REPORT,
+                                                2, rep_data, 2);
+                        if (error >= 0)
+                                error = usb_get_report(intf,
+                                                WAC_HID_FEATURE_REPORT, 2,
+                                                rep_data, 2);
+                } while ((error < 0 || rep_data[1] != 2) && limit++ < 5);
+        }
 
         usb_set_intfdata(intf, wacom);
         return 0;
@@ -333,7 +502,8 @@ static void wacom_disconnect(struct usb_interface *intf)
         usb_kill_urb(wacom->irq);
         input_unregister_device(wacom->dev);
         usb_free_urb(wacom->irq);
-        usb_buffer_free(interface_to_usbdev(intf), 10, wacom->wacom_wac->data, wacom->data_dma);
+        usb_buffer_free(interface_to_usbdev(intf), 10,
+                        wacom->wacom_wac->data, wacom->data_dma);
         kfree(wacom->wacom_wac);
         kfree(wacom);
 }
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index bf3d9a8b2c1b..8dc8d1e59bea 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -535,31 +535,147 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
         return 1;
 }
 
+int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo)
+{
+        char *data = wacom->data;
+        int prox = 0, pressure;
+        static int stylusInProx, touchInProx = 1, touchOut;
+        struct urb *urb = ((struct wacom_combo *)wcombo)->urb;
+
+        dbg("wacom_tpc_irq: received report #%d", data[0]);
+
+        if (urb->actual_length == 5 || data[0] == 6) { /* Touch data */
+                if (urb->actual_length == 5) {  /* with touch */
+                        prox = data[0] & 0x03;
+                } else {  /* with capacity */
+                        prox = data[1] & 0x03;
+                }
+
+                if (!stylusInProx) { /* stylus not in prox */
+                        if (prox) {
+                                if (touchInProx) {
+                                        wacom->tool[1] = BTN_TOOL_DOUBLETAP;
+                                        wacom->id[0] = TOUCH_DEVICE_ID;
+                                        if (urb->actual_length != 5) {
+                                                wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[2]));
+                                                wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[4]));
+                                                wacom_report_abs(wcombo, ABS_PRESSURE, wacom_le16_to_cpu(&data[6]));
+                                                wacom_report_key(wcombo, BTN_TOUCH, wacom_le16_to_cpu(&data[6]));
+                                        } else {
+                                                wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[1]));
+                                                wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[3]));
+                                                wacom_report_key(wcombo, BTN_TOUCH, 1);
+                                        }
+                                        wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
+                                        wacom_report_key(wcombo, wacom->tool[1], prox & 0x01);
+                                        touchOut = 1;
+                                        return 1;
+                                }
+                        } else {
+                                wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
+                                wacom_report_key(wcombo, wacom->tool[1], prox & 0x01);
+                                wacom_report_key(wcombo, BTN_TOUCH, 0);
+                                touchOut = 0;
+                                touchInProx = 1;
+                                return 1;
+                        }
+                } else if (touchOut || !prox) { /* force touch out-prox */
+                        wacom_report_abs(wcombo, ABS_MISC, TOUCH_DEVICE_ID);
+                        wacom_report_key(wcombo, BTN_TOUCH, 0);
+                        touchOut = 0;
+                        touchInProx = 1;
+                        return 1;
+                }
+        } else if (data[0] == 2) { /* Penabled */
+                prox = data[1] & 0x20;
+
+                touchInProx = 0;
+
+                wacom->id[0] = ERASER_DEVICE_ID;
+
+                /*
+                 * if going from out of proximity into proximity select between the eraser
+                 * and the pen based on the state of the stylus2 button, choose eraser if
+                 * pressed else choose pen. if not a proximity change from out to in, send
+                 * an out of proximity for previous tool then a in for new tool.
+                 */
+                if (prox) { /* in prox */
+                        if (!wacom->tool[0]) {
+                                /* Going into proximity select tool */
+                                wacom->tool[1] = (data[1] & 0x08) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+                                if (wacom->tool[1] == BTN_TOOL_PEN)
+                                        wacom->id[0] = STYLUS_DEVICE_ID;
+                        } else if (wacom->tool[1] == BTN_TOOL_RUBBER && !(data[1] & 0x08)) {
+                                /*
+                                 * was entered with stylus2 pressed
+                                 * report out proximity for previous tool
+                                */
+                                wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
+                                wacom_report_key(wcombo, wacom->tool[1], 0);
+                                wacom_input_sync(wcombo);
+
+                                /* set new tool */
+                                wacom->tool[1] = BTN_TOOL_PEN;
+                                wacom->id[0] = STYLUS_DEVICE_ID;
+                                return 0;
+                        }
+                        if (wacom->tool[1] != BTN_TOOL_RUBBER) {
+                                /* Unknown tool selected default to pen tool */
+                                wacom->tool[1] = BTN_TOOL_PEN;
+                                wacom->id[0] = STYLUS_DEVICE_ID;
+                        }
+                        wacom_report_key(wcombo, BTN_STYLUS, data[1] & 0x02);
+                        wacom_report_key(wcombo, BTN_STYLUS2, data[1] & 0x10);
+                        wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[2]));
+                        wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[4]));
+                        pressure = ((data[7] & 0x01) << 8) | data[6];
+                        if (pressure < 0)
+                                pressure = wacom->features->pressure_max + pressure + 1;
+                        wacom_report_abs(wcombo, ABS_PRESSURE, pressure);
+                        wacom_report_key(wcombo, BTN_TOUCH, pressure);
+                } else {
+                        wacom_report_abs(wcombo, ABS_PRESSURE, 0);
+                        wacom_report_key(wcombo, BTN_STYLUS, 0);
+                        wacom_report_key(wcombo, BTN_STYLUS2, 0);
+                        wacom_report_key(wcombo, BTN_TOUCH, 0);
+                }
+                wacom_report_key(wcombo, wacom->tool[1], prox);
+                wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
+                stylusInProx = prox;
+                wacom->tool[0] = prox;
+                return 1;
+        }
+        return 0;
+}
+
 int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo)
 {
         switch (wacom_wac->features->type) {
                 case PENPARTNER:
-                        return (wacom_penpartner_irq(wacom_wac, wcombo));
-                        break;
+                        return wacom_penpartner_irq(wacom_wac, wcombo);
+
                 case PL:
-                        return (wacom_pl_irq(wacom_wac, wcombo));
-                        break;
+                        return wacom_pl_irq(wacom_wac, wcombo);
+
                 case WACOM_G4:
                 case GRAPHIRE:
                 case WACOM_MO:
-                        return (wacom_graphire_irq(wacom_wac, wcombo));
-                        break;
+                        return wacom_graphire_irq(wacom_wac, wcombo);
+
                 case PTU:
-                        return (wacom_ptu_irq(wacom_wac, wcombo));
-                        break;
+                        return wacom_ptu_irq(wacom_wac, wcombo);
+
                 case INTUOS:
                 case INTUOS3S:
                 case INTUOS3:
                 case INTUOS3L:
                 case CINTIQ:
                 case WACOM_BEE:
-                        return (wacom_intuos_irq(wacom_wac, wcombo));
-                        break;
+                        return wacom_intuos_irq(wacom_wac, wcombo);
+
+                case TABLETPC:
+                        return wacom_tpc_irq(wacom_wac, wcombo);
+
                 default:
                         return 0;
         }
@@ -586,13 +702,15 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w
                         /* fall through */
                 case INTUOS3S:
                         input_dev_i3s(input_dev, wacom_wac);
+                        /* fall through */
                 case INTUOS:
                         input_dev_i(input_dev, wacom_wac);
                         break;
                 case PL:
                 case PTU:
+                case TABLETPC:
                         input_dev_pl(input_dev, wacom_wac);
-                        break;
+                        /* fall through */
                 case PENPARTNER:
                         input_dev_pt(input_dev, wacom_wac);
                         break;
@@ -611,6 +729,7 @@ static struct wacom_features wacom_features[] = {
         { "Wacom Graphire4 6x8", 8,  16704, 12064,  511, 63, WACOM_G4 },
         { "Wacom BambooFun 4x5", 9,  14760,  9225,  511, 63, WACOM_MO },
         { "Wacom BambooFun 6x8", 9,  21648, 13530,  511, 63, WACOM_MO },
+        { "Wacom Bamboo1 Medium",8,  16704, 12064,  511, 63, GRAPHIRE },
         { "Wacom Volito",        8,   5104,  3712,  511, 63, GRAPHIRE },
         { "Wacom PenStation2",   8,   3250,  2320,  255, 63, GRAPHIRE },
         { "Wacom Volito2 4x5",   8,   5104,  3712,  511, 63, GRAPHIRE },
@@ -650,6 +769,10 @@ static struct wacom_features wacom_features[] = {
         { "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 63, CINTIQ },
         { "Wacom Cintiq 20WSX",  10, 86680, 54180, 1023, 63, WACOM_BEE },
         { "Wacom Cintiq 12WX",   10, 53020, 33440, 1023, 63, WACOM_BEE },
+        { "Wacom DTU1931",        8, 37832, 30305,  511,  0, PL },
+        { "Wacom ISDv4 90",       8, 26202, 16325,  255,  0, TABLETPC },
+        { "Wacom ISDv4 93",       8, 26202, 16325,  255,  0, TABLETPC },
+        { "Wacom ISDv4 9A",       8, 26202, 16325,  255,  0, TABLETPC },
         { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 31, INTUOS },
         { }
 };
@@ -665,6 +788,7 @@ static struct usb_device_id wacom_ids[] = {
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x16) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x17) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x18) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x19) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x61) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x62) },
@@ -704,18 +828,26 @@ static struct usb_device_id wacom_ids[] = {
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC7) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x90) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x93) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x9A) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) },
         { }
 };
 
-const struct usb_device_id * get_device_table(void) {
-        const struct usb_device_id * id_table = wacom_ids;
+const struct usb_device_id *get_device_table(void)
+{
+        const struct usb_device_id *id_table = wacom_ids;
+
         return id_table;
 }
 
-struct wacom_features * get_wacom_feature(const struct usb_device_id * id) {
+struct wacom_features * get_wacom_feature(const struct usb_device_id *id)
+{
         int index = id - wacom_ids;
         struct wacom_features *wf = &wacom_features[index];
+
         return wf;
 }
 
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 3342bc05847d..f9c8b69673b7 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -10,6 +10,7 @@
 #define WACOM_WAC_H
 
 #define STYLUS_DEVICE_ID        0x02
+#define TOUCH_DEVICE_ID         0x03
 #define CURSOR_DEVICE_ID        0x06
 #define ERASER_DEVICE_ID        0x0A
 #define PAD_DEVICE_ID           0x0F
@@ -27,6 +28,7 @@ enum {
         CINTIQ,
         WACOM_BEE,
         WACOM_MO,
+        TABLETPC,
         MAX_TYPE
 };
 
@@ -38,6 +40,8 @@ struct wacom_features {
         int pressure_max;
         int distance_max;
         int type;
+        int touch_x_max;
+        int touch_y_max;
 };
 
 struct wacom_wac {
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c
index d20689cdbd5d..8f38c5e55ce6 100644
--- a/drivers/input/touchscreen/elo.c
+++ b/drivers/input/touchscreen/elo.c
@@ -262,7 +262,7 @@ static int elo_setup_10(struct elo *elo)
                 input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0);
 
         printk(KERN_INFO "elo: %sTouch touchscreen, fw: %02x.%02x, "
-                "features: %x02x, controller: 0x%02x\n",
+                "features: 0x%02x, controller: 0x%02x\n",
                 elo_types[(packet[1] -'0') & 0x03],
                 packet[5], packet[4], packet[3], packet[7]);
 
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c
index 3ab6362f043c..928d2ed8865f 100644
--- a/drivers/input/xen-kbdfront.c
+++ b/drivers/input/xen-kbdfront.c
@@ -323,7 +323,7 @@ static struct xenbus_device_id xenkbd_ids[] = {
         { "" }
 };
 
-static struct xenbus_driver xenkbd = {
+static struct xenbus_driver xenkbd_driver = {
         .name = "vkbd",
         .owner = THIS_MODULE,
         .ids = xenkbd_ids,
@@ -342,12 +342,12 @@ static int __init xenkbd_init(void)
         if (xen_initial_domain())
                 return -ENODEV;
 
-        return xenbus_register_frontend(&xenkbd);
+        return xenbus_register_frontend(&xenkbd_driver);
 }
 
 static void __exit xenkbd_cleanup(void)
 {
-        xenbus_unregister_driver(&xenkbd);
+        xenbus_unregister_driver(&xenkbd_driver);
 }
 
 module_init(xenkbd_init);
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 84d75a3f5d17..ded9d0baf607 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1213,7 +1213,7 @@ static void HiSax_shiftcards(int idx)
                 memcpy(&cards[i], &cards[i + 1], sizeof(cards[i]));
 }
 
-static int HiSax_inithardware(int *busy_flag)
+static int __init HiSax_inithardware(int *busy_flag)
 {
         int foundcards = 0;
         int i = 0;
@@ -1542,7 +1542,9 @@ static void __exit HiSax_exit(void)
         printk(KERN_INFO "HiSax module removed\n");
 }
 
-int hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card)
+#ifdef CONFIG_HOTPLUG
+
+int __devinit hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card)
 {
         u_char ids[16];
         int ret = -1;
@@ -1563,6 +1565,8 @@ error:
 }
 
 EXPORT_SYMBOL(hisax_init_pcmcia);
+#endif
+
 EXPORT_SYMBOL(HiSax_closecard);
 
 #include "hisax_if.h"
@@ -1580,6 +1584,11 @@ static void hisax_bc_close(struct BCState *bcs);
 static void hisax_bh(struct work_struct *work);
 static void EChannel_proc_rcv(struct hisax_d_if *d_if);
 
+static int hisax_setup_card_dynamic(struct IsdnCard *card)
+{
+        return 2;
+}
+
 int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[],
                    char *name, int protocol)
 {
@@ -1599,7 +1608,8 @@ int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[],
         cards[i].protocol = protocol;
         sprintf(id, "%s%d", name, i);
         nrcards++;
-        retval = checkcard(i, id, NULL, hisax_d_if->owner, hisax_cs_setup_card);
+        retval = checkcard(i, id, NULL, hisax_d_if->owner,
+                                hisax_setup_card_dynamic);
         if (retval == 0) { // yuck
                 cards[i].typ = 0;
                 nrcards--;
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 2c21d4f25cc8..a98ab72adf95 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -288,7 +288,7 @@ static void __devexit rackmeter_stop_cpu_sniffer(struct rackmeter *rm)
         cancel_rearming_delayed_work(&rm->cpu[1].sniffer);
 }
 
-static int rackmeter_setup(struct rackmeter *rm)
+static int __devinit rackmeter_setup(struct rackmeter *rm)
 {
         pr_debug("rackmeter: setting up i2s..\n");
         rackmeter_setup_i2s(rm);
@@ -582,12 +582,12 @@ static struct of_device_id rackmeter_match[] = {
         { }
 };
 
-static struct macio_driver rackmeter_drv = {
+static struct macio_driver rackmeter_driver = {
         .name = "rackmeter",
         .owner = THIS_MODULE,
         .match_table = rackmeter_match,
         .probe = rackmeter_probe,
-        .remove = rackmeter_remove,
+        .remove = __devexit_p(rackmeter_remove),
         .shutdown = rackmeter_shutdown,
 };
 
@@ -596,14 +596,14 @@ static int __init rackmeter_init(void)
 {
         pr_debug("rackmeter_init()\n");
 
-        return macio_register_driver(&rackmeter_drv);
+        return macio_register_driver(&rackmeter_driver);
 }
 
 static void __exit rackmeter_exit(void)
 {
         pr_debug("rackmeter_exit()\n");
 
-        macio_unregister_driver(&rackmeter_drv);
+        macio_unregister_driver(&rackmeter_driver);
 }
 
 module_init(rackmeter_init);
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index d15984e599bc..a21ce9edcc7e 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -376,7 +376,7 @@ static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb)
         pci_free_consistent(dm1105dvb->pdev, 6*DM1105_DMA_BYTES, dm1105dvb->ts_buf, dm1105dvb->dma_addr);
 }
 
-static void __devinit dm1105dvb_enable_irqs(struct dm1105dvb *dm1105dvb)
+static void dm1105dvb_enable_irqs(struct dm1105dvb *dm1105dvb)
 {
         outb(INTMAK_ALLMASK, dm_io_mem(DM1105_INTMAK));
         outb(1, dm_io_mem(DM1105_CR));
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 8557bf12cfb4..7a421e9dba5a 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -585,6 +585,8 @@ restart:
                 if (fe->ops.set_voltage)
                         fe->ops.set_voltage(fe, SEC_VOLTAGE_OFF);
                 if (fe->ops.tuner_ops.sleep) {
+                        if (fe->ops.i2c_gate_ctrl)
+                                fe->ops.i2c_gate_ctrl(fe, 1);
                         fe->ops.tuner_ops.sleep(fe);
                         if (fe->ops.i2c_gate_ctrl)
                                 fe->ops.i2c_gate_ctrl(fe, 0);
@@ -934,7 +936,8 @@ void dtv_property_dump(struct dtv_property *tvp)
 int is_legacy_delivery_system(fe_delivery_system_t s)
 {
         if((s == SYS_UNDEFINED) || (s == SYS_DVBC_ANNEX_AC) ||
-                (s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS))
+           (s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS) ||
+           (s == SYS_ATSC))
                 return 1;
 
         return 0;
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 847d8fdd9ec4..e9ab0249d133 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -681,12 +681,6 @@ static int af9015_download_firmware(struct usb_device *udev,
                 goto error;
         }
 
-        /* firmware is running, reconnect device in the usb bus */
-        req.cmd = RECONNECT_USB;
-        ret = af9015_rw_udev(udev, &req);
-        if (ret)
-                err("reconnect failed: %d", ret);
-
 error:
         return ret;
 }
@@ -1208,6 +1202,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                 .usb_ctrl = DEVICE_SPECIFIC,
                 .download_firmware = af9015_download_firmware,
                 .firmware = "dvb-usb-af9015.fw",
+                .no_reconnect = 1,
 
                 .size_of_priv = sizeof(struct af9015_state), \
 
@@ -1306,6 +1301,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                 .usb_ctrl = DEVICE_SPECIFIC,
                 .download_firmware = af9015_download_firmware,
                 .firmware = "dvb-usb-af9015.fw",
+                .no_reconnect = 1,
 
                 .size_of_priv = sizeof(struct af9015_state), \
 
diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/dvb/dvb-usb/dib0700.h
index 739193943c17..8b544fe79b0d 100644
--- a/drivers/media/dvb/dvb-usb/dib0700.h
+++ b/drivers/media/dvb/dvb-usb/dib0700.h
@@ -22,7 +22,7 @@ extern int dvb_usb_dib0700_debug;
 
 #define REQUEST_I2C_READ     0x2
 #define REQUEST_I2C_WRITE    0x3
-#define REQUEST_POLL_RC      0x4
+#define REQUEST_POLL_RC      0x4 /* deprecated in firmware v1.20 */
 #define REQUEST_JUMPRAM      0x8
 #define REQUEST_SET_CLOCK    0xB
 #define REQUEST_SET_GPIO     0xC
@@ -40,11 +40,14 @@ struct dib0700_state {
         u16 mt2060_if1[2];
         u8 rc_toggle;
         u8 rc_counter;
+        u8 rc_func_version;
         u8 is_dib7000pc;
         u8 fw_use_new_i2c_api;
         u8 disable_streaming_master_mode;
 };
 
+extern int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
+                               u32 *romversion, u32 *ramversion, u32 *fwtype);
 extern int dib0700_set_gpio(struct dvb_usb_device *, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val);
 extern int dib0700_ctrl_clock(struct dvb_usb_device *d, u32 clk_MHz, u8 clock_out_gp3);
 extern int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen);
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
index dd53cee3896d..200b215f4d8b 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -19,6 +19,22 @@ MODULE_PARM_DESC(dvb_usb_dib0700_ir_proto, "set ir protocol (0=NEC, 1=RC5 (defau
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
+
+int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
+                        u32 *romversion, u32 *ramversion, u32 *fwtype)
+{
+        u8 b[16];
+        int ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0),
+                                  REQUEST_GET_VERSION,
+                                  USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
+                                  b, sizeof(b), USB_CTRL_GET_TIMEOUT);
+        *hwversion  = (b[0] << 24)  | (b[1] << 16)  | (b[2] << 8)  | b[3];
+        *romversion = (b[4] << 24)  | (b[5] << 16)  | (b[6] << 8)  | b[7];
+        *ramversion = (b[8] << 24)  | (b[9] << 16)  | (b[10] << 8) | b[11];
+        *fwtype     = (b[12] << 24) | (b[13] << 16) | (b[14] << 8) | b[15];
+        return ret;
+}
+
 /* expecting rx buffer: request data[0] data[1] ... data[2] */
 static int dib0700_ctrl_wr(struct dvb_usb_device *d, u8 *tx, u8 txlen)
 {
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 0cfccc24b190..f28d3ae59e04 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -38,6 +38,7 @@ static struct mt2060_config bristol_mt2060_config[2] = {
         }
 };
 
+
 static struct dibx000_agc_config bristol_dib3000p_mt2060_agc_config = {
         .band_caps = BAND_VHF | BAND_UHF,
         .setup     = (1 << 8) | (5 << 5) | (0 << 4) | (0 << 3) | (0 << 2) | (2 << 0),
@@ -451,8 +452,13 @@ static u8 rc_request[] = { REQUEST_POLL_RC, 0 };
 
 /* Number of keypresses to ignore before start repeating */
 #define RC_REPEAT_DELAY 2
+#define RC_REPEAT_DELAY_V1_20 5
 
-static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+
+
+/* Used by firmware versions < 1.20 (deprecated) */
+static int dib0700_rc_query_legacy(struct dvb_usb_device *d, u32 *event,
+                                   int *state)
 {
         u8 key[4];
         int i;
@@ -529,6 +535,137 @@ static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         return 0;
 }
 
+/* This is the structure of the RC response packet starting in firmware 1.20 */
+struct dib0700_rc_response {
+        u8 report_id;
+        u8 data_state;
+        u8 system_msb;
+        u8 system_lsb;
+        u8 data;
+        u8 not_data;
+};
+
+/* This supports the new IR response format for firmware v1.20 */
+static int dib0700_rc_query_v1_20(struct dvb_usb_device *d, u32 *event,
+                                  int *state)
+{
+        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        struct dib0700_state *st = d->priv;
+        struct dib0700_rc_response poll_reply;
+        u8 buf[6];
+        int i;
+        int status;
+        int actlen;
+        int found = 0;
+
+        /* Set initial results in case we exit the function early */
+        *event = 0;
+        *state = REMOTE_NO_KEY_PRESSED;
+
+        /* Firmware v1.20 provides RC data via bulk endpoint 1 */
+        status = usb_bulk_msg(d->udev, usb_rcvbulkpipe(d->udev, 1), buf,
+                              sizeof(buf), &actlen, 50);
+        if (status < 0) {
+                /* No data available (meaning no key press) */
+                return 0;
+        }
+
+        if (actlen != sizeof(buf)) {
+                /* We didn't get back the 6 byte message we expected */
+                err("Unexpected RC response size [%d]", actlen);
+                return -1;
+        }
+
+        poll_reply.report_id  = buf[0];
+        poll_reply.data_state = buf[1];
+        poll_reply.system_msb = buf[2];
+        poll_reply.system_lsb = buf[3];
+        poll_reply.data       = buf[4];
+        poll_reply.not_data   = buf[5];
+
+        /*
+        info("rid=%02x ds=%02x sm=%02x sl=%02x d=%02x nd=%02x\n",
+             poll_reply.report_id, poll_reply.data_state,
+             poll_reply.system_msb, poll_reply.system_lsb,
+             poll_reply.data, poll_reply.not_data);
+        */
+
+        if ((poll_reply.data + poll_reply.not_data) != 0xff) {
+                /* Key failed integrity check */
+                err("key failed integrity check: %02x %02x %02x %02x",
+                    poll_reply.system_msb, poll_reply.system_lsb,
+                    poll_reply.data, poll_reply.not_data);
+                return -1;
+        }
+
+        /* Find the key in the map */
+        for (i = 0; i < d->props.rc_key_map_size; i++) {
+                if (keymap[i].custom == poll_reply.system_lsb &&
+                    keymap[i].data == poll_reply.data) {
+                        *event = keymap[i].event;
+                        found = 1;
+                        break;
+                }
+        }
+
+        if (found == 0) {
+                err("Unknown remote controller key: %02x %02x %02x %02x",
+                    poll_reply.system_msb, poll_reply.system_lsb,
+                    poll_reply.data, poll_reply.not_data);
+                d->last_event = 0;
+                return 0;
+        }
+
+        if (poll_reply.data_state == 1) {
+                /* New key hit */
+                st->rc_counter = 0;
+                *event = keymap[i].event;
+                *state = REMOTE_KEY_PRESSED;
+                d->last_event = keymap[i].event;
+        } else if (poll_reply.data_state == 2) {
+                /* Key repeated */
+                st->rc_counter++;
+
+                /* prevents unwanted double hits */
+                if (st->rc_counter > RC_REPEAT_DELAY_V1_20) {
+                        *event = d->last_event;
+                        *state = REMOTE_KEY_PRESSED;
+                        st->rc_counter = RC_REPEAT_DELAY_V1_20;
+                }
+        } else {
+                err("Unknown data state [%d]", poll_reply.data_state);
+        }
+
+        return 0;
+}
+
+static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        struct dib0700_state *st = d->priv;
+
+        /* Because some people may have improperly named firmware files,
+           let's figure out whether to use the new firmware call or the legacy
+           call based on the firmware version embedded in the file */
+        if (st->rc_func_version == 0) {
+                u32 hwver, romver, ramver, fwtype;
+                int ret = dib0700_get_version(d, &hwver, &romver, &ramver,
+                                              &fwtype);
+                if (ret < 0) {
+                        err("Could not determine version info");
+                        return -1;
+                }
+                if (ramver < 0x10200)
+                        st->rc_func_version = 1;
+                else
+                        st->rc_func_version = 2;
+        }
+
+        if (st->rc_func_version == 2)
+                return dib0700_rc_query_v1_20(d, event, state);
+        else
+                return dib0700_rc_query_legacy(d, event, state);
+}
+
 static struct dvb_usb_rc_key dib0700_rc_keys[] = {
         /* Key codes for the tiny Pinnacle remote*/
         { 0x07, 0x00, KEY_MUTE },
diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/dvb/dvb-usb/usb-urb.c
index 397f51a7b2ad..da93b9e982c0 100644
--- a/drivers/media/dvb/dvb-usb/usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/usb-urb.c
@@ -135,7 +135,7 @@ stream->buf_list[stream->buf_num], (long long)stream->dma_addr[stream->buf_num])
 
 static int usb_bulk_urb_init(struct usb_data_stream *stream)
 {
-        int i;
+        int i, j;
 
         if ((i = usb_allocate_stream_buffers(stream,stream->props.count,
                                         stream->props.u.bulk.buffersize)) < 0)
@@ -143,9 +143,13 @@ static int usb_bulk_urb_init(struct usb_data_stream *stream)
 
         /* allocate the URBs */
         for (i = 0; i < stream->props.count; i++) {
-                if ((stream->urb_list[i] = usb_alloc_urb(0,GFP_ATOMIC)) == NULL)
+                stream->urb_list[i] = usb_alloc_urb(0, GFP_ATOMIC);
+                if (!stream->urb_list[i]) {
+                        deb_mem("not enough memory for urb_alloc_urb!.\n");
+                        for (j = 0; j < i; j++)
+                                usb_free_urb(stream->urb_list[i]);
                         return -ENOMEM;
-
+                }
                 usb_fill_bulk_urb( stream->urb_list[i], stream->udev,
                                 usb_rcvbulkpipe(stream->udev,stream->props.endpoint),
                                 stream->buf_list[i],
@@ -170,9 +174,14 @@ static int usb_isoc_urb_init(struct usb_data_stream *stream)
         for (i = 0; i < stream->props.count; i++) {
                 struct urb *urb;
                 int frame_offset = 0;
-                if ((stream->urb_list[i] =
-                                        usb_alloc_urb(stream->props.u.isoc.framesperurb,GFP_ATOMIC)) == NULL)
+
+                stream->urb_list[i] = usb_alloc_urb(stream->props.u.isoc.framesperurb, GFP_ATOMIC);
+                if (!stream->urb_list[i]) {
+                        deb_mem("not enough memory for urb_alloc_urb!\n");
+                        for (j = 0; j < i; j++)
+                                usb_free_urb(stream->urb_list[i]);
                         return -ENOMEM;
+                }
 
                 urb = stream->urb_list[i];
 
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index 6f9b77360440..e98d6caf2c23 100644
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -95,7 +95,7 @@ static struct sms_board sms_boards[] = {
         [SMS1XXX_BOARD_HAUPPAUGE_WINDHAM] = {
                 .name   = "Hauppauge WinTV MiniStick",
                 .type   = SMS_NOVA_B0,
-                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-01.fw",
+                .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
         },
 };
 
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 66ab0c6e9783..4a3f2b8ea37d 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -808,6 +808,12 @@ static int ttusb_alloc_iso_urbs(struct ttusb *ttusb)
                                                  ISO_BUF_COUNT,
                                                  &ttusb->iso_dma_handle);
 
+        if (!ttusb->iso_buffer) {
+                dprintk("%s: pci_alloc_consistent - not enough memory\n",
+                        __func__);
+                return -ENOMEM;
+        }
+
         memset(ttusb->iso_buffer, 0,
                ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT);
 
@@ -1659,7 +1665,14 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         ttusb_setup_interfaces(ttusb);
 
-        ttusb_alloc_iso_urbs(ttusb);
+        result = ttusb_alloc_iso_urbs(ttusb);
+        if (result < 0) {
+                dprintk("%s: ttusb_alloc_iso_urbs - failed\n", __func__);
+                mutex_unlock(&ttusb->semi2c);
+                kfree(ttusb);
+                return result;
+        }
+
         if (ttusb_init_controller(ttusb))
                 printk("ttusb_init_controller: error\n");
 
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index ab33fec8a19f..0aa96df80fc2 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1157,6 +1157,12 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)
                                                 ISO_BUF_COUNT),
                                                &dec->iso_dma_handle);
 
+        if (!dec->iso_buffer) {
+                dprintk("%s: pci_alloc_consistent - not enough memory\n",
+                        __func__);
+                return -ENOMEM;
+        }
+
         memset(dec->iso_buffer, 0,
                ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF * ISO_BUF_COUNT));
 
@@ -1254,6 +1260,7 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec)
                 dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE,
                                         GFP_ATOMIC, &dec->irq_dma_handle);
                 if(!dec->irq_buffer) {
+                        usb_free_urb(dec->irq_urb);
                         return -ENOMEM;
                 }
                 usb_fill_int_urb(dec->irq_urb, dec->udev,dec->irq_pipe,
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index ac3292d7646c..7a8d49ef646e 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -62,7 +62,7 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev)
 
         dprintk("Stopping isoc\n");
         for (i = 0; i < EM28XX_AUDIO_BUFS; i++) {
-                usb_kill_urb(dev->adev->urb[i]);
+                usb_unlink_urb(dev->adev->urb[i]);
                 usb_free_urb(dev->adev->urb[i]);
                 dev->adev->urb[i] = NULL;
         }
@@ -75,7 +75,6 @@ static void em28xx_audio_isocirq(struct urb *urb)
         struct em28xx            *dev = urb->context;
         int                      i;
         unsigned int             oldptr;
-        unsigned long            flags;
         int                      period_elapsed = 0;
         int                      status;
         unsigned char            *cp;
@@ -96,9 +95,21 @@ static void em28xx_audio_isocirq(struct urb *urb)
                         if (!length)
                                 continue;
 
-                        spin_lock_irqsave(&dev->adev->slock, flags);
-
                         oldptr = dev->adev->hwptr_done_capture;
+                        if (oldptr + length >= runtime->buffer_size) {
+                                unsigned int cnt =
+                                    runtime->buffer_size - oldptr;
+                                memcpy(runtime->dma_area + oldptr * stride, cp,
+                                       cnt * stride);
+                                memcpy(runtime->dma_area, cp + cnt * stride,
+                                       length * stride - cnt * stride);
+                        } else {
+                                memcpy(runtime->dma_area + oldptr * stride, cp,
+                                       length * stride);
+                        }
+
+                        snd_pcm_stream_lock(substream);
+
                         dev->adev->hwptr_done_capture += length;
                         if (dev->adev->hwptr_done_capture >=
                             runtime->buffer_size)
@@ -113,19 +124,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
                                 period_elapsed = 1;
                         }
 
-                        spin_unlock_irqrestore(&dev->adev->slock, flags);
-
-                        if (oldptr + length >= runtime->buffer_size) {
-                                unsigned int cnt =
-                                    runtime->buffer_size - oldptr;
-                                memcpy(runtime->dma_area + oldptr * stride, cp,
-                                       cnt * stride);
-                                memcpy(runtime->dma_area, cp + cnt * stride,
-                                       length * stride - cnt * stride);
-                        } else {
-                                memcpy(runtime->dma_area + oldptr * stride, cp,
-                                       length * stride);
-                        }
+                        snd_pcm_stream_unlock(substream);
                 }
                 if (period_elapsed)
                         snd_pcm_period_elapsed(substream);
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 5d837c16ee22..15e2b525310d 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -69,19 +69,33 @@ int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg,
         int ret, byte;
 
         if (dev->state & DEV_DISCONNECTED)
-                return(-ENODEV);
+                return -ENODEV;
+
+        if (len > URB_MAX_CTRL_SIZE)
+                return -EINVAL;
 
         em28xx_regdbg("req=%02x, reg=%02x ", req, reg);
 
+        mutex_lock(&dev->ctrl_urb_lock);
         ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req,
                               USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                              0x0000, reg, buf, len, HZ);
+                              0x0000, reg, dev->urb_buf, len, HZ);
+        if (ret < 0) {
+                if (reg_debug)
+                        printk(" failed!\n");
+                mutex_unlock(&dev->ctrl_urb_lock);
+                return ret;
+        }
+
+        if (len)
+                memcpy(buf, dev->urb_buf, len);
+
+        mutex_unlock(&dev->ctrl_urb_lock);
 
         if (reg_debug) {
-                printk(ret < 0 ? " failed!\n" : "%02x values: ", ret);
+                printk("%02x values: ", ret);
                 for (byte = 0; byte < len; byte++)
                         printk(" %02x", (unsigned char)buf[byte]);
-
                 printk("\n");
         }
 
@@ -102,16 +116,20 @@ int em28xx_read_reg_req(struct em28xx *dev, u8 req, u16 reg)
 
         em28xx_regdbg("req=%02x, reg=%02x:", req, reg);
 
+        mutex_lock(&dev->ctrl_urb_lock);
         ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req,
                               USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                              0x0000, reg, &val, 1, HZ);
-
-        if (reg_debug)
-                printk(ret < 0 ? " failed!\n" :
-                                 "%02x\n", (unsigned char) val);
+                              0x0000, reg, dev->urb_buf, 1, HZ);
+        val = dev->urb_buf[0];
+        mutex_unlock(&dev->ctrl_urb_lock);
 
-        if (ret < 0)
+        if (ret < 0) {
+                printk(" failed!\n");
                 return ret;
+        }
+
+        if (reg_debug)
+                printk("%02x\n", (unsigned char) val);
 
         return val;
 }
@@ -130,19 +148,13 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
 {
         int ret;
 
-        /*usb_control_msg seems to expect a kmalloced buffer */
-        unsigned char *bufs;
-
         if (dev->state & DEV_DISCONNECTED)
                 return -ENODEV;
 
-        if (len < 1)
+        if ((len < 1) || (len > URB_MAX_CTRL_SIZE))
                 return -EINVAL;
 
-        bufs = kmalloc(len, GFP_KERNEL);
-
         em28xx_regdbg("req=%02x reg=%02x:", req, reg);
-
         if (reg_debug) {
                 int i;
                 for (i = 0; i < len; ++i)
@@ -150,16 +162,16 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
                 printk("\n");
         }
 
-        if (!bufs)
-                return -ENOMEM;
-        memcpy(bufs, buf, len);
+        mutex_lock(&dev->ctrl_urb_lock);
+        memcpy(dev->urb_buf, buf, len);
         ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), req,
                               USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                              0x0000, reg, bufs, len, HZ);
+                              0x0000, reg, dev->urb_buf, len, HZ);
+        mutex_unlock(&dev->ctrl_urb_lock);
+
         if (dev->wait_after_write)
                 msleep(dev->wait_after_write);
 
-        kfree(bufs);
         return ret;
 }
 
@@ -270,6 +282,8 @@ static int em28xx_set_audio_source(struct em28xx *dev)
                         break;
                 case EM28XX_AMUX_LINE_IN:
                         input = EM28XX_AUDIO_SRC_LINE;
+                        video = disable;
+                        line  = enable;
                         break;
                 case EM28XX_AMUX_AC97_VIDEO:
                         input = EM28XX_AUDIO_SRC_LINE;
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 3bab56b997fc..2360c61ddca9 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -337,9 +337,9 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
         /* Check if board has eeprom */
         err = i2c_master_recv(&dev->i2c_client, &buf, 0);
         if (err < 0) {
-                em28xx_errdev("%s: i2c_master_recv failed! err [%d]\n",
-                        __func__, err);
-                return err;
+                em28xx_errdev("board has no eeprom\n");
+                memset(eedata, 0, len);
+                return -ENODEV;
         }
 
         buf = 0;
@@ -609,14 +609,16 @@ int em28xx_i2c_register(struct em28xx *dev)
         dev->i2c_client.adapter = &dev->i2c_adap;
 
         retval = em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
-        if (retval < 0) {
+        if ((retval < 0) && (retval != -ENODEV)) {
                 em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n",
                         __func__, retval);
+
                 return retval;
         }
 
         if (i2c_scan)
                 em28xx_do_i2c_scan(dev);
+
         return 0;
 }
 
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index a1ab2ef45578..610f535a257c 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -73,6 +73,7 @@ MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
 static LIST_HEAD(em28xx_devlist);
+static DEFINE_MUTEX(em28xx_devlist_mutex);
 
 static unsigned int card[]     = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
 static unsigned int video_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
@@ -1519,7 +1520,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         struct em28xx_fh *fh;
         enum v4l2_buf_type fh_type = 0;
 
-        lock_kernel();
+        mutex_lock(&em28xx_devlist_mutex);
         list_for_each_entry(h, &em28xx_devlist, devlist) {
                 if (h->vdev->minor == minor) {
                         dev  = h;
@@ -1535,10 +1536,11 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                         dev   = h;
                 }
         }
-        if (NULL == dev) {
-                unlock_kernel();
+        mutex_unlock(&em28xx_devlist_mutex);
+        if (NULL == dev)
                 return -ENODEV;
-        }
+
+        mutex_lock(&dev->lock);
 
         em28xx_videodbg("open minor=%d type=%s users=%d\n",
                                 minor, v4l2_type_names[fh_type], dev->users);
@@ -1547,10 +1549,9 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
         if (!fh) {
                 em28xx_errdev("em28xx-video.c: Out of memory?!\n");
-                unlock_kernel();
+                mutex_unlock(&dev->lock);
                 return -ENOMEM;
         }
-        mutex_lock(&dev->lock);
         fh->dev = dev;
         fh->radio = radio;
         fh->type = fh_type;
@@ -1584,7 +1585,6 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                         sizeof(struct em28xx_buffer), fh);
 
         mutex_unlock(&dev->lock);
-        unlock_kernel();
 
         return errCode;
 }
@@ -1871,6 +1871,7 @@ int em28xx_register_extension(struct em28xx_ops *ops)
 {
         struct em28xx *dev = NULL;
 
+        mutex_lock(&em28xx_devlist_mutex);
         mutex_lock(&em28xx_extension_devlist_lock);
         list_add_tail(&ops->next, &em28xx_extension_devlist);
         list_for_each_entry(dev, &em28xx_devlist, devlist) {
@@ -1879,6 +1880,7 @@ int em28xx_register_extension(struct em28xx_ops *ops)
         }
         printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name);
         mutex_unlock(&em28xx_extension_devlist_lock);
+        mutex_unlock(&em28xx_devlist_mutex);
         return 0;
 }
 EXPORT_SYMBOL(em28xx_register_extension);
@@ -1887,6 +1889,7 @@ void em28xx_unregister_extension(struct em28xx_ops *ops)
 {
         struct em28xx *dev = NULL;
 
+        mutex_lock(&em28xx_devlist_mutex);
         list_for_each_entry(dev, &em28xx_devlist, devlist) {
                 if (dev)
                         ops->fini(dev);
@@ -1896,6 +1899,7 @@ void em28xx_unregister_extension(struct em28xx_ops *ops)
         printk(KERN_INFO "Em28xx: Removed (%s) extension\n", ops->name);
         list_del(&ops->next);
         mutex_unlock(&em28xx_extension_devlist_lock);
+        mutex_unlock(&em28xx_devlist_mutex);
 }
 EXPORT_SYMBOL(em28xx_unregister_extension);
 
@@ -1921,6 +1925,60 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
 }
 
 
+static int register_analog_devices(struct em28xx *dev)
+{
+        int ret;
+
+        /* allocate and fill video video_device struct */
+        dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video");
+        if (!dev->vdev) {
+                em28xx_errdev("cannot allocate video_device.\n");
+                return -ENODEV;
+        }
+
+        /* register v4l2 video video_device */
+        ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
+                                       video_nr[dev->devno]);
+        if (ret) {
+                em28xx_errdev("unable to register video device (error=%i).\n",
+                              ret);
+                return ret;
+        }
+
+        /* Allocate and fill vbi video_device struct */
+        dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi");
+
+        /* register v4l2 vbi video_device */
+        ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
+                                        vbi_nr[dev->devno]);
+        if (ret < 0) {
+                em28xx_errdev("unable to register vbi device\n");
+                return ret;
+        }
+
+        if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {
+                dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, "radio");
+                if (!dev->radio_dev) {
+                        em28xx_errdev("cannot allocate video_device.\n");
+                        return -ENODEV;
+                }
+                ret = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
+                                            radio_nr[dev->devno]);
+                if (ret < 0) {
+                        em28xx_errdev("can't register radio device\n");
+                        return ret;
+                }
+                em28xx_info("Registered radio device as /dev/radio%d\n",
+                            dev->radio_dev->num);
+        }
+
+        em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
+                                dev->vdev->num, dev->vbi_dev->num);
+
+        return 0;
+}
+
+
 /*
  * em28xx_init_dev()
  * allocates and inits the device structs, registers i2c bus and v4l device
@@ -1936,6 +1994,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
 
         dev->udev = udev;
         mutex_init(&dev->lock);
+        mutex_init(&dev->ctrl_urb_lock);
         spin_lock_init(&dev->slock);
         init_waitqueue_head(&dev->open);
         init_waitqueue_head(&dev->wait_frame);
@@ -1953,8 +2012,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         errCode = em28xx_config(dev);
         if (errCode) {
                 em28xx_errdev("error configuring device\n");
-                em28xx_devused &= ~(1<<dev->devno);
-                kfree(dev);
                 return -ENOMEM;
         }
 
@@ -2001,50 +2058,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
                 return errCode;
         }
 
-        list_add_tail(&dev->devlist, &em28xx_devlist);
-
-        /* allocate and fill video video_device struct */
-        dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video");
-        if (NULL == dev->vdev) {
-                em28xx_errdev("cannot allocate video_device.\n");
-                goto fail_unreg;
-        }
-
-        /* register v4l2 video video_device */
-        retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
-                                       video_nr[dev->devno]);
-        if (retval) {
-                em28xx_errdev("unable to register video device (error=%i).\n",
-                              retval);
-                goto fail_unreg;
-        }
-
-        /* Allocate and fill vbi video_device struct */
-        dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi");
-        /* register v4l2 vbi video_device */
-        if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
-                                        vbi_nr[dev->devno]) < 0) {
-                em28xx_errdev("unable to register vbi device\n");
-                retval = -ENODEV;
-                goto fail_unreg;
-        }
-
-        if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {
-                dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, "radio");
-                if (NULL == dev->radio_dev) {
-                        em28xx_errdev("cannot allocate video_device.\n");
-                        goto fail_unreg;
-                }
-                retval = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
-                                            radio_nr[dev->devno]);
-                if (retval < 0) {
-                        em28xx_errdev("can't register radio device\n");
-                        goto fail_unreg;
-                }
-                em28xx_info("Registered radio device as /dev/radio%d\n",
-                            dev->radio_dev->num);
-        }
-
         /* init video dma queues */
         INIT_LIST_HEAD(&dev->vidq.active);
         INIT_LIST_HEAD(&dev->vidq.queued);
@@ -2071,8 +2084,14 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
 
         video_mux(dev, 0);
 
-        em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
-                                dev->vdev->num, dev->vbi_dev->num);
+        mutex_lock(&em28xx_devlist_mutex);
+        list_add_tail(&dev->devlist, &em28xx_devlist);
+        retval = register_analog_devices(dev);
+        if (retval < 0) {
+                em28xx_release_resources(dev);
+                mutex_unlock(&em28xx_devlist_mutex);
+                goto fail_reg_devices;
+        }
 
         mutex_lock(&em28xx_extension_devlist_lock);
         if (!list_empty(&em28xx_extension_devlist)) {
@@ -2082,13 +2101,12 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
                 }
         }
         mutex_unlock(&em28xx_extension_devlist_lock);
+        mutex_unlock(&em28xx_devlist_mutex);
 
         return 0;
 
-fail_unreg:
-        em28xx_release_resources(dev);
+fail_reg_devices:
         mutex_unlock(&dev->lock);
-        kfree(dev);
         return retval;
 }
 
@@ -2231,8 +2249,12 @@ static int em28xx_usb_probe(struct usb_interface *interface,
 
         /* allocate device struct */
         retval = em28xx_init_dev(&dev, udev, nr);
-        if (retval)
+        if (retval) {
+                em28xx_devused &= ~(1<<dev->devno);
+                kfree(dev);
+
                 return retval;
+        }
 
         em28xx_info("Found %s\n", em28xx_boards[dev->model].name);
 
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 82781178e0a3..5956e9b3062f 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -102,6 +102,9 @@
 #define EM28XX_MIN_BUF 4
 #define EM28XX_DEF_BUF 8
 
+/*Limits the max URB message size */
+#define URB_MAX_CTRL_SIZE 80
+
 /* Params for validated field */
 #define EM28XX_BOARD_NOT_VALIDATED 1
 #define EM28XX_BOARD_VALIDATED     0
@@ -430,6 +433,7 @@ struct em28xx {
 
         /* locks */
         struct mutex lock;
+        struct mutex ctrl_urb_lock;     /* protects urb_buf */
         /* spinlock_t queue_lock; */
         struct list_head inqueue, outqueue;
         wait_queue_head_t open, wait_frame, wait_stream;
@@ -451,6 +455,8 @@ struct em28xx {
         unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
         struct urb *urb[EM28XX_NUM_BUFS];       /* urb for isoc transfers */
         char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */
+        char urb_buf[URB_MAX_CTRL_SIZE];        /* urb control msg buffer */
+
         /* helper funcs that call usb_control_msg */
         int (*em28xx_write_regs) (struct em28xx *dev, u16 reg,
                                         char *buf, int len);
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index a9d51ba7c57c..de28354ea5ba 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -846,10 +846,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
         return 0;
 }
 
+/* called on streamoff with alt 0 and on disconnect */
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
         int retry = 50;
 
+        if (!gspca_dev->present)
+                return;
         reg_w_val(gspca_dev, 0x0000, 0x00);
         reg_r(gspca_dev, 0x0002, 1);
         reg_w_val(gspca_dev, 0x0053, 0x00);
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
index 65d3cbfe6b27..607942fd7970 100644
--- a/drivers/media/video/gspca/finepix.c
+++ b/drivers/media/video/gspca/finepix.c
@@ -276,6 +276,12 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         /* Stop the state machine */
         if (dev->state != FPIX_NOP)
                 wait_for_completion(&dev->can_close);
+}
+
+/* called on streamoff with alt 0 and disconnect */
+static void sd_stop0(struct gspca_dev *gspca_dev)
+{
+        struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
 
         usb_free_urb(dev->control_urb);
         dev->control_urb = NULL;
@@ -385,6 +391,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 error:
         /* Free the ressources */
         sd_stopN(gspca_dev);
+        sd_stop0(gspca_dev);
         return ret;
 }
 
@@ -425,6 +432,7 @@ static const struct sd_desc sd_desc = {
         .init = sd_init,
         .start = sd_start,
         .stopN = sd_stopN,
+        .stop0 = sd_stop0,
 };
 
 /* -- device connect -- */
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index e48fbfc8ad05..748a87e82e44 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -646,15 +646,14 @@ static void gspca_stream_off(struct gspca_dev *gspca_dev)
 {
         gspca_dev->streaming = 0;
         atomic_set(&gspca_dev->nevent, 0);
-        if (gspca_dev->present) {
-                if (gspca_dev->sd_desc->stopN)
-                        gspca_dev->sd_desc->stopN(gspca_dev);
-                destroy_urbs(gspca_dev);
-                gspca_set_alt0(gspca_dev);
-                if (gspca_dev->sd_desc->stop0)
-                        gspca_dev->sd_desc->stop0(gspca_dev);
-                PDEBUG(D_STREAM, "stream off OK");
-        }
+        if (gspca_dev->present
+            && gspca_dev->sd_desc->stopN)
+                gspca_dev->sd_desc->stopN(gspca_dev);
+        destroy_urbs(gspca_dev);
+        gspca_set_alt0(gspca_dev);
+        if (gspca_dev->sd_desc->stop0)
+                gspca_dev->sd_desc->stop0(gspca_dev);
+        PDEBUG(D_STREAM, "stream off OK");
 }
 
 static void gspca_set_default_mode(struct gspca_dev *gspca_dev)
@@ -863,7 +862,7 @@ static int dev_open(struct inode *inode, struct file *file)
         int ret;
 
         PDEBUG(D_STREAM, "%s open", current->comm);
-        gspca_dev = (struct gspca_dev *) video_devdata(file);
+        gspca_dev = video_drvdata(file);
         if (mutex_lock_interruptible(&gspca_dev->queue_lock))
                 return -ERESTARTSYS;
         if (!gspca_dev->present) {
@@ -875,6 +874,13 @@ static int dev_open(struct inode *inode, struct file *file)
                 ret = -EBUSY;
                 goto out;
         }
+
+        /* protect the subdriver against rmmod */
+        if (!try_module_get(gspca_dev->module)) {
+                ret = -ENODEV;
+                goto out;
+        }
+
         gspca_dev->users++;
 
         /* one more user */
@@ -884,10 +890,10 @@ static int dev_open(struct inode *inode, struct file *file)
 #ifdef GSPCA_DEBUG
         /* activate the v4l2 debug */
         if (gspca_debug & D_V4L2)
-                gspca_dev->vdev.debug |= V4L2_DEBUG_IOCTL
+                gspca_dev->vdev->debug |= V4L2_DEBUG_IOCTL
                                         | V4L2_DEBUG_IOCTL_ARG;
         else
-                gspca_dev->vdev.debug &= ~(V4L2_DEBUG_IOCTL
+                gspca_dev->vdev->debug &= ~(V4L2_DEBUG_IOCTL
                                         | V4L2_DEBUG_IOCTL_ARG);
 #endif
         ret = 0;
@@ -921,6 +927,7 @@ static int dev_close(struct inode *inode, struct file *file)
                 gspca_dev->memory = GSPCA_MEMORY_NO;
         }
         file->private_data = NULL;
+        module_put(gspca_dev->module);
         mutex_unlock(&gspca_dev->queue_lock);
 
         PDEBUG(D_STREAM, "close done");
@@ -1748,11 +1755,6 @@ out:
         return ret;
 }
 
-static void dev_release(struct video_device *vfd)
-{
-        /* nothing */
-}
-
 static struct file_operations dev_fops = {
         .owner = THIS_MODULE,
         .open = dev_open,
@@ -1800,7 +1802,7 @@ static struct video_device gspca_template = {
         .name = "gspca main driver",
         .fops = &dev_fops,
         .ioctl_ops = &dev_ioctl_ops,
-        .release = dev_release,         /* mandatory */
+        .release = video_device_release,
         .minor = -1,
 };
 
@@ -1869,17 +1871,18 @@ int gspca_dev_probe(struct usb_interface *intf,
         init_waitqueue_head(&gspca_dev->wq);
 
         /* init video stuff */
-        memcpy(&gspca_dev->vdev, &gspca_template, sizeof gspca_template);
-        gspca_dev->vdev.parent = &dev->dev;
-        memcpy(&gspca_dev->fops, &dev_fops, sizeof gspca_dev->fops);
-        gspca_dev->vdev.fops = &gspca_dev->fops;
-        gspca_dev->fops.owner = module;         /* module protection */
+        gspca_dev->vdev = video_device_alloc();
+        memcpy(gspca_dev->vdev, &gspca_template, sizeof gspca_template);
+        gspca_dev->vdev->parent = &dev->dev;
+        gspca_dev->module = module;
         gspca_dev->present = 1;
-        ret = video_register_device(&gspca_dev->vdev,
+        video_set_drvdata(gspca_dev->vdev, gspca_dev);
+        ret = video_register_device(gspca_dev->vdev,
                                   VFL_TYPE_GRABBER,
                                   video_nr);
         if (ret < 0) {
                 err("video_register_device err %d", ret);
+                video_device_release(gspca_dev->vdev);
                 goto out;
         }
 
@@ -1887,7 +1890,8 @@ int gspca_dev_probe(struct usb_interface *intf,
         PDEBUG(D_PROBE, "probe ok");
         return 0;
 out:
-        kref_put(&gspca_dev->kref, gspca_delete);
+        kfree(gspca_dev->usb_buf);
+        kfree(gspca_dev);
         return ret;
 }
 EXPORT_SYMBOL(gspca_dev_probe);
@@ -1905,7 +1909,7 @@ void gspca_disconnect(struct usb_interface *intf)
         usb_set_intfdata(intf, NULL);
 
 /* We don't want people trying to open up the device */
-        video_unregister_device(&gspca_dev->vdev);
+        video_unregister_device(gspca_dev->vdev);
 
         gspca_dev->present = 0;
         gspca_dev->streaming = 0;
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 1d9dc90b4791..d25e8d69373b 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -97,7 +97,7 @@ struct sd_desc {
         cam_pkt_op pkt_scan;
 /* optional operations */
         cam_v_op stopN;         /* called on stream off - main alt */
-        cam_v_op stop0;         /* called on stream off - alt 0 */
+        cam_v_op stop0;         /* called on stream off & disconnect - alt 0 */
         cam_v_op dq_callback;   /* called when a frame has been dequeued */
         cam_jpg_op get_jcomp;
         cam_jpg_op set_jcomp;
@@ -120,8 +120,8 @@ struct gspca_frame {
 };
 
 struct gspca_dev {
-        struct video_device vdev;       /* !! must be the first item */
-        struct file_operations fops;
+        struct video_device *vdev;
+        struct module *module;          /* subdriver handling the device */
         struct usb_device *dev;
         struct kref kref;
         struct file *capt_file;         /* file doing video capture */
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index e5ff9a6199ef..fbd45e235d97 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -749,10 +749,13 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */
 }
 
+/* called on streamoff with alt 0 and on disconnect */
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
+        if (!gspca_dev->present)
+                return;
         if (sd->sensor == SENSOR_PAC7302) {
                 reg_w(gspca_dev, 0xff, 0x01);
                 reg_w(gspca_dev, 0x78, 0x40);
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index b742f260c7ca..e29954c1c38c 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -2022,8 +2022,11 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_write(gspca_dev->dev, SPCA501_REG_CTLRL, 0x01, 0x00);
 }
 
+/* called on streamoff with alt 0 and on disconnect */
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
+        if (!gspca_dev->present)
+                return;
         reg_write(gspca_dev->dev, SPCA501_REG_CTLRL, 0x05, 0x00);
 }
 
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index b345749213cf..895b9fe4018c 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -742,8 +742,12 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_write(gspca_dev->dev, 0x02, 0x00, 0x00);
 }
 
+/* called on streamoff with alt 0 and on disconnect */
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
+        if (!gspca_dev->present)
+                return;
+
         /* This maybe reset or power control */
         reg_write(gspca_dev->dev, 0x03, 0x03, 0x20);
         reg_write(gspca_dev->dev, 0x03, 0x01, 0x0);
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 020a03c466c1..c3de4e44123d 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -766,10 +766,13 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         }
 }
 
+/* called on streamoff with alt 0 and on disconnect */
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
+        if (!gspca_dev->present)
+                return;
         if (sd->chip_revision == Rev012A) {
                 reg_w_val(gspca_dev->dev, 0x8118, 0x29);
                 reg_w_val(gspca_dev->dev, 0x8114, 0x08);
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index be46d9232540..17af353ddd1c 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -1633,10 +1633,13 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
         reg_w(dev, 0xa0, 0x09, 0xb003);
 }
 
+/* called on streamoff with alt 0 and on disconnect */
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
         struct usb_device *dev = gspca_dev->dev;
 
+        if (!gspca_dev->present)
+                return;
         reg_w(dev, 0x89, 0xffff, 0xffff);
 }
 
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index 8b3101d347c3..0befacf49855 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -7336,10 +7336,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
         return 0;
 }
 
+/* called on streamoff with alt 0 and on disconnect */
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
+        if (!gspca_dev->present)
+                return;
         send_unknown(gspca_dev->dev, sd->sensor);
 }
 
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 5272926db73e..3c3f8cf73108 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -192,7 +192,7 @@ struct s2255_dmaqueue {
 #define S2255_FW_FAILED         3
 #define S2255_FW_DISCONNECTING  4
 
-#define S2255_FW_MARKER         0x22552f2f
+#define S2255_FW_MARKER         cpu_to_le32(0x22552f2f)
 /* 2255 read states */
 #define S2255_READ_IDLE         0
 #define S2255_READ_FRAME        1
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 5c027b6b4e5a..650983806392 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -481,7 +481,7 @@ struct vm_operations_struct gru_vm_ops = {
         .fault          = gru_fault,
 };
 
-module_init(gru_init);
+fs_initcall(gru_init);
 module_exit(gru_exit);
 
 module_param(gru_options, ulong, 0644);
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 7bcb81002dcf..571b211608d1 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -1038,8 +1038,8 @@ static int sony_nc_add(struct acpi_device *device)
                 goto outinput;
         }
 
-        if (!acpi_video_backlight_support()) {
-                printk(KERN_INFO DRV_PFX "Sony: Brightness ignored, must be "
+        if (acpi_video_backlight_support()) {
+                printk(KERN_INFO DRV_PFX "brightness ignored, must be "
                        "controlled by ACPI video driver\n");
         } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT",
                                                 &handle))) {
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 7a4a26b0edd2..899766e16fa8 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -5318,6 +5318,7 @@ static enum fan_control_commands fan_control_commands;
 
 static u8 fan_control_initial_status;
 static u8 fan_control_desired_level;
+static u8 fan_control_resume_level;
 static int fan_watchdog_maxinterval;
 
 static struct mutex fan_mutex;
@@ -5440,8 +5441,8 @@ static int fan_set_level(int level)
 
         case TPACPI_FAN_WR_ACPI_FANS:
         case TPACPI_FAN_WR_TPEC:
-                if ((level != TP_EC_FAN_AUTO) &&
-                    (level != TP_EC_FAN_FULLSPEED) &&
+                if (!(level & TP_EC_FAN_AUTO) &&
+                    !(level & TP_EC_FAN_FULLSPEED) &&
                     ((level < 0) || (level > 7)))
                         return -EINVAL;
 
@@ -6005,38 +6006,67 @@ static void fan_exit(void)
 
 static void fan_suspend(pm_message_t state)
 {
+        int rc;
+
         if (!fan_control_allowed)
                 return;
 
         /* Store fan status in cache */
-        fan_get_status_safe(NULL);
+        fan_control_resume_level = 0;
+        rc = fan_get_status_safe(&fan_control_resume_level);
+        if (rc < 0)
+                printk(TPACPI_NOTICE
+                        "failed to read fan level for later "
+                        "restore during resume: %d\n", rc);
+
+        /* if it is undefined, don't attempt to restore it.
+         * KEEP THIS LAST */
         if (tp_features.fan_ctrl_status_undef)
-                fan_control_desired_level = TP_EC_FAN_AUTO;
+                fan_control_resume_level = 0;
 }
 
 static void fan_resume(void)
 {
-        u8 saved_fan_level;
         u8 current_level = 7;
         bool do_set = false;
+        int rc;
 
         /* DSDT *always* updates status on resume */
         tp_features.fan_ctrl_status_undef = 0;
 
-        saved_fan_level = fan_control_desired_level;
         if (!fan_control_allowed ||
+            !fan_control_resume_level ||
             (fan_get_status_safe(&current_level) < 0))
                 return;
 
         switch (fan_control_access_mode) {
         case TPACPI_FAN_WR_ACPI_SFAN:
-                do_set = (saved_fan_level > current_level);
+                /* never decrease fan level */
+                do_set = (fan_control_resume_level > current_level);
                 break;
         case TPACPI_FAN_WR_ACPI_FANS:
         case TPACPI_FAN_WR_TPEC:
-                do_set = ((saved_fan_level & TP_EC_FAN_FULLSPEED) ||
-                          (saved_fan_level == 7 &&
-                           !(current_level & TP_EC_FAN_FULLSPEED)));
+                /* never decrease fan level, scale is:
+                 * TP_EC_FAN_FULLSPEED > 7 >= TP_EC_FAN_AUTO
+                 *
+                 * We expect the firmware to set either 7 or AUTO, but we
+                 * handle FULLSPEED out of paranoia.
+                 *
+                 * So, we can safely only restore FULLSPEED or 7, anything
+                 * else could slow the fan.  Restoring AUTO is useless, at
+                 * best that's exactly what the DSDT already set (it is the
+                 * slower it uses).
+                 *
+                 * Always keep in mind that the DSDT *will* have set the
+                 * fans to what the vendor supposes is the best level.  We
+                 * muck with it only to speed the fan up.
+                 */
+                if (fan_control_resume_level != 7 &&
+                    !(fan_control_resume_level & TP_EC_FAN_FULLSPEED))
+                        return;
+                else
+                        do_set = !(current_level & TP_EC_FAN_FULLSPEED) &&
+                                 (current_level != fan_control_resume_level);
                 break;
         default:
                 return;
@@ -6044,8 +6074,11 @@ static void fan_resume(void)
         if (do_set) {
                 printk(TPACPI_NOTICE
                         "restoring fan level to 0x%02x\n",
-                        saved_fan_level);
-                fan_set_level_safe(saved_fan_level);
+                        fan_control_resume_level);
+                rc = fan_set_level_safe(fan_control_resume_level);
+                if (rc < 0)
+                        printk(TPACPI_NOTICE
+                                "failed to restore fan level: %d\n", rc);
         }
 }
 
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index e04bcf1dff87..d8966bae0e0b 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -1022,7 +1022,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
         }
 
         /*
-         * OK, now the LEB is locked and we can safely start moving iy. Since
+         * OK, now the LEB is locked and we can safely start moving it. Since
          * this function utilizes thie @ubi->peb1_buf buffer which is shared
          * with some other functions, so lock the buffer by taking the
          * @ubi->buf_mutex.
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index 4f2daa5bbecf..41d47e1cf15c 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -320,7 +320,7 @@ static int compare_lebs(struct ubi_device *ubi, const struct ubi_scan_leb *seb,
         }
 
         err = ubi_io_read_data(ubi, buf, pnum, 0, len);
-        if (err && err != UBI_IO_BITFLIPS)
+        if (err && err != UBI_IO_BITFLIPS && err != -EBADMSG)
                 goto out_free_buf;
 
         data_crc = be32_to_cpu(vid_hdr->data_crc);
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 05d70937b543..dcb6dac1dc54 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1396,7 +1396,8 @@ int ubi_thread(void *u)
                                 ubi_msg("%s: %d consecutive failures",
                                         ubi->bgt_name, WL_MAX_FAILURES);
                                 ubi_ro_mode(ubi);
-                                break;
+                                ubi->thread_enabled = 0;
+                                continue;
                         }
                 } else
                         failures = 0;
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 75f9f7f2fbed..e93f5d3f2277 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1827,9 +1827,10 @@ config FEC2
 
 config FEC_MPC52xx
         tristate "MPC52xx FEC driver"
-        depends on PPC_MPC52xx && PPC_BESTCOMM_FEC
+        depends on PPC_MPC52xx && PPC_BESTCOMM
         select CRC32
         select PHYLIB
+        select PPC_BESTCOMM_FEC
         ---help---
           This option enables support for the MPC5200's on-chip
           Fast Ethernet Controller
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index e8879217a1d2..7e24b5048686 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -70,6 +70,9 @@ static void macvlan_broadcast(struct sk_buff *skb,
         struct sk_buff *nskb;
         unsigned int i;
 
+        if (skb->protocol == htons(ETH_P_PAUSE))
+                return;
+
         for (i = 0; i < MACVLAN_HASH_SIZE; i++) {
                 hlist_for_each_entry_rcu(vlan, n, &port->vlan_hash[i], hlist) {
                         dev = vlan->dev;
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 468921b8f4b6..90a0281d15ea 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -753,6 +753,7 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
         struct mlx4_priv *priv = mlx4_priv(dev);
         int err;
         int port;
+        __be32 ib_port_default_caps;
 
         err = mlx4_init_uar_table(dev);
         if (err) {
@@ -852,6 +853,13 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
         }
 
         for (port = 1; port <= dev->caps.num_ports; port++) {
+                ib_port_default_caps = 0;
+                err = mlx4_get_port_ib_caps(dev, port, &ib_port_default_caps);
+                if (err)
+                        mlx4_warn(dev, "failed to get port %d default "
+                                  "ib capabilities (%d). Continuing with "
+                                  "caps = 0\n", port, err);
+                dev->caps.ib_port_def_cap[port] = ib_port_default_caps;
                 err = mlx4_SET_PORT(dev, port);
                 if (err) {
                         mlx4_err(dev, "Failed to set port %d, aborting\n",
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index 56a2e213fe62..34c909deaff3 100644
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -385,5 +385,6 @@ void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table);
 void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table);
 
 int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port);
+int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps);
 
 #endif /* MLX4_H */
diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c
index e2fdab42c4ce..0a057e5dc63b 100644
--- a/drivers/net/mlx4/port.c
+++ b/drivers/net/mlx4/port.c
@@ -258,6 +258,42 @@ out:
 }
 EXPORT_SYMBOL_GPL(mlx4_unregister_vlan);
 
+int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps)
+{
+        struct mlx4_cmd_mailbox *inmailbox, *outmailbox;
+        u8 *inbuf, *outbuf;
+        int err;
+
+        inmailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(inmailbox))
+                return PTR_ERR(inmailbox);
+
+        outmailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(outmailbox)) {
+                mlx4_free_cmd_mailbox(dev, inmailbox);
+                return PTR_ERR(outmailbox);
+        }
+
+        inbuf = inmailbox->buf;
+        outbuf = outmailbox->buf;
+        memset(inbuf, 0, 256);
+        memset(outbuf, 0, 256);
+        inbuf[0] = 1;
+        inbuf[1] = 1;
+        inbuf[2] = 1;
+        inbuf[3] = 1;
+        *(__be16 *) (&inbuf[16]) = cpu_to_be16(0x0015);
+        *(__be32 *) (&inbuf[20]) = cpu_to_be32(port);
+
+        err = mlx4_cmd_box(dev, inmailbox->dma, outmailbox->dma, port, 3,
+                           MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C);
+        if (!err)
+                *caps = *(__be32 *) (outbuf + 84);
+        mlx4_free_cmd_mailbox(dev, inmailbox);
+        mlx4_free_cmd_mailbox(dev, outmailbox);
+        return err;
+}
+
 int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)
 {
         struct mlx4_cmd_mailbox *mailbox;
@@ -273,7 +309,8 @@ int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)
                 ((u8 *) mailbox->buf)[3] = 6;
                 ((__be16 *) mailbox->buf)[4] = cpu_to_be16(1 << 15);
                 ((__be16 *) mailbox->buf)[6] = cpu_to_be16(1 << 15);
-        }
+        } else
+                ((__be32 *) mailbox->buf)[1] = dev->caps.ib_port_def_cap[port];
         err = mlx4_cmd(dev, mailbox->dma, port, is_eth, MLX4_CMD_SET_PORT,
                        MLX4_CMD_TIME_CLASS_B);
 
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index cf3cca4642f2..f51944b28cfa 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -349,7 +349,7 @@ static int ibmtr_suspend(struct pcmcia_device *link)
         return 0;
 }
 
-static int ibmtr_resume(struct pcmcia_device *link)
+static int __devinit ibmtr_resume(struct pcmcia_device *link)
 {
         ibmtr_dev_t *info = link->priv;
         struct net_device *dev = info->dev;
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 185b1dff10a8..e98d9773158d 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -1353,6 +1353,7 @@ static int pppol2tp_release(struct socket *sock)
                         kfree_skb(skb);
                         sock_put(sk);
                 }
+                sock_put(sk);
         }
 
         release_sock(sk);
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 84d1feb1c179..21d823c0892c 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -1733,7 +1733,7 @@ static const struct ethtool_ops smc911x_ethtool_ops = {
  * This routine has a simple purpose -- make the SMC chip generate an
  * interrupt, so an auto-detect routine can detect it, and find the IRQ,
  */
-static int __init smc911x_findirq(struct net_device *dev)
+static int __devinit smc911x_findirq(struct net_device *dev)
 {
         struct smc911x_local *lp = netdev_priv(dev);
         int timeout = 20;
@@ -1797,7 +1797,7 @@ static int __init smc911x_findirq(struct net_device *dev)
  * o  actually GRAB the irq.
  * o  GRAB the region
  */
-static int __init smc911x_probe(struct net_device *dev)
+static int __devinit smc911x_probe(struct net_device *dev)
 {
         struct smc911x_local *lp = netdev_priv(dev);
         int i, retval;
@@ -2046,7 +2046,7 @@ err_out:
  *       0 --> there is a device
  *       anything else, error
  */
-static int smc911x_drv_probe(struct platform_device *pdev)
+static int __devinit smc911x_drv_probe(struct platform_device *pdev)
 {
 #ifdef SMC_DYNAMIC_BUS_CONFIG
         struct smc911x_platdata *pd = pdev->dev.platform_data;
@@ -2122,7 +2122,7 @@ out:
         return ret;
 }
 
-static int smc911x_drv_remove(struct platform_device *pdev)
+static int __devexit smc911x_drv_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct smc911x_local *lp = netdev_priv(ndev);
@@ -2193,7 +2193,7 @@ static int smc911x_drv_resume(struct platform_device *dev)
 
 static struct platform_driver smc911x_driver = {
         .probe           = smc911x_drv_probe,
-        .remove  = smc911x_drv_remove,
+        .remove  = __devexit_p(smc911x_drv_remove),
         .suspend         = smc911x_drv_suspend,
         .resume  = smc911x_drv_resume,
         .driver  = {
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 5879c719b538..54912aadf4b2 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -1695,7 +1695,7 @@ static const struct ethtool_ops smc_ethtool_ops = {
  * I just deleted auto_irq.c, since it was never built...
  *   --jgarzik
  */
-static int __init smc_findirq(struct smc_local *lp)
+static int __devinit smc_findirq(struct smc_local *lp)
 {
         void __iomem *ioaddr = lp->base;
         int timeout = 20;
@@ -1769,7 +1769,7 @@ static int __init smc_findirq(struct smc_local *lp)
  * o  actually GRAB the irq.
  * o  GRAB the region
  */
-static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
+static int __devinit smc_probe(struct net_device *dev, void __iomem *ioaddr,
                             unsigned long irq_flags)
 {
         struct smc_local *lp = netdev_priv(dev);
@@ -2124,7 +2124,7 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device *
  *      0 --> there is a device
  *      anything else, error
  */
-static int __init smc_drv_probe(struct platform_device *pdev)
+static int __devinit smc_drv_probe(struct platform_device *pdev)
 {
         struct smc91x_platdata *pd = pdev->dev.platform_data;
         struct smc_local *lp;
@@ -2238,7 +2238,7 @@ static int __init smc_drv_probe(struct platform_device *pdev)
         return ret;
 }
 
-static int smc_drv_remove(struct platform_device *pdev)
+static int __devexit smc_drv_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct smc_local *lp = netdev_priv(ndev);
@@ -2303,7 +2303,7 @@ static int smc_drv_resume(struct platform_device *dev)
 
 static struct platform_driver smc_driver = {
         .probe          = smc_drv_probe,
-        .remove         = smc_drv_remove,
+        .remove         = __devexit_p(smc_drv_remove),
         .suspend        = smc_drv_suspend,
         .resume         = smc_drv_resume,
         .driver         = {
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 4b21bcf4af99..fe376fde4e89 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1784,7 +1784,7 @@ static int __devexit xennet_remove(struct xenbus_device *dev)
         return 0;
 }
 
-static struct xenbus_driver netfront = {
+static struct xenbus_driver netfront_driver = {
         .name = "vif",
         .owner = THIS_MODULE,
         .ids = netfront_ids,
@@ -1804,7 +1804,7 @@ static int __init netif_init(void)
 
         printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n");
 
-        return xenbus_register_frontend(&netfront);
+        return xenbus_register_frontend(&netfront_driver);
 }
 module_init(netif_init);
 
@@ -1814,7 +1814,7 @@ static void __exit netif_exit(void)
         if (xen_initial_domain())
                 return;
 
-        xenbus_unregister_driver(&netfront);
+        xenbus_unregister_driver(&netfront_driver);
 }
 module_exit(netif_exit);
 
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index e2e95b36a603..101ed49a2d15 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -70,6 +70,8 @@ static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc
          * parallel ports and <S> is the number of serial ports.
          */
         card->numports = (dev->subsystem_device & 0xf0) >> 4;
+        if (card->numports > ARRAY_SIZE(card->addr))
+                card->numports = ARRAY_SIZE(card->addr);
         return 0;
 }
 
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 28af496b441e..061d1ee0046a 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2042,7 +2042,7 @@ static int __devinit pci_init(void)
         return 0;
 }
 
-static int __devinit pci_setup(char *str)
+static int __init pci_setup(char *str)
 {
         while (str) {
                 char *k = strchr(str, ',');
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index a926c896475e..643a6b98462b 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -879,7 +879,7 @@ static void rio_update_route_tables(struct rio_mport *port)
  * link, then start recursive peer enumeration. Returns %0 if
  * enumeration succeeds or %-EBUSY if enumeration fails.
  */
-int rio_enum_mport(struct rio_mport *mport)
+int __devinit rio_enum_mport(struct rio_mport *mport)
 {
         struct rio_net *net = NULL;
         int rc = 0;
@@ -972,7 +972,7 @@ static void rio_enum_timeout(unsigned long data)
  * peer discovery. Returns %0 if discovery succeeds or %-EBUSY
  * on failure.
  */
-int rio_disc_mport(struct rio_mport *mport)
+int __devinit rio_disc_mport(struct rio_mport *mport)
 {
         struct rio_net *net = NULL;
         int enum_timeout_flag = 0;
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 680661abbc4b..6395c780008b 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -467,7 +467,7 @@ static int __devinit rio_init(void)
 
 device_initcall(rio_init);
 
-int rio_init_mports(void)
+int __devinit rio_init_mports(void)
 {
         int rc = 0;
         struct rio_mport *port;
diff --git a/drivers/rtc/rtc-starfire.c b/drivers/rtc/rtc-starfire.c
index 7ccb0dd700af..5be98bfd7ed3 100644
--- a/drivers/rtc/rtc-starfire.c
+++ b/drivers/rtc/rtc-starfire.c
@@ -6,7 +6,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/time.h>
 #include <linux/rtc.h>
 #include <linux/platform_device.h>
 
@@ -16,11 +15,6 @@ MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
 MODULE_DESCRIPTION("Starfire RTC driver");
 MODULE_LICENSE("GPL");
 
-struct starfire_rtc {
-        struct rtc_device       *rtc;
-        spinlock_t              lock;
-};
-
 static u32 starfire_get_time(void)
 {
         static char obp_gettod[32];
@@ -35,64 +29,31 @@ static u32 starfire_get_time(void)
 
 static int starfire_read_time(struct device *dev, struct rtc_time *tm)
 {
-        struct starfire_rtc *p = dev_get_drvdata(dev);
-        unsigned long flags, secs;
-
-        spin_lock_irqsave(&p->lock, flags);
-        secs = starfire_get_time();
-        spin_unlock_irqrestore(&p->lock, flags);
-
-        rtc_time_to_tm(secs, tm);
-
-        return 0;
-}
-
-static int starfire_set_time(struct device *dev, struct rtc_time *tm)
-{
-        unsigned long secs;
-        int err;
-
-        err = rtc_tm_to_time(tm, &secs);
-        if (err)
-                return err;
-
-        /* Do nothing, time is set using the service processor
-         * console on this platform.
-         */
-        return 0;
+        rtc_time_to_tm(starfire_get_time(), tm);
+        return rtc_valid_tm(tm);
 }
 
 static const struct rtc_class_ops starfire_rtc_ops = {
         .read_time      = starfire_read_time,
-        .set_time       = starfire_set_time,
 };
 
-static int __devinit starfire_rtc_probe(struct platform_device *pdev)
+static int __init starfire_rtc_probe(struct platform_device *pdev)
 {
-        struct starfire_rtc *p = kzalloc(sizeof(*p), GFP_KERNEL);
-
-        if (!p)
-                return -ENOMEM;
+        struct rtc_device *rtc = rtc_device_register("starfire", &pdev->dev,
+                                     &starfire_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
 
-        spin_lock_init(&p->lock);
+        platform_set_drvdata(pdev, rtc);
 
-        p->rtc = rtc_device_register("starfire", &pdev->dev,
-                                     &starfire_rtc_ops, THIS_MODULE);
-        if (IS_ERR(p->rtc)) {
-                int err = PTR_ERR(p->rtc);
-                kfree(p);
-                return err;
-        }
-        platform_set_drvdata(pdev, p);
         return 0;
 }
 
-static int __devexit starfire_rtc_remove(struct platform_device *pdev)
+static int __exit starfire_rtc_remove(struct platform_device *pdev)
 {
-        struct starfire_rtc *p = platform_get_drvdata(pdev);
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
 
-        rtc_device_unregister(p->rtc);
-        kfree(p);
+        rtc_device_unregister(rtc);
 
         return 0;
 }
@@ -102,13 +63,12 @@ static struct platform_driver starfire_rtc_driver = {
                 .name   = "rtc-starfire",
                 .owner  = THIS_MODULE,
         },
-        .probe          = starfire_rtc_probe,
-        .remove         = __devexit_p(starfire_rtc_remove),
+        .remove         = __exit_p(starfire_rtc_remove),
 };
 
 static int __init starfire_rtc_init(void)
 {
-        return platform_driver_register(&starfire_rtc_driver);
+        return platform_driver_probe(&starfire_rtc_driver, starfire_rtc_probe);
 }
 
 static void __exit starfire_rtc_exit(void)
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 35364f64da7f..c557ba34e1aa 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -720,7 +720,6 @@ static int zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *act,
                 goto failed_openfcp;
 
         atomic_set_mask(ZFCP_STATUS_COMMON_OPEN, &act->adapter->status);
-        schedule_work(&act->adapter->scan_work);
 
         return ZFCP_ERP_SUCCEEDED;
 
@@ -1186,7 +1185,9 @@ static void zfcp_erp_scsi_scan(struct work_struct *work)
                 container_of(work, struct zfcp_erp_add_work, work);
         struct zfcp_unit *unit = p->unit;
         struct fc_rport *rport = unit->port->rport;
-        scsi_scan_target(&rport->dev, 0, rport->scsi_target_id,
+
+        if (rport && rport->port_state == FC_PORTSTATE_ONLINE)
+                scsi_scan_target(&rport->dev, 0, rport->scsi_target_id,
                          scsilun_to_int((struct scsi_lun *)&unit->fcp_lun), 0);
         atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status);
         zfcp_unit_put(unit);
@@ -1282,6 +1283,8 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result)
         case ZFCP_ERP_ACTION_REOPEN_ADAPTER:
                 if (result != ZFCP_ERP_SUCCEEDED)
                         zfcp_erp_rports_del(adapter);
+                else
+                        schedule_work(&adapter->scan_work);
                 zfcp_adapter_put(adapter);
                 break;
         }
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index 1a7c80a77ff5..8aab3091a7b1 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -50,7 +50,8 @@ static int zfcp_wka_port_get(struct zfcp_wka_port *wka_port)
         if (mutex_lock_interruptible(&wka_port->mutex))
                 return -ERESTARTSYS;
 
-        if (wka_port->status != ZFCP_WKA_PORT_ONLINE) {
+        if (wka_port->status == ZFCP_WKA_PORT_OFFLINE ||
+            wka_port->status == ZFCP_WKA_PORT_CLOSING) {
                 wka_port->status = ZFCP_WKA_PORT_OPENING;
                 if (zfcp_fsf_open_wka_port(wka_port))
                         wka_port->status = ZFCP_WKA_PORT_OFFLINE;
@@ -125,8 +126,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
 
         read_lock_irqsave(&zfcp_data.config_lock, flags);
         list_for_each_entry(port, &fsf_req->adapter->port_list_head, list) {
-                /* FIXME: ZFCP_STATUS_PORT_DID_DID check is racy */
-                if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_DID_DID))
+                if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_PHYS_OPEN))
                         /* Try to connect to unused ports anyway. */
                         zfcp_erp_port_reopen(port,
                                              ZFCP_STATUS_COMMON_ERP_FAILED,
@@ -610,7 +610,6 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter)
         int ret, i;
         struct zfcp_gpn_ft *gpn_ft;
 
-        zfcp_erp_wait(adapter); /* wait until adapter is finished with ERP */
         if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT)
                 return 0;
 
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index d024442ee128..dc0367690405 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -930,8 +930,10 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id,
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND,
                                   req_flags, adapter->pool.fsf_req_abort);
-        if (IS_ERR(req))
+        if (IS_ERR(req)) {
+                req = NULL;
                 goto out;
+        }
 
         if (unlikely(!(atomic_read(&unit->status) &
                        ZFCP_STATUS_COMMON_UNBLOCKED)))
@@ -1584,6 +1586,7 @@ static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req)
                 wka_port->status = ZFCP_WKA_PORT_OFFLINE;
                 break;
         case FSF_PORT_ALREADY_OPEN:
+                break;
         case FSF_GOOD:
                 wka_port->handle = header->port_handle;
                 wka_port->status = ZFCP_WKA_PORT_ONLINE;
@@ -2113,18 +2116,21 @@ static inline void zfcp_fsf_trace_latency(struct zfcp_fsf_req *fsf_req)
 
 static void zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *req)
 {
-        struct scsi_cmnd *scpnt = req->data;
+        struct scsi_cmnd *scpnt;
         struct fcp_rsp_iu *fcp_rsp_iu = (struct fcp_rsp_iu *)
             &(req->qtcb->bottom.io.fcp_rsp);
         u32 sns_len;
         char *fcp_rsp_info = (unsigned char *) &fcp_rsp_iu[1];
         unsigned long flags;
 
-        if (unlikely(!scpnt))
-                return;
-
         read_lock_irqsave(&req->adapter->abort_lock, flags);
 
+        scpnt = req->data;
+        if (unlikely(!scpnt)) {
+                read_unlock_irqrestore(&req->adapter->abort_lock, flags);
+                return;
+        }
+
         if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ABORTED)) {
                 set_host_byte(scpnt, DID_SOFT_ERROR);
                 set_driver_byte(scpnt, SUGGEST_RETRY);
@@ -2442,8 +2448,10 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,
                 goto out;
         req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,
                                   adapter->pool.fsf_req_scsi);
-        if (IS_ERR(req))
+        if (IS_ERR(req)) {
+                req = NULL;
                 goto out;
+        }
 
         req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT;
         req->data = unit;
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index e46fd3e9f68f..468c880f8b6d 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -88,7 +88,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,
         ret = zfcp_fsf_send_fcp_command_task(adapter, unit, scpnt, 0,
                                              ZFCP_REQ_AUTO_CLEANUP);
         if (unlikely(ret == -EBUSY))
-                zfcp_scsi_command_fail(scpnt, DID_NO_CONNECT);
+                return SCSI_MLQUEUE_DEVICE_BUSY;
         else if (unlikely(ret < 0))
                 return SCSI_MLQUEUE_HOST_BUSY;
 
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 9aa301c1ed07..162cd927d94b 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -427,8 +427,8 @@ static int aac_slave_configure(struct scsi_device *sdev)
                  * Firmware has an individual device recovery time typically
                  * of 35 seconds, give us a margin.
                  */
-                if (sdev->timeout < (45 * HZ))
-                        sdev->timeout = 45 * HZ;
+                if (sdev->request_queue->rq_timeout < (45 * HZ))
+                        blk_queue_rq_timeout(sdev->request_queue, 45*HZ);
                 for (cid = 0; cid < aac->maximum_num_containers; ++cid)
                         if (aac->fsa_dev[cid].valid)
                                 ++num_lsu;
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 218777bfc143..399fe559e4de 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -13872,8 +13872,10 @@ static int __devinit advansys_board_found(struct Scsi_Host *shost,
         advansys_wide_free_mem(boardp);
         free_irq(boardp->irq, shost);
  err_free_dma:
+#ifdef CONFIG_ISA
         if (shost->dma_channel != NO_ISA_DMA)
                 free_dma(shost->dma_channel);
+#endif
  err_free_proc:
         kfree(boardp->prtbuf);
  err_unmap:
@@ -13894,10 +13896,12 @@ static int advansys_release(struct Scsi_Host *shost)
         ASC_DBG(1, "begin\n");
         scsi_remove_host(shost);
         free_irq(board->irq, shost);
+#ifdef CONFIG_ISA
         if (shost->dma_channel != NO_ISA_DMA) {
                 ASC_DBG(1, "free_dma()\n");
                 free_dma(shost->dma_channel);
         }
+#endif
         if (ASC_NARROW_BOARD(board)) {
                 dma_unmap_single(board->dev,
                                         board->dvc_var.asc_dvc_var.overrun_dma,
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index c387c15a2128..fb247fdfa2bd 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -588,7 +588,7 @@ static struct pci_driver gdth_pci_driver = {
         .remove         = gdth_pci_remove_one,
 };
 
-static void gdth_pci_remove_one(struct pci_dev *pdev)
+static void __devexit gdth_pci_remove_one(struct pci_dev *pdev)
 {
         gdth_ha_str *ha = pci_get_drvdata(pdev);
 
@@ -600,7 +600,7 @@ static void gdth_pci_remove_one(struct pci_dev *pdev)
         pci_disable_device(pdev);
 }
 
-static int gdth_pci_init_one(struct pci_dev *pdev,
+static int __devinit gdth_pci_init_one(struct pci_dev *pdev,
                                        const struct pci_device_id *ent)
 {
         ushort vendor = pdev->vendor;
@@ -853,7 +853,7 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha)
 #endif /* CONFIG_ISA */
 
 #ifdef CONFIG_PCI
-static int gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr,
+static int __devinit gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr,
                                    gdth_ha_str *ha)
 {
     register gdt6_dpram_str __iomem *dp6_ptr;
@@ -1237,7 +1237,7 @@ static int gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr,
 
 /* controller protocol functions */
 
-static void __init gdth_enable_int(gdth_ha_str *ha)
+static void __devinit gdth_enable_int(gdth_ha_str *ha)
 {
     ulong flags;
     gdt2_dpram_str __iomem *dp2_ptr;
@@ -1553,7 +1553,7 @@ static int gdth_internal_cmd(gdth_ha_str *ha, unchar service, ushort opcode,
 
 /* search for devices */
 
-static int __init gdth_search_drives(gdth_ha_str *ha)
+static int __devinit gdth_search_drives(gdth_ha_str *ha)
 {
     ushort cdev_cnt, i;
     int ok;
@@ -4935,7 +4935,7 @@ static int __init gdth_eisa_probe_one(ushort eisa_slot)
 #endif /* CONFIG_EISA */
 
 #ifdef CONFIG_PCI
-static int gdth_pci_probe_one(gdth_pci_str *pcistr,
+static int __devinit gdth_pci_probe_one(gdth_pci_str *pcistr,
                              gdth_ha_str **ha_out)
 {
         struct Scsi_Host *shp;
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 87e09f35d3d4..6cad1758243a 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1442,7 +1442,7 @@ static int ibmvscsi_slave_configure(struct scsi_device *sdev)
         spin_lock_irqsave(shost->host_lock, lock_flags);
         if (sdev->type == TYPE_DISK) {
                 sdev->allow_restart = 1;
-                sdev->timeout = 60 * HZ;
+                blk_queue_rq_timeout(sdev->request_queue, 60 * HZ);
         }
         scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun);
         spin_unlock_irqrestore(shost->host_lock, lock_flags);
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index a454f94623d7..17ce7abe17ee 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -1016,7 +1016,8 @@ static int megasas_slave_configure(struct scsi_device *sdev)
          * The RAID firmware may require extended timeouts.
          */
         if (sdev->channel >= MEGASAS_MAX_PD_CHANNELS)
-                sdev->timeout = MEGASAS_DEFAULT_CMD_TIMEOUT * HZ;
+                blk_queue_rq_timeout(sdev->request_queue,
+                                     MEGASAS_DEFAULT_CMD_TIMEOUT * HZ);
         return 0;
 }
 
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 386361778ebb..edfaf241c5ba 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -932,8 +932,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
                 int i, rtn = NEEDS_RETRY;
 
                 for (i = 0; rtn == NEEDS_RETRY && i < 2; i++)
-                        rtn = scsi_send_eh_cmnd(scmd, stu_command, 6,
-                                                scmd->device->timeout, 0);
+                        rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, scmd->device->request_queue->rq_timeout, 0);
 
                 if (rtn == SUCCESS)
                         return 0;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index f5d3b96890dc..fa45a1a66867 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -567,15 +567,18 @@ static inline int scsi_host_is_busy(struct Scsi_Host *shost)
  */
 static void scsi_run_queue(struct request_queue *q)
 {
-        struct scsi_device *starved_head = NULL, *sdev = q->queuedata;
+        struct scsi_device *sdev = q->queuedata;
         struct Scsi_Host *shost = sdev->host;
+        LIST_HEAD(starved_list);
         unsigned long flags;
 
         if (scsi_target(sdev)->single_lun)
                 scsi_single_lun_run(sdev);
 
         spin_lock_irqsave(shost->host_lock, flags);
-        while (!list_empty(&shost->starved_list) && !scsi_host_is_busy(shost)) {
+        list_splice_init(&shost->starved_list, &starved_list);
+
+        while (!list_empty(&starved_list)) {
                 int flagset;
 
                 /*
@@ -588,24 +591,18 @@ static void scsi_run_queue(struct request_queue *q)
                  * scsi_request_fn must get the host_lock before checking
                  * or modifying starved_list or starved_entry.
                  */
-                sdev = list_entry(shost->starved_list.next,
-                                          struct scsi_device, starved_entry);
-                /*
-                 * The *queue_ready functions can add a device back onto the
-                 * starved list's tail, so we must check for a infinite loop.
-                 */
-                if (sdev == starved_head)
+                if (scsi_host_is_busy(shost))
                         break;
-                if (!starved_head)
-                        starved_head = sdev;
 
+                sdev = list_entry(starved_list.next,
+                                  struct scsi_device, starved_entry);
+                list_del_init(&sdev->starved_entry);
                 if (scsi_target_is_busy(scsi_target(sdev))) {
                         list_move_tail(&sdev->starved_entry,
                                        &shost->starved_list);
                         continue;
                 }
 
-                list_del_init(&sdev->starved_entry);
                 spin_unlock(shost->host_lock);
 
                 spin_lock(sdev->request_queue->queue_lock);
@@ -621,6 +618,8 @@ static void scsi_run_queue(struct request_queue *q)
 
                 spin_lock(shost->host_lock);
         }
+        /* put any unprocessed entries back */
+        list_splice(&starved_list, &shost->starved_list);
         spin_unlock_irqrestore(shost->host_lock, flags);
 
         blk_run_queue(q);
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 3790906a77d1..2fa830c0be27 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -477,7 +477,7 @@ stex_slave_config(struct scsi_device *sdev)
 {
         sdev->use_10_for_rw = 1;
         sdev->use_10_for_ms = 1;
-        sdev->timeout = 60 * HZ;
+        blk_queue_rq_timeout(sdev->request_queue, 60 * HZ);
         sdev->tagged_supported = 1;
 
         return 0;
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index 6a3f8fb0c9dd..3317148a4b93 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -286,8 +286,8 @@ static void ulite_release_port(struct uart_port *port)
 
 static int ulite_request_port(struct uart_port *port)
 {
-        pr_debug("ulite console: port=%p; port->mapbase=%x\n",
-                 port, port->mapbase);
+        pr_debug("ulite console: port=%p; port->mapbase=%llx\n",
+                 port, (unsigned long long) port->mapbase);
 
         if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) {
                 dev_err(port->dev, "Memory region busy\n");
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c
index 87b73e0169c5..b02f25c702fd 100644
--- a/drivers/spi/au1550_spi.c
+++ b/drivers/spi/au1550_spi.c
@@ -369,10 +369,23 @@ static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t)
         dma_rx_addr = t->rx_dma;
 
         /*
-         * check if buffers are already dma mapped, map them otherwise
+         * check if buffers are already dma mapped, map them otherwise:
+         * - first map the TX buffer, so cache data gets written to memory
+         * - then map the RX buffer, so that cache entries (with
+         *   soon-to-be-stale data) get removed
          * use rx buffer in place of tx if tx buffer was not provided
          * use temp rx buffer (preallocated or realloc to fit) for rx dma
          */
+        if (t->tx_buf) {
+                if (t->tx_dma == 0) {   /* if DMA_ADDR_INVALID, map it */
+                        dma_tx_addr = dma_map_single(hw->dev,
+                                        (void *)t->tx_buf,
+                                        t->len, DMA_TO_DEVICE);
+                        if (dma_mapping_error(hw->dev, dma_tx_addr))
+                                dev_err(hw->dev, "tx dma map error\n");
+                }
+        }
+
         if (t->rx_buf) {
                 if (t->rx_dma == 0) {   /* if DMA_ADDR_INVALID, map it */
                         dma_rx_addr = dma_map_single(hw->dev,
@@ -396,15 +409,8 @@ static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t)
                 dma_sync_single_for_device(hw->dev, dma_rx_addr,
                         t->len, DMA_FROM_DEVICE);
         }
-        if (t->tx_buf) {
-                if (t->tx_dma == 0) {   /* if DMA_ADDR_INVALID, map it */
-                        dma_tx_addr = dma_map_single(hw->dev,
-                                        (void *)t->tx_buf,
-                                        t->len, DMA_TO_DEVICE);
-                        if (dma_mapping_error(hw->dev, dma_tx_addr))
-                                dev_err(hw->dev, "tx dma map error\n");
-                }
-        } else {
+
+        if (!t->tx_buf) {
                 dma_sync_single_for_device(hw->dev, dma_rx_addr,
                                 t->len, DMA_BIDIRECTIONAL);
                 hw->tx = hw->rx;
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index 0debe11b67b4..3b97803e1d11 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -142,6 +142,7 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
         unsigned rfalarm;
         unsigned send_at_once = MPC52xx_PSC_BUFSIZE;
         unsigned recv_at_once;
+        int last_block = 0;
 
         if (!t->tx_buf && !t->rx_buf && t->len)
                 return -EINVAL;
@@ -151,15 +152,17 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
         while (rb < t->len) {
                 if (t->len - rb > MPC52xx_PSC_BUFSIZE) {
                         rfalarm = MPC52xx_PSC_RFALARM;
+                        last_block = 0;
                 } else {
                         send_at_once = t->len - sb;
                         rfalarm = MPC52xx_PSC_BUFSIZE - (t->len - rb);
+                        last_block = 1;
                 }
 
                 dev_dbg(&spi->dev, "send %d bytes...\n", send_at_once);
                 for (; send_at_once; sb++, send_at_once--) {
                         /* set EOF flag before the last word is sent */
-                        if (send_at_once == 1)
+                        if (send_at_once == 1 && last_block)
                                 out_8(&psc->ircr2, 0x01);
 
                         if (tx_buf)
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 0b4db0ce78d6..269a55ec52ef 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1456,7 +1456,7 @@ static int __init spi_imx_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct spi_imx_master *platform_info;
         struct spi_master *master;
-        struct driver_data *drv_data = NULL;
+        struct driver_data *drv_data;
         struct resource *res;
         int irq, status = 0;
 
@@ -1467,14 +1467,6 @@ static int __init spi_imx_probe(struct platform_device *pdev)
                 goto err_no_pdata;
         }
 
-        drv_data->clk = clk_get(&pdev->dev, "perclk2");
-        if (IS_ERR(drv_data->clk)) {
-                dev_err(&pdev->dev, "probe - cannot get get\n");
-                status = PTR_ERR(drv_data->clk);
-                goto err_no_clk;
-        }
-        clk_enable(drv_data->clk);
-
         /* Allocate master with space for drv_data */
         master = spi_alloc_master(dev, sizeof(struct driver_data));
         if (!master) {
@@ -1495,6 +1487,14 @@ static int __init spi_imx_probe(struct platform_device *pdev)
 
         drv_data->dummy_dma_buf = SPI_DUMMY_u32;
 
+        drv_data->clk = clk_get(&pdev->dev, "perclk2");
+        if (IS_ERR(drv_data->clk)) {
+                dev_err(&pdev->dev, "probe - cannot get clock\n");
+                status = PTR_ERR(drv_data->clk);
+                goto err_no_clk;
+        }
+        clk_enable(drv_data->clk);
+
         /* Find and map resources */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
@@ -1630,12 +1630,13 @@ err_no_iomap:
         kfree(drv_data->ioarea);
 
 err_no_iores:
-        spi_master_put(master);
-
-err_no_pdata:
         clk_disable(drv_data->clk);
         clk_put(drv_data->clk);
+
 err_no_clk:
+        spi_master_put(master);
+
+err_no_pdata:
 err_no_mem:
         return status;
 }
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index cc1f647f579b..f2447a5476bb 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -34,7 +34,7 @@ struct s3c2410_spigpio {
 
 static inline struct s3c2410_spigpio *spidev_to_sg(struct spi_device *spi)
 {
-        return spi->controller_data;
+        return spi_master_get_devdata(spi->master);
 }
 
 static inline void setsck(struct spi_device *dev, int on)
@@ -118,6 +118,7 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
         /* setup spi bitbang adaptor */
         sp->bitbang.master = spi_master_get(master);
         sp->bitbang.master->bus_num = info->bus_num;
+        sp->bitbang.master->num_chipselect = info->num_chipselect;
         sp->bitbang.chipselect = s3c2410_spigpio_chipselect;
 
         sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0;
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 89a43755a453..5d869c4d3eb2 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -597,7 +597,9 @@ static int spidev_probe(struct spi_device *spi)
         }
         mutex_unlock(&device_list_lock);
 
-        if (status != 0)
+        if (status == 0)
+                spi_set_drvdata(spi, spidev);
+        else
                 kfree(spidev);
 
         return status;
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index 1fe8b44787b3..b3408ff39fba 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -2363,6 +2363,9 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
                 nuke(loop_ep, -ESHUTDOWN);
         spin_unlock_irqrestore(&udc_controller->lock, flags);
 
+        /* report disconnect; the controller is already quiesced */
+        driver->disconnect(&udc_controller->gadget);
+
         /* unbind gadget and unhook driver. */
         driver->unbind(&udc_controller->gadget);
         udc_controller->gadget.dev.driver = NULL;
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
index 091bb55c9aa7..f3c6703cffda 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/drivers/usb/gadget/fsl_usb2_udc.c
@@ -1836,6 +1836,9 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
                 nuke(loop_ep, -ESHUTDOWN);
         spin_unlock_irqrestore(&udc_controller->lock, flags);
 
+        /* report disconnect; the controller is already quiesced */
+        driver->disconnect(&udc_controller->gadget);
+
         /* unbind gadget and unhook driver. */
         driver->unbind(&udc_controller->gadget);
         udc_controller->gadget.dev.driver = NULL;
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index da6e93c201d2..2dbc0db0b46c 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -141,7 +141,11 @@ static int is_vbus_present(void)
 
         if (mach->gpio_vbus) {
                 int value = gpio_get_value(mach->gpio_vbus);
-                return mach->gpio_vbus_inverted ? !value : value;
+
+                if (mach->gpio_vbus_inverted)
+                        return !value;
+                else
+                        return !!value;
         }
         if (mach->udc_is_connected)
                 return mach->udc_is_connected();
@@ -982,7 +986,7 @@ static int pxa25x_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
         struct pxa25x_udc       *udc;
 
         udc = container_of(_gadget, struct pxa25x_udc, gadget);
-        udc->vbus = (is_active != 0);
+        udc->vbus = is_active;
         DMSG("vbus %s\n", is_active ? "supplied" : "inactive");
         pullup(udc);
         return 0;
@@ -1399,12 +1403,8 @@ lubbock_vbus_irq(int irq, void *_dev)
 static irqreturn_t udc_vbus_irq(int irq, void *_dev)
 {
         struct pxa25x_udc       *dev = _dev;
-        int                     vbus = gpio_get_value(dev->mach->gpio_vbus);
 
-        if (dev->mach->gpio_vbus_inverted)
-                vbus = !vbus;
-
-        pxa25x_udc_vbus_session(&dev->gadget, vbus);
+        pxa25x_udc_vbus_session(&dev->gadget, is_vbus_present());
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 9d0ea573aef6..36864f958444 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -169,18 +169,21 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                 }
                 break;
         case PCI_VENDOR_ID_ATI:
-                /* SB700 old version has a bug in EHCI controller,
+                /* SB600 and old version of SB700 have a bug in EHCI controller,
                  * which causes usb devices lose response in some cases.
                  */
-                if (pdev->device == 0x4396) {
+                if ((pdev->device == 0x4386) || (pdev->device == 0x4396)) {
                         p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,
                                                  PCI_DEVICE_ID_ATI_SBX00_SMBUS,
                                                  NULL);
                         if (!p_smbus)
                                 break;
                         rev = p_smbus->revision;
-                        if ((rev == 0x3a) || (rev == 0x3b)) {
+                        if ((pdev->device == 0x4386) || (rev == 0x3a)
+                            || (rev == 0x3b)) {
                                 u8 tmp;
+                                ehci_info(ehci, "applying AMD SB600/SB700 USB "
+                                        "freeze workaround\n");
                                 pci_read_config_byte(pdev, 0x53, &tmp);
                                 pci_write_config_byte(pdev, 0x53, tmp | (1<<3));
                         }
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index b11798d17ae5..c7d4b5a06bdb 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -183,16 +183,14 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action)
          * the async ring; just the I/O watchdog.  Note that if a
          * SHRINK were pending, OFF would never be requested.
          */
-        enum ehci_timer_action oldactions = ehci->actions;
+        if (timer_pending(&ehci->watchdog)
+                        && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))
+                                & ehci->actions))
+                return;
 
         if (!test_and_set_bit (action, &ehci->actions)) {
                 unsigned long t;
 
-                if (timer_pending(&ehci->watchdog)
-                        && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))
-                                & oldactions))
-                        return;
-
                 switch (action) {
                 case TIMER_IO_WATCHDOG:
                         t = EHCI_IO_JIFFIES;
@@ -208,7 +206,7 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action)
                         t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1;
                         break;
                 }
-                mod_timer(&ehci->watchdog, round_jiffies(t + jiffies));
+                mod_timer(&ehci->watchdog, t + jiffies);
         }
 }
 
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 5b20de130e08..5b95009d2fbb 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -135,6 +135,7 @@ static int usb_console_setup(struct console *co, char *options)
                                 err("no more memory");
                                 goto reset_open_count;
                         }
+                        kref_init(&tty->kref);
                         termios = kzalloc(sizeof(*termios), GFP_KERNEL);
                         if (!termios) {
                                 retval = -ENOMEM;
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 6fa1ec441b61..809697b3c7fc 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -224,6 +224,7 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
 #define ONDA_VENDOR_ID                          0x19d2
 #define ONDA_PRODUCT_MSA501HS                   0x0001
 #define ONDA_PRODUCT_ET502HS                    0x0002
+#define ONDA_PRODUCT_MT503HS                    0x0200
 
 #define BANDRICH_VENDOR_ID                      0x1A8D
 #define BANDRICH_PRODUCT_C100_1                 0x1002
@@ -413,6 +414,40 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) },
         { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) },
         { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0003) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0004) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0005) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0006) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0007) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0008) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0009) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000a) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000b) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000c) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000d) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000e) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000f) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0010) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0011) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0012) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0013) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0014) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0015) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0016) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0017) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0018) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0019) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0020) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0021) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0022) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0023) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0024) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0025) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0026) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0027) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0028) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0029) },
+        { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MT503HS) },
         { USB_DEVICE(YISO_VENDOR_ID, YISO_PRODUCT_U893) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 6da9a7a962a8..e61f2bfc64ad 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -318,6 +318,18 @@ UNUSUAL_DEV(  0x045a, 0x5210, 0x0101, 0x0101,
                 US_SC_SCSI, US_PR_KARMA, rio_karma_init, 0),
 #endif
 
+/* Reported by Tamas Kerecsen <kerecsen@bigfoot.com>
+ * Obviously the PROM has not been customized by the VAR;
+ * the Vendor and Product string descriptors are:
+ *      Generic Mass Storage (PROTOTYPE--Remember to change idVendor)
+ *      Generic Manufacturer (PROTOTYPE--Remember to change idVendor)
+ */
+UNUSUAL_DEV(  0x045e, 0xffff, 0x0000, 0x0000,
+                "Mitac",
+                "GPS",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_MAX_SECTORS_64 ),
+
 /*
  * This virtual floppy is found in Sun equipment (x4600, x4200m2, etc.)
  * Reported by Pete Zaitcev <zaitcev@redhat.com>
@@ -377,6 +389,13 @@ UNUSUAL_DEV(  0x04b0, 0x0401, 0x0200, 0x0200,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY),
 
+/* Reported by Tobias Kunze Briseno <t-linux@fictive.com> */
+UNUSUAL_DEV(  0x04b0, 0x0403, 0x0200, 0x0200,
+                "NIKON",
+                "NIKON DSC D2H",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY),
+
 /* Reported by Milinevsky Dmitry <niam.niam@gmail.com> */
 UNUSUAL_DEV(  0x04b0, 0x0409, 0x0100, 0x0100,
                 "NIKON",
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
index 8718f7349d6b..a547e5d4c8bf 100644
--- a/drivers/video/aty/radeon_accel.c
+++ b/drivers/video/aty/radeon_accel.c
@@ -174,12 +174,12 @@ static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo,
                                     const struct fb_image *image,
                                     u32 fg, u32 bg)
 {
-        unsigned int src_bytes, dwords;
+        unsigned int dwords;
         u32 *bits;
 
         radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache,
                           rinfo->dp_gui_mc_base |
-                          GMC_BRUSH_NONE |
+                          GMC_BRUSH_NONE | GMC_DST_CLIP_LEAVE |
                           GMC_SRC_DATATYPE_MONO_FG_BG |
                           ROP3_S |
                           GMC_BYTE_ORDER_MSB_TO_LSB |
@@ -189,9 +189,6 @@ static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo,
         radeonfb_set_creg(rinfo, DP_SRC_FRGD_CLR, &rinfo->dp_src_fg_cache, fg);
         radeonfb_set_creg(rinfo, DP_SRC_BKGD_CLR, &rinfo->dp_src_bg_cache, bg);
 
-        radeon_fifo_wait(rinfo, 1);
-        OUTREG(DST_Y_X, (image->dy << 16) | image->dx);
-
         /* Ensure the dst cache is flushed and the engine idle before
          * issuing the operation.
          *
@@ -205,13 +202,19 @@ static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo,
 
         /* X here pads width to a multiple of 32 and uses the clipper to
          * adjust the result. Is that really necessary ? Things seem to
-         * work ok for me without that and the doco doesn't seem to imply
+         * work ok for me without that and the doco doesn't seem to imply]
          * there is such a restriction.
          */
-        OUTREG(DST_WIDTH_HEIGHT, (image->width << 16) | image->height);
+        radeon_fifo_wait(rinfo, 4);
+        OUTREG(SC_TOP_LEFT, (image->dy << 16) | image->dx);
+        OUTREG(SC_BOTTOM_RIGHT, ((image->dy + image->height) << 16) |
+               (image->dx + image->width));
+        OUTREG(DST_Y_X, (image->dy << 16) | image->dx);
+
+        OUTREG(DST_HEIGHT_WIDTH, (image->height << 16) | ((image->width + 31) & ~31));
 
-        src_bytes = (((image->width * image->depth) + 7) / 8) * image->height;
-        dwords = (src_bytes + 3) / 4;
+        dwords = (image->width + 31) >> 5;
+        dwords *= image->height;
         bits = (u32*)(image->data);
 
         while(dwords >= 8) {
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 9a5821c65ebf..b3ffe8205d2b 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -1875,6 +1875,7 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo)
         info->fbops = &radeonfb_ops;
         info->screen_base = rinfo->fb_base;
         info->screen_size = rinfo->mapped_vram;
+
         /* Fill fix common fields */
         strlcpy(info->fix.id, rinfo->name, sizeof(info->fix.id));
         info->fix.smem_start = rinfo->fb_base_phys;
@@ -1889,8 +1890,25 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo)
         info->fix.mmio_len = RADEON_REGSIZE;
         info->fix.accel = FB_ACCEL_ATI_RADEON;
 
+        /* Allocate colormap */
         fb_alloc_cmap(&info->cmap, 256, 0);
 
+        /* Setup pixmap used for acceleration */
+#define PIXMAP_SIZE     (2048 * 4)
+
+        info->pixmap.addr = kmalloc(PIXMAP_SIZE, GFP_KERNEL);
+        if (!info->pixmap.addr) {
+                printk(KERN_ERR "radeonfb: Failed to allocate pixmap !\n");
+                noaccel = 1;
+                goto bail;
+        }
+        info->pixmap.size = PIXMAP_SIZE;
+        info->pixmap.flags = FB_PIXMAP_SYSTEM;
+        info->pixmap.scan_align = 4;
+        info->pixmap.buf_align = 4;
+        info->pixmap.access_align = 32;
+
+bail:
         if (noaccel)
                 info->flags |= FBINFO_HWACCEL_DISABLED;
 
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index b92947d62ad6..67ff370d80af 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2389,16 +2389,13 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
 
         if (!fbcon_is_inactive(vc, info)) {
                 if (ops->blank_state != blank) {
-                        int ret = 1;
-
                         ops->blank_state = blank;
                         fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
                         ops->cursor_flash = (!blank);
 
-                        if (info->fbops->fb_blank)
-                                ret = info->fbops->fb_blank(blank, info);
-                        if (ret)
-                                fbcon_generic_blank(vc, info, blank);
+                        if (!(info->flags & FBINFO_MISC_USEREVENT))
+                                if (fb_blank(info, blank))
+                                        fbcon_generic_blank(vc, info, blank);
                 }
 
                 if (!blank)
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index b790ddff76f9..ee380d5f3410 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -164,7 +164,6 @@ static struct fb_var_screeninfo macfb_defined = {
 };
 
 static struct fb_fix_screeninfo macfb_fix = {
-        .id     = "Macintosh ",
         .type   = FB_TYPE_PACKED_PIXELS,
         .accel  = FB_ACCEL_NONE,
 };
@@ -760,22 +759,22 @@ static int __init macfb_init(void)
 
                 switch(ndev->dr_hw) {
                 case NUBUS_DRHW_APPLE_MDC:
-                        strcat( macfb_fix.id, "Display Card" );
+                        strcpy(macfb_fix.id, "Mac Disp. Card");
                         macfb_setpalette = mdc_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
                 case NUBUS_DRHW_APPLE_TFB:
-                        strcat( macfb_fix.id, "Toby" );
+                        strcpy(macfb_fix.id, "Toby");
                         macfb_setpalette = toby_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
                 case NUBUS_DRHW_APPLE_JET:
-                        strcat( macfb_fix.id, "Jet");
+                        strcpy(macfb_fix.id, "Jet");
                         macfb_setpalette = jet_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;                  
                 default:
-                        strcat( macfb_fix.id, "Generic NuBus" );
+                        strcpy(macfb_fix.id, "Generic NuBus");
                         break;
                 }
         }
@@ -786,21 +785,11 @@ static int __init macfb_init(void)
         if (!video_is_nubus)
                 switch( mac_bi_data.id )
                 {
-                        /* These don't have onboard video.  Eventually, we may
-                           be able to write separate framebuffer drivers for
-                           them (tobyfb.c, hiresfb.c, etc, etc) */
-                case MAC_MODEL_II:
-                case MAC_MODEL_IIX:
-                case MAC_MODEL_IICX:
-                case MAC_MODEL_IIFX:
-                        strcat( macfb_fix.id, "Generic NuBus" );
-                        break;
-
                         /* Valkyrie Quadras */
                 case MAC_MODEL_Q630:
                         /* I'm not sure about this one */
                 case MAC_MODEL_P588:
-                        strcat( macfb_fix.id, "Valkyrie built-in" );
+                        strcpy(macfb_fix.id, "Valkyrie");
                         macfb_setpalette = valkyrie_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         valkyrie_cmap_regs = ioremap(DAC_BASE, 0x1000);
@@ -823,7 +812,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_Q700:
                 case MAC_MODEL_Q900:
                 case MAC_MODEL_Q950:
-                        strcat( macfb_fix.id, "DAFB built-in" );
+                        strcpy(macfb_fix.id, "DAFB");
                         macfb_setpalette = dafb_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         dafb_cmap_regs = ioremap(DAFB_BASE, 0x1000);
@@ -831,7 +820,7 @@ static int __init macfb_init(void)
 
                         /* LC II uses the V8 framebuffer */
                 case MAC_MODEL_LCII:
-                        strcat( macfb_fix.id, "V8 built-in" );
+                        strcpy(macfb_fix.id, "V8");
                         macfb_setpalette = v8_brazil_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
@@ -843,7 +832,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_IIVI:
                 case MAC_MODEL_IIVX:
                 case MAC_MODEL_P600:
-                        strcat( macfb_fix.id, "Brazil built-in" );
+                        strcpy(macfb_fix.id, "Brazil");
                         macfb_setpalette = v8_brazil_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
@@ -860,7 +849,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_P460:
                         macfb_setpalette = v8_brazil_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
-                        strcat( macfb_fix.id, "Sonora built-in" );
+                        strcpy(macfb_fix.id, "Sonora");
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
                         break;
 
@@ -871,7 +860,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_IISI:
                         macfb_setpalette = rbv_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
-                        strcat( macfb_fix.id, "RBV built-in" );
+                        strcpy(macfb_fix.id, "RBV");
                         rbv_cmap_regs = ioremap(DAC_BASE, 0x1000);
                         break;
 
@@ -880,7 +869,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_C660:
                         macfb_setpalette = civic_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
-                        strcat( macfb_fix.id, "Civic built-in" );
+                        strcpy(macfb_fix.id, "Civic");
                         civic_cmap_regs = ioremap(CIVIC_BASE, 0x1000);
                         break;
 
@@ -901,7 +890,7 @@ static int __init macfb_init(void)
                                 v8_brazil_cmap_regs =
                                         ioremap(DAC_BASE, 0x1000);
                         }
-                        strcat( macfb_fix.id, "LC built-in" );
+                        strcpy(macfb_fix.id, "LC");
                         break;
                         /* We think this may be like the LC II */
                 case MAC_MODEL_CCL:
@@ -911,18 +900,18 @@ static int __init macfb_init(void)
                                 v8_brazil_cmap_regs =
                                         ioremap(DAC_BASE, 0x1000);
                         }
-                        strcat( macfb_fix.id, "Color Classic built-in" );
+                        strcpy(macfb_fix.id, "Color Classic");
                         break;
 
                         /* And we *do* mean "weirdos" */
                 case MAC_MODEL_TV:
-                        strcat( macfb_fix.id, "Mac TV built-in" );
+                        strcpy(macfb_fix.id, "Mac TV");
                         break;
 
                         /* These don't have colour, so no need to worry */
                 case MAC_MODEL_SE30:
                 case MAC_MODEL_CLII:
-                        strcat( macfb_fix.id, "Monochrome built-in" );
+                        strcpy(macfb_fix.id, "Monochrome");
                         break;
 
                         /* Powerbooks are particularly difficult.  Many of
@@ -935,7 +924,7 @@ static int __init macfb_init(void)
                 case MAC_MODEL_PB140:
                 case MAC_MODEL_PB145:
                 case MAC_MODEL_PB170:
-                        strcat( macfb_fix.id, "DDC built-in" );
+                        strcpy(macfb_fix.id, "DDC");
                         break;
 
                         /* Internal is GSC, External (if present) is ViSC */
@@ -945,13 +934,13 @@ static int __init macfb_init(void)
                 case MAC_MODEL_PB180:
                 case MAC_MODEL_PB210:
                 case MAC_MODEL_PB230:
-                        strcat( macfb_fix.id, "GSC built-in" );
+                        strcpy(macfb_fix.id, "GSC");
                         break;
 
                         /* Internal is TIM, External is ViSC */
                 case MAC_MODEL_PB165C:
                 case MAC_MODEL_PB180C:
-                        strcat( macfb_fix.id, "TIM built-in" );
+                        strcpy(macfb_fix.id, "TIM");
                         break;
 
                         /* Internal is CSC, External is Keystone+Ariel. */
@@ -963,12 +952,12 @@ static int __init macfb_init(void)
                 case MAC_MODEL_PB280C:
                         macfb_setpalette = csc_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
-                        strcat( macfb_fix.id, "CSC built-in" );
+                        strcpy(macfb_fix.id, "CSC");
                         csc_cmap_regs = ioremap(CSC_BASE, 0x1000);
                         break;
                 
                 default:
-                        strcat( macfb_fix.id, "Unknown/Unsupported built-in" );
+                        strcpy(macfb_fix.id, "Unknown");
                         break;
                 }
 
@@ -978,16 +967,23 @@ static int __init macfb_init(void)
         fb_info.pseudo_palette  = pseudo_palette;
         fb_info.flags           = FBINFO_DEFAULT;
 
-        fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);
+        err = fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);
+        if (err)
+                goto fail_unmap;
         
         err = register_framebuffer(&fb_info);
-        if (!err)
-                printk("fb%d: %s frame buffer device\n",
-                       fb_info.node, fb_info.fix.id);
-        else {
-                iounmap(fb_info.screen_base);
-                iounmap_macfb();
-        }
+        if (err)
+                goto fail_dealloc;
+
+        printk("fb%d: %s frame buffer device\n",
+               fb_info.node, fb_info.fix.id);
+        return 0;
+
+fail_dealloc:
+        fb_dealloc_cmap(&fb_info.cmap);
+fail_unmap:
+        iounmap(fb_info.screen_base);
+        iounmap_macfb();
         return err;
 }
 
diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile
index 99da8b6d2c36..ed13889c1162 100644
--- a/drivers/video/omap/Makefile
+++ b/drivers/video/omap/Makefile
@@ -23,7 +23,6 @@ objs-y$(CONFIG_MACH_OMAP_PALMZ71) += lcd_palmz71.o
 objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o
 objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o
 objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o
-objs-y$(CONFIG_MACH_SX1) += lcd_sx1.o
 
 omapfb-objs := $(objs-yy)
 
diff --git a/drivers/video/omap/lcd_sx1.c b/drivers/video/omap/lcd_sx1.c
deleted file mode 100644
index e55de201b8ff..000000000000
--- a/drivers/video/omap/lcd_sx1.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * LCD panel support for the Siemens SX1 mobile phone
- *
- * Current version : Vovan888@gmail.com, great help from FCA00000
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-
-#include <mach/gpio.h>
-#include <mach/omapfb.h>
-#include <mach/mcbsp.h>
-#include <mach/mux.h>
-
-/*
- * OMAP310 GPIO registers
- */
-#define GPIO_DATA_INPUT         0xfffce000
-#define GPIO_DATA_OUTPUT        0xfffce004
-#define GPIO_DIR_CONTROL        0xfffce008
-#define GPIO_INT_CONTROL        0xfffce00c
-#define GPIO_INT_MASK           0xfffce010
-#define GPIO_INT_STATUS         0xfffce014
-#define GPIO_PIN_CONTROL        0xfffce018
-
-
-#define A_LCD_SSC_RD    3
-#define A_LCD_SSC_SD    7
-#define _A_LCD_RESET    9
-#define _A_LCD_SSC_CS   12
-#define _A_LCD_SSC_A0   13
-
-#define DSP_REG         0xE1017024
-
-const unsigned char INIT_1[12] = {
-        0x1C, 0x02, 0x88, 0x00, 0x1E, 0xE0, 0x00, 0xDC, 0x00, 0x02, 0x00
-};
-
-const unsigned char INIT_2[127] = {
-        0x15, 0x00, 0x29, 0x00, 0x3E, 0x00, 0x51, 0x00,
-        0x65, 0x00, 0x7A, 0x00, 0x8D, 0x00, 0xA1, 0x00,
-        0xB6, 0x00, 0xC7, 0x00, 0xD8, 0x00, 0xEB, 0x00,
-        0xFB, 0x00, 0x0B, 0x01, 0x1B, 0x01, 0x27, 0x01,
-        0x34, 0x01, 0x41, 0x01, 0x4C, 0x01, 0x55, 0x01,
-        0x5F, 0x01, 0x68, 0x01, 0x70, 0x01, 0x78, 0x01,
-        0x7E, 0x01, 0x86, 0x01, 0x8C, 0x01, 0x94, 0x01,
-        0x9B, 0x01, 0xA1, 0x01, 0xA4, 0x01, 0xA9, 0x01,
-        0xAD, 0x01, 0xB2, 0x01, 0xB7, 0x01, 0xBC, 0x01,
-        0xC0, 0x01, 0xC4, 0x01, 0xC8, 0x01, 0xCB, 0x01,
-        0xCF, 0x01, 0xD2, 0x01, 0xD5, 0x01, 0xD8, 0x01,
-        0xDB, 0x01, 0xE0, 0x01, 0xE3, 0x01, 0xE6, 0x01,
-        0xE8, 0x01, 0xEB, 0x01, 0xEE, 0x01, 0xF1, 0x01,
-        0xF3, 0x01, 0xF8, 0x01, 0xF9, 0x01, 0xFC, 0x01,
-        0x00, 0x02, 0x03, 0x02, 0x07, 0x02, 0x09, 0x02,
-        0x0E, 0x02, 0x13, 0x02, 0x1C, 0x02, 0x00
-};
-
-const unsigned char INIT_3[15] = {
-        0x14, 0x26, 0x33, 0x3D, 0x45, 0x4D, 0x53, 0x59,
-        0x5E, 0x63, 0x67, 0x6D, 0x71, 0x78, 0xFF
-};
-
-static void epson_sendbyte(int flag, unsigned char byte)
-{
-        int i, shifter = 0x80;
-
-        if (!flag)
-                gpio_set_value(_A_LCD_SSC_A0, 0);
-        mdelay(2);
-        gpio_set_value(A_LCD_SSC_RD, 1);
-
-        gpio_set_value(A_LCD_SSC_SD, flag);
-
-        OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200);
-        OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202);
-        for (i = 0; i < 8; i++) {
-                OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200);
-                gpio_set_value(A_LCD_SSC_SD, shifter & byte);
-                OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202);
-                shifter >>= 1;
-        }
-        gpio_set_value(_A_LCD_SSC_A0, 1);
-}
-
-static void init_system(void)
-{
-        omap_mcbsp_request(OMAP_MCBSP3);
-        omap_mcbsp_stop(OMAP_MCBSP3);
-}
-
-static void setup_GPIO(void)
-{
-        /* new wave */
-        gpio_request(A_LCD_SSC_RD, "lcd_ssc_rd");
-        gpio_request(A_LCD_SSC_SD, "lcd_ssc_sd");
-        gpio_request(_A_LCD_RESET, "lcd_reset");
-        gpio_request(_A_LCD_SSC_CS, "lcd_ssc_cs");
-        gpio_request(_A_LCD_SSC_A0, "lcd_ssc_a0");
-
-        /* set GPIOs to output, with initial data */
-        gpio_direction_output(A_LCD_SSC_RD, 1);
-        gpio_direction_output(A_LCD_SSC_SD, 0);
-        gpio_direction_output(_A_LCD_RESET, 0);
-        gpio_direction_output(_A_LCD_SSC_CS, 1);
-        gpio_direction_output(_A_LCD_SSC_A0, 1);
-}
-
-static void display_init(void)
-{
-        int i;
-
-        omap_cfg_reg(MCBSP3_CLKX);
-
-        mdelay(2);
-        setup_GPIO();
-        mdelay(2);
-
-        /* reset LCD */
-        gpio_set_value(A_LCD_SSC_SD, 1);
-        epson_sendbyte(0, 0x25);
-
-        gpio_set_value(_A_LCD_RESET, 0);
-        mdelay(10);
-        gpio_set_value(_A_LCD_RESET, 1);
-
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        mdelay(2);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        /* init LCD, phase 1 */
-        epson_sendbyte(0, 0xCA);
-        for (i = 0; i < 10; i++)
-                epson_sendbyte(1, INIT_1[i]);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        /* init LCD phase 2 */
-        epson_sendbyte(0, 0xCB);
-        for (i = 0; i < 125; i++)
-                epson_sendbyte(1, INIT_2[i]);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        /* init LCD phase 2a */
-        epson_sendbyte(0, 0xCC);
-        for (i = 0; i < 14; i++)
-                epson_sendbyte(1, INIT_3[i]);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        /* init LCD phase 3 */
-        epson_sendbyte(0, 0xBC);
-        epson_sendbyte(1, 0x08);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        /* init LCD phase 4 */
-        epson_sendbyte(0, 0x07);
-        epson_sendbyte(1, 0x05);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        /* init LCD phase 5 */
-        epson_sendbyte(0, 0x94);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        /* init LCD phase 6 */
-        epson_sendbyte(0, 0xC6);
-        epson_sendbyte(1, 0x80);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        mdelay(100); /* used to be 1000 */
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        /* init LCD phase 7 */
-        epson_sendbyte(0, 0x16);
-        epson_sendbyte(1, 0x02);
-        epson_sendbyte(1, 0x00);
-        epson_sendbyte(1, 0xB1);
-        epson_sendbyte(1, 0x00);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        /* init LCD phase 8 */
-        epson_sendbyte(0, 0x76);
-        epson_sendbyte(1, 0x00);
-        epson_sendbyte(1, 0x00);
-        epson_sendbyte(1, 0xDB);
-        epson_sendbyte(1, 0x00);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        /* init LCD phase 9 */
-        epson_sendbyte(0, 0xAF);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-}
-
-static int sx1_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
-{
-        return 0;
-}
-
-static void sx1_panel_cleanup(struct lcd_panel *panel)
-{
-}
-
-static void sx1_panel_disable(struct lcd_panel *panel)
-{
-        printk(KERN_INFO "SX1: LCD panel disable\n");
-        sx1_setmmipower(0);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-
-        epson_sendbyte(0, 0x25);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        epson_sendbyte(0, 0xAE);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-        mdelay(100);
-        gpio_set_value(_A_LCD_SSC_CS, 0);
-
-        epson_sendbyte(0, 0x95);
-        gpio_set_value(_A_LCD_SSC_CS, 1);
-}
-
-static int sx1_panel_enable(struct lcd_panel *panel)
-{
-        printk(KERN_INFO "lcd_sx1: LCD panel enable\n");
-        init_system();
-        display_init();
-
-        sx1_setmmipower(1);
-        sx1_setbacklight(0x18);
-        sx1_setkeylight (0x06);
-        return 0;
-}
-
-
-static unsigned long sx1_panel_get_caps(struct lcd_panel *panel)
-{
-        return 0;
-}
-
-struct lcd_panel sx1_panel = {
-        .name           = "sx1",
-        .config         = OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC |
-                          OMAP_LCDC_INV_HSYNC | OMAP_LCDC_INV_PIX_CLOCK |
-                          OMAP_LCDC_INV_OUTPUT_EN,
-
-        .x_res          = 176,
-        .y_res          = 220,
-        .data_lines     = 16,
-        .bpp            = 16,
-        .hsw            = 5,
-        .hfp            = 5,
-        .hbp            = 5,
-        .vsw            = 2,
-        .vfp            = 1,
-        .vbp            = 1,
-        .pixel_clock    = 1500,
-
-        .init           = sx1_panel_init,
-        .cleanup        = sx1_panel_cleanup,
-        .enable         = sx1_panel_enable,
-        .disable        = sx1_panel_disable,
-        .get_caps       = sx1_panel_get_caps,
-};
-
-static int sx1_panel_probe(struct platform_device *pdev)
-{
-        omapfb_register_panel(&sx1_panel);
-        return 0;
-}
-
-static int sx1_panel_remove(struct platform_device *pdev)
-{
-        return 0;
-}
-
-static int sx1_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
-{
-        return 0;
-}
-
-static int sx1_panel_resume(struct platform_device *pdev)
-{
-        return 0;
-}
-
-struct platform_driver sx1_panel_driver = {
-        .probe          = sx1_panel_probe,
-        .remove         = sx1_panel_remove,
-        .suspend        = sx1_panel_suspend,
-        .resume         = sx1_panel_resume,
-        .driver = {
-                .name   = "lcd_sx1",
-                .owner  = THIS_MODULE,
-        },
-};
-
-static int sx1_panel_drv_init(void)
-{
-        return platform_driver_register(&sx1_panel_driver);
-}
-
-static void sx1_panel_drv_cleanup(void)
-{
-        platform_driver_unregister(&sx1_panel_driver);
-}
-
-module_init(sx1_panel_drv_init);
-module_exit(sx1_panel_drv_cleanup);
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 97204497d9f7..cc59c52e1103 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -804,6 +804,9 @@ static int pxafb_smart_thread(void *arg)
 
 static int pxafb_smart_init(struct pxafb_info *fbi)
 {
+        if (!(fbi->lccr0 | LCCR0_LCDT))
+                return 0;
+
         fbi->smart_thread = kthread_run(pxafb_smart_thread, fbi,
                                         "lcd_refresh");
         if (IS_ERR(fbi->smart_thread)) {
@@ -1372,7 +1375,7 @@ static void pxafb_decode_mach_info(struct pxafb_info *fbi,
         fbi->cmap_inverse       = inf->cmap_inverse;
         fbi->cmap_static        = inf->cmap_static;
 
-        switch (lcd_conn & 0xf) {
+        switch (lcd_conn & LCD_TYPE_MASK) {
         case LCD_TYPE_MONO_STN:
                 fbi->lccr0 = LCCR0_CMS;
                 break;
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index a463b3dd837b..2493f05e9f61 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -668,7 +668,7 @@ static struct xenbus_device_id xenfb_ids[] = {
         { "" }
 };
 
-static struct xenbus_driver xenfb = {
+static struct xenbus_driver xenfb_driver = {
         .name = "vfb",
         .owner = THIS_MODULE,
         .ids = xenfb_ids,
@@ -687,12 +687,12 @@ static int __init xenfb_init(void)
         if (xen_initial_domain())
                 return -ENODEV;
 
-        return xenbus_register_frontend(&xenfb);
+        return xenbus_register_frontend(&xenfb_driver);
 }
 
 static void __exit xenfb_cleanup(void)
 {
-        xenbus_unregister_driver(&xenfb);
+        xenbus_unregister_driver(&xenfb_driver);
 }
 
 module_init(xenfb_init);
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 5da3d2423cc0..40a3a2afbfe7 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -298,8 +298,9 @@ static int xilinxfb_assign(struct device *dev, unsigned long physaddr,
 
         /* Put a banner in the log (for DEBUG) */
         dev_dbg(dev, "regs: phys=%lx, virt=%p\n", physaddr, drvdata->regs);
-        dev_dbg(dev, "fb: phys=%p, virt=%p, size=%x\n",
-                (void*)drvdata->fb_phys, drvdata->fb_virt, fbsize);
+        dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n",
+                (unsigned long long) drvdata->fb_phys, drvdata->fb_virt,
+                fbsize);
 
         return 0;       /* success */
 
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index a14d5b6e4c7c..90616822cd20 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -36,7 +36,7 @@ config W1_MASTER_DS2482
 
 config W1_MASTER_DS1WM
         tristate "Maxim DS1WM 1-wire busmaster"
-        depends on W1 && ARM
+        depends on W1 && ARM && HAVE_CLK
         help
           Say Y here to enable the DS1WM 1-wire driver, such as that
           in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index a3765e0be4a8..763c1ea5dce5 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -40,6 +40,7 @@
 #include <linux/bootmem.h>
 #include <linux/slab.h>
 #include <asm/desc.h>
+#include <asm/cacheflush.h>
 
 #define PCI_BIOS32_SD_VALUE             0x5F32335F      /* "_32_" */
 #define CRU_BIOS_SIGNATURE_VALUE        0x55524324
@@ -394,6 +395,8 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm)
                                 smbios_cru64_ptr->double_offset;
                         cru_rom_addr = ioremap(cru_physical_address,
                                 smbios_cru64_ptr->double_length);
+                        set_memory_x((unsigned long)cru_rom_addr & PAGE_MASK,
+                                smbios_cru64_ptr->double_length >> PAGE_SHIFT);
                 }
         }
 }
@@ -482,7 +485,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
                         "Management Log for details.\n");
         }
 
-        return NOTIFY_STOP;
+        return NOTIFY_OK;
 }
 
 /*
diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c
index ca344a85eb95..2474ebca88f6 100644
--- a/drivers/watchdog/iTCO_vendor_support.c
+++ b/drivers/watchdog/iTCO_vendor_support.c
@@ -1,7 +1,7 @@
 /*
  *      intel TCO vendor specific watchdog driver support
  *
- *      (c) Copyright 2006 Wim Van Sebroeck <wim@iguana.be>.
+ *      (c) Copyright 2006-2008 Wim Van Sebroeck <wim@iguana.be>.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -19,8 +19,7 @@
 
 /* Module and version information */
 #define DRV_NAME        "iTCO_vendor_support"
-#define DRV_VERSION     "1.01"
-#define DRV_RELDATE     "11-Nov-2006"
+#define DRV_VERSION     "1.02"
 #define PFX             DRV_NAME ": "
 
 /* Includes */
@@ -78,24 +77,6 @@ MODULE_PARM_DESC(vendorsupport, "iTCO vendor specific support mode, default=0 (n
  *          20.6 seconds.
  */
 
-static void supermicro_old_pre_start(unsigned long acpibase)
-{
-        unsigned long val32;
-
-        val32 = inl(SMI_EN);
-        val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
-        outl(val32, SMI_EN);    /* Needed to activate watchdog */
-}
-
-static void supermicro_old_pre_stop(unsigned long acpibase)
-{
-        unsigned long val32;
-
-        val32 = inl(SMI_EN);
-        val32 &= 0x00002000;    /* Turn on SMI clearing watchdog */
-        outl(val32, SMI_EN);    /* Needed to deactivate watchdog */
-}
-
 static void supermicro_old_pre_keepalive(unsigned long acpibase)
 {
         /* Reload TCO Timer (done in iTCO_wdt_keepalive) + */
@@ -247,18 +228,14 @@ static void supermicro_new_pre_set_heartbeat(unsigned int heartbeat)
 void iTCO_vendor_pre_start(unsigned long acpibase,
                            unsigned int heartbeat)
 {
-        if (vendorsupport == SUPERMICRO_OLD_BOARD)
-                supermicro_old_pre_start(acpibase);
-        else if (vendorsupport == SUPERMICRO_NEW_BOARD)
+        if (vendorsupport == SUPERMICRO_NEW_BOARD)
                 supermicro_new_pre_start(heartbeat);
 }
 EXPORT_SYMBOL(iTCO_vendor_pre_start);
 
 void iTCO_vendor_pre_stop(unsigned long acpibase)
 {
-        if (vendorsupport == SUPERMICRO_OLD_BOARD)
-                supermicro_old_pre_stop(acpibase);
-        else if (vendorsupport == SUPERMICRO_NEW_BOARD)
+        if (vendorsupport == SUPERMICRO_NEW_BOARD)
                 supermicro_new_pre_stop();
 }
 EXPORT_SYMBOL(iTCO_vendor_pre_stop);
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index bfb93bc2ca9f..26173a270e94 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -1,7 +1,7 @@
 /*
  *      intel TCO Watchdog Driver (Used in i82801 and i6300ESB chipsets)
  *
- *      (c) Copyright 2006-2007 Wim Van Sebroeck <wim@iguana.be>.
+ *      (c) Copyright 2006-2008 Wim Van Sebroeck <wim@iguana.be>.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -20,34 +20,41 @@
  *      82801BAM (ICH2-M)    : document number 290687-002, 298242-027,
  *      82801CA  (ICH3-S)    : document number 290733-003, 290739-013,
  *      82801CAM (ICH3-M)    : document number 290716-001, 290718-007,
- *      82801DB  (ICH4)      : document number 290744-001, 290745-020,
- *      82801DBM (ICH4-M)    : document number 252337-001, 252663-005,
+ *      82801DB  (ICH4)      : document number 290744-001, 290745-025,
+ *      82801DBM (ICH4-M)    : document number 252337-001, 252663-008,
  *      82801E   (C-ICH)     : document number 273599-001, 273645-002,
- *      82801EB  (ICH5)      : document number 252516-001, 252517-003,
- *      82801ER  (ICH5R)     : document number 252516-001, 252517-003,
- *      82801FB  (ICH6)      : document number 301473-002, 301474-007,
- *      82801FR  (ICH6R)     : document number 301473-002, 301474-007,
- *      82801FBM (ICH6-M)    : document number 301473-002, 301474-007,
- *      82801FW  (ICH6W)     : document number 301473-001, 301474-007,
- *      82801FRW (ICH6RW)    : document number 301473-001, 301474-007,
- *      82801GB  (ICH7)      : document number 307013-002, 307014-009,
- *      82801GR  (ICH7R)     : document number 307013-002, 307014-009,
- *      82801GDH (ICH7DH)    : document number 307013-002, 307014-009,
- *      82801GBM (ICH7-M)    : document number 307013-002, 307014-009,
- *      82801GHM (ICH7-M DH) : document number 307013-002, 307014-009,
- *      82801HB  (ICH8)      : document number 313056-003, 313057-009,
- *      82801HR  (ICH8R)     : document number 313056-003, 313057-009,
- *      82801HBM (ICH8M)     : document number 313056-003, 313057-009,
- *      82801HH  (ICH8DH)    : document number 313056-003, 313057-009,
- *      82801HO  (ICH8DO)    : document number 313056-003, 313057-009,
- *      82801HEM (ICH8M-E)   : document number 313056-003, 313057-009,
- *      82801IB  (ICH9)      : document number 316972-001, 316973-006,
- *      82801IR  (ICH9R)     : document number 316972-001, 316973-006,
- *      82801IH  (ICH9DH)    : document number 316972-001, 316973-006,
- *      82801IO  (ICH9DO)    : document number 316972-001, 316973-006,
- *      6300ESB  (6300ESB)   : document number 300641-003, 300884-010,
- *      631xESB  (631xESB)   : document number 313082-001, 313075-005,
- *      632xESB  (632xESB)   : document number 313082-001, 313075-005
+ *      82801EB  (ICH5)      : document number 252516-001, 252517-028,
+ *      82801ER  (ICH5R)     : document number 252516-001, 252517-028,
+ *      6300ESB  (6300ESB)   : document number 300641-004, 300884-013,
+ *      82801FB  (ICH6)      : document number 301473-002, 301474-026,
+ *      82801FR  (ICH6R)     : document number 301473-002, 301474-026,
+ *      82801FBM (ICH6-M)    : document number 301473-002, 301474-026,
+ *      82801FW  (ICH6W)     : document number 301473-001, 301474-026,
+ *      82801FRW (ICH6RW)    : document number 301473-001, 301474-026,
+ *      631xESB  (631xESB)   : document number 313082-001, 313075-006,
+ *      632xESB  (632xESB)   : document number 313082-001, 313075-006,
+ *      82801GB  (ICH7)      : document number 307013-003, 307014-024,
+ *      82801GR  (ICH7R)     : document number 307013-003, 307014-024,
+ *      82801GDH (ICH7DH)    : document number 307013-003, 307014-024,
+ *      82801GBM (ICH7-M)    : document number 307013-003, 307014-024,
+ *      82801GHM (ICH7-M DH) : document number 307013-003, 307014-024,
+ *      82801GU  (ICH7-U)    : document number 307013-003, 307014-024,
+ *      82801HB  (ICH8)      : document number 313056-003, 313057-017,
+ *      82801HR  (ICH8R)     : document number 313056-003, 313057-017,
+ *      82801HBM (ICH8M)     : document number 313056-003, 313057-017,
+ *      82801HH  (ICH8DH)    : document number 313056-003, 313057-017,
+ *      82801HO  (ICH8DO)    : document number 313056-003, 313057-017,
+ *      82801HEM (ICH8M-E)   : document number 313056-003, 313057-017,
+ *      82801IB  (ICH9)      : document number 316972-004, 316973-012,
+ *      82801IR  (ICH9R)     : document number 316972-004, 316973-012,
+ *      82801IH  (ICH9DH)    : document number 316972-004, 316973-012,
+ *      82801IO  (ICH9DO)    : document number 316972-004, 316973-012,
+ *      82801IBM (ICH9M)     : document number 316972-004, 316973-012,
+ *      82801IEM (ICH9M-E)   : document number 316972-004, 316973-012,
+ *      82801JIB (ICH10)     : document number 319973-002, 319974-002,
+ *      82801JIR (ICH10R)    : document number 319973-002, 319974-002,
+ *      82801JD  (ICH10D)    : document number 319973-002, 319974-002,
+ *      82801JDO (ICH10DO)   : document number 319973-002, 319974-002
  */
 
 /*
@@ -56,8 +63,7 @@
 
 /* Module and version information */
 #define DRV_NAME        "iTCO_wdt"
-#define DRV_VERSION     "1.03"
-#define DRV_RELDATE     "30-Apr-2008"
+#define DRV_VERSION     "1.04"
 #define PFX             DRV_NAME ": "
 
 /* Includes */
@@ -96,19 +102,26 @@ enum iTCO_chipsets {
         TCO_ICH6,       /* ICH6 & ICH6R */
         TCO_ICH6M,      /* ICH6-M */
         TCO_ICH6W,      /* ICH6W & ICH6RW */
+        TCO_631XESB,    /* 631xESB/632xESB */
         TCO_ICH7,       /* ICH7 & ICH7R */
-        TCO_ICH7M,      /* ICH7-M */
+        TCO_ICH7DH,     /* ICH7DH */
+        TCO_ICH7M,      /* ICH7-M & ICH7-U */
         TCO_ICH7MDH,    /* ICH7-M DH */
         TCO_ICH8,       /* ICH8 & ICH8R */
-        TCO_ICH8ME,     /* ICH8M-E */
         TCO_ICH8DH,     /* ICH8DH */
         TCO_ICH8DO,     /* ICH8DO */
         TCO_ICH8M,      /* ICH8M */
+        TCO_ICH8ME,     /* ICH8M-E */
         TCO_ICH9,       /* ICH9 */
         TCO_ICH9R,      /* ICH9R */
         TCO_ICH9DH,     /* ICH9DH */
         TCO_ICH9DO,     /* ICH9DO */
-        TCO_631XESB,    /* 631xESB/632xESB */
+        TCO_ICH9M,      /* ICH9M */
+        TCO_ICH9ME,     /* ICH9M-E */
+        TCO_ICH10,      /* ICH10 */
+        TCO_ICH10R,     /* ICH10R */
+        TCO_ICH10D,     /* ICH10D */
+        TCO_ICH10DO,    /* ICH10DO */
 };
 
 static struct {
@@ -129,19 +142,26 @@ static struct {
         {"ICH6 or ICH6R", 2},
         {"ICH6-M", 2},
         {"ICH6W or ICH6RW", 2},
+        {"631xESB/632xESB", 2},
         {"ICH7 or ICH7R", 2},
-        {"ICH7-M", 2},
+        {"ICH7DH", 2},
+        {"ICH7-M or ICH7-U", 2},
         {"ICH7-M DH", 2},
         {"ICH8 or ICH8R", 2},
-        {"ICH8M-E", 2},
         {"ICH8DH", 2},
         {"ICH8DO", 2},
         {"ICH8M", 2},
+        {"ICH8M-E", 2},
         {"ICH9", 2},
         {"ICH9R", 2},
         {"ICH9DH", 2},
         {"ICH9DO", 2},
-        {"631xESB/632xESB", 2},
+        {"ICH9M", 2},
+        {"ICH9M-E", 2},
+        {"ICH10", 2},
+        {"ICH10R", 2},
+        {"ICH10D", 2},
+        {"ICH10DO", 2},
         {NULL, 0}
 };
 
@@ -175,18 +195,6 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
         { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_0,           TCO_ICH6)},
         { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_1,           TCO_ICH6M)},
         { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH6_2,           TCO_ICH6W)},
-        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_0,           TCO_ICH7)},
-        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_1,           TCO_ICH7M)},
-        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_31,          TCO_ICH7MDH)},
-        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_0,           TCO_ICH8)},
-        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_1,           TCO_ICH8ME)},
-        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_2,           TCO_ICH8DH)},
-        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_3,           TCO_ICH8DO)},
-        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_4,           TCO_ICH8M)},
-        { ITCO_PCI_DEVICE(0x2918,                               TCO_ICH9)},
-        { ITCO_PCI_DEVICE(0x2916,                               TCO_ICH9R)},
-        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_2,           TCO_ICH9DH)},
-        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_4,           TCO_ICH9DO)},
         { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ESB2_0,           TCO_631XESB)},
         { ITCO_PCI_DEVICE(0x2671,                               TCO_631XESB)},
         { ITCO_PCI_DEVICE(0x2672,                               TCO_631XESB)},
@@ -203,6 +211,25 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
         { ITCO_PCI_DEVICE(0x267d,                               TCO_631XESB)},
         { ITCO_PCI_DEVICE(0x267e,                               TCO_631XESB)},
         { ITCO_PCI_DEVICE(0x267f,                               TCO_631XESB)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_0,           TCO_ICH7)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_30,          TCO_ICH7DH)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_1,           TCO_ICH7M)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH7_31,          TCO_ICH7MDH)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_0,           TCO_ICH8)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_2,           TCO_ICH8DH)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_3,           TCO_ICH8DO)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_4,           TCO_ICH8M)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH8_1,           TCO_ICH8ME)},
+        { ITCO_PCI_DEVICE(0x2918,                               TCO_ICH9)},
+        { ITCO_PCI_DEVICE(0x2916,                               TCO_ICH9R)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_2,           TCO_ICH9DH)},
+        { ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_4,           TCO_ICH9DO)},
+        { ITCO_PCI_DEVICE(0x2919,                               TCO_ICH9M)},
+        { ITCO_PCI_DEVICE(0x2917,                               TCO_ICH9ME)},
+        { ITCO_PCI_DEVICE(0x3a18,                               TCO_ICH10)},
+        { ITCO_PCI_DEVICE(0x3a16,                               TCO_ICH10R)},
+        { ITCO_PCI_DEVICE(0x3a1a,                               TCO_ICH10D)},
+        { ITCO_PCI_DEVICE(0x3a14,                               TCO_ICH10DO)},
         { 0, },                 /* End of list */
 };
 MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);
@@ -311,6 +338,7 @@ static int iTCO_wdt_unset_NO_REBOOT_bit(void)
 static int iTCO_wdt_start(void)
 {
         unsigned int val;
+        unsigned long val32;
 
         spin_lock(&iTCO_wdt_private.io_lock);
 
@@ -323,6 +351,18 @@ static int iTCO_wdt_start(void)
                 return -EIO;
         }
 
+        /* Bit 13: TCO_EN -> 0 = Disables TCO logic generating an SMI# */
+        val32 = inl(SMI_EN);
+        val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
+        outl(val32, SMI_EN);
+
+        /* Force the timer to its reload value by writing to the TCO_RLD
+           register */
+        if (iTCO_wdt_private.iTCO_version == 2)
+                outw(0x01, TCO_RLD);
+        else if (iTCO_wdt_private.iTCO_version == 1)
+                outb(0x01, TCO_RLD);
+
         /* Bit 11: TCO Timer Halt -> 0 = The TCO timer is enabled to count */
         val = inw(TCO1_CNT);
         val &= 0xf7ff;
@@ -338,6 +378,7 @@ static int iTCO_wdt_start(void)
 static int iTCO_wdt_stop(void)
 {
         unsigned int val;
+        unsigned long val32;
 
         spin_lock(&iTCO_wdt_private.io_lock);
 
@@ -349,6 +390,11 @@ static int iTCO_wdt_stop(void)
         outw(val, TCO1_CNT);
         val = inw(TCO1_CNT);
 
+        /* Bit 13: TCO_EN -> 1 = Enables the TCO logic to generate SMI# */
+        val32 = inl(SMI_EN);
+        val32 &= 0x00002000;
+        outl(val32, SMI_EN);
+
         /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
         iTCO_wdt_set_NO_REBOOT_bit();
 
@@ -459,7 +505,6 @@ static int iTCO_wdt_open(struct inode *inode, struct file *file)
         /*
          *      Reload and activate timer
          */
-        iTCO_wdt_keepalive();
         iTCO_wdt_start();
         return nonseekable_open(inode, file);
 }
@@ -604,7 +649,6 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
         int ret;
         u32 base_address;
         unsigned long RCBA;
-        unsigned long val32;
 
         /*
          *      Find the ACPI/PM base I/O address which is the base
@@ -644,17 +688,13 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
         /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
         iTCO_wdt_set_NO_REBOOT_bit();
 
-        /* Set the TCO_EN bit in SMI_EN register */
+        /* The TCO logic uses the TCO_EN bit in the SMI_EN register */
         if (!request_region(SMI_EN, 4, "iTCO_wdt")) {
                 printk(KERN_ERR PFX
                         "I/O address 0x%04lx already in use\n", SMI_EN);
                 ret = -EIO;
                 goto out;
         }
-        val32 = inl(SMI_EN);
-        val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
-        outl(val32, SMI_EN);
-        release_region(SMI_EN, 4);
 
         /* The TCO I/O registers reside in a 32-byte range pointed to
            by the TCOBASE value */
@@ -662,7 +702,7 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
                 printk(KERN_ERR PFX "I/O address 0x%04lx already in use\n",
                         TCOBASE);
                 ret = -EIO;
-                goto out;
+                goto unreg_smi_en;
         }
 
         printk(KERN_INFO PFX
@@ -672,8 +712,9 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
                         TCOBASE);
 
         /* Clear out the (probably old) status */
-        outb(0, TCO1_STS);
-        outb(3, TCO2_STS);
+        outb(8, TCO1_STS);      /* Clear the Time Out Status bit */
+        outb(2, TCO2_STS);      /* Clear SECOND_TO_STS bit */
+        outb(4, TCO2_STS);      /* Clear BOOT_STS bit */
 
         /* Make sure the watchdog is not running */
         iTCO_wdt_stop();
@@ -701,6 +742,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
 
 unreg_region:
         release_region(TCOBASE, 0x20);
+unreg_smi_en:
+        release_region(SMI_EN, 4);
 out:
         if (iTCO_wdt_private.iTCO_version == 2)
                 iounmap(iTCO_wdt_private.gcs);
@@ -718,6 +761,7 @@ static void __devexit iTCO_wdt_cleanup(void)
         /* Deregister */
         misc_deregister(&iTCO_wdt_miscdev);
         release_region(TCOBASE, 0x20);
+        release_region(SMI_EN, 4);
         if (iTCO_wdt_private.iTCO_version == 2)
                 iounmap(iTCO_wdt_private.gcs);
         pci_dev_put(iTCO_wdt_private.pdev);
@@ -782,8 +826,8 @@ static int __init iTCO_wdt_init_module(void)
 {
         int err;
 
-        printk(KERN_INFO PFX "Intel TCO WatchDog Timer Driver v%s (%s)\n",
-                DRV_VERSION, DRV_RELDATE);
+        printk(KERN_INFO PFX "Intel TCO WatchDog Timer Driver v%s\n",
+                DRV_VERSION);
 
         err = platform_driver_register(&iTCO_wdt_driver);
         if (err)
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index b4b7b0a4c119..3acce623f209 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -98,6 +98,8 @@ static void mtx1_wdt_reset(void)
 
 static void mtx1_wdt_start(void)
 {
+        unsigned long flags;
+
         spin_lock_irqsave(&mtx1_wdt_device.lock, flags);
         if (!mtx1_wdt_device.queue) {
                 mtx1_wdt_device.queue = 1;
@@ -110,6 +112,8 @@ static void mtx1_wdt_start(void)
 
 static int mtx1_wdt_stop(void)
 {
+        unsigned long flags;
+
         spin_lock_irqsave(&mtx1_wdt_device.lock, flags);
         if (mtx1_wdt_device.queue) {
                 mtx1_wdt_device.queue = 0;