263 files changed, 2684 insertions, 2094 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index f1372de4ce79..4875f0149eb4 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -68,6 +68,24 @@ config ACPI_PROCFS
          Say N to delete /proc/acpi/ files that have moved to /sys/
+config ACPI_PROC_EVENT
+        bool "Deprecated /proc/acpi/event support"
+        depends on PROC_FS
+        default y
+        ---help---
+          A user-space daemon, acpi, typically read /proc/acpi/event
+          and handled all ACPI sub-system generated events.
+          These events are now delivered to user-space via
+          either the input layer, or as netlink events.
+          This build option enables the old code for legacy
+          user-space implementation.  After some time, this will
+          be moved under CONFIG_ACPI_PROCFS, and then deleted.
+          Say Y here to retain the old behaviour.  Say N if your
+          user-space is newer than kernel 2.6.23 (September 2007).
 config ACPI_AC
        tristate "AC Adapter"
        depends on X86
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index d8b35093527a..26d70702b313 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -204,7 +204,10 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
        case ACPI_NOTIFY_BUS_CHECK:
        case ACPI_NOTIFY_DEVICE_CHECK:
                acpi_ac_get_state(ac);
-                acpi_bus_generate_event(device, event, (u32) ac->state);
+                acpi_bus_generate_proc_event(device, event, (u32) ac->state);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event,
+                                                  (u32) ac->state);
                break;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 86fd142f4bf3..d915fec9bf63 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1069,7 +1069,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
                hotk->brightness = (event & ~((u32) BR_DOWN));
        }
-        acpi_bus_generate_event(hotk->device, event,
+        acpi_bus_generate_proc_event(hotk->device, event,
                                hotk->event_count[event % 128]++);
        return;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index d7b499fe0cd9..9b2c0f74f869 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -113,7 +113,7 @@ struct acpi_battery_info {
        acpi_string oem_info;
 };
-enum acpi_battery_files {
+enum acpi_battery_files{
        ACPI_BATTERY_INFO = 0,
        ACPI_BATTERY_STATE,
        ACPI_BATTERY_ALARM,
@@ -129,14 +129,13 @@ struct acpi_battery_flags {
 };
 struct acpi_battery {
+        struct mutex mutex;
        struct acpi_device *device;
        struct acpi_battery_flags flags;
        struct acpi_buffer bif_data;
        struct acpi_buffer bst_data;
-        struct mutex lock;
        unsigned long alarm;
        unsigned long update_time[ACPI_BATTERY_NUMFILES];
 };
 inline int acpi_battery_present(struct acpi_battery *battery)
@@ -236,10 +235,10 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
                return 0;
        /* Evaluate _BIF */
-        mutex_lock(&battery->lock);
-        status = acpi_evaluate_object(acpi_battery_handle(battery), "_BIF",
+        status =
-                                      NULL, &buffer);
+            acpi_evaluate_object(acpi_battery_handle(battery), "_BIF", NULL,
-        mutex_unlock(&battery->lock);
+                                 &buffer);
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));
                return -ENODEV;
@@ -286,10 +285,10 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
                return 0;
        /* Evaluate _BST */
-        mutex_lock(&battery->lock);
-        status = acpi_evaluate_object(acpi_battery_handle(battery), "_BST",
+        status =
-                                      NULL, &buffer);
+            acpi_evaluate_object(acpi_battery_handle(battery), "_BST", NULL,
-        mutex_unlock(&battery->lock);
+                                 &buffer);
        if (ACPI_FAILURE(status)) {
                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));
                return -ENODEV;
@@ -337,10 +336,9 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery,
        arg0.integer.value = alarm;
-        mutex_lock(&battery->lock);
+        status =
-        status = acpi_evaluate_object(acpi_battery_handle(battery), "_BTP",
+            acpi_evaluate_object(acpi_battery_handle(battery), "_BTP",
                                 &arg_list, NULL);
-        mutex_unlock(&battery->lock);
        if (ACPI_FAILURE(status))
                return -ENODEV;
@@ -660,6 +658,8 @@ acpi_battery_write_alarm(struct file *file,
        if (!battery || (count > sizeof(alarm_string) - 1))
                return -EINVAL;
+        mutex_lock(&battery->mutex);
        result = acpi_battery_update(battery, 1, &update_result);
        if (result) {
                result = -ENODEV;
@@ -688,7 +688,9 @@ acpi_battery_write_alarm(struct file *file,
        acpi_battery_check_result(battery, result);
        if (!result)
-                return count;
+                result = count;
+        mutex_unlock(&battery->mutex);
        return result;
 }
@@ -712,6 +714,8 @@ static int acpi_battery_read(int fid, struct seq_file *seq)
        int update_result = ACPI_BATTERY_NONE_UPDATE;
        int update = 0;
+        mutex_lock(&battery->mutex);
        update = (get_seconds() - battery->update_time[fid] >= update_time);
        update = (update | battery->flags.update[fid]);
@@ -729,6 +733,7 @@ static int acpi_battery_read(int fid, struct seq_file *seq)
        result = acpi_read_funcs[fid].print(seq, result);
        acpi_battery_check_result(battery, result);
        battery->flags.update[fid] = result;
+        mutex_unlock(&battery->mutex);
        return result;
 }
@@ -867,8 +872,11 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
        case ACPI_NOTIFY_DEVICE_CHECK:
                device = battery->device;
                acpi_battery_notify_update(battery);
-                acpi_bus_generate_event(device, event,
+                acpi_bus_generate_proc_event(device, event,
                                        acpi_battery_present(battery));
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event,
+                                                  acpi_battery_present(battery));
                break;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -892,7 +900,10 @@ static int acpi_battery_add(struct acpi_device *device)
        if (!battery)
                return -ENOMEM;
-        mutex_init(&battery->lock);
+        mutex_init(&battery->mutex);
+        mutex_lock(&battery->mutex);
        battery->device = device;
        strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
        strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
@@ -928,6 +939,7 @@ static int acpi_battery_add(struct acpi_device *device)
                kfree(battery);
        }
+        mutex_unlock(&battery->mutex);
        return result;
 }
@@ -942,6 +954,8 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
        battery = acpi_driver_data(device);
+        mutex_lock(&battery->mutex);
        status = acpi_remove_notify_handler(device->handle,
                                            ACPI_ALL_NOTIFY,
                                            acpi_battery_notify);
@@ -952,7 +966,9 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
        kfree(battery->bst_data.pointer);
-        mutex_destroy(&battery->lock);
+        mutex_unlock(&battery->mutex);
+        mutex_destroy(&battery->mutex);
        kfree(battery);
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 6b2658c96242..9ba778a2b484 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -276,6 +276,7 @@ EXPORT_SYMBOL(acpi_bus_set_power);
                                Event Management
   -------------------------------------------------------------------------- */
+#ifdef CONFIG_ACPI_PROC_EVENT
 static DEFINE_SPINLOCK(acpi_bus_event_lock);
 LIST_HEAD(acpi_bus_event_list);
@@ -283,7 +284,7 @@ DECLARE_WAIT_QUEUE_HEAD(acpi_bus_event_queue);
 extern int event_is_open;
-int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)
+int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)
 {
        struct acpi_bus_event *event = NULL;
        unsigned long flags = 0;
@@ -292,10 +293,6 @@ int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)
        if (!device)
                return -EINVAL;
-        if (acpi_bus_generate_genetlink_event(device, type, data))
-                printk(KERN_WARNING PREFIX
-                        "Failed to generate an ACPI event via genetlink!\n");
        /* drop event on the floor if no one's listening */
        if (!event_is_open)
                return 0;
@@ -318,7 +315,7 @@ int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)
        return 0;
 }
-EXPORT_SYMBOL(acpi_bus_generate_event);
+EXPORT_SYMBOL(acpi_bus_generate_proc_event);
 int acpi_bus_receive_event(struct acpi_bus_event *event)
 {
@@ -364,6 +361,7 @@ int acpi_bus_receive_event(struct acpi_bus_event *event)
 }
 EXPORT_SYMBOL(acpi_bus_receive_event);
+#endif  /* CONFIG_ACPI_PROC_EVENT */
 /* --------------------------------------------------------------------------
                             Notification Handling
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 540581338ef5..2e79a3395ecf 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -284,7 +284,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
                }
                input_sync(input);
-                acpi_bus_generate_event(button->device, event,
+                acpi_bus_generate_proc_event(button->device, event,
                                        ++button->pushed);
                break;
        default:
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 56bee9e065cf..3f7935ab0cf5 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -696,14 +696,6 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
        return AE_CTRL_TERMINATE;
 }
-static void ec_remove_handlers(struct acpi_ec *ec)
-{
-        acpi_remove_address_space_handler(ec->handle,
-                                          ACPI_ADR_SPACE_EC,
-                                          &acpi_ec_space_handler);
-        acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
-}
 static int acpi_ec_add(struct acpi_device *device)
 {
        struct acpi_ec *ec = NULL;
@@ -727,13 +719,16 @@ static int acpi_ec_add(struct acpi_device *device)
        /* Check if we found the boot EC */
        if (boot_ec) {
                if (boot_ec->gpe == ec->gpe) {
-                        ec_remove_handlers(boot_ec);
+                        /* We might have incorrect info for GL at boot time */
-                        mutex_destroy(&boot_ec->lock);
+                        mutex_lock(&boot_ec->lock);
-                        kfree(boot_ec);
+                        boot_ec->global_lock = ec->global_lock;
-                        first_ec = boot_ec = NULL;
+                        /* Copy handlers from new ec into boot ec */
+                        list_splice(&ec->list, &boot_ec->list);
+                        mutex_unlock(&boot_ec->lock);
+                        kfree(ec);
+                        ec = boot_ec;
                }
-        }
+        } else
-        if (!first_ec)
                first_ec = ec;
        ec->handle = device->handle;
        acpi_driver_data(device) = ec;
@@ -762,6 +757,9 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
        if (ec == first_ec)
                first_ec = NULL;
+        /* Don't touch boot EC */
+        if (boot_ec != ec)
+                kfree(ec);
        return 0;
 }
@@ -825,7 +823,9 @@ static int acpi_ec_start(struct acpi_device *device)
        if (!ec)
                return -EINVAL;
-        ret = ec_install_handlers(ec);
+        /* Boot EC is already working */
+        if (ec != boot_ec)
+                ret = ec_install_handlers(ec);
        /* EC is fully operational, allow queries */
        atomic_set(&ec->query_pending, 0);
@@ -835,6 +835,7 @@ static int acpi_ec_start(struct acpi_device *device)
 static int acpi_ec_stop(struct acpi_device *device, int type)
 {
+        acpi_status status;
        struct acpi_ec *ec;
        if (!device)
@@ -843,7 +844,21 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
        ec = acpi_driver_data(device);
        if (!ec)
                return -EINVAL;
-        ec_remove_handlers(ec);
+        /* Don't touch boot EC */
+        if (ec == boot_ec)
+                return 0;
+        status = acpi_remove_address_space_handler(ec->handle,
+                                                   ACPI_ADR_SPACE_EC,
+                                                   &acpi_ec_space_handler);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
+        status = acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
        return 0;
 }
@@ -871,7 +886,8 @@ int __init acpi_ec_ecdt_probe(void)
                printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
                status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
                                                boot_ec, NULL);
-                if (ACPI_FAILURE(status))
+                /* Check that acpi_get_devices actually find something */
+                if (ACPI_FAILURE(status) || !boot_ec->handle)
                        goto error;
        }
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 95637a4ff782..a2b9304596ce 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -17,6 +17,7 @@
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("event");
+#ifdef CONFIG_ACPI_PROC_EVENT
 /* Global vars for handling event proc entry */
 static DEFINE_SPINLOCK(acpi_system_event_lock);
 int event_is_open = 0;
@@ -106,6 +107,7 @@ static const struct file_operations acpi_system_event_ops = {
        .release = acpi_system_close_event,
        .poll = acpi_system_poll_event,
 };
+#endif  /* CONFIG_ACPI_PROC_EVENT */
 #ifdef CONFIG_NET
 static unsigned int acpi_event_seqnum;
@@ -147,7 +149,8 @@ static struct genl_multicast_group acpi_event_mcgrp = {
        .name = ACPI_GENL_MCAST_GROUP_NAME,
 };
-int acpi_bus_generate_genetlink_event(struct acpi_device *device,
+int acpi_bus_generate_netlink_event(const char *device_class,
+                                      const char *bus_id,
                                      u8 type, int data)
 {
        struct sk_buff *skb;
@@ -191,8 +194,8 @@ int acpi_bus_generate_genetlink_event(struct acpi_device *device,
        memset(event, 0, sizeof(struct acpi_genl_event));
-        strcpy(event->device_class, device->pnp.device_class);
+        strcpy(event->device_class, device_class);
-        strcpy(event->bus_id, device->dev.bus_id);
+        strcpy(event->bus_id, bus_id);
        event->type = type;
        event->data = data;
@@ -211,6 +214,8 @@ int acpi_bus_generate_genetlink_event(struct acpi_device *device,
        return 0;
 }
+EXPORT_SYMBOL(acpi_bus_generate_netlink_event);
 static int acpi_event_genetlink_init(void)
 {
        int result;
@@ -228,12 +233,15 @@ static int acpi_event_genetlink_init(void)
 }
 #else
-int acpi_bus_generate_genetlink_event(struct acpi_device *device, u8 type,
+int acpi_bus_generate_netlink_event(const char *device_class,
-                                      int data)
+                                      const char *bus_id,
+                                      u8 type, int data)
 {
        return 0;
 }
+EXPORT_SYMBOL(acpi_generate_netlink_event);
 static int acpi_event_genetlink_init(void)
 {
        return -ENODEV;
@@ -242,7 +250,9 @@ static int acpi_event_genetlink_init(void)
 static int __init acpi_event_init(void)
 {
+#ifdef CONFIG_ACPI_PROC_EVENT
        struct proc_dir_entry *entry;
+#endif
        int error = 0;
        if (acpi_disabled)
@@ -254,12 +264,14 @@ static int __init acpi_event_init(void)
                printk(KERN_WARNING PREFIX
                       "Failed to create genetlink family for ACPI event\n");
+#ifdef CONFIG_ACPI_PROC_EVENT
        /* 'event' [R] */
        entry = create_proc_entry("event", S_IRUSR, acpi_root_dir);
        if (entry)
                entry->proc_fops = &acpi_system_event_ops;
        else
                return -ENODEV;
+#endif
        return 0;
 }
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 76c525dc590b..cf69c0040a39 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -576,13 +576,10 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
                ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
        }
-        status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
-        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
-        }
-        /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
        /*
+         * GPEs must be enabled before _WAK is called as GPEs
+         * might get fired there
+         *
         * Restore the GPEs:
         * 1) Disable/Clear all GPEs
         * 2) Enable all runtime GPEs
@@ -591,13 +588,19 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
-        acpi_gbl_system_awake_and_running = TRUE;
        status = acpi_hw_enable_all_runtime_gpes();
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
+        status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
+        }
+        /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
+        acpi_gbl_system_awake_and_running = TRUE;
        /* Enable power button */
        (void)
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index ab65b2c2560e..f39fbc6b9237 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
 ******************************************************************************/
 acpi_status
-acpi_get_devices(char *HID,
+acpi_get_devices(const char *HID,
                 acpi_walk_callback user_function,
                 void *context, void **return_value)
 {
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 498422343f38..e944aaee4e06 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -698,16 +698,23 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
        switch (event) {
        case ACPI_PROCESSOR_NOTIFY_PERFORMANCE:
                acpi_processor_ppc_has_changed(pr);
-                acpi_bus_generate_event(device, event,
+                acpi_bus_generate_proc_event(device, event,
                                        pr->performance_platform_limit);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event,
+                                                  pr->performance_platform_limit);
                break;
        case ACPI_PROCESSOR_NOTIFY_POWER:
                acpi_processor_cst_has_changed(pr);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event, 0);
                break;
        case ACPI_PROCESSOR_NOTIFY_THROTTLING:
                acpi_processor_tstate_has_changed(pr);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event, 0);
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Unsupported event [0x%x]\n", event));
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index a8634a0655fc..d9b8af763e1e 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -63,6 +63,7 @@
 ACPI_MODULE_NAME("processor_idle");
 #define ACPI_PROCESSOR_FILE_POWER       "power"
 #define US_TO_PM_TIMER_TICKS(t)         ((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
+#define PM_TIMER_TICK_NS                (1000000000ULL/PM_TIMER_FREQUENCY)
 #define C2_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
 #define C3_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
 static void (*pm_idle_save) (void) __read_mostly;
@@ -462,6 +463,9 @@ static void acpi_processor_idle(void)
                 * TBD: Can't get time duration while in C1, as resumes
                 *      go to an ISR rather than here.  Need to instrument
                 *      base interrupt handler.
+                 *
+                 * Note: the TSC better not stop in C1, sched_clock() will
+                 *       skew otherwise.
                 */
                sleep_ticks = 0xFFFFFFFF;
                break;
@@ -469,6 +473,8 @@ static void acpi_processor_idle(void)
        case ACPI_STATE_C2:
                /* Get start time (ticks) */
                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
+                /* Tell the scheduler that we are going deep-idle: */
+                sched_clock_idle_sleep_event();
                /* Invoke C2 */
                acpi_state_timer_broadcast(pr, cx, 1);
                acpi_cstate_enter(cx);
@@ -479,17 +485,22 @@ static void acpi_processor_idle(void)
                /* TSC halts in C2, so notify users */
                mark_tsc_unstable("possible TSC halt in C2");
 #endif
+                /* Compute time (ticks) that we were actually asleep */
+                sleep_ticks = ticks_elapsed(t1, t2);
+                /* Tell the scheduler how much we idled: */
+                sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
                /* Re-enable interrupts */
                local_irq_enable();
+                /* Do not account our idle-switching overhead: */
+                sleep_ticks -= cx->latency_ticks + C2_OVERHEAD;
                current_thread_info()->status |= TS_POLLING;
-                /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks =
-                    ticks_elapsed(t1, t2) - cx->latency_ticks - C2_OVERHEAD;
                acpi_state_timer_broadcast(pr, cx, 0);
                break;
        case ACPI_STATE_C3:
                /*
                 * disable bus master
                 * bm_check implies we need ARB_DIS
@@ -518,6 +529,8 @@ static void acpi_processor_idle(void)
                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
                /* Invoke C3 */
                acpi_state_timer_broadcast(pr, cx, 1);
+                /* Tell the scheduler that we are going deep-idle: */
+                sched_clock_idle_sleep_event();
                acpi_cstate_enter(cx);
                /* Get end time (ticks) */
                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
@@ -531,12 +544,17 @@ static void acpi_processor_idle(void)
                /* TSC halts in C3, so notify users */
                mark_tsc_unstable("TSC halts in C3");
 #endif
+                /* Compute time (ticks) that we were actually asleep */
+                sleep_ticks = ticks_elapsed(t1, t2);
+                /* Tell the scheduler how much we idled: */
+                sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
                /* Re-enable interrupts */
                local_irq_enable();
+                /* Do not account our idle-switching overhead: */
+                sleep_ticks -= cx->latency_ticks + C3_OVERHEAD;
                current_thread_info()->status |= TS_POLLING;
-                /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks =
-                    ticks_elapsed(t1, t2) - cx->latency_ticks - C3_OVERHEAD;
                acpi_state_timer_broadcast(pr, cx, 0);
                break;
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 82c3a550016d..a578986e3214 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -440,11 +440,12 @@ static int acpi_sbs_generate_event(struct acpi_device *device,
        strcpy(acpi_device_bid(device), bid);
        strcpy(acpi_device_class(device), class);
-        result = acpi_bus_generate_event(device, event, state);
+        result = acpi_bus_generate_proc_event(device, event, state);
        strcpy(acpi_device_bid(device), bid_saved);
        strcpy(acpi_device_class(device), class_saved);
+        acpi_bus_generate_netlink_event(class, bid, event, state);
        return result;
 }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index be74347d1354..64620d668742 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -35,8 +35,9 @@ struct acpi_device_bus_id{
 * e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:
 * char *modalias: "acpi:IBM0001:ACPI0001"
 */
-int create_modalias(struct acpi_device *acpi_dev, char *modalias, int size){
+static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
+                           int size)
+{
        int len;
        if (!acpi_dev->flags.hardware_id)
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index e8cff5dd4cbc..c52ade816fb4 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -305,7 +305,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
        unsigned long d_min, d_max;
        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
-                printk(KERN_ERR "ACPI handle has no context!\n");
+                printk(KERN_DEBUG "ACPI handle has no context!\n");
                return -ENODEV;
        }
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 1da64b4518c0..8cc9492ffbf2 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -51,6 +51,65 @@ ACPI_MODULE_NAME("tbutils")
 static acpi_physical_address
 acpi_tb_get_root_table_entry(u8 * table_entry,
                             acpi_native_uint table_entry_size);
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_check_xsdt
+ *
+ * PARAMETERS:  address                    - Pointer to the XSDT
+ *
+ * RETURN:      status
+ *              AE_OK - XSDT is okay
+ *              AE_NO_MEMORY - can't map XSDT
+ *              AE_INVALID_TABLE_LENGTH - invalid table length
+ *              AE_NULL_ENTRY - XSDT has NULL entry
+ *
+ * DESCRIPTION: validate XSDT
+******************************************************************************/
+static acpi_status
+acpi_tb_check_xsdt(acpi_physical_address address)
+{
+        struct acpi_table_header *table;
+        u32 length;
+        u64 xsdt_entry_address;
+        u8 *table_entry;
+        u32 table_count;
+        int i;
+        table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
+        if (!table)
+                return AE_NO_MEMORY;
+        length = table->length;
+        acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
+        if (length < sizeof(struct acpi_table_header))
+                return AE_INVALID_TABLE_LENGTH;
+        table = acpi_os_map_memory(address, length);
+        if (!table)
+                return AE_NO_MEMORY;
+        /* Calculate the number of tables described in XSDT */
+        table_count =
+                (u32) ((table->length -
+                sizeof(struct acpi_table_header)) / sizeof(u64));
+        table_entry =
+                ACPI_CAST_PTR(u8, table) + sizeof(struct acpi_table_header);
+        for (i = 0; i < table_count; i++) {
+                ACPI_MOVE_64_TO_64(&xsdt_entry_address, table_entry);
+                if (!xsdt_entry_address) {
+                        /* XSDT has NULL entry */
+                        break;
+                }
+                table_entry += sizeof(u64);
+        }
+        acpi_os_unmap_memory(table, length);
+        if (i < table_count)
+                return AE_NULL_ENTRY;
+        else
+                return AE_OK;
+}
 /*******************************************************************************
 *
@@ -341,6 +400,7 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
        u32 table_count;
        struct acpi_table_header *table;
        acpi_physical_address address;
+        acpi_physical_address rsdt_address;
        u32 length;
        u8 *table_entry;
        acpi_status status;
@@ -369,6 +429,8 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
                 */
                address = (acpi_physical_address) rsdp->xsdt_physical_address;
                table_entry_size = sizeof(u64);
+                rsdt_address = (acpi_physical_address)
+                                        rsdp->rsdt_physical_address;
        } else {
                /* Root table is an RSDT (32-bit physical addresses) */
@@ -382,6 +444,15 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
         */
        acpi_os_unmap_memory(rsdp, sizeof(struct acpi_table_rsdp));
+        if (table_entry_size == sizeof(u64)) {
+                if (acpi_tb_check_xsdt(address) == AE_NULL_ENTRY) {
+                        /* XSDT has NULL entry, RSDT is used */
+                        address = rsdt_address;
+                        table_entry_size = sizeof(u32);
+                        ACPI_WARNING((AE_INFO, "BIOS XSDT has NULL entry,"
+                                        "using RSDT"));
+                }
+        }
        /* Map the RSDT/XSDT table header to get the full table length */
        table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 1e06159fd9c4..bc6d5866ef98 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -77,23 +77,27 @@ MODULE_LICENSE("GPL");
 static int act;
 module_param(act, int, 0644);
-MODULE_PARM_DESC(act, "Disable or override all lowest active trip points.\n");
+MODULE_PARM_DESC(act, "Disable or override all lowest active trip points.");
+static int crt;
+module_param(crt, int, 0644);
+MODULE_PARM_DESC(crt, "Disable or lower all critical trip points.");
 static int tzp;
 module_param(tzp, int, 0444);
-MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.\n");
+MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.");
 static int nocrt;
 module_param(nocrt, int, 0);
-MODULE_PARM_DESC(nocrt, "Set to disable action on ACPI thermal zone critical and hot trips.\n");
+MODULE_PARM_DESC(nocrt, "Set to take no action upon ACPI thermal zone critical trips points.");
 static int off;
 module_param(off, int, 0);
-MODULE_PARM_DESC(off, "Set to disable ACPI thermal support.\n");
+MODULE_PARM_DESC(off, "Set to disable ACPI thermal support.");
 static int psv;
 module_param(psv, int, 0644);
-MODULE_PARM_DESC(psv, "Disable or override all passive trip points.\n");
+MODULE_PARM_DESC(psv, "Disable or override all passive trip points.");
 static int acpi_thermal_add(struct acpi_device *device);
 static int acpi_thermal_remove(struct acpi_device *device, int type);
@@ -340,6 +344,20 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
                                  tz->trips.critical.temperature));
        }
+        if (tz->trips.critical.flags.valid == 1) {
+                if (crt == -1) {
+                        tz->trips.critical.flags.valid = 0;
+                } else if (crt > 0) {
+                        unsigned long crt_k = CELSIUS_TO_KELVIN(crt);
+                        /*
+                         * Allow override to lower critical threshold
+                         */
+                        if (crt_k < tz->trips.critical.temperature)
+                                tz->trips.critical.temperature = crt_k;
+                }
+        }
        /* Critical Sleep (optional) */
        status =
@@ -485,8 +503,12 @@ static int acpi_thermal_critical(struct acpi_thermal *tz)
        printk(KERN_EMERG
               "Critical temperature reached (%ld C), shutting down.\n",
               KELVIN_TO_CELSIUS(tz->temperature));
-        acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_CRITICAL,
+        acpi_bus_generate_proc_event(tz->device, ACPI_THERMAL_NOTIFY_CRITICAL,
                                tz->trips.critical.flags.enabled);
+        acpi_bus_generate_netlink_event(tz->device->pnp.device_class,
+                                          tz->device->dev.bus_id,
+                                          ACPI_THERMAL_NOTIFY_CRITICAL,
+                                          tz->trips.critical.flags.enabled);
        orderly_poweroff(true);
@@ -504,8 +526,12 @@ static int acpi_thermal_hot(struct acpi_thermal *tz)
        } else if (tz->trips.hot.flags.enabled)
                tz->trips.hot.flags.enabled = 0;
-        acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_HOT,
+        acpi_bus_generate_proc_event(tz->device, ACPI_THERMAL_NOTIFY_HOT,
                                tz->trips.hot.flags.enabled);
+        acpi_bus_generate_netlink_event(tz->device->pnp.device_class,
+                                          tz->device->dev.bus_id,
+                                          ACPI_THERMAL_NOTIFY_HOT,
+                                          tz->trips.hot.flags.enabled);
        /* TBD: Call user-mode "sleep(S4)" function */
@@ -1067,9 +1093,9 @@ static int acpi_thermal_add_fs(struct acpi_device *device)
                entry->owner = THIS_MODULE;
        }
-        /* 'trip_points' [R/W] */
+        /* 'trip_points' [R] */
        entry = create_proc_entry(ACPI_THERMAL_FILE_TRIP_POINTS,
-                                  S_IFREG | S_IRUGO | S_IWUSR,
+                                  S_IRUGO,
                                  acpi_device_dir(device));
        if (!entry)
                return -ENODEV;
@@ -1149,12 +1175,16 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
        case ACPI_THERMAL_NOTIFY_THRESHOLDS:
                acpi_thermal_get_trip_points(tz);
                acpi_thermal_check(tz);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event, 0);
                break;
        case ACPI_THERMAL_NOTIFY_DEVICES:
                if (tz->flags.devices)
                        acpi_thermal_get_devices(tz);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                acpi_bus_generate_netlink_event(device->pnp.device_class,
+                                                  device->dev.bus_id, event, 0);
                break;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -1339,6 +1369,13 @@ static int thermal_act(struct dmi_system_id *d) {
        }
        return 0;
 }
+static int thermal_nocrt(struct dmi_system_id *d) {
+        printk(KERN_NOTICE "ACPI: %s detected: "
+                "disabling all critical thermal trip point actions.\n", d->ident);
+        nocrt = 1;
+        return 0;
+}
 static int thermal_tzp(struct dmi_system_id *d) {
        if (tzp == 0) {
@@ -1387,6 +1424,14 @@ static struct dmi_system_id thermal_dmi_table[] __initdata = {
                DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"),
                },
        },
+        {
+         .callback = thermal_nocrt,
+         .ident = "Gigabyte GA-7ZX",
+         .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co., Ltd."),
+                DMI_MATCH(DMI_BOARD_NAME, "7ZX"),
+                },
+        },
        {}
 };
 #endif /* CONFIG_DMI */
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index 1621655d6e2b..93ea8290b4f7 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -126,6 +126,7 @@ const char *acpi_format_exception(acpi_status status)
                            "Unknown exception code: 0x%8.8X", status));
                exception = "UNKNOWN_STATUS_CODE";
+                dump_stack();
        }
        return (ACPI_CAST_PTR(const char, exception));
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index d98701941981..3c9bb85a6a93 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -31,7 +31,7 @@
 #include <linux/list.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/input.h>
 #include <linux/backlight.h>
 #include <linux/video_output.h>
 #include <asm/uaccess.h>
@@ -138,6 +138,8 @@ struct acpi_video_bus {
        struct semaphore sem;
        struct list_head video_device_list;
        struct proc_dir_entry *dir;
+        struct input_dev *input;
+        char phys[32];  /* for input device */
 };
 struct acpi_video_device_flags {
@@ -1764,6 +1766,9 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
 {
        struct acpi_video_bus *video = data;
        struct acpi_device *device = NULL;
+        struct input_dev *input;
+        int keycode;
        printk("video bus notify\n");
@@ -1771,11 +1776,13 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
                return;
        device = video->device;
+        input = video->input;
        switch (event) {
        case ACPI_VIDEO_NOTIFY_SWITCH:  /* User requested a switch,
                                         * most likely via hotkey. */
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_SWITCHVIDEOMODE;
                break;
        case ACPI_VIDEO_NOTIFY_PROBE:   /* User plugged in or removed a video
@@ -1783,22 +1790,38 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
                acpi_video_device_enumerate(video);
                acpi_video_device_rebind(video);
                acpi_video_switch_output(video, event);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_SWITCHVIDEOMODE;
                break;
        case ACPI_VIDEO_NOTIFY_CYCLE:   /* Cycle Display output hotkey pressed. */
+                acpi_video_switch_output(video, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_SWITCHVIDEOMODE;
+                break;
        case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT:     /* Next Display output hotkey pressed. */
+                acpi_video_switch_output(video, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_VIDEO_NEXT;
+                break;
        case ACPI_VIDEO_NOTIFY_PREV_OUTPUT:     /* previous Display output hotkey pressed. */
                acpi_video_switch_output(video, event);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_VIDEO_PREV;
                break;
        default:
+                keycode = KEY_UNKNOWN;
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Unsupported event [0x%x]\n", event));
                break;
        }
+        input_report_key(input, keycode, 1);
+        input_sync(input);
+        input_report_key(input, keycode, 0);
+        input_sync(input);
        return;
 }
@@ -1806,38 +1829,65 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
 {
        struct acpi_video_device *video_device = data;
        struct acpi_device *device = NULL;
+        struct acpi_video_bus *bus;
+        struct input_dev *input;
+        int keycode;
        if (!video_device)
                return;
        device = video_device->dev;
+        bus = video_device->video;
+        input = bus->input;
        switch (event) {
-        case ACPI_VIDEO_NOTIFY_SWITCH:  /* change in status (cycle output device) */
-        case ACPI_VIDEO_NOTIFY_PROBE:   /* change in status (output device status) */
-                acpi_bus_generate_event(device, event, 0);
-                break;
        case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:        /* Cycle brightness */
+                acpi_video_switch_brightness(video_device, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_BRIGHTNESS_CYCLE;
+                break;
        case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS:  /* Increase brightness */
+                acpi_video_switch_brightness(video_device, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_BRIGHTNESSUP;
+                break;
        case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS:  /* Decrease brightness */
+                acpi_video_switch_brightness(video_device, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_BRIGHTNESSDOWN;
+                break;
        case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */
+                acpi_video_switch_brightness(video_device, event);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_BRIGHTNESS_ZERO;
+                break;
        case ACPI_VIDEO_NOTIFY_DISPLAY_OFF:     /* display device off */
                acpi_video_switch_brightness(video_device, event);
-                acpi_bus_generate_event(device, event, 0);
+                acpi_bus_generate_proc_event(device, event, 0);
+                keycode = KEY_DISPLAY_OFF;
                break;
        default:
+                keycode = KEY_UNKNOWN;
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Unsupported event [0x%x]\n", event));
                break;
        }
+        input_report_key(input, keycode, 1);
+        input_sync(input);
+        input_report_key(input, keycode, 0);
+        input_sync(input);
        return;
 }
+static int instance;
 static int acpi_video_bus_add(struct acpi_device *device)
 {
        int result = 0;
        acpi_status status = 0;
        struct acpi_video_bus *video = NULL;
+        struct input_dev *input;
        if (!device)
@@ -1847,6 +1897,13 @@ static int acpi_video_bus_add(struct acpi_device *device)
        if (!video)
                return -ENOMEM;
+        /* a hack to fix the duplicate name "VID" problem on T61 */
+        if (!strcmp(device->pnp.bus_id, "VID")) {
+                if (instance)
+                        device->pnp.bus_id[3] = '0' + instance;
+                instance ++;
+        }
        video->device = device;
        strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
        strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
@@ -1881,6 +1938,39 @@ static int acpi_video_bus_add(struct acpi_device *device)
                goto end;
        }
+        video->input = input = input_allocate_device();
+        snprintf(video->phys, sizeof(video->phys),
+                "%s/video/input0", acpi_device_hid(video->device));
+        input->name = acpi_device_name(video->device);
+        input->phys = video->phys;
+        input->id.bustype = BUS_HOST;
+        input->id.product = 0x06;
+        input->evbit[0] = BIT(EV_KEY);
+        set_bit(KEY_SWITCHVIDEOMODE, input->keybit);
+        set_bit(KEY_VIDEO_NEXT, input->keybit);
+        set_bit(KEY_VIDEO_PREV, input->keybit);
+        set_bit(KEY_BRIGHTNESS_CYCLE, input->keybit);
+        set_bit(KEY_BRIGHTNESSUP, input->keybit);
+        set_bit(KEY_BRIGHTNESSDOWN, input->keybit);
+        set_bit(KEY_BRIGHTNESS_ZERO, input->keybit);
+        set_bit(KEY_DISPLAY_OFF, input->keybit);
+        set_bit(KEY_UNKNOWN, input->keybit);
+        result = input_register_device(input);
+        if (result) {
+                acpi_remove_notify_handler(video->device->handle,
+                                                ACPI_DEVICE_NOTIFY,
+                                                acpi_video_bus_notify);
+                acpi_video_bus_stop_devices(video);
+                acpi_video_bus_put_devices(video);
+                kfree(video->attached_array);
+                acpi_video_bus_remove_fs(device);
+                goto end;
+        }
        printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s  rom: %s  post: %s)\n",
               ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
               video->flags.multihead ? "yes" : "no",
@@ -1914,6 +2004,7 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
        acpi_video_bus_put_devices(video);
        acpi_video_bus_remove_fs(device);
+        input_unregister_device(video->input);
        kfree(video->attached_array);
        kfree(video);
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 430fcf4f9ef3..945466954724 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -26,7 +26,7 @@
 #include <linux/libata.h>
 #define DRV_NAME "ata_generic"
-#define DRV_VERSION "0.2.12"
+#define DRV_VERSION "0.2.13"
 /*
 *      A generic parallel ATA driver using libata
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 071d274afaab..3b8bf1812dc8 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -94,7 +94,7 @@
 #include <linux/dmi.h>
 #define DRV_NAME        "ata_piix"
-#define DRV_VERSION     "2.11"
+#define DRV_VERSION     "2.12"
 enum {
        PIIX_IOCFG              = 0x54, /* IDE I/O configuration register */
@@ -130,6 +130,7 @@ enum {
        ich6m_sata_ahci         = 8,
        ich8_sata_ahci          = 9,
        piix_pata_mwdma         = 10,   /* PIIX3 MWDMA only */
+        tolapai_sata_ahci       = 11,
        /* constants for mapping table */
        P0                      = 0,  /* port 0 */
@@ -253,6 +254,8 @@ static const struct pci_device_id piix_pci_tbl[] = {
        { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
        /* SATA Controller IDE (ICH9M) */
        { 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
+        /* SATA Controller IDE (Tolapai) */
+        { 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci },
        { }     /* terminate list */
 };
@@ -441,12 +444,25 @@ static const struct piix_map_db ich8_map_db = {
        },
 };
+static const struct piix_map_db tolapai_map_db = {
+        .mask = 0x3,
+        .port_enable = 0x3,
+        .map = {
+                /* PM   PS   SM   SS       MAP */
+                {  P0,  NA,  P1,  NA }, /* 00b */
+                {  RV,  RV,  RV,  RV }, /* 01b */
+                {  RV,  RV,  RV,  RV }, /* 10b */
+                {  RV,  RV,  RV,  RV },
+        },
+};
 static const struct piix_map_db *piix_map_db_table[] = {
        [ich5_sata]             = &ich5_map_db,
        [ich6_sata]             = &ich6_map_db,
        [ich6_sata_ahci]        = &ich6_map_db,
        [ich6m_sata_ahci]       = &ich6m_map_db,
        [ich8_sata_ahci]        = &ich8_map_db,
+        [tolapai_sata_ahci]     = &tolapai_map_db,
 };
 static struct ata_port_info piix_port_info[] = {
@@ -560,6 +576,17 @@ static struct ata_port_info piix_port_info[] = {
                .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
                .port_ops       = &piix_pata_ops,
        },
+        /* tolapai_sata_ahci: 11: */
+        {
+                .sht            = &piix_sht,
+                .flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SCR |
+                                  PIIX_FLAG_AHCI,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .udma_mask      = ATA_UDMA6,
+                .port_ops       = &piix_sata_ops,
+        },
 };
 static struct pci_bits piix_enable_bits[] = {
@@ -908,6 +935,13 @@ static int piix_broken_suspend(void)
                        },
                },
                {
+                        .ident = "Satellite U200",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite U200"),
+                        },
+                },
+                {
                        .ident = "Satellite U205",
                        .matches = {
                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -921,7 +955,8 @@ static int piix_broken_suspend(void)
                                DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"),
                        },
                },
-                { }
+                { }     /* terminate list */
        };
        static const char *oemstrs[] = {
                "Tecra M3,",
@@ -1139,6 +1174,41 @@ static void __devinit piix_init_sata_map(struct pci_dev *pdev,
        hpriv->map = map;
 }
+static void piix_iocfg_bit18_quirk(struct pci_dev *pdev)
+{
+        static struct dmi_system_id sysids[] = {
+                {
+                        /* Clevo M570U sets IOCFG bit 18 if the cdrom
+                         * isn't used to boot the system which
+                         * disables the channel.
+                         */
+                        .ident = "M570U",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "Clevo Co."),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "M570U"),
+                        },
+                },
+                { }     /* terminate list */
+        };
+        u32 iocfg;
+        if (!dmi_check_system(sysids))
+                return;
+        /* The datasheet says that bit 18 is NOOP but certain systems
+         * seem to use it to disable a channel.  Clear the bit on the
+         * affected systems.
+         */
+        pci_read_config_dword(pdev, PIIX_IOCFG, &iocfg);
+        if (iocfg & (1 << 18)) {
+                dev_printk(KERN_INFO, &pdev->dev,
+                           "applying IOCFG bit18 quirk\n");
+                iocfg &= ~(1 << 18);
+                pci_write_config_dword(pdev, PIIX_IOCFG, iocfg);
+        }
+}
 /**
 *      piix_init_one - Register PIIX ATA PCI device with kernel services
 *      @pdev: PCI device to register
@@ -1200,6 +1270,9 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                              piix_map_db_table[ent->driver_data]);
        }
+        /* apply IOCFG bit18 quirk */
+        piix_iocfg_bit18_quirk(pdev);
        /* On ICH5, some BIOSen disable the interrupt using the
         * PCI_COMMAND_INTX_DISABLE bit added in PCI 2.3.
         * On ICH6, this bit has the same effect, but only when
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 99d4fbffb0df..c43de9a710db 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1911,8 +1911,9 @@ int ata_dev_configure(struct ata_device *dev)
                                        dev->flags |= ATA_DFLAG_FLUSH_EXT;
                        }
-                        if (ata_id_hpa_enabled(dev->id))
+                        if (!(dev->horkage & ATA_HORKAGE_BROKEN_HPA) &&
-                                dev->n_sectors = ata_hpa_resize(dev);
+                            ata_id_hpa_enabled(dev->id))
+                                dev->n_sectors = ata_hpa_resize(dev);
                        /* config NCQ */
                        ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc));
@@ -3700,11 +3701,16 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int readid_flags)
                goto fail;
        /* verify n_sectors hasn't changed */
-        if (dev->class == ATA_DEV_ATA && dev->n_sectors != n_sectors) {
+        if (dev->class == ATA_DEV_ATA && n_sectors &&
+            dev->n_sectors != n_sectors) {
                ata_dev_printk(dev, KERN_INFO, "n_sectors mismatch "
                               "%llu != %llu\n",
                               (unsigned long long)n_sectors,
                               (unsigned long long)dev->n_sectors);
+                /* restore original n_sectors */
+                dev->n_sectors = n_sectors;
                rc = -ENODEV;
                goto fail;
        }
@@ -3790,7 +3796,11 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
        { "ST9160821AS",        "3.CLF",        ATA_HORKAGE_NONCQ, },
        { "SAMSUNG HD401LJ",    "ZZ100-15",     ATA_HORKAGE_NONCQ, },
-        /* Devices with NCQ limits */
+        /* devices which puke on READ_NATIVE_MAX */
+        { "HDS724040KLSA80",    "KFAOA20N",     ATA_HORKAGE_BROKEN_HPA, },
+        { "WDC WD3200JD-00KLB0", "WD-WCAMR1130137", ATA_HORKAGE_BROKEN_HPA },
+        { "WDC WD2500JD-00HBB0", "WD-WMAL71490727", ATA_HORKAGE_BROKEN_HPA },
+        { "MAXTOR 6L080L4",     "A93.0500",     ATA_HORKAGE_BROKEN_HPA },
        /* End Marker */
        { }
@@ -3980,6 +3990,11 @@ static unsigned int ata_dev_init_params(struct ata_device *dev,
        tf.device |= (heads - 1) & 0x0f; /* max head = num. of heads - 1 */
        err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);
+        /* A clean abort indicates an original or just out of spec drive
+           and we should continue as we issue the setup based on the
+           drive reported working geometry */
+        if (err_mask == AC_ERR_DEV && (tf.feature & ATA_ABORTED))
+                err_mask = 0;
        DPRINTK("EXIT, err_mask=%x\n", err_mask);
        return err_mask;
@@ -6020,6 +6035,7 @@ void ata_dev_init(struct ata_device *dev)
         */
        spin_lock_irqsave(ap->lock, flags);
        dev->flags &= ~ATA_DFLAG_INIT_MASK;
+        dev->horkage = 0;
        spin_unlock_irqrestore(ap->lock, flags);
        memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0,
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index e8a28e94fe47..94e5edc12ac9 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -34,7 +34,7 @@
 #include <linux/dmi.h>
 #define DRV_NAME "pata_ali"
-#define DRV_VERSION "0.7.4"
+#define DRV_VERSION "0.7.5"
 /*
 *      Cable special cases
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index b09facad63e1..04048fcf6305 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -25,7 +25,7 @@
 #include <linux/libata.h>
 #define DRV_NAME "pata_amd"
-#define DRV_VERSION "0.3.8"
+#define DRV_VERSION "0.3.9"
 /**
 *      timing_setup            -       shared timing computation and load
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 80509be49e7a..86f85a2cab7e 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -22,7 +22,7 @@
 #include <linux/libata.h>
 #define DRV_NAME "pata_atiixp"
-#define DRV_VERSION "0.4.5"
+#define DRV_VERSION "0.4.6"
 enum {
        ATIIXP_IDE_PIO_TIMING   = 0x40,
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 7dc76e71bd55..e2459088cdcd 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "pata_cs5520"
-#define DRV_VERSION     "0.6.5"
+#define DRV_VERSION     "0.6.6"
 struct pio_clocks
 {
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 68f150a1e2f4..c6066aa43ec8 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -35,7 +35,7 @@
 #include <linux/dmi.h>
 #define DRV_NAME        "pata_cs5530"
-#define DRV_VERSION     "0.7.3"
+#define DRV_VERSION     "0.7.4"
 static void __iomem *cs5530_port_base(struct ata_port *ap)
 {
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 91a396fa5b20..9e553c54203a 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -17,7 +17,7 @@
 #include <linux/libata.h>
 #define DRV_NAME "pata_isapnp"
-#define DRV_VERSION "0.2.1"
+#define DRV_VERSION "0.2.2"
 static struct scsi_host_template isapnp_sht = {
        .module                 = THIS_MODULE,
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 430673be1df7..5d8b91e70ecd 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -80,7 +80,7 @@
 #define DRV_NAME "pata_it821x"
-#define DRV_VERSION "0.3.7"
+#define DRV_VERSION "0.3.8"
 struct it821x_dev
 {
@@ -533,6 +533,10 @@ static int it821x_check_atapi_dma(struct ata_queued_cmd *qc)
        struct ata_port *ap = qc->ap;
        struct it821x_dev *itdev = ap->private_data;
+        /* Only use dma for transfers to/from the media. */
+        if (qc->nbytes < 2048)
+                return -EOPNOTSUPP;
        /* No ATAPI DMA in smart mode */
        if (itdev->smart)
                return -EOPNOTSUPP;
@@ -587,7 +591,7 @@ static int it821x_port_start(struct ata_port *ap)
        itdev->want[1][1] = ATA_ANY;
        itdev->last_device = -1;
-        if (pdev->revision == 0x11) {
+        if (pdev->revision == 0x10) {
                itdev->timing10 = 1;
                /* Need to disable ATAPI DMA for this case */
                if (!itdev->smart)
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 87594c04d3a3..ae206f35f747 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -192,6 +192,8 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
 static const struct pci_device_id marvell_pci_tbl[] = {
        { PCI_DEVICE(0x11AB, 0x6101), },
+        { PCI_DEVICE(0x11AB, 0x6121), },
+        { PCI_DEVICE(0x11AB, 0x6123), },
        { PCI_DEVICE(0x11AB, 0x6145), },
        { }     /* terminate list */
 };
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 182e83c9047b..099f4cdc4cd9 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -24,7 +24,7 @@
 #define DRV_NAME        "mpc52xx_ata"
-#define DRV_VERSION     "0.1.0ac2"
+#define DRV_VERSION     "0.1.2"
 /* Private structures used by the driver */
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 6da23feed039..0f2b027624d6 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -42,7 +42,7 @@
 #define DRV_NAME "pata_pcmcia"
-#define DRV_VERSION "0.3.1"
+#define DRV_VERSION "0.3.2"
 /*
 *      Private data structure to glue stuff together
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 69a5aa4949f5..bb64a986e8f5 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -35,7 +35,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "pata_pdc2027x"
-#define DRV_VERSION     "0.9"
+#define DRV_VERSION     "1.0"
 #undef PDC_DEBUG
 #ifdef PDC_DEBUG
@@ -563,13 +563,13 @@ static long pdc_read_counter(struct ata_host *host)
        u32 bccrl, bccrh, bccrlv, bccrhv;
 retry:
-        bccrl = readl(mmio_base + PDC_BYTE_COUNT) & 0xffff;
+        bccrl = readl(mmio_base + PDC_BYTE_COUNT) & 0x7fff;
-        bccrh = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0xffff;
+        bccrh = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0x7fff;
        rmb();
        /* Read the counter values again for verification */
-        bccrlv = readl(mmio_base + PDC_BYTE_COUNT) & 0xffff;
+        bccrlv = readl(mmio_base + PDC_BYTE_COUNT) & 0x7fff;
-        bccrhv = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0xffff;
+        bccrhv = readl(mmio_base + PDC_BYTE_COUNT + 0x100) & 0x7fff;
        rmb();
        counter = (bccrh << 15) | bccrl;
@@ -692,16 +692,16 @@ static long pdc_detect_pll_input_clock(struct ata_host *host)
        struct timeval start_time, end_time;
        long pll_clock, usec_elapsed;
-        /* Read current counter value */
-        start_count = pdc_read_counter(host);
-        do_gettimeofday(&start_time);
        /* Start the test mode */
        scr = readl(mmio_base + PDC_SYS_CTL);
        PDPRINTK("scr[%X]\n", scr);
        writel(scr | (0x01 << 14), mmio_base + PDC_SYS_CTL);
        readl(mmio_base + PDC_SYS_CTL); /* flush */
+        /* Read current counter value */
+        start_count = pdc_read_counter(host);
+        do_gettimeofday(&start_time);
        /* Let the counter run for 100 ms. */
        mdelay(100);
@@ -719,7 +719,7 @@ static long pdc_detect_pll_input_clock(struct ata_host *host)
        usec_elapsed = (end_time.tv_sec - start_time.tv_sec) * 1000000 +
                (end_time.tv_usec - start_time.tv_usec);
-        pll_clock = (start_count - end_count) / 100 *
+        pll_clock = ((start_count - end_count) & 0x3fffffff) / 100 *
                (100000000 / usec_elapsed);
        PDPRINTK("start[%ld] end[%ld] \n", start_count, end_count);
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index a909f793ffc1..5086d03f2d7c 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -22,7 +22,7 @@
 #include <linux/pata_platform.h>
 #define DRV_NAME "pata_platform"
-#define DRV_VERSION "1.0"
+#define DRV_VERSION "1.1"
 static int pio_mask = 1;
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index b8b2d11e4180..5edf67b1f3bf 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -40,7 +40,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "sc1200"
-#define DRV_VERSION     "0.2.5"
+#define DRV_VERSION     "0.2.6"
 #define SC1200_REV_A    0x00
 #define SC1200_REV_B1   0x01
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 36cdbd2b0bd5..2d048ef25a5a 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -43,7 +43,7 @@
 #include <linux/libata.h>
 #define DRV_NAME                "pata_scc"
-#define DRV_VERSION             "0.2"
+#define DRV_VERSION             "0.3"
 #define PCI_DEVICE_ID_TOSHIBA_SCC_ATA           0x01b4
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 89691541fe59..0faf99c8f13e 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 #define DRV_NAME "pata_serverworks"
-#define DRV_VERSION "0.4.1"
+#define DRV_VERSION "0.4.2"
 #define SVWKS_CSB5_REVISION_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
 #define SVWKS_CSB6_REVISION     0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index b0cd52d6e3fb..40395804a66f 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -33,7 +33,7 @@
 #include <linux/libata.h>
 #define DRV_NAME "pata_sil680"
-#define DRV_VERSION "0.4.6"
+#define DRV_VERSION "0.4.7"
 #define SIL680_MMIO_BAR         5
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 66bd0e83ac07..2bd7645f1a88 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -54,6 +54,7 @@ struct sis_laptop {
 static const struct sis_laptop sis_laptop[] = {
        /* devid, subvendor, subdev */
        { 0x5513, 0x1043, 0x1107 },     /* ASUS A6K */
+        { 0x5513, 0x1734, 0x105F },     /* FSC Amilo A1630 */
        /* end marker */
        { 0, }
 };
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 8c2813aa6cdb..c0f43bb25956 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -26,7 +26,7 @@
 #include <linux/libata.h>
 #define DRV_NAME "pata_sl82c105"
-#define DRV_VERSION "0.3.1"
+#define DRV_VERSION "0.3.2"
 enum {
        /*
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index f645fe22cd1e..636c4f1a0b24 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -63,7 +63,7 @@
 #include <linux/dmi.h>
 #define DRV_NAME "pata_via"
-#define DRV_VERSION "0.3.1"
+#define DRV_VERSION "0.3.2"
 /*
 *      The following comes directly from Vojtech Pavlik's ide/pci/via82cxxx
@@ -97,6 +97,7 @@ static const struct via_isa_bridge {
        u8 rev_max;
        u16 flags;
 } via_isa_bridges[] = {
+        { "vx800",      PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
        { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
        { "vt8251",     PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
        { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
@@ -144,6 +145,9 @@ static int via_cable_override(struct pci_dev *pdev)
        /* Systems by DMI */
        if (dmi_check_system(cable_dmi_table))
                return 1;
+        /* Arima W730-K8/Targa Visionary 811/... */
+        if (pdev->subsystem_vendor == 0x161F && pdev->subsystem_device == 0x2032)
+                return 1;
        return 0;
 }
@@ -240,7 +244,6 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
        int ut;
        int offset = 3 - (2*ap->port_no) - adev->devno;
        /* Calculate the timing values we require */
        ata_timing_compute(adev, mode, &t, T, UT);
@@ -287,9 +290,17 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
                        ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07;
                        break;
        }
        /* Set UDMA unless device is not UDMA capable */
-        if (udma_type)
+        if (udma_type) {
-                pci_write_config_byte(pdev, 0x50 + offset, ut);
+                u8 cable80_status;
+                /* Get 80-wire cable detection bit */
+                pci_read_config_byte(pdev, 0x50 + offset, &cable80_status);
+                cable80_status &= 0x10;
+                pci_write_config_byte(pdev, 0x50 + offset, ut | cable80_status);
+        }
 }
 static void via_set_piomode(struct ata_port *ap, struct ata_device *adev)
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index bec1de594de8..5c79271401af 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -44,7 +44,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "pdc_adma"
-#define DRV_VERSION     "0.06"
+#define DRV_VERSION     "1.0"
 /* macro to calculate base address for ATA regs */
 #define ADMA_ATA_REGS(base,port_no)     ((base) + ((port_no) * 0x40))
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index a9c948d7604a..fdbed8ecdfc2 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -28,7 +28,7 @@
 #include <scsi/scsi_device.h>
 #define DRV_NAME        "sata_inic162x"
-#define DRV_VERSION     "0.2"
+#define DRV_VERSION     "0.3"
 enum {
        MMIO_BAR                = 5,
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 3acf65e75eb2..11bf6c7ac122 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -72,7 +72,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "sata_mv"
-#define DRV_VERSION     "0.81"
+#define DRV_VERSION     "1.0"
 enum {
        /* BAR's are enumerated in terms of pci_resource_start() terms */
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 0b58c4df6fd2..40dc73139858 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -49,7 +49,7 @@
 #include <linux/libata.h>
 #define DRV_NAME                        "sata_nv"
-#define DRV_VERSION                     "3.4"
+#define DRV_VERSION                     "3.5"
 #define NV_ADMA_DMA_BOUNDARY            0xffffffffUL
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index d39ebc23c4a9..25698cf0dce0 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -45,7 +45,7 @@
 #include "sata_promise.h"
 #define DRV_NAME        "sata_promise"
-#define DRV_VERSION     "2.09"
+#define DRV_VERSION     "2.10"
 enum {
        PDC_MAX_PORTS           = 4,
@@ -328,8 +328,8 @@ static const struct pci_device_id pdc_ata_pci_tbl[] = {
        { PCI_VDEVICE(PROMISE, 0x3318), board_20319 },
        { PCI_VDEVICE(PROMISE, 0x3319), board_20319 },
-        { PCI_VDEVICE(PROMISE, 0x3515), board_20319 },
+        { PCI_VDEVICE(PROMISE, 0x3515), board_40518 },
-        { PCI_VDEVICE(PROMISE, 0x3519), board_20319 },
+        { PCI_VDEVICE(PROMISE, 0x3519), board_40518 },
        { PCI_VDEVICE(PROMISE, 0x3d17), board_40518 },
        { PCI_VDEVICE(PROMISE, 0x3d18), board_40518 },
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index c8f9242e7f44..5e1dfdda698f 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -39,7 +39,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "sata_qstor"
-#define DRV_VERSION     "0.08"
+#define DRV_VERSION     "0.09"
 enum {
        QS_MMIO_BAR             = 4,
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index db6763758952..8c72e714b456 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "sata_sil"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 enum {
        SIL_MMIO_BAR            = 5,
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 46fbbe7f121c..ef83e6b1e314 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -30,7 +30,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "sata_sil24"
-#define DRV_VERSION     "0.9"
+#define DRV_VERSION     "1.0"
 /*
 * Port request block (PRB) 32 bytes
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 31a2f55aae66..41c1d6e8f1fe 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -43,7 +43,7 @@
 #include "sis.h"
 #define DRV_NAME        "sata_sis"
-#define DRV_VERSION     "0.8"
+#define DRV_VERSION     "1.0"
 enum {
        sis_180                 = 0,
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index 92e877075037..d9678e7bc3a9 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -53,7 +53,7 @@
 #endif /* CONFIG_PPC_OF */
 #define DRV_NAME        "sata_svw"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 enum {
        /* ap->flags bits */
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 5193bd8647ba..97aefdd87be4 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -92,7 +92,7 @@
 #include "sata_promise.h"
 #define DRV_NAME        "sata_sx4"
-#define DRV_VERSION     "0.11"
+#define DRV_VERSION     "0.12"
 enum {
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 78c28512f01c..e6b8b45279af 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -36,7 +36,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "sata_uli"
-#define DRV_VERSION     "1.2"
+#define DRV_VERSION     "1.3"
 enum {
        uli_5289                = 0,
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 86b7bfc17324..57fd30de8f0d 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "sata_via"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 enum board_ids_enum {
        vt6420,
@@ -371,7 +371,7 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev)
 {
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
        static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 };
-        pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->pio_mode - XFER_UDMA_0]);
+        pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->dma_mode - XFER_UDMA_0]);
 }
 static const unsigned int svia_bar_sizes[] = {
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 24344d0d0575..1920915dfa2c 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -47,7 +47,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "sata_vsc"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 enum {
        VSC_MMIO_BAR                    = 0,
diff --git a/drivers/auxdisplay/cfag12864b.c b/drivers/auxdisplay/cfag12864b.c
index cb44cb4f6a47..80bb06105387 100644
--- a/drivers/auxdisplay/cfag12864b.c
+++ b/drivers/auxdisplay/cfag12864b.c
@@ -355,7 +355,7 @@ static int __init cfag12864b_init(void)
        cfag12864b_cache = kmalloc(sizeof(unsigned char) *
                CFAG12864B_SIZE, GFP_KERNEL);
-        if (cfag12864b_buffer == NULL) {
+        if (cfag12864b_cache == NULL) {
                printk(KERN_ERR CFAG12864B_NAME ": ERROR: "
                        "can't alloc cache buffer (%i bytes)\n",
                        CFAG12864B_SIZE);
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index ef32e977d307..4245b7f80a49 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -68,6 +68,7 @@ config AMIGA_Z2RAM
 config BLK_DEV_XD
        tristate "XT hard disk support"
        depends on ISA && ISA_DMA_API
+        select CHECK_SIGNATURE
        help
          Very old 8 bit hard disk controllers used in the IBM XT computer
          will be supported if you say Y here.
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 4dff49256ac2..317a790c153b 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -417,7 +417,7 @@ static int __send_request(struct request *req)
        desc->req_id = port->req_id;
        desc->operation = op;
        if (port->vdisk_type == VD_DISK_TYPE_DISK) {
-                desc->slice = 2;
+                desc->slice = 0xff;
        } else {
                desc->slice = 0;
        }
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 59b054810ed0..98a9cdeaffb6 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -691,15 +691,18 @@ static void hci_usb_rx_complete(struct urb *urb)
                                        urb->iso_frame_desc[i].offset,
                                        urb->iso_frame_desc[i].actual_length);
        
-                        if (!urb->iso_frame_desc[i].status)
+                        if (!urb->iso_frame_desc[i].status) {
+                                husb->hdev->stat.byte_rx += urb->iso_frame_desc[i].actual_length;
                                hci_recv_fragment(husb->hdev, _urb->type, 
                                        urb->transfer_buffer + urb->iso_frame_desc[i].offset,
                                        urb->iso_frame_desc[i].actual_length);
+                        }
                }
 #else
                ;
 #endif
        } else {
+                husb->hdev->stat.byte_rx += count;
                err = hci_recv_fragment(husb->hdev, _urb->type, urb->transfer_buffer, count);
                if (err < 0) { 
                        BT_ERR("%s corrupted packet: type %d count %d",
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index df0ddf14b85c..f60bca70d1fb 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -223,6 +223,8 @@ static int amd_irongate_configure(void)
        pci_read_config_dword(agp_bridge->dev, AMD_MMBASE, &temp);
        temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);
        amd_irongate_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
+        if (!amd_irongate_private.registers)
+                return -ENOMEM;
        /* Write out the address of the gatt table */
        writel(agp_bridge->gatt_bus_addr, amd_irongate_private.registers+AMD_ATTBASE);
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index da7513d7b4e7..2d46b713c8f2 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -213,6 +213,9 @@ static int ati_configure(void)
        temp = (temp & 0xfffff000);
        ati_generic_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);
+        if (!ati_generic_private.registers)
+                return -ENOMEM;
        if (is_r200())
                pci_write_config_dword(agp_bridge->dev, ATI_RS100_IG_AGPMODE, 0x20000);
        else
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index df8da7262853..d78cd09186aa 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -375,6 +375,7 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
        if (!r->start && r->end) {
                if (pci_assign_resource(pdev, 0)) {
                        printk(KERN_ERR PFX "could not assign resource 0\n");
+                        agp_put_bridge(bridge);
                        return -ENODEV;
                }
        }
@@ -386,6 +387,7 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
        */
        if (pci_enable_device(pdev)) {
                printk(KERN_ERR PFX "Unable to Enable PCI device\n");
+                agp_put_bridge(bridge);
                return -ENODEV;
        }
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index bcdb149c8179..313a133a1172 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -221,6 +221,7 @@ hp_zx1_lba_init (u64 hpa)
        if (cap != PCI_CAP_ID_AGP) {
                printk(KERN_ERR PFX "Invalid capability ID 0x%02x at 0x%x\n",
                       cap, hp->lba_cap_offset);
+                iounmap(hp->lba_regs);
                return -ENODEV;
        }
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
index 53354bf83af7..75d2aca6353d 100644
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
@@ -249,6 +249,10 @@ static int i460_create_gatt_table (struct agp_bridge_data *bridge)
        num_entries = A_SIZE_8(temp)->num_entries;
        i460.gatt = ioremap(INTEL_I460_ATTBASE, PAGE_SIZE << page_order);
+        if (!i460.gatt) {
+                printk(KERN_ERR PFX "ioremap failed\n");
+                return -ENOMEM;
+        }
        /* These are no good, the should be removed from the agp_bridge strucure... */
        agp_bridge->gatt_table_real = NULL;
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 294cdbf4d44d..2c9ca2c64628 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -930,8 +930,10 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
        temp &= 0xfff80000;
        intel_private.registers = ioremap(temp,128 * 4096);
-        if (!intel_private.registers)
+        if (!intel_private.registers) {
+                iounmap(intel_private.gtt);
                return -ENOMEM;
+        }
        temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000;
        global_cache_flush();   /* FIXME: ? */
@@ -985,13 +987,15 @@ static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge)
       temp &= 0xfff00000;
       intel_private.gtt = ioremap((temp + (512 * 1024)) , 512 * 1024);
-       if (!intel_private.gtt)
+        if (!intel_private.gtt)
-               return -ENOMEM;
+                return -ENOMEM;
       intel_private.registers = ioremap(temp,128 * 4096);
-       if (!intel_private.registers)
+       if (!intel_private.registers) {
-               return -ENOMEM;
+                iounmap(intel_private.gtt);
+                return -ENOMEM;
+        }
       temp = readl(intel_private.registers+I810_PGETBL_CTL) & 0xfffff000;
       global_cache_flush();   /* FIXME: ? */
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index 6cd7373dcdf4..225ed2a53d45 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -157,6 +157,9 @@ static int nvidia_configure(void)
        nvidia_private.aperture =
                (volatile u32 __iomem *) ioremap(apbase, 33 * PAGE_SIZE);
+        if (!nvidia_private.aperture)
+                return -ENOMEM;
        return 0;
 }
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 9aaf401a8975..0ecc54d327bc 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -399,6 +399,11 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
                .device_id  = PCI_DEVICE_ID_VIA_P4M890,
                .chipset_name   = "P4M890",
        },
+        /* P4M900 */
+        {
+                .device_id  = PCI_DEVICE_ID_VIA_VT3364,
+                .chipset_name   = "P4M900",
+        },
        { }, /* dummy final entry, always present */
 };
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 923174c54a1c..c115b39b8517 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -177,8 +177,14 @@ static int drm_addmap_core(struct drm_device * dev, unsigned int offset,
                                                     MTRR_TYPE_WRCOMB, 1);
                        }
                }
-                if (map->type == _DRM_REGISTERS)
+                if (map->type == _DRM_REGISTERS) {
                        map->handle = ioremap(map->offset, map->size);
+                        if (!map->handle) {
+                                drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+                                return -ENOMEM;
+                        }
+                }
+                                
                break;
        case _DRM_SHM:
                list = drm_find_matching_map(dev, map);
@@ -479,11 +485,6 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
                return -EINVAL;
        }
-        if (!map) {
-                mutex_unlock(&dev->struct_mutex);
-                return -EINVAL;
-        }
        /* Register and framebuffer maps are permanent */
        if ((map->type == _DRM_REGISTERS) || (map->type == _DRM_FRAME_BUFFER)) {
                mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c
index 832de1d9ba7e..3dd1ed3d1bf5 100644
--- a/drivers/char/drm/via_dmablit.c
+++ b/drivers/char/drm/via_dmablit.c
@@ -560,7 +560,7 @@ via_init_dmablit(struct drm_device *dev)
                blitq->head = 0;
                blitq->cur = 0;
                blitq->serviced = 0;
-                blitq->num_free = VIA_NUM_BLIT_SLOTS;
+                blitq->num_free = VIA_NUM_BLIT_SLOTS - 1;
                blitq->num_outstanding = 0;
                blitq->is_active = 0;
                blitq->aborting = 0;
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 77bf4aa217a8..7ecffc9c738f 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -909,6 +909,8 @@ int hpet_alloc(struct hpet_data *hdp)
        hpetp->hp_delta = hpet_calibrate(hpetp);
+/* This clocksource driver currently only works on ia64 */
+#ifdef CONFIG_IA64
        if (!hpet_clocksource) {
                hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc;
                CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr);
@@ -918,6 +920,7 @@ int hpet_alloc(struct hpet_data *hdp)
                hpetp->hp_clocksource = &clocksource_hpet;
                hpet_clocksource = &clocksource_hpet;
        }
+#endif
        return 0;
 }
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 96d2f9ee42d6..9b07f7851061 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2292,7 +2292,7 @@ static int __devinit ipmi_of_probe(struct of_device *dev,
        info->irq               = irq_of_parse_and_map(dev->node, 0);
        info->dev               = &dev->dev;
-        dev_dbg(&dev->dev, "addr 0x%lx regsize %ld spacing %ld irq %x\n",
+        dev_dbg(&dev->dev, "addr 0x%lx regsize %d spacing %d irq %x\n",
                info->io.addr_data, info->io.regsize, info->io.regspacing,
                info->irq);
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 2ce0af1bd588..d95f316afb5a 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1022,10 +1022,6 @@ static const unsigned short x86_keycodes[256] =
        308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330,
        332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 };
-#ifdef CONFIG_MAC_EMUMOUSEBTN
-extern int mac_hid_mouse_emulate_buttons(int, int, int);
-#endif /* CONFIG_MAC_EMUMOUSEBTN */
 #ifdef CONFIG_SPARC
 static int sparc_l1_a_state = 0;
 extern void sun_do_break(void);
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 1f0962616ee5..4fe9206f84de 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -25,7 +25,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <linux/delay.h>
 #include "lcd.h"
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index aeec67e27264..859858561ab6 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -875,7 +875,7 @@ found:
 #ifdef CONFIG_ACPI
        if (sonypi_acpi_device)
-                acpi_bus_generate_event(sonypi_acpi_device, 1, event);
+                acpi_bus_generate_proc_event(sonypi_acpi_device, 1, event);
 #endif
        kfifo_put(sonypi_device.fifo, (unsigned char *)&event, sizeof(event));
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index bbb7f1292665..2f97d2f8f916 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -1565,6 +1565,9 @@ static int hdlcdev_open(struct net_device *dev)
        int rc;
        unsigned long flags;
+        if (!try_module_get(THIS_MODULE))
+                return -EBUSY;
        DBGINFO(("%s hdlcdev_open\n", dev->name));
        /* generic HDLC layer open processing */
@@ -1634,6 +1637,7 @@ static int hdlcdev_close(struct net_device *dev)
        info->netcount=0;
        spin_unlock_irqrestore(&info->netlock, flags);
+        module_put(THIS_MODULE);
        return 0;
 }
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 9bb542913b86..39564b76d4a3 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -7,7 +7,7 @@
 * Reiner Sailer <sailer@watson.ibm.com>
 * Kylene Hall <kjhall@us.ibm.com>
 *
- * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ * Maintained by: <tpmdd-devel@lists.sourceforge.net>
 *
 * Device driver for TCG/TCPA TPM (trusted platform module).
 * Specifications at www.trustedcomputinggroup.org       
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index b2e2b002a1bb..d15ccddc92eb 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -7,7 +7,7 @@
 * Reiner Sailer <sailer@watson.ibm.com>
 * Kylene Hall <kjhall@us.ibm.com>
 *
- * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ * Maintained by: <tpmdd-devel@lists.sourceforge.net>
 *
 * Device driver for TCG/TCPA TPM (trusted platform module).
 * Specifications at www.trustedcomputinggroup.org       
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index 1ab0896070be..d0e7926eb486 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -7,7 +7,7 @@
 * Reiner Sailer <sailer@watson.ibm.com>
 * Kylene Hall <kjhall@us.ibm.com>
 *
- * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ * Maintained by: <tpmdd-devel@lists.sourceforge.net>
 *
 * Device driver for TCG/TCPA TPM (trusted platform module).
 * Specifications at www.trustedcomputinggroup.org       
diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
index 9363bcf0a402..6c831f9466b7 100644
--- a/drivers/char/tpm/tpm_atmel.h
+++ b/drivers/char/tpm/tpm_atmel.h
@@ -4,7 +4,7 @@
 * Authors:
 * Kylene Hall <kjhall@us.ibm.com>
 *
- * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ * Maintained by: <tpmdd-devel@lists.sourceforge.net>
 *
 * Device driver for TCG/TCPA TPM (trusted platform module).
 * Specifications at www.trustedcomputinggroup.org
diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
index 8677fc6a545e..60a2d2630e36 100644
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
@@ -7,6 +7,8 @@
 *      Reiner Sailer <sailer@watson.ibm.com>
 *      Kylene Hall <kjhall@us.ibm.com>
 *
+ * Maintained by: <tpmdd-devel@lists.sourceforge.net>
+ *
 * Access to the eventlog extended by the TCG BIOS of PC platform
 *
 * This program is free software; you can redistribute it and/or
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
index 608f73071bef..6313326bc41f 100644
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
@@ -7,7 +7,7 @@
 * Reiner Sailer <sailer@watson.ibm.com>
 * Kylene Hall <kjhall@us.ibm.com>
 *
- * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ * Maintained by: <tpmdd-devel@lists.sourceforge.net>
 *
 * Device driver for TCG/TCPA TPM (trusted platform module).
 * Specifications at www.trustedcomputinggroup.org       
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 483f3f60013c..23fa18a6654c 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -5,6 +5,8 @@
 * Leendert van Doorn <leendert@watson.ibm.com>
 * Kylene Hall <kjhall@us.ibm.com>
 *
+ * Maintained by: <tpmdd-devel@lists.sourceforge.net>
+ *
 * Device driver for TCG/TCPA TPM (trusted platform module).
 * Specifications at www.trustedcomputinggroup.org
 *
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 51ea93cab6c4..9c867cf6de64 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2063,8 +2063,7 @@ static int init_dev(struct tty_driver *driver, int idx,
        }
        if (!*tp_loc) {
-                tp = (struct ktermios *) kmalloc(sizeof(struct ktermios),
+                tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
-                                                GFP_KERNEL);
                if (!tp)
                        goto free_mem_out;
                *tp = driver->init_termios;
@@ -2094,8 +2093,7 @@ static int init_dev(struct tty_driver *driver, int idx,
                }
                if (!*o_tp_loc) {
-                        o_tp = (struct ktermios *)
+                        o_tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
-                                kmalloc(sizeof(struct ktermios), GFP_KERNEL);
                        if (!o_tp)
                                goto free_mem_out;
                        *o_tp = driver->other->init_termios;
diff --git a/drivers/char/watchdog/alim1535_wdt.c b/drivers/char/watchdog/alim1535_wdt.c
index e3f6a7d0c83d..c404fc69e7e6 100644
--- a/drivers/char/watchdog/alim1535_wdt.c
+++ b/drivers/char/watchdog/alim1535_wdt.c
@@ -312,6 +312,7 @@ static int ali_notify_sys(struct notifier_block *this, unsigned long code, void
 */
 static struct pci_device_id ali_pci_tbl[] = {
+        { PCI_VENDOR_ID_AL, 0x1533, PCI_ANY_ID, PCI_ANY_ID,},
        { PCI_VENDOR_ID_AL, 0x1535, PCI_ANY_ID, PCI_ANY_ID,},
        { 0, },
 };
@@ -329,9 +330,11 @@ static int __init ali_find_watchdog(void)
        struct pci_dev *pdev;
        u32 wdog;
-        /* Check for a 1535 series bridge */
+        /* Check for a 1533/1535 series bridge */
        pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1535, NULL);
-        if(pdev == NULL)
+        if (pdev == NULL)
+                pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1533, NULL);
+        if (pdev == NULL)
                return -ENODEV;
        pci_dev_put(pdev);
diff --git a/drivers/char/watchdog/eurotechwdt.c b/drivers/char/watchdog/eurotechwdt.c
index b070324e27a6..b14e9d1f164d 100644
--- a/drivers/char/watchdog/eurotechwdt.c
+++ b/drivers/char/watchdog/eurotechwdt.c
@@ -1,5 +1,5 @@
 /*
- *      Eurotech CPU-1220/1410 on board WDT driver
+ *      Eurotech CPU-1220/1410/1420 on board WDT driver
 *
 *      (c) Copyright 2001 Ascensit <support@ascensit.com>
 *      (c) Copyright 2001 Rodolfo Giometti <giometti@ascensit.com>
@@ -25,6 +25,9 @@
 /* Changelog:
 *
+ * 2001 - Rodolfo Giometti
+ *      Initial release
+ *
 * 2002/04/25 - Rob Radez
 *      clean up #includes
 *      clean up locking
@@ -33,13 +36,15 @@
 *      add WDIOC_GETSTATUS and WDIOC_SETOPTIONS ioctls
 *      add expect_close support
 *
- * 2001 - Rodolfo Giometti
- *      Initial release
- *
 * 2002.05.30 - Joel Becker <joel.becker@oracle.com>
 *      Added Matt Domsch's nowayout module option.
 */
+/*
+ *      The eurotech CPU-1220/1410/1420's watchdog is a part
+ *      of the on-board SUPER I/O device SMSC FDC 37B782.
+ */
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index 2d1f17865b64..41b18c5a3141 100644
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -191,17 +191,12 @@ static int ioat_dma_alloc_chan_resources(struct dma_chan *chan)
        int i;
        LIST_HEAD(tmp_list);
-        /*
+        /* have we already been set up? */
-         * In-use bit automatically set by reading chanctrl
+        if (!list_empty(&ioat_chan->free_desc))
-         * If 0, we got it, if 1, someone else did
+                return INITIAL_IOAT_DESC_COUNT;
-         */
-        chanctrl = readw(ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
-        if (chanctrl & IOAT_CHANCTRL_CHANNEL_IN_USE)
-                return -EBUSY;
        /* Setup register to interrupt and write completion status on error */
-        chanctrl = IOAT_CHANCTRL_CHANNEL_IN_USE |
+        chanctrl = IOAT_CHANCTRL_ERR_INT_EN |
-                IOAT_CHANCTRL_ERR_INT_EN |
                IOAT_CHANCTRL_ANY_ERR_ABORT_EN |
                IOAT_CHANCTRL_ERR_COMPLETION_EN;
        writew(chanctrl, ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
@@ -282,11 +277,6 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan)
                        in_use_descs - 1);
        ioat_chan->last_completion = ioat_chan->completion_addr = 0;
-        /* Tell hw the chan is free */
-        chanctrl = readw(ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
-        chanctrl &= ~IOAT_CHANCTRL_CHANNEL_IN_USE;
-        writew(chanctrl, ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
 }
 static struct dma_async_tx_descriptor *
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 0aeab3218bb6..3e9719948a8e 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -510,9 +510,11 @@ fw_core_remove_card(struct fw_card *card)
        /* Set up the dummy driver. */
        card->driver = &dummy_driver;
-        fw_flush_transactions(card);
        fw_destroy_nodes(card);
+        flush_scheduled_work();
+        fw_flush_transactions(card);
+        del_timer_sync(&card->flush_timer);
        fw_card_put(card);
 }
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 7e427b4c74b5..e14c1ca7813e 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1945,10 +1945,8 @@ static int pci_suspend(struct pci_dev *pdev, pm_message_t state)
                return err;
        }
        err = pci_set_power_state(pdev, pci_choose_state(pdev, state));
-        if (err) {
+        if (err)
-                fw_error("pci_set_power_state failed\n");
+                fw_error("pci_set_power_state failed with %d\n", err);
-                return err;
-        }
        return 0;
 }
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index ba816ef6def1..238730f75db1 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -159,6 +159,7 @@ struct sbp2_pointer {
 struct sbp2_orb {
        struct fw_transaction t;
+        struct kref kref;
        dma_addr_t request_bus;
        int rcode;
        struct sbp2_pointer pointer;
@@ -280,6 +281,14 @@ static const struct {
 };
 static void
+free_orb(struct kref *kref)
+{
+        struct sbp2_orb *orb = container_of(kref, struct sbp2_orb, kref);
+        kfree(orb);
+}
+static void
 sbp2_status_write(struct fw_card *card, struct fw_request *request,
                  int tcode, int destination, int source,
                  int generation, int speed,
@@ -312,8 +321,8 @@ sbp2_status_write(struct fw_card *card, struct fw_request *request,
        spin_lock_irqsave(&card->lock, flags);
        list_for_each_entry(orb, &sd->orb_list, link) {
                if (STATUS_GET_ORB_HIGH(status) == 0 &&
-                    STATUS_GET_ORB_LOW(status) == orb->request_bus &&
+                    STATUS_GET_ORB_LOW(status) == orb->request_bus) {
-                    orb->rcode == RCODE_COMPLETE) {
+                        orb->rcode = RCODE_COMPLETE;
                        list_del(&orb->link);
                        break;
                }
@@ -325,6 +334,8 @@ sbp2_status_write(struct fw_card *card, struct fw_request *request,
        else
                fw_error("status write for unknown orb\n");
+        kref_put(&orb->kref, free_orb);
        fw_send_response(card, request, RCODE_COMPLETE);
 }
@@ -335,13 +346,27 @@ complete_transaction(struct fw_card *card, int rcode,
        struct sbp2_orb *orb = data;
        unsigned long flags;
-        orb->rcode = rcode;
+        /*
-        if (rcode != RCODE_COMPLETE) {
+         * This is a little tricky.  We can get the status write for
-                spin_lock_irqsave(&card->lock, flags);
+         * the orb before we get this callback.  The status write
+         * handler above will assume the orb pointer transaction was
+         * successful and set the rcode to RCODE_COMPLETE for the orb.
+         * So this callback only sets the rcode if it hasn't already
+         * been set and only does the cleanup if the transaction
+         * failed and we didn't already get a status write.
+         */
+        spin_lock_irqsave(&card->lock, flags);
+        if (orb->rcode == -1)
+                orb->rcode = rcode;
+        if (orb->rcode != RCODE_COMPLETE) {
                list_del(&orb->link);
-                spin_unlock_irqrestore(&card->lock, flags);
                orb->callback(orb, NULL);
        }
+        spin_unlock_irqrestore(&card->lock, flags);
+        kref_put(&orb->kref, free_orb);
 }
 static void
@@ -360,6 +385,10 @@ sbp2_send_orb(struct sbp2_orb *orb, struct fw_unit *unit,
        list_add_tail(&orb->link, &sd->orb_list);
        spin_unlock_irqrestore(&device->card->lock, flags);
+        /* Take a ref for the orb list and for the transaction callback. */
+        kref_get(&orb->kref);
+        kref_get(&orb->kref);
        fw_send_request(device->card, &orb->t, TCODE_WRITE_BLOCK_REQUEST,
                        node_id, generation, device->max_speed, offset,
                        &orb->pointer, sizeof(orb->pointer),
@@ -416,6 +445,7 @@ sbp2_send_management_orb(struct fw_unit *unit, int node_id, int generation,
        if (orb == NULL)
                return -ENOMEM;
+        kref_init(&orb->base.kref);
        orb->response_bus =
                dma_map_single(device->card->device, &orb->response,
                               sizeof(orb->response), DMA_FROM_DEVICE);
@@ -490,7 +520,7 @@ sbp2_send_management_orb(struct fw_unit *unit, int node_id, int generation,
        if (response)
                fw_memcpy_from_be32(response,
                                    orb->response, sizeof(orb->response));
-        kfree(orb);
+        kref_put(&orb->base.kref, free_orb);
        return retval;
 }
@@ -886,7 +916,6 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
        orb->cmd->result = result;
        orb->done(orb->cmd);
-        kfree(orb);
 }
 static int sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb)
@@ -1005,6 +1034,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
        /* Initialize rcode to something not RCODE_COMPLETE. */
        orb->base.rcode = -1;
+        kref_init(&orb->base.kref);
        orb->unit = unit;
        orb->done = done;
@@ -1051,10 +1081,11 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
        sbp2_send_orb(&orb->base, unit, sd->node_id, sd->generation,
                      sd->command_block_agent_address + SBP2_ORB_POINTER);
+        kref_put(&orb->base.kref, free_orb);
        return 0;
 fail_mapping:
-        kfree(orb);
+        kref_put(&orb->base.kref, free_orb);
 fail_alloc:
        return SCSI_MLQUEUE_HOST_BUSY;
 }
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 565c4e679b8d..6eea3476b90c 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -882,7 +882,7 @@ static int __init lm78_isa_device_add(unsigned short address)
 {
        struct resource res = {
                .start  = address,
-                .end    = address + LM78_EXTENT,
+                .end    = address + LM78_EXTENT - 1,
                .name   = "lm78",
                .flags  = IORESOURCE_IO,
        };
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index c95909cc1d21..dcc941a5aaff 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1746,7 +1746,7 @@ w83781d_isa_device_add(unsigned short address)
 {
        struct resource res = {
                .start  = address,
-                .end    = address + W83781D_EXTENT,
+                .end    = address + W83781D_EXTENT - 1,
                .name   = "w83781d",
                .flags  = IORESOURCE_IO,
        };
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 8a5f5825bb72..7f0a0a62cf60 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -357,13 +357,29 @@ static int sendbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
        return wrcount;
 }
+static int acknak(struct i2c_adapter *i2c_adap, int is_ack)
+{
+        struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
+        /* assert: sda is high */
+        if (is_ack)             /* send ack */
+                setsda(adap, 0);
+        udelay((adap->udelay + 1) / 2);
+        if (sclhi(adap) < 0) {  /* timeout */
+                dev_err(&i2c_adap->dev, "readbytes: ack/nak timeout\n");
+                return -ETIMEDOUT;
+        }
+        scllo(adap);
+        return 0;
+}
 static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
 {
        int inval;
        int rdcount=0;          /* counts bytes read */
-        struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
        unsigned char *temp = msg->buf;
        int count = msg->len;
+        const unsigned flags = msg->flags;
        while (count > 0) {
                inval = i2c_inb(i2c_adap);
@@ -377,28 +393,12 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                temp++;
                count--;
-                if (msg->flags & I2C_M_NO_RD_ACK) {
-                        bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x\n",
-                                inval);
-                        continue;
-                }
-                /* assert: sda is high */
-                if (count)              /* send ack */
-                        setsda(adap, 0);
-                udelay((adap->udelay + 1) / 2);
-                bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x %s\n", inval,
-                        count ? "A" : "NA");
-                if (sclhi(adap)<0) {    /* timeout */
-                        dev_err(&i2c_adap->dev, "readbytes: timeout at ack\n");
-                        return -ETIMEDOUT;
-                };
-                scllo(adap);
                /* Some SMBus transactions require that we receive the
                   transaction length as the first read byte. */
-                if (rdcount == 1 && (msg->flags & I2C_M_RECV_LEN)) {
+                if (rdcount == 1 && (flags & I2C_M_RECV_LEN)) {
                        if (inval <= 0 || inval > I2C_SMBUS_BLOCK_MAX) {
+                                if (!(flags & I2C_M_NO_RD_ACK))
+                                        acknak(i2c_adap, 0);
                                dev_err(&i2c_adap->dev, "readbytes: invalid "
                                        "block length (%d)\n", inval);
                                return -EREMOTEIO;
@@ -409,6 +409,18 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                        count += inval;
                        msg->len += inval;
                }
+                bit_dbg(2, &i2c_adap->dev, "readbytes: 0x%02x %s\n",
+                        inval,
+                        (flags & I2C_M_NO_RD_ACK)
+                                ? "(no ack/nak)"
+                                : (count ? "A" : "NA"));
+                if (!(flags & I2C_M_NO_RD_ACK)) {
+                        inval = acknak(i2c_adap, count);
+                        if (inval < 0)
+                                return inval;
+                }
        }
        return rdcount;
 }
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 1842f523c23d..9f3a4cd0b07f 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -208,6 +208,7 @@ config I2C_PIIX4
            ATI IXP400
            ATI SB600
            ATI SB700
+            ATI SB800
            Serverworks OSB4
            Serverworks CSB5
            Serverworks CSB6
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 025f19423faf..44e1cd21bb01 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -147,7 +147,7 @@ static int __init i2c_gpio_probe(struct platform_device *pdev)
         * The reason to do so is to avoid sysfs names that only make
         * sense when there are multiple adapters.
         */
-        adap->nr = pdev->id >= 0 ? pdev->id : 0;
+        adap->nr = (pdev->id != -1) ? pdev->id : 0;
        ret = i2c_bit_add_numbered_bus(adap);
        if (ret)
                goto err_add_bus;
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index debc76cd2161..167e4137ee21 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -23,7 +23,7 @@
   Supports:
        Intel PIIX4, 440MX
        Serverworks OSB4, CSB5, CSB6, HT-1000
-        ATI IXP200, IXP300, IXP400, SB600, SB700
+        ATI IXP200, IXP300, IXP400, SB600, SB700, SB800
        SMSC Victory66
   Note: we assume there can only be one device, with one SMBus interface.
@@ -397,9 +397,7 @@ static struct pci_device_id piix4_ids[] = {
          .driver_data = 0 },
        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS),
          .driver_data = 0 },
-        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SMBUS),
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS),
-          .driver_data = 0 },
-        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SMBUS),
          .driver_data = 0 },
        { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4),
          .driver_data = 0 },
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 9d6b790d4321..bb5466b27b59 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -926,7 +926,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
         * The reason to do so is to avoid sysfs names that only make
         * sense when there are multiple adapters.
         */
-        i2c->adap.nr = dev->id >= 0 ? dev->id : 0;
+        i2c->adap.nr = dev->id != -1 ? dev->id : 0;
        ret = i2c_add_numbered_adapter(&i2c->adap);
        if (ret < 0) {
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 581316f9581d..8c539381d622 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -74,6 +74,7 @@ static struct via_isa_bridge {
        u8 udma_mask;
        u8 flags;
 } via_isa_bridges[] = {
+        { "vx800",      PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
        { "vt6410",     PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 47dbe8f17e82..a81ba8fca0db 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -513,9 +513,9 @@ static int sbp2util_create_command_orb_pool(struct sbp2_lu *lu)
        return 0;
 }
-static void sbp2util_remove_command_orb_pool(struct sbp2_lu *lu)
+static void sbp2util_remove_command_orb_pool(struct sbp2_lu *lu,
+                                             struct hpsb_host *host)
 {
-        struct hpsb_host *host = lu->hi->host;
        struct list_head *lh, *next;
        struct sbp2_command_info *cmd;
        unsigned long flags;
@@ -922,15 +922,16 @@ static void sbp2_remove_device(struct sbp2_lu *lu)
        if (!lu)
                return;
        hi = lu->hi;
+        if (!hi)
+                goto no_hi;
        if (lu->shost) {
                scsi_remove_host(lu->shost);
                scsi_host_put(lu->shost);
        }
        flush_scheduled_work();
-        sbp2util_remove_command_orb_pool(lu);
+        sbp2util_remove_command_orb_pool(lu, hi->host);
        list_del(&lu->lu_list);
@@ -971,9 +972,8 @@ static void sbp2_remove_device(struct sbp2_lu *lu)
        lu->ud->device.driver_data = NULL;
-        if (hi)
+        module_put(hi->host->driver->owner);
-                module_put(hi->host->driver->owner);
+no_hi:
        kfree(lu);
 }
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index 1518b41482ae..beb2a381467f 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -916,7 +916,7 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p)
        PDBG("%s opening rnic dev %s\n", __FUNCTION__, rdev_p->dev_name);
        memset(&rdev_p->ctrl_qp, 0, sizeof(rdev_p->ctrl_qp));
        if (!rdev_p->t3cdev_p)
-                rdev_p->t3cdev_p = T3CDEV(netdev_p);
+                rdev_p->t3cdev_p = dev2t3cdev(netdev_p);
        rdev_p->t3cdev_p->ulp = (void *) rdev_p;
        err = rdev_p->t3cdev_p->ctl(rdev_p->t3cdev_p, RDMA_GET_PARAMS,
                                         &(rdev_p->rnic_info));
diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c
index fc19ef9fd963..cf22472d9414 100644
--- a/drivers/infiniband/hw/ehca/ehca_hca.c
+++ b/drivers/infiniband/hw/ehca/ehca_hca.c
@@ -93,9 +93,13 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props)
        props->max_pd          = min_t(int, rblock->max_pd, INT_MAX);
        props->max_ah          = min_t(int, rblock->max_ah, INT_MAX);
        props->max_fmr         = min_t(int, rblock->max_mr, INT_MAX);
-        props->max_srq         = 0;
-        props->max_srq_wr      = 0;
+        if (EHCA_BMASK_GET(HCA_CAP_SRQ, shca->hca_cap)) {
-        props->max_srq_sge     = 0;
+                props->max_srq         = props->max_qp;
+                props->max_srq_wr      = props->max_qp_wr;
+                props->max_srq_sge     = 3;
+        }
        props->max_pkeys       = 16;
        props->local_ca_ack_delay
                = rblock->local_ca_ack_delay;
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index ee06d8bd7396..a925ea52443f 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -175,41 +175,55 @@ error_data1:
 }
-static void qp_event_callback(struct ehca_shca *shca, u64 eqe,
+static void dispatch_qp_event(struct ehca_shca *shca, struct ehca_qp *qp,
-                              enum ib_event_type event_type, int fatal)
+                              enum ib_event_type event_type)
 {
        struct ib_event event;
-        struct ehca_qp *qp;
-        u32 token = EHCA_BMASK_GET(EQE_QP_TOKEN, eqe);
-        read_lock(&ehca_qp_idr_lock);
-        qp = idr_find(&ehca_qp_idr, token);
-        read_unlock(&ehca_qp_idr_lock);
-        if (!qp)
-                return;
-        if (fatal)
-                ehca_error_data(shca, qp, qp->ipz_qp_handle.handle);
        event.device = &shca->ib_device;
+        event.event = event_type;
        if (qp->ext_type == EQPT_SRQ) {
                if (!qp->ib_srq.event_handler)
                        return;
-                event.event = fatal ? IB_EVENT_SRQ_ERR : event_type;
                event.element.srq = &qp->ib_srq;
                qp->ib_srq.event_handler(&event, qp->ib_srq.srq_context);
        } else {
                if (!qp->ib_qp.event_handler)
                        return;
-                event.event = event_type;
                event.element.qp = &qp->ib_qp;
                qp->ib_qp.event_handler(&event, qp->ib_qp.qp_context);
        }
+}
+static void qp_event_callback(struct ehca_shca *shca, u64 eqe,
+                              enum ib_event_type event_type, int fatal)
+{
+        struct ehca_qp *qp;
+        u32 token = EHCA_BMASK_GET(EQE_QP_TOKEN, eqe);
+        read_lock(&ehca_qp_idr_lock);
+        qp = idr_find(&ehca_qp_idr, token);
+        read_unlock(&ehca_qp_idr_lock);
+        if (!qp)
+                return;
+        if (fatal)
+                ehca_error_data(shca, qp, qp->ipz_qp_handle.handle);
+        dispatch_qp_event(shca, qp, fatal && qp->ext_type == EQPT_SRQ ?
+                          IB_EVENT_SRQ_ERR : event_type);
+        /*
+         * eHCA only processes one WQE at a time for SRQ base QPs,
+         * so the last WQE has been processed as soon as the QP enters
+         * error state.
+         */
+        if (fatal && qp->ext_type == EQPT_SRQBASE)
+                dispatch_qp_event(shca, qp, IB_EVENT_QP_LAST_WQE_REACHED);
        return;
 }
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index b178cba96345..84d435a5ee11 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -600,10 +600,12 @@ static struct ehca_qp *internal_create_qp(
        if (EHCA_BMASK_GET(HCA_CAP_MINI_QP, shca->hca_cap)
            && !(context && udata)) { /* no small QP support in userspace ATM */
-                ehca_determine_small_queue(
+                if (HAS_SQ(my_qp))
-                        &parms.squeue, max_send_sge, is_llqp);
+                        ehca_determine_small_queue(
-                ehca_determine_small_queue(
+                                &parms.squeue, max_send_sge, is_llqp);
-                        &parms.rqueue, max_recv_sge, is_llqp);
+                if (HAS_RQ(my_qp))
+                        ehca_determine_small_queue(
+                                &parms.rqueue, max_recv_sge, is_llqp);
                parms.qp_storage =
                        (parms.squeue.is_small || parms.rqueue.is_small);
        }
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
index a090c679c397..29bd476fbd54 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -172,7 +172,7 @@ static void free_small_queue_page(struct ipz_queue *queue, struct ehca_pd *pd)
        unsigned long bit;
        int free_page = 0;
-        bit = ((unsigned long)queue->queue_pages[0] & PAGE_MASK)
+        bit = ((unsigned long)queue->queue_pages[0] & ~PAGE_MASK)
                >> (order + 9);
        mutex_lock(&pd->lock);
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index 3154ccd74000..45c4939ced75 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -246,13 +246,12 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
 int iforce_get_id_packet(struct iforce *iforce, char *packet)
 {
-        int status;
        switch (iforce->bus) {
-        case IFORCE_USB:
+        case IFORCE_USB: {
 #ifdef CONFIG_JOYSTICK_IFORCE_USB
+                int status;
                iforce->cr.bRequest = packet[0];
                iforce->ctrl->dev = iforce->usbdev;
@@ -273,6 +272,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
 #else
                dbg("iforce_get_id_packet: iforce->bus = USB!");
 #endif
+                }
                break;
        case IFORCE_232:
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 739212252b09..f0b22b8b2769 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -22,7 +22,6 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
-#include <linux/irq.h>
 #include <linux/gpio_keys.h>
 #include <asm/gpio.h>
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 9b26574f1466..d602b8fa7d46 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -68,6 +68,7 @@ config INPUT_WISTRON_BTNS
        select INPUT_POLLDEV
        select NEW_LEDS
        select LEDS_CLASS
+        select CHECK_SIGNATURE
        help
          Say Y here for support of Winstron laptop button interface, used on
          laptops of various brands, including Acer and Fujitsu-Siemens. If
diff --git a/drivers/input/mouse/touchkit_ps2.h b/drivers/input/mouse/touchkit_ps2.h
index 61e9dfd8419f..8a0dd3574aef 100644
--- a/drivers/input/mouse/touchkit_ps2.h
+++ b/drivers/input/mouse/touchkit_ps2.h
@@ -15,7 +15,8 @@
 #ifdef CONFIG_MOUSE_PS2_TOUCHKIT
 int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties);
 #else
-inline int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties)
+static inline int touchkit_ps2_detect(struct psmouse *psmouse,
+                                      int set_properties)
 {
        return -ENOSYS;
 }
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 74f14e097789..3e99df6be084 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -340,8 +340,8 @@ static int __init gscps2_probe(struct parisc_device *dev)
        if (dev->id.sversion == 0x96)
                hpa += GSC_DINO_OFFSET;
-        ps2port = kmalloc(sizeof(struct gscps2port), GFP_KERNEL);
+        ps2port = kzalloc(sizeof(struct gscps2port), GFP_KERNEL);
-        serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+        serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
        if (!ps2port || !serio) {
                ret = -ENOMEM;
                goto fail_nomem;
@@ -349,8 +349,6 @@ static int __init gscps2_probe(struct parisc_device *dev)
        dev_set_drvdata(&dev->dev, ps2port);
-        memset(ps2port, 0, sizeof(struct gscps2port));
-        memset(serio, 0, sizeof(struct serio));
        ps2port->port = serio;
        ps2port->padev = dev;
        ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4);
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 3888dc307e0c..06b05dd22485 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -512,6 +512,7 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
 {
        unsigned long flags;
        unsigned char str, data;
+        int ret = 0;
        spin_lock_irqsave(&i8042_lock, flags);
        str = i8042_read_status();
@@ -520,10 +521,11 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
                if (i8042_irq_being_tested &&
                    data == 0xa5 && (str & I8042_STR_AUXDATA))
                        complete(&i8042_aux_irq_delivered);
+                ret = 1;
        }
        spin_unlock_irqrestore(&i8042_lock, flags);
-        return IRQ_HANDLED;
+        return IRQ_RETVAL(ret);
 }
 /*
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index b1a26e02df02..60843b3f3b6f 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -1,12 +1,12 @@
 /*
 * hfc_usb.c
 *
- * $Id: hfc_usb.c,v 2.3.2.13 2006/02/17 17:17:22 mbachem Exp $
+ * $Id: hfc_usb.c,v 2.3.2.20 2007/08/20 14:07:54 mbachem Exp $
 *
 * modular HiSax ISDN driver for Colognechip HFC-S USB chip
 *
- * Authors : Peter Sprenger  (sprenger@moving-bytes.de)
+ * Authors : Peter Sprenger (sprenger@moving-bytes.de)
- *           Martin Bachem   (info@colognechip.com)
+ *           Martin Bachem (m.bachem@gmx.de, info@colognechip.com)
 *
 *           based on the first hfc_usb driver of
 *           Werner Cornelius (werner@isdn-development.de)
@@ -37,24 +37,25 @@
 #include <linux/kernel_stat.h>
 #include <linux/usb.h>
 #include <linux/kernel.h>
+#include <linux/smp_lock.h>
+#include <linux/sched.h>
+#include <linux/moduleparam.h>
 #include "hisax.h"
 #include "hisax_if.h"
 #include "hfc_usb.h"
 static const char *hfcusb_revision =
-    "$Revision: 2.3.2.13 $ $Date: 2006/02/17 17:17:22 $ ";
+    "$Revision: 2.3.2.20 $ $Date: 2007/08/20 14:07:54 $ ";
 /* Hisax debug support
-* use "modprobe debug=x" where x is bitfield of USB_DBG & ISDN_DBG
+*  debug flags defined in hfc_usb.h as HFCUSB_DBG_[*]
 */
-#ifdef CONFIG_HISAX_DEBUG
-#include <linux/moduleparam.h>
 #define __debug_variable hfc_debug
 #include "hisax_debug.h"
 static u_int debug;
 module_param(debug, uint, 0);
 static int hfc_debug;
-#endif
 /* private vendor specific data */
 typedef struct {
@@ -63,9 +64,7 @@ typedef struct {
        char *vend_name;        // device name
 } hfcsusb_vdata;
-/****************************************/
+/* VID/PID device list */
-/* data defining the devices to be used */
-/****************************************/
 static struct usb_device_id hfcusb_idtab[] = {
        {
         USB_DEVICE(0x0959, 0x2bd0),
@@ -90,49 +89,47 @@ static struct usb_device_id hfcusb_idtab[] = {
         .driver_info = (unsigned long) &((hfcsusb_vdata)
                          {LED_SCHEME1, {4, 0, 2, 1},
                           "Stollmann USB TA"}),
-         },
+        },
        {
         USB_DEVICE(0x0742, 0x2009),
         .driver_info = (unsigned long) &((hfcsusb_vdata)
                          {LED_SCHEME1, {4, 0, 2, 1},
                           "Aceex USB ISDN TA"}),
-         },
+        },
        {
         USB_DEVICE(0x0742, 0x200A),
         .driver_info = (unsigned long) &((hfcsusb_vdata)
                          {LED_SCHEME1, {4, 0, 2, 1},
                           "OEM USB ISDN TA"}),
-         },
+        },
        {
         USB_DEVICE(0x08e3, 0x0301),
         .driver_info = (unsigned long) &((hfcsusb_vdata)
                          {LED_SCHEME1, {2, 0, 1, 4},
                           "Olitec USB RNIS"}),
-         },
+        },
        {
         USB_DEVICE(0x07fa, 0x0846),
         .driver_info = (unsigned long) &((hfcsusb_vdata)
                          {LED_SCHEME1, {0x80, -64, -32, -16},
                           "Bewan Modem RNIS USB"}),
-         },
+        },
        {
         USB_DEVICE(0x07fa, 0x0847),
         .driver_info = (unsigned long) &((hfcsusb_vdata)
                          {LED_SCHEME1, {0x80, -64, -32, -16},
                           "Djinn Numeris USB"}),
-         },
+        },
        {
         USB_DEVICE(0x07b0, 0x0006),
         .driver_info = (unsigned long) &((hfcsusb_vdata)
                          {LED_SCHEME1, {0x80, -64, -32, -16},
                           "Twister ISDN TA"}),
-         },
+        },
        { }
 };
-/***************************************************************/
 /* structure defining input+output fifos (interrupt/bulk mode) */
-/***************************************************************/
 struct usb_fifo;                /* forward definition */
 typedef struct iso_urb_struct {
        struct urb *purb;
@@ -140,8 +137,8 @@ typedef struct iso_urb_struct {
        struct usb_fifo *owner_fifo;    /* pointer to owner fifo */
 } iso_urb_struct;
 struct hfcusb_data;             /* forward definition */
 typedef struct usb_fifo {
        int fifonum;            /* fifo index attached to this structure */
        int active;             /* fifo is currently active */
@@ -160,15 +157,12 @@ typedef struct usb_fifo {
        struct hisax_if *hif;   /* hisax interface */
        int delete_flg;         /* only delete skbuff once */
        int last_urblen;        /* remember length of last packet */
 } usb_fifo;
-/*********************************************/
 /* structure holding all data for one device */
-/*********************************************/
 typedef struct hfcusb_data {
        /* HiSax Interface for loadable Layer1 drivers */
-        struct hisax_d_if d_if; /* see hisax_if.h */
+        struct hisax_d_if d_if;         /* see hisax_if.h */
        struct hisax_b_if b_if[2];      /* see hisax_if.h */
        int protocol;
@@ -176,12 +170,13 @@ typedef struct hfcusb_data {
        int if_used;            /* used interface number */
        int alt_used;           /* used alternate config */
        int ctrl_paksize;       /* control pipe packet size */
-        int ctrl_in_pipe, ctrl_out_pipe;        /* handles for control pipe */
+        int ctrl_in_pipe,       /* handles for control pipe */
+            ctrl_out_pipe;
        int cfg_used;           /* configuration index used */
        int vend_idx;           /* vendor found */
        int b_mode[2];          /* B-channel mode */
        int l1_activated;       /* layer 1 activated */
-        int disc_flag;          /* 'true' if device was disonnected to avoid some USB actions */
+        int disc_flag;          /* TRUE if device was disonnected to avoid some USB actions */
        int packet_size, iso_packet_size;
        /* control pipe background handling */
@@ -208,7 +203,6 @@ typedef struct hfcusb_data {
 static void collect_rx_frame(usb_fifo * fifo, __u8 * data, int len,
                             int finish);
 static inline const char *
 symbolic(struct hfcusb_symbolic_list list[], const int num)
 {
@@ -219,10 +213,6 @@ symbolic(struct hfcusb_symbolic_list list[], const int num)
        return "<unknown ERROR>";
 }
-/******************************************************/
-/* start next background transfer for control channel */
-/******************************************************/
 static void
 ctrl_start_transfer(hfcusb_data * hfc)
 {
@@ -240,10 +230,6 @@ ctrl_start_transfer(hfcusb_data * hfc)
        }
 }                               /* ctrl_start_transfer */
-/************************************/
-/* queue a control transfer request */
-/* return 0 on success.             */
-/************************************/
 static int
 queue_control_request(hfcusb_data * hfc, __u8 reg, __u8 val, int action)
 {
@@ -260,19 +246,8 @@ queue_control_request(hfcusb_data * hfc, __u8 reg, __u8 val, int action)
        if (++hfc->ctrl_cnt == 1)
                ctrl_start_transfer(hfc);
        return (0);
-}                               /* queue_control_request */
-static int
-control_action_handler(hfcusb_data * hfc, int reg, int val, int action)
-{
-        if (!action)
-                return (1);     /* no action defined */
-        return (0);
 }
-/***************************************************************/
-/* control completion routine handling background control cmds */
-/***************************************************************/
 static void
 ctrl_complete(struct urb *urb)
 {
@@ -282,9 +257,6 @@ ctrl_complete(struct urb *urb)
        urb->dev = hfc->dev;
        if (hfc->ctrl_cnt) {
                buf = &hfc->ctrl_buff[hfc->ctrl_out_idx];
-                control_action_handler(hfc, buf->hfc_reg, buf->reg_val,
-                                       buf->action);
                hfc->ctrl_cnt--;        /* decrement actual count */
                if (++hfc->ctrl_out_idx >= HFC_CTRL_BUFSIZE)
                        hfc->ctrl_out_idx = 0;  /* pointer wrap */
@@ -293,9 +265,7 @@ ctrl_complete(struct urb *urb)
        }
 }                               /* ctrl_complete */
-/***************************************************/
 /* write led data to auxport & invert if necessary */
-/***************************************************/
 static void
 write_led(hfcusb_data * hfc, __u8 led_state)
 {
@@ -305,9 +275,6 @@ write_led(hfcusb_data * hfc, __u8 led_state)
        }
 }
-/**************************/
-/* handle LED bits        */
-/**************************/
 static void
 set_led_bit(hfcusb_data * hfc, signed short led_bits, int unset)
 {
@@ -324,9 +291,7 @@ set_led_bit(hfcusb_data * hfc, signed short led_bits, int unset)
        }
 }
-/**************************/
+/* handle LED requests */
-/* handle LED requests    */
-/**************************/
 static void
 handle_led(hfcusb_data * hfc, int event)
 {
@@ -339,85 +304,73 @@ handle_led(hfcusb_data * hfc, int event)
        switch (event) {
                case LED_POWER_ON:
-                        set_led_bit(hfc, driver_info->led_bits[0],
+                        set_led_bit(hfc, driver_info->led_bits[0], 0);
-                                    0);
+                        set_led_bit(hfc, driver_info->led_bits[1], 1);
-                        set_led_bit(hfc, driver_info->led_bits[1],
+                        set_led_bit(hfc, driver_info->led_bits[2], 1);
-                                    1);
+                        set_led_bit(hfc, driver_info->led_bits[3], 1);
-                        set_led_bit(hfc, driver_info->led_bits[2],
-                                    1);
-                        set_led_bit(hfc, driver_info->led_bits[3],
-                                    1);
                        break;
-                case LED_POWER_OFF:     /* no Power off handling */
+                case LED_POWER_OFF:
+                        set_led_bit(hfc, driver_info->led_bits[0], 1);
+                        set_led_bit(hfc, driver_info->led_bits[1], 1);
+                        set_led_bit(hfc, driver_info->led_bits[2], 1);
+                        set_led_bit(hfc, driver_info->led_bits[3], 1);
                        break;
                case LED_S0_ON:
-                        set_led_bit(hfc, driver_info->led_bits[1],
+                        set_led_bit(hfc, driver_info->led_bits[1], 0);
-                                    0);
                        break;
                case LED_S0_OFF:
-                        set_led_bit(hfc, driver_info->led_bits[1],
+                        set_led_bit(hfc, driver_info->led_bits[1], 1);
-                                    1);
                        break;
                case LED_B1_ON:
-                        set_led_bit(hfc, driver_info->led_bits[2],
+                        set_led_bit(hfc, driver_info->led_bits[2], 0);
-                                    0);
                        break;
                case LED_B1_OFF:
-                        set_led_bit(hfc, driver_info->led_bits[2],
+                        set_led_bit(hfc, driver_info->led_bits[2], 1);
-                                    1);
                        break;
                case LED_B2_ON:
-                        set_led_bit(hfc, driver_info->led_bits[3],
+                        set_led_bit(hfc, driver_info->led_bits[3], 0);
-                                    0);
                        break;
                case LED_B2_OFF:
-                        set_led_bit(hfc, driver_info->led_bits[3],
+                        set_led_bit(hfc, driver_info->led_bits[3], 1);
-                                    1);
                        break;
        }
        write_led(hfc, hfc->led_state);
 }
-/********************************/
+/* ISDN l1 timer T3 expires */
-/* called when timer t3 expires */
-/********************************/
 static void
 l1_timer_expire_t3(hfcusb_data * hfc)
 {
        hfc->d_if.ifc.l1l2(&hfc->d_if.ifc, PH_DEACTIVATE | INDICATION,
                           NULL);
-#ifdef CONFIG_HISAX_DEBUG
-        DBG(ISDN_DBG,
+        DBG(HFCUSB_DBG_STATES,
            "HFC-S USB: PH_DEACTIVATE | INDICATION sent (T3 expire)");
-#endif
-        hfc->l1_activated = false;
+        hfc->l1_activated = 0;
        handle_led(hfc, LED_S0_OFF);
        /* deactivate : */
        queue_control_request(hfc, HFCUSB_STATES, 0x10, 1);
        queue_control_request(hfc, HFCUSB_STATES, 3, 1);
 }
-/********************************/
+/* ISDN l1 timer T4 expires */
-/* called when timer t4 expires */
-/********************************/
 static void
 l1_timer_expire_t4(hfcusb_data * hfc)
 {
        hfc->d_if.ifc.l1l2(&hfc->d_if.ifc, PH_DEACTIVATE | INDICATION,
                           NULL);
-#ifdef CONFIG_HISAX_DEBUG
-        DBG(ISDN_DBG,
+        DBG(HFCUSB_DBG_STATES,
            "HFC-S USB: PH_DEACTIVATE | INDICATION sent (T4 expire)");
-#endif
-        hfc->l1_activated = false;
+        hfc->l1_activated = 0;
        handle_led(hfc, LED_S0_OFF);
 }
-/*****************************/
+/* S0 state changed */
-/* handle S0 state changes   */
-/*****************************/
 static void
-state_handler(hfcusb_data * hfc, __u8 state)
+s0_state_handler(hfcusb_data * hfc, __u8 state)
 {
        __u8 old_state;
@@ -425,38 +378,29 @@ state_handler(hfcusb_data * hfc, __u8 state)
        if (state == old_state || state < 1 || state > 8)
                return;
-#ifdef CONFIG_HISAX_DEBUG
+        DBG(HFCUSB_DBG_STATES, "HFC-S USB: S0 statechange(%d -> %d)",
-        DBG(ISDN_DBG, "HFC-S USB: new S0 state:%d old_state:%d", state,
+            old_state, state);
-            old_state);
-#endif
        if (state < 4 || state == 7 || state == 8) {
                if (timer_pending(&hfc->t3_timer))
                        del_timer(&hfc->t3_timer);
-#ifdef CONFIG_HISAX_DEBUG
+                DBG(HFCUSB_DBG_STATES, "HFC-S USB: T3 deactivated");
-                DBG(ISDN_DBG, "HFC-S USB: T3 deactivated");
-#endif
        }
        if (state >= 7) {
                if (timer_pending(&hfc->t4_timer))
                        del_timer(&hfc->t4_timer);
-#ifdef CONFIG_HISAX_DEBUG
+                DBG(HFCUSB_DBG_STATES, "HFC-S USB: T4 deactivated");
-                DBG(ISDN_DBG, "HFC-S USB: T4 deactivated");
-#endif
        }
        if (state == 7 && !hfc->l1_activated) {
                hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,
                                   PH_ACTIVATE | INDICATION, NULL);
-#ifdef CONFIG_HISAX_DEBUG
+                DBG(HFCUSB_DBG_STATES, "HFC-S USB: PH_ACTIVATE | INDICATION sent");
-                DBG(ISDN_DBG, "HFC-S USB: PH_ACTIVATE | INDICATION sent");
+                hfc->l1_activated = 1;
-#endif
-                hfc->l1_activated = true;
                handle_led(hfc, LED_S0_ON);
        } else if (state <= 3 /* && activated */ ) {
                if (old_state == 7 || old_state == 8) {
-#ifdef CONFIG_HISAX_DEBUG
+                        DBG(HFCUSB_DBG_STATES, "HFC-S USB: T4 activated");
-                        DBG(ISDN_DBG, "HFC-S USB: T4 activated");
-#endif
                        if (!timer_pending(&hfc->t4_timer)) {
                                hfc->t4_timer.expires =
                                    jiffies + (HFC_TIMER_T4 * HZ) / 1000;
@@ -466,18 +410,15 @@ state_handler(hfcusb_data * hfc, __u8 state)
                        hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,
                                           PH_DEACTIVATE | INDICATION,
                                           NULL);
-#ifdef CONFIG_HISAX_DEBUG
+                        DBG(HFCUSB_DBG_STATES,
-                        DBG(ISDN_DBG,
                            "HFC-S USB: PH_DEACTIVATE | INDICATION sent");
-#endif
+                        hfc->l1_activated = 0;
-                        hfc->l1_activated = false;
                        handle_led(hfc, LED_S0_OFF);
                }
        }
        hfc->l1_state = state;
 }
-/* prepare iso urb */
 static void
 fill_isoc_urb(struct urb *urb, struct usb_device *dev, unsigned int pipe,
              void *buf, int num_packets, int packet_size, int interval,
@@ -503,15 +444,16 @@ fill_isoc_urb(struct urb *urb, struct usb_device *dev, unsigned int pipe,
 }
 /* allocs urbs and start isoc transfer with two pending urbs to avoid
-   gaps in the transfer chain */
+ * gaps in the transfer chain
+ */
 static int
 start_isoc_chain(usb_fifo * fifo, int num_packets_per_urb,
                 usb_complete_t complete, int packet_size)
 {
        int i, k, errcode;
-        printk(KERN_INFO "HFC-S USB: starting ISO-chain for Fifo %i\n",
+        DBG(HFCUSB_DBG_INIT, "HFC-S USB: starting ISO-URBs for fifo:%d\n",
-               fifo->fifonum);
+            fifo->fifonum);
        /* allocate Memory for Iso out Urbs */
        for (i = 0; i < 2; i++) {
@@ -556,10 +498,9 @@ start_isoc_chain(usb_fifo * fifo, int num_packets_per_urb,
                errcode = usb_submit_urb(fifo->iso[i].purb, GFP_KERNEL);
                fifo->active = (errcode >= 0) ? 1 : 0;
-                if (errcode < 0) {
+                if (errcode < 0)
-                        printk(KERN_INFO "HFC-S USB: %s  URB nr:%d\n",
+                        printk(KERN_INFO "HFC-S USB: usb_submit_urb URB nr:%d, error(%i): '%s'\n",
-                               symbolic(urb_errlist, errcode), i);
+                               i, errcode, symbolic(urb_errlist, errcode));
-                };
        }
        return (fifo->active);
 }
@@ -572,16 +513,15 @@ stop_isoc_chain(usb_fifo * fifo)
        for (i = 0; i < 2; i++) {
                if (fifo->iso[i].purb) {
-#ifdef CONFIG_HISAX_DEBUG
+                        DBG(HFCUSB_DBG_INIT,
-                        DBG(USB_DBG,
                            "HFC-S USB: Stopping iso chain for fifo %i.%i",
                            fifo->fifonum, i);
-#endif
                        usb_kill_urb(fifo->iso[i].purb);
                        usb_free_urb(fifo->iso[i].purb);
                        fifo->iso[i].purb = NULL;
                }
        }
        usb_kill_urb(fifo->urb);
        usb_free_urb(fifo->urb);
        fifo->urb = NULL;
@@ -594,9 +534,6 @@ static int iso_packets[8] =
        ISOC_PACKETS_D, ISOC_PACKETS_D, ISOC_PACKETS_D, ISOC_PACKETS_D
 };
-/*****************************************************/
-/* transmit completion routine for all ISO tx fifos */
-/*****************************************************/
 static void
 tx_iso_complete(struct urb *urb)
 {
@@ -607,20 +544,38 @@ tx_iso_complete(struct urb *urb)
            errcode;
        int frame_complete, transp_mode, fifon, status;
        __u8 threshbit;
-        __u8 threshtable[8] = { 1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80 };
        fifon = fifo->fifonum;
        status = urb->status;
        tx_offset = 0;
+        /* ISO transfer only partially completed,
+           look at individual frame status for details */
+        if (status == -EXDEV) {
+                DBG(HFCUSB_DBG_VERBOSE_USB, "HFC-S USB: tx_iso_complete with -EXDEV"
+                    ", urb->status %d, fifonum %d\n",
+                    status, fifon);
+                for (k = 0; k < iso_packets[fifon]; ++k) {
+                        errcode = urb->iso_frame_desc[k].status;
+                        if (errcode)
+                                DBG(HFCUSB_DBG_VERBOSE_USB, "HFC-S USB: tx_iso_complete "
+                                       "packet %i, status: %i\n",
+                                       k, errcode);
+                }
+                // clear status, so go on with ISO transfers
+                status = 0;
+        }
        if (fifo->active && !status) {
                transp_mode = 0;
                if (fifon < 4 && hfc->b_mode[fifon / 2] == L1_MODE_TRANS)
-                        transp_mode = true;
+                        transp_mode = 1;
                /* is FifoFull-threshold set for our channel? */
-                threshbit = threshtable[fifon] & hfc->threshold_mask;
+                threshbit = (hfc->threshold_mask & (1 << fifon));
                num_isoc_packets = iso_packets[fifon];
                /* predict dataflow to avoid fifo overflow */
@@ -635,8 +590,9 @@ tx_iso_complete(struct urb *urb)
                              tx_iso_complete, urb->context);
                memset(context_iso_urb->buffer, 0,
                       sizeof(context_iso_urb->buffer));
-                frame_complete = false;
+                frame_complete = 0;
-                /* Generate next Iso Packets */
+                /* Generate next ISO Packets */
                for (k = 0; k < num_isoc_packets; ++k) {
                        if (fifo->skbuff) {
                                len = fifo->skbuff->len;
@@ -661,7 +617,7 @@ tx_iso_complete(struct urb *urb)
                                                /* add 2 byte flags and 16bit CRC at end of ISDN frame */
                                                fifo->bit_line += 32;
                                        }
-                                        frame_complete = true;
+                                        frame_complete = 1;
                                }
                                memcpy(context_iso_urb->buffer +
@@ -688,7 +644,7 @@ tx_iso_complete(struct urb *urb)
                        }
                        if (frame_complete) {
-                                fifo->delete_flg = true;
+                                fifo->delete_flg = 1;
                                fifo->hif->l1l2(fifo->hif,
                                                PH_DATA | CONFIRM,
                                                (void *) (unsigned long) fifo->skbuff->
@@ -696,30 +652,26 @@ tx_iso_complete(struct urb *urb)
                                if (fifo->skbuff && fifo->delete_flg) {
                                        dev_kfree_skb_any(fifo->skbuff);
                                        fifo->skbuff = NULL;
-                                        fifo->delete_flg = false;
+                                        fifo->delete_flg = 0;
                                }
-                                frame_complete = false;
+                                frame_complete = 0;
                        }
                }
                errcode = usb_submit_urb(urb, GFP_ATOMIC);
                if (errcode < 0) {
                        printk(KERN_INFO
-                               "HFC-S USB: error submitting ISO URB: %d \n",
+                               "HFC-S USB: error submitting ISO URB: %d\n",
                               errcode);
                }
        } else {
                if (status && !hfc->disc_flag) {
                        printk(KERN_INFO
-                               "HFC-S USB: tx_iso_complete : urb->status %s (%i), fifonum=%d\n",
+                               "HFC-S USB: tx_iso_complete: error(%i): '%s', fifonum=%d\n",
-                               symbolic(urb_errlist, status), status,
+                               status, symbolic(urb_errlist, status), fifon);
-                               fifon);
                }
        }
-}                               /* tx_iso_complete */
+}
-/*****************************************************/
-/* receive completion routine for all ISO tx fifos   */
-/*****************************************************/
 static void
 rx_iso_complete(struct urb *urb)
 {
@@ -731,21 +683,25 @@ rx_iso_complete(struct urb *urb)
        unsigned int iso_status;
        __u8 *buf;
        static __u8 eof[8];
-#ifdef CONFIG_HISAX_DEBUG
-        __u8 i;
-#endif
        fifon = fifo->fifonum;
        status = urb->status;
        if (urb->status == -EOVERFLOW) {
-#ifdef CONFIG_HISAX_DEBUG
+                DBG(HFCUSB_DBG_VERBOSE_USB,
-                DBG(USB_DBG,
+                    "HFC-USB: ignoring USB DATAOVERRUN fifo(%i)", fifon);
-                    "HFC-USB: ignoring USB DATAOVERRUN  for fifo  %i \n",
+                status = 0;
-                    fifon);
+        }
-#endif
+        /* ISO transfer only partially completed,
+           look at individual frame status for details */
+        if (status == -EXDEV) {
+                DBG(HFCUSB_DBG_VERBOSE_USB, "HFC-S USB: rx_iso_complete with -EXDEV "
+                    "urb->status %d, fifonum %d\n",
+                    status, fifon);
                status = 0;
        }
        if (fifo->active && !status) {
                num_isoc_packets = iso_packets[fifon];
                maxlen = fifo->usb_packet_maxlen;
@@ -754,40 +710,38 @@ rx_iso_complete(struct urb *urb)
                        offset = urb->iso_frame_desc[k].offset;
                        buf = context_iso_urb->buffer + offset;
                        iso_status = urb->iso_frame_desc[k].status;
-#ifdef CONFIG_HISAX_DEBUG
                        if (iso_status && !hfc->disc_flag)
-                                DBG(USB_DBG,
+                                DBG(HFCUSB_DBG_VERBOSE_USB,
-                                    "HFC-S USB: ISO packet failure - status:%x",
+                                    "HFC-S USB: rx_iso_complete "
-                                    iso_status);
+                                    "ISO packet %i, status: %i\n",
+                                    k, iso_status);
-                        if ((fifon == 5) && (debug > 1)) {
+                        if (fifon == HFCUSB_D_RX) {
-                                printk(KERN_INFO
+                                DBG(HFCUSB_DBG_VERBOSE_USB,
                                       "HFC-S USB: ISO-D-RX lst_urblen:%2d "
-                                       "act_urblen:%2d max-urblen:%2d "
+                                       "act_urblen:%2d max-urblen:%2d EOF:0x%0x",
-                                       "EOF:0x%0x DATA: ",
                                       fifo->last_urblen, len, maxlen,
                                       eof[5]);
-                                for (i = 0; i < len; i++)
-                                        printk("%.2x ", buf[i]);
+                                DBG_PACKET(HFCUSB_DBG_VERBOSE_USB, buf, len);
-                                printk("\n");
                        }
-#endif
                        if (fifo->last_urblen != maxlen) {
                                /* the threshold mask is in the 2nd status byte */
                                hfc->threshold_mask = buf[1];
                                /* care for L1 state only for D-Channel
                                   to avoid overlapped iso completions */
-                                if (fifon == 5) {
+                                if (fifon == HFCUSB_D_RX) {
                                        /* the S0 state is in the upper half
                                           of the 1st status byte */
-                                        state_handler(hfc, buf[0] >> 4);
+                                        s0_state_handler(hfc, buf[0] >> 4);
                                }
                                eof[fifon] = buf[0] & 1;
                                if (len > 2)
                                        collect_rx_frame(fifo, buf + 2,
                                                         len - 2,
-                                                         (len <
+                                                         (len < maxlen) ?
-                                                          maxlen) ?
                                                         eof[fifon] : 0);
                        } else {
                                collect_rx_frame(fifo, buf, len,
@@ -804,41 +758,37 @@ rx_iso_complete(struct urb *urb)
                              rx_iso_complete, urb->context);
                errcode = usb_submit_urb(urb, GFP_ATOMIC);
                if (errcode < 0) {
-                        printk(KERN_INFO
+                        printk(KERN_ERR
-                               "HFC-S USB: error submitting ISO URB: %d \n",
+                               "HFC-S USB: error submitting ISO URB: %d\n",
                               errcode);
                }
        } else {
                if (status && !hfc->disc_flag) {
-                        printk(KERN_INFO
+                        printk(KERN_ERR
                               "HFC-S USB: rx_iso_complete : "
                               "urb->status %d, fifonum %d\n",
                               status, fifon);
                }
        }
-}                               /* rx_iso_complete */
+}
-/*****************************************************/
+/* collect rx data from INT- and ISO-URBs  */
-/* collect data from interrupt or isochron in        */
-/*****************************************************/
 static void
 collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
 {
        hfcusb_data *hfc = fifo->hfc;
        int transp_mode, fifon;
-#ifdef CONFIG_HISAX_DEBUG
-        int i;
-#endif
        fifon = fifo->fifonum;
        transp_mode = 0;
        if (fifon < 4 && hfc->b_mode[fifon / 2] == L1_MODE_TRANS)
-                transp_mode = true;
+                transp_mode = 1;
        if (!fifo->skbuff) {
                fifo->skbuff = dev_alloc_skb(fifo->max_size + 3);
                if (!fifo->skbuff) {
-                        printk(KERN_INFO
+                        printk(KERN_ERR
-                               "HFC-S USB: cannot allocate buffer (dev_alloc_skb) fifo:%d\n",
+                               "HFC-S USB: cannot allocate buffer for fifo(%d)\n",
                               fifon);
                        return;
                }
@@ -847,17 +797,11 @@ collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
                if (fifo->skbuff->len + len < fifo->max_size) {
                        memcpy(skb_put(fifo->skbuff, len), data, len);
                } else {
-#ifdef CONFIG_HISAX_DEBUG
+                        DBG(HFCUSB_DBG_FIFO_ERR,
-                        printk(KERN_INFO "HFC-S USB: ");
+                               "HCF-USB: got frame exceeded fifo->max_size(%d) fifo(%d)",
-                        for (i = 0; i < 15; i++)
-                                printk("%.2x ",
-                                       fifo->skbuff->data[fifo->skbuff->
-                                                          len - 15 + i]);
-                        printk("\n");
-#endif
-                        printk(KERN_INFO
-                               "HCF-USB: got frame exceeded fifo->max_size:%d on fifo:%d\n",
                               fifo->max_size, fifon);
+                        DBG_SKB(HFCUSB_DBG_VERBOSE_USB, fifo->skbuff);
+                        skb_trim(fifo->skbuff, 0);
                }
        }
        if (transp_mode && fifo->skbuff->len >= 128) {
@@ -870,6 +814,13 @@ collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
        if (finish) {
                if ((!fifo->skbuff->data[fifo->skbuff->len - 1])
                    && (fifo->skbuff->len > 3)) {
+                        if (fifon == HFCUSB_D_RX) {
+                                DBG(HFCUSB_DBG_DCHANNEL,
+                                    "HFC-S USB: D-RX len(%d)", fifo->skbuff->len);
+                                DBG_SKB(HFCUSB_DBG_DCHANNEL, fifo->skbuff);
+                        }
                        /* remove CRC & status */
                        skb_trim(fifo->skbuff, fifo->skbuff->len - 3);
                        if (fifon == HFCUSB_PCM_RX) {
@@ -882,39 +833,17 @@ collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
                                                fifo->skbuff);
                        fifo->skbuff = NULL;    /* buffer was freed from upper layer */
                } else {
-                        if (fifo->skbuff->len > 3) {
+                        DBG(HFCUSB_DBG_FIFO_ERR,
-                                printk(KERN_INFO
+                            "HFC-S USB: ERROR frame len(%d) fifo(%d)",
-                                       "HFC-S USB: got frame %d bytes but CRC ERROR on fifo:%d!!!\n",
+                            fifo->skbuff->len, fifon);
-                                       fifo->skbuff->len, fifon);
+                        DBG_SKB(HFCUSB_DBG_VERBOSE_USB, fifo->skbuff);
-#ifdef CONFIG_HISAX_DEBUG
-                                if (debug > 1) {
-                                        printk(KERN_INFO "HFC-S USB: ");
-                                        for (i = 0; i < 15; i++)
-                                                printk("%.2x ",
-                                                       fifo->skbuff->
-                                                       data[fifo->skbuff->
-                                                            len - 15 + i]);
-                                        printk("\n");
-                                }
-#endif
-                        }
-#ifdef CONFIG_HISAX_DEBUG
-                        else {
-                                printk(KERN_INFO
-                                       "HFC-S USB: frame to small (%d bytes)!!!\n",
-                                       fifo->skbuff->len);
-                        }
-#endif
                        skb_trim(fifo->skbuff, 0);
                }
        }
 }
-/***********************************************/
-/* receive completion routine for all rx fifos */
-/***********************************************/
 static void
-rx_complete(struct urb *urb)
+rx_int_complete(struct urb *urb)
 {
        int len;
        int status;
@@ -922,18 +851,14 @@ rx_complete(struct urb *urb)
        usb_fifo *fifo = (usb_fifo *) urb->context;
        hfcusb_data *hfc = fifo->hfc;
        static __u8 eof[8];
-#ifdef CONFIG_HISAX_DEBUG
-        __u8 i;
-#endif
        urb->dev = hfc->dev;    /* security init */
        fifon = fifo->fifonum;
        if ((!fifo->active) || (urb->status)) {
-#ifdef CONFIG_HISAX_DEBUG
+                DBG(HFCUSB_DBG_INIT, "HFC-S USB: RX-Fifo %i is going down (%i)",
-                DBG(USB_DBG, "HFC-S USB: RX-Fifo %i is going down (%i)",
                    fifon, urb->status);
-#endif
                fifo->urb->interval = 0;        /* cancel automatic rescheduling */
                if (fifo->skbuff) {
                        dev_kfree_skb_any(fifo->skbuff);
@@ -945,22 +870,20 @@ rx_complete(struct urb *urb)
        buf = fifo->buffer;
        maxlen = fifo->usb_packet_maxlen;
-#ifdef CONFIG_HISAX_DEBUG
+        if (fifon == HFCUSB_D_RX) {
-        if ((fifon == 5) && (debug > 1)) {
+                DBG(HFCUSB_DBG_VERBOSE_USB,
-                printk(KERN_INFO
+                       "HFC-S USB: INT-D-RX lst_urblen:%2d "
-                       "HFC-S USB: INT-D-RX lst_urblen:%2d act_urblen:%2d max-urblen:%2d EOF:0x%0x DATA: ",
+                       "act_urblen:%2d max-urblen:%2d EOF:0x%0x",
-                       fifo->last_urblen, len, maxlen, eof[5]);
+                       fifo->last_urblen, len, maxlen,
-                for (i = 0; i < len; i++)
+                       eof[5]);
-                        printk("%.2x ", buf[i]);
+                DBG_PACKET(HFCUSB_DBG_VERBOSE_USB, buf, len);
-                printk("\n");
        }
-#endif
        if (fifo->last_urblen != fifo->usb_packet_maxlen) {
                /* the threshold mask is in the 2nd status byte */
                hfc->threshold_mask = buf[1];
                /* the S0 state is in the upper half of the 1st status byte */
-                state_handler(hfc, buf[0] >> 4);
+                s0_state_handler(hfc, buf[0] >> 4);
                eof[fifon] = buf[0] & 1;
                /* if we have more than the 2 status bytes -> collect data */
                if (len > 2)
@@ -975,20 +898,19 @@ rx_complete(struct urb *urb)
        status = usb_submit_urb(urb, GFP_ATOMIC);
        if (status) {
                printk(KERN_INFO
-                       "HFC-S USB: error resubmitting URN at rx_complete...\n");
+                       "HFC-S USB: %s error resubmitting URB fifo(%d)\n",
+                       __FUNCTION__, fifon);
        }
-}                               /* rx_complete */
+}
-/***************************************************/
+/* start initial INT-URB for certain fifo */
-/* start the interrupt transfer for the given fifo */
-/***************************************************/
 static void
 start_int_fifo(usb_fifo * fifo)
 {
        int errcode;
-        printk(KERN_INFO "HFC-S USB: starting intr IN fifo:%d\n",
+        DBG(HFCUSB_DBG_INIT, "HFC-S USB: starting RX INT-URB for fifo:%d\n",
-               fifo->fifonum);
+            fifo->fifonum);
        if (!fifo->urb) {
                fifo->urb = usb_alloc_urb(0, GFP_KERNEL);
@@ -997,33 +919,28 @@ start_int_fifo(usb_fifo * fifo)
        }
        usb_fill_int_urb(fifo->urb, fifo->hfc->dev, fifo->pipe,
                         fifo->buffer, fifo->usb_packet_maxlen,
-                         rx_complete, fifo, fifo->intervall);
+                         rx_int_complete, fifo, fifo->intervall);
        fifo->active = 1;       /* must be marked active */
        errcode = usb_submit_urb(fifo->urb, GFP_KERNEL);
        if (errcode) {
-                printk(KERN_INFO
+                printk(KERN_ERR
                       "HFC-S USB: submit URB error(start_int_info): status:%i\n",
                       errcode);
                fifo->active = 0;
                fifo->skbuff = NULL;
        }
-}                               /* start_int_fifo */
+}
-/*****************************/
-/* set the B-channel mode    */
-/*****************************/
 static void
-set_hfcmode(hfcusb_data * hfc, int channel, int mode)
+setup_bchannel(hfcusb_data * hfc, int channel, int mode)
 {
        __u8 val, idx_table[2] = { 0, 2 };
        if (hfc->disc_flag) {
                return;
        }
-#ifdef CONFIG_HISAX_DEBUG
+        DBG(HFCUSB_DBG_STATES, "HFC-S USB: setting channel %d to mode %d",
-        DBG(ISDN_DBG, "HFC-S USB: setting channel %d to mode %d", channel,
+            channel, mode);
-            mode);
-#endif
        hfc->b_mode[channel] = mode;
        /* setup CON_HDLC */
@@ -1080,20 +997,17 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
        switch (pr) {
                case PH_ACTIVATE | REQUEST:
                        if (fifo->fifonum == HFCUSB_D_TX) {
-#ifdef CONFIG_HISAX_DEBUG
+                                DBG(HFCUSB_DBG_STATES,
-                                DBG(ISDN_DBG,
                                    "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_ACTIVATE | REQUEST");
-#endif
                                if (hfc->l1_state != 3
                                    && hfc->l1_state != 7) {
                                        hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,
                                                           PH_DEACTIVATE |
                                                           INDICATION,
                                                           NULL);
-#ifdef CONFIG_HISAX_DEBUG
+                                        DBG(HFCUSB_DBG_STATES,
-                                        DBG(ISDN_DBG,
                                            "HFC-S USB: PH_DEACTIVATE | INDICATION sent (not state 3 or 7)");
-#endif
                                } else {
                                        if (hfc->l1_state == 7) {       /* l1 already active */
                                                hfc->d_if.ifc.l1l2(&hfc->
@@ -1103,10 +1017,8 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
                                                                   |
                                                                   INDICATION,
                                                                   NULL);
-#ifdef CONFIG_HISAX_DEBUG
+                                                DBG(HFCUSB_DBG_STATES,
-                                                DBG(ISDN_DBG,
                                                    "HFC-S USB: PH_ACTIVATE | INDICATION sent again ;)");
-#endif
                                        } else {
                                                /* force sending sending INFO1 */
                                                queue_control_request(hfc,
@@ -1132,11 +1044,9 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
                                        }
                                }
                        } else {
-#ifdef CONFIG_HISAX_DEBUG
+                                DBG(HFCUSB_DBG_STATES,
-                                DBG(ISDN_DBG,
+                                    "HFC_USB: hfc_usb_d_l2l1 B-chan: PH_ACTIVATE | REQUEST");
-                                    "HFC_USB: hfc_usb_d_l2l1 Bx-chan: PH_ACTIVATE | REQUEST");
+                                setup_bchannel(hfc,
-#endif
-                                set_hfcmode(hfc,
                                            (fifo->fifonum ==
                                             HFCUSB_B1_TX) ? 0 : 1,
                                            (long) arg);
@@ -1147,18 +1057,12 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
                        break;
                case PH_DEACTIVATE | REQUEST:
                        if (fifo->fifonum == HFCUSB_D_TX) {
-#ifdef CONFIG_HISAX_DEBUG
+                                DBG(HFCUSB_DBG_STATES,
-                                DBG(ISDN_DBG,
                                    "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_DEACTIVATE | REQUEST");
-#endif
-                                printk(KERN_INFO
-                                       "HFC-S USB: ISDN TE device should not deativate...\n");
                        } else {
-#ifdef CONFIG_HISAX_DEBUG
+                                DBG(HFCUSB_DBG_STATES,
-                                DBG(ISDN_DBG,
                                    "HFC_USB: hfc_usb_d_l2l1 Bx-chan: PH_DEACTIVATE | REQUEST");
-#endif
+                                setup_bchannel(hfc,
-                                set_hfcmode(hfc,
                                            (fifo->fifonum ==
                                             HFCUSB_B1_TX) ? 0 : 1,
                                            (int) L1_MODE_NULL);
@@ -1171,25 +1075,20 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
                        if (fifo->skbuff && fifo->delete_flg) {
                                dev_kfree_skb_any(fifo->skbuff);
                                fifo->skbuff = NULL;
-                                fifo->delete_flg = false;
+                                fifo->delete_flg = 0;
                        }
                        fifo->skbuff = arg;     /* we have a new buffer */
                        break;
                default:
-                        printk(KERN_INFO
+                        DBG(HFCUSB_DBG_STATES,
-                               "HFC_USB: hfc_usb_d_l2l1: unkown state : %#x\n",
+                               "HFC_USB: hfc_usb_d_l2l1: unkown state : %#x", pr);
-                               pr);
                        break;
        }
 }
-/***************************************************************************/
+/* initial init HFC-S USB chip registers, HiSax interface, USB URBs */
-/* usb_init is called once when a new matching device is detected to setup */
-/* main parameters. It registers the driver at the main hisax module.      */
-/* on success 0 is returned.                                               */
-/***************************************************************************/
 static int
-usb_init(hfcusb_data * hfc)
+hfc_usb_init(hfcusb_data * hfc)
 {
        usb_fifo *fifo;
        int i, err;
@@ -1214,11 +1113,11 @@ usb_init(hfcusb_data * hfc)
        /* aux = output, reset off */
        write_usb(hfc, HFCUSB_CIRM, 0x10);
-        /* set USB_SIZE to match the wMaxPacketSize for INT or BULK transfers */
+        /* set USB_SIZE to match wMaxPacketSize for INT or BULK transfers */
        write_usb(hfc, HFCUSB_USB_SIZE,
                  (hfc->packet_size / 8) | ((hfc->packet_size / 8) << 4));
-        /* set USB_SIZE_I to match the wMaxPacketSize for ISO transfers */
+        /* set USB_SIZE_I to match wMaxPacketSize for ISO transfers */
        write_usb(hfc, HFCUSB_USB_SIZE_I, hfc->iso_packet_size);
        /* enable PCM/GCI master mode */
@@ -1257,8 +1156,8 @@ usb_init(hfcusb_data * hfc)
        hfc->b_mode[0] = L1_MODE_NULL;
        hfc->b_mode[1] = L1_MODE_NULL;
-        hfc->l1_activated = false;
+        hfc->l1_activated = 0;
-        hfc->disc_flag = false;
+        hfc->disc_flag = 0;
        hfc->led_state = 0;
        hfc->led_new_data = 0;
        hfc->old_led_state = 0;
@@ -1349,11 +1248,9 @@ usb_init(hfcusb_data * hfc)
        handle_led(hfc, LED_POWER_ON);
        return (0);
-}                               /* usb_init */
+}
-/*************************************************/
+/* initial callback for each plugged USB device */
-/* function called to probe a new plugged device */
-/*************************************************/
 static int
 hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
@@ -1378,11 +1275,6 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                }
        }
-#ifdef CONFIG_HISAX_DEBUG
-        DBG(USB_DBG,
-            "HFC-USB: probing interface(%d) actalt(%d) minor(%d)\n", ifnum,
-            iface->desc.bAlternateSetting, intf->minor);
-#endif
        printk(KERN_INFO
               "HFC-S USB: probing interface(%d) actalt(%d) minor(%d)\n",
               ifnum, iface->desc.bAlternateSetting, intf->minor);
@@ -1403,15 +1295,11 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                        /* check for config EOL element */
                        while (validconf[cfg_used][0]) {
-                                cfg_found = true;
+                                cfg_found = 1;
                                vcf = validconf[cfg_used];
                                /* first endpoint descriptor */
                                ep = iface->endpoint;
-#ifdef CONFIG_HISAX_DEBUG
-                                DBG(USB_DBG,
-                                    "HFC-S USB: (if=%d alt=%d cfg_used=%d)\n",
-                                    ifnum, probe_alt_setting, cfg_used);
-#endif
                                memcpy(cmptbl, vcf, 16 * sizeof(int));
                                /* check for all endpoints in this alternate setting */
@@ -1425,7 +1313,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                                idx++;
                                        attr = ep->desc.bmAttributes;
                                        if (cmptbl[idx] == EP_NUL) {
-                                                cfg_found = false;
+                                                cfg_found = 0;
                                        }
                                        if (attr == USB_ENDPOINT_XFER_INT
                                            && cmptbl[idx] == EP_INT)
@@ -1438,16 +1326,9 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                                cmptbl[idx] = EP_NUL;
                                        /* check if all INT endpoints match minimum interval */
-                                        if (attr == USB_ENDPOINT_XFER_INT
+                                        if ((attr == USB_ENDPOINT_XFER_INT)
-                                            && ep->desc.bInterval <
+                                            && (ep->desc.bInterval < vcf[17])) {
-                                            vcf[17]) {
+                                                cfg_found = 0;
-#ifdef CONFIG_HISAX_DEBUG
-                                                if (cfg_found)
-                                                        DBG(USB_DBG,
-                                                            "HFC-S USB: Interrupt Endpoint interval < %d found - skipping config",
-                                                            vcf[17]);
-#endif
-                                                cfg_found = false;
                                        }
                                        ep++;
                                }
@@ -1455,7 +1336,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                        /* all entries must be EP_NOP or EP_NUL for a valid config */
                                        if (cmptbl[i] != EP_NOP
                                            && cmptbl[i] != EP_NUL)
-                                                cfg_found = false;
+                                                cfg_found = 0;
                                }
                                if (cfg_found) {
                                        if (cfg_used < small_match) {
@@ -1464,23 +1345,16 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                                    probe_alt_setting;
                                                iface_used = iface;
                                        }
-#ifdef CONFIG_HISAX_DEBUG
-                                        DBG(USB_DBG,
-                                            "HFC-USB: small_match=%x %x\n",
-                                            small_match, alt_used);
-#endif
                                }
                                cfg_used++;
                        }
                        alt_idx++;
-                }               /* (alt_idx < intf->num_altsetting) */
+                } /* (alt_idx < intf->num_altsetting) */
                /* found a valid USB Ta Endpint config */
                if (small_match != 0xffff) {
                        iface = iface_used;
-                        if (!
+                        if (!(context = kzalloc(sizeof(hfcusb_data), GFP_KERNEL)))
-                            (context =
-                             kzalloc(sizeof(hfcusb_data), GFP_KERNEL)))
                                return (-ENOMEM);       /* got no mem */
                        ep = iface->endpoint;
@@ -1613,20 +1487,15 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                            driver_info;
                        printk(KERN_INFO "HFC-S USB: detected \"%s\"\n",
                               driver_info->vend_name);
-#ifdef CONFIG_HISAX_DEBUG
-                        DBG(USB_DBG,
+                        DBG(HFCUSB_DBG_INIT,
-                            "HFC-S USB: Endpoint-Config: %s (if=%d alt=%d)\n",
+                            "HFC-S USB: Endpoint-Config: %s (if=%d alt=%d), E-Channel(%d)",
                            conf_str[small_match], context->if_used,
-                            context->alt_used);
+                            context->alt_used,
-                        printk(KERN_INFO
+                            validconf[small_match][18]);
-                               "HFC-S USB: E-channel (\"ECHO:\") logging ");
-                        if (validconf[small_match][18])
-                                printk(" possible\n");
-                        else
-                                printk("NOT possible\n");
-#endif
                        /* init the chip and register the driver */
-                        if (usb_init(context)) {
+                        if (hfc_usb_init(context)) {
                                usb_kill_urb(context->ctrl_urb);
                                usb_free_urb(context->ctrl_urb);
                                context->ctrl_urb = NULL;
@@ -1643,17 +1512,19 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
        return (-EIO);
 }
-/****************************************************/
+/* callback for unplugged USB device */
-/* function called when an active device is removed */
-/****************************************************/
 static void
 hfc_usb_disconnect(struct usb_interface
                   *intf)
 {
        hfcusb_data *context = usb_get_intfdata(intf);
        int i;
+        handle_led(context, LED_POWER_OFF);
+        schedule_timeout((10 * HZ) / 1000);
        printk(KERN_INFO "HFC-S USB: device disconnect\n");
-        context->disc_flag = true;
+        context->disc_flag = 1;
        usb_set_intfdata(intf, NULL);
        if (!context)
                return;
@@ -1661,25 +1532,22 @@ hfc_usb_disconnect(struct usb_interface
                del_timer(&context->t3_timer);
        if (timer_pending(&context->t4_timer))
                del_timer(&context->t4_timer);
        /* tell all fifos to terminate */
        for (i = 0; i < HFCUSB_NUM_FIFOS; i++) {
                if (context->fifos[i].usb_transfer_mode == USB_ISOC) {
                        if (context->fifos[i].active > 0) {
                                stop_isoc_chain(&context->fifos[i]);
-#ifdef CONFIG_HISAX_DEBUG
+                                DBG(HFCUSB_DBG_INIT,
-                                DBG(USB_DBG,
+                                    "HFC-S USB: %s stopping ISOC chain Fifo(%i)",
-                                    "HFC-S USB: hfc_usb_disconnect: stopping ISOC chain Fifo no %i",
+                                    __FUNCTION__, i);
-                                    i);
-#endif
                        }
                } else {
                        if (context->fifos[i].active > 0) {
                                context->fifos[i].active = 0;
-#ifdef CONFIG_HISAX_DEBUG
+                                DBG(HFCUSB_DBG_INIT,
-                                DBG(USB_DBG,
+                                    "HFC-S USB: %s unlinking URB for Fifo(%i)",
-                                    "HFC-S USB: hfc_usb_disconnect: unlinking URB for Fifo no %i",
+                                    __FUNCTION__, i);
-                                    i);
-#endif
                        }
                        usb_kill_urb(context->fifos[i].urb);
                        usb_free_urb(context->fifos[i].urb);
@@ -1692,34 +1560,29 @@ hfc_usb_disconnect(struct usb_interface
        context->ctrl_urb = NULL;
        hisax_unregister(&context->d_if);
        kfree(context);         /* free our structure again */
-}                               /* hfc_usb_disconnect */
+}
-/************************************/
-/* our driver information structure */
-/************************************/
 static struct usb_driver hfc_drv = {
        .name  = "hfc_usb",
        .id_table = hfcusb_idtab,
        .probe = hfc_usb_probe,
        .disconnect = hfc_usb_disconnect,
 };
 static void __exit
-hfc_usb_exit(void)
+hfc_usb_mod_exit(void)
 {
-#ifdef CONFIG_HISAX_DEBUG
+        usb_deregister(&hfc_drv); /* release our driver */
-        DBG(USB_DBG, "HFC-S USB: calling \"hfc_usb_exit\" ...");
-#endif
-        usb_deregister(&hfc_drv);       /* release our driver */
        printk(KERN_INFO "HFC-S USB: module removed\n");
 }
 static int __init
-hfc_usb_init(void)
+hfc_usb_mod_init(void)
 {
+        char revstr[30], datestr[30], dummy[30];
 #ifndef CONFIG_HISAX_DEBUG
-        unsigned int debug = -1;
+        hfc_debug = debug;
 #endif
-        char revstr[30], datestr[30], dummy[30];
        sscanf(hfcusb_revision,
               "%s %s $ %s %s %s $ ", dummy, revstr,
               dummy, datestr, dummy);
@@ -1734,8 +1597,8 @@ hfc_usb_init(void)
        return (0);
 }
-module_init(hfc_usb_init);
+module_init(hfc_usb_mod_init);
-module_exit(hfc_usb_exit);
+module_exit(hfc_usb_mod_exit);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h
index 471f2354dfde..e79f56568d30 100644
--- a/drivers/isdn/hisax/hfc_usb.h
+++ b/drivers/isdn/hisax/hfc_usb.h
@@ -1,8 +1,8 @@
 /*
-* hfc_usb.h
+ * hfc_usb.h
-*
+ *
-* $Id: hfc_usb.h,v 4.2 2005/04/07 15:27:17 martinb1 Exp $
+ * $Id: hfc_usb.h,v 1.1.2.5 2007/08/20 14:36:03 mbachem Exp $
-*/
+ */
 #ifndef __HFC_USB_H__
 #define __HFC_USB_H__
@@ -10,25 +10,20 @@
 #define DRIVER_AUTHOR   "Peter Sprenger (sprenger@moving-byters.de)"
 #define DRIVER_DESC     "HFC-S USB based HiSAX ISDN driver"
-#define VERBOSE_USB_DEBUG
+#define HFC_CTRL_TIMEOUT        20      /* 5ms timeout writing/reading regs */
+#define HFC_TIMER_T3            8000    /* timeout for l1 activation timer */
+#define HFC_TIMER_T4            500     /* time for state change interval */
-/***********/
+#define HFCUSB_L1_STATECHANGE   0       /* L1 state changed */
-/* defines */
+#define HFCUSB_L1_DRX           1       /* D-frame received */
-/***********/
+#define HFCUSB_L1_ERX           2       /* E-frame received */
-#define HFC_CTRL_TIMEOUT 20     /* 5ms timeout writing/reading regs */
+#define HFCUSB_L1_DTX           4       /* D-frames completed */
-#define HFC_TIMER_T3 8000       /* timeout for l1 activation timer */
-#define HFC_TIMER_T4 500        /* time for state change interval */
-#define HFCUSB_L1_STATECHANGE 0 /* L1 state changed */
+#define MAX_BCH_SIZE            2048    /* allowed B-channel packet size */
-#define HFCUSB_L1_DRX 1         /* D-frame received */
-#define HFCUSB_L1_ERX 2         /* E-frame received */
-#define HFCUSB_L1_DTX 4         /* D-frames completed */
-#define MAX_BCH_SIZE 2048       /* allowed B-channel packet size */
+#define HFCUSB_RX_THRESHOLD     64      /* threshold for fifo report bit rx */
+#define HFCUSB_TX_THRESHOLD     64      /* threshold for fifo report bit tx */
-#define HFCUSB_RX_THRESHOLD 64  /* threshold for fifo report bit rx */
-#define HFCUSB_TX_THRESHOLD 64  /* threshold for fifo report bit tx */
 #define HFCUSB_CHIP_ID          0x16    /* Chip ID register index */
 #define HFCUSB_CIRM             0x00    /* cirm register index */
@@ -52,9 +47,8 @@
 #define HFCUSB_CHIPID           0x40    /* ID value of HFC-S USB */
-/******************/
 /* fifo registers */
-/******************/
 #define HFCUSB_NUM_FIFOS        8       /* maximum number of fifos */
 #define HFCUSB_B1_TX            0       /* index for B1 transmit bulk/int */
 #define HFCUSB_B1_RX            1       /* index for B1 receive bulk/int */
@@ -66,9 +60,9 @@
 #define HFCUSB_PCM_RX           7
 /*
-* used to switch snd_transfer_mode for different TA modes e.g. the Billion USB TA just
+ * used to switch snd_transfer_mode for different TA modes e.g. the Billion USB TA just
-* supports ISO out, while the Cologne Chip EVAL TA just supports BULK out
+ * supports ISO out, while the Cologne Chip EVAL TA just supports BULK out
-*/
+ */
 #define USB_INT         0
 #define USB_BULK        1
 #define USB_ISOC        2
@@ -77,49 +71,36 @@
 #define ISOC_PACKETS_B  8
 #define ISO_BUFFER_SIZE 128
-// ISO send definitions
+/* Fifo flow Control for TX ISO */
 #define SINK_MAX        68
 #define SINK_MIN        48
 #define SINK_DMIN       12
 #define SINK_DMAX       18
 #define BITLINE_INF     (-64*8)
+/* HFC-S USB register access by Control-URSs */
-/**********/
-/* macros */
-/**********/
 #define write_usb(a,b,c)usb_control_msg((a)->dev,(a)->ctrl_out_pipe,0,0x40,(c),(b),NULL,0,HFC_CTRL_TIMEOUT)
 #define read_usb(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_in_pipe,1,0xC0,0,(b),(c),1,HFC_CTRL_TIMEOUT)
-/*******************/
-/* Debugging Flags */
-/*******************/
-#define USB_DBG   1
-#define ISDN_DBG  2
-/* *********************/
-/* USB related defines */
-/***********************/
 #define HFC_CTRL_BUFSIZE 32
-/*************************************************/
 /* entry and size of output/input control buffer */
-/*************************************************/
 typedef struct {
        __u8 hfc_reg;           /* register number */
        __u8 reg_val;           /* value to be written (or read) */
        int action;             /* data for action handler */
 } ctrl_buft;
+/* Debugging Flags */
+#define HFCUSB_DBG_INIT         0x0001
+#define HFCUSB_DBG_STATES       0x0002
+#define HFCUSB_DBG_DCHANNEL     0x0080
+#define HFCUSB_DBG_FIFO_ERR     0x4000
+#define HFCUSB_DBG_VERBOSE_USB  0x8000
-/********************/
+/*
-/* URB error codes: */
+ * URB error codes:
-/********************/
+ * Used to represent a list of values and their respective symbolic names
-/* Used to represent a list of values and their respective symbolic names */
+ */
 struct hfcusb_symbolic_list {
        const int num;
        const char *name;
@@ -134,20 +115,20 @@ static struct hfcusb_symbolic_list urb_errlist[] = {
        {-ENXIO, "URB already queued"},
        {-EFBIG, "Too much ISO frames requested"},
        {-ENOSR, "Buffer error (overrun)"},
-        {-EPIPE, "Specified endpoint is stalled"},
+        {-EPIPE, "Specified endpoint is stalled (device not responding)"},
        {-EOVERFLOW, "Babble (bad cable?)"},
        {-EPROTO, "Bit-stuff error (bad cable?)"},
-        {-EILSEQ, "CRC or missing token"},
+        {-EILSEQ, "CRC/Timeout"},
-        {-ETIME, "Device did not respond"},
+        {-ETIMEDOUT, "NAK (device does not respond)"},
        {-ESHUTDOWN, "Device unplugged"},
        {-1, NULL}
 };
-/*****************************************************/
+/*
-/* device dependant information to support different */
+ * device dependant information to support different
-/* ISDN Ta's using the HFC-S USB chip                */
+ * ISDN Ta's using the HFC-S USB chip
-/*****************************************************/
+ */
 /* USB descriptor need to contain one of the following EndPoint combination: */
 #define CNF_4INT3ISO    1       // 4 INT IN, 3 ISO OUT
@@ -155,16 +136,19 @@ static struct hfcusb_symbolic_list urb_errlist[] = {
 #define CNF_4ISO3ISO    3       // 4 ISO IN, 3 ISO OUT
 #define CNF_3ISO3ISO    4       // 3 ISO IN, 3 ISO OUT
-#define EP_NUL 1                // Endpoint at this position not allowed
+#define EP_NUL  1       // Endpoint at this position not allowed
-#define EP_NOP 2                // all type of endpoints allowed at this position
+#define EP_NOP  2       // all type of endpoints allowed at this position
-#define EP_ISO 3                // Isochron endpoint mandatory at this position
+#define EP_ISO  3       // Isochron endpoint mandatory at this position
-#define EP_BLK 4                // Bulk endpoint mandatory at this position
+#define EP_BLK  4       // Bulk endpoint mandatory at this position
-#define EP_INT 5                // Interrupt endpoint mandatory at this position
+#define EP_INT  5       // Interrupt endpoint mandatory at this position
-/* this array represents all endpoints possible in the HCF-USB the last
+/*
-* 3 entries are the configuration number, the minimum interval for
+ * List of all supported endpoint configuration sets, used to find the
-* Interrupt endpoints & boolean if E-channel logging possible
+ * best matching endpoint configuration within a devices' USB descriptor.
-*/
+ * We need at least 3 RX endpoints, and 3 TX endpoints, either
+ * INT-in and ISO-out, or ISO-in and ISO-out)
+ * with 4 RX endpoints even E-Channel logging is possible
+ */
 static int validconf[][19] = {
        // INT in, ISO out config
        {EP_NUL, EP_INT, EP_NUL, EP_INT, EP_NUL, EP_INT, EP_NOP, EP_INT,
@@ -193,7 +177,6 @@ static char *conf_str[] = {
 };
 #endif
 typedef struct {
        int vendor;             // vendor id
        int prod_id;            // product id
@@ -202,9 +185,9 @@ typedef struct {
        signed short led_bits[8];       // array of 8 possible LED bitmask settings
 } vendor_data;
-#define LED_OFF      0          // no LED support
+#define LED_OFF         0       // no LED support
-#define LED_SCHEME1  1          // LED standard scheme
+#define LED_SCHEME1     1       // LED standard scheme
-#define LED_SCHEME2  2          // not used yet...
+#define LED_SCHEME2     2       // not used yet...
 #define LED_POWER_ON    1
 #define LED_POWER_OFF   2
@@ -217,11 +200,8 @@ typedef struct {
 #define LED_B2_OFF      9
 #define LED_B2_DATA     10
-#define LED_NORMAL   0          // LEDs are normal
+#define LED_NORMAL      0       // LEDs are normal
-#define LED_INVERTED 1          // LEDs are inverted
+#define LED_INVERTED    1       // LEDs are inverted
-/* time in ms to perform a Flashing LED when B-Channel has traffic */
-#define LED_TIME      250
-#endif                          // __HFC_USB_H__
+#endif  // __HFC_USB_H__
diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index 90a23795db7e..02d9918705dd 100644
--- a/drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/drivers/isdn/i4l/isdn_bsdcomp.c
@@ -341,7 +341,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
         * Allocate space for the dictionary. This may be more than one page in
         * length.
         */
-        db->dict = (struct bsd_dict *) vmalloc (hsize * sizeof (struct bsd_dict));
+        db->dict = vmalloc(hsize * sizeof(struct bsd_dict));
        if (!db->dict) {
                bsd_free (db);
                return NULL;
@@ -354,8 +354,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
        if (!decomp)
                db->lens = NULL;
        else {
-                db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) *
+                db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));
-                        sizeof (db->lens[0]));
                if (!db->lens) {
                        bsd_free (db);
                        return (NULL);
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index c97330b19877..ec5f4046412f 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -2291,7 +2291,7 @@ static int __init isdn_init(void)
        int i;
        char tmprev[50];
-        if (!(dev = (isdn_dev *) vmalloc(sizeof(isdn_dev)))) {
+        if (!(dev = vmalloc(sizeof(isdn_dev)))) {
                printk(KERN_WARNING "isdn: Could not allocate device-struct.\n");
                return -EIO;
        }
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index fd6925f41647..41e2250613a1 100644
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,6 +1,6 @@
 config LGUEST
        tristate "Linux hypervisor example code"
-        depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE
+        depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE && FUTEX
        select LGUEST_GUEST
        select HVC_DRIVER
        ---help---
diff --git a/drivers/lguest/interrupts_and_traps.c b/drivers/lguest/interrupts_and_traps.c
index 49aa55577d0d..39731232d827 100644
--- a/drivers/lguest/interrupts_and_traps.c
+++ b/drivers/lguest/interrupts_and_traps.c
@@ -270,8 +270,11 @@ void pin_stack_pages(struct lguest *lg)
        /* Depending on the CONFIG_4KSTACKS option, the Guest can have one or
         * two pages of stack space. */
        for (i = 0; i < lg->stack_pages; i++)
-                /* The stack grows *upwards*, hence the subtraction */
+                /* The stack grows *upwards*, so the address we're given is the
-                pin_page(lg, lg->esp1 - i * PAGE_SIZE);
+                 * start of the page after the kernel stack.  Subtract one to
+                 * get back onto the first stack page, and keep subtracting to
+                 * get to the rest of the stack pages. */
+                pin_page(lg, lg->esp1 - 1 - i * PAGE_SIZE);
 }
 /* Direct traps also mean that we need to know whenever the Guest wants to use
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index bc77c5e2ca9f..5c742a526082 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -89,7 +89,7 @@ static int sleepy_trackpad;
 static int autopoll_devs;
 int __adb_probe_sync;
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
 static struct pmu_sleep_notifier adb_sleep_notifier = {
        adb_notify_sleep,
@@ -313,7 +313,7 @@ int __init adb_init(void)
                printk(KERN_WARNING "Warning: no ADB interface detected\n");
                adb_controller = NULL;
        } else {
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
                pmu_register_sleep_notifier(&adb_sleep_notifier);
 #endif /* CONFIG_PM */
 #ifdef CONFIG_PPC
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c
index 76c1e8e4a487..33dee3a773ed 100644
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -13,6 +13,7 @@
 #include <linux/sysctl.h>
 #include <linux/input.h>
 #include <linux/module.h>
+#include <linux/kbd_kern.h>
 static struct input_dev *emumousebtn;
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 157080b3b468..04f3973e3874 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -152,10 +152,10 @@ static spinlock_t pmu_lock;
 static u8 pmu_intr_mask;
 static int pmu_version;
 static int drop_interrupts;
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 static int option_lid_wakeup = 1;
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
-#if (defined(CONFIG_PM)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
+#if (defined(CONFIG_PM_SLEEP)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
 static int sleep_in_progress;
 #endif
 static unsigned long async_req_locks;
@@ -875,7 +875,7 @@ proc_read_options(char *page, char **start, off_t off,
 {
        char *p = page;
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
        if (pmu_kind == PMU_KEYLARGO_BASED &&
            pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
                p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);
@@ -916,7 +916,7 @@ proc_write_options(struct file *file, const char __user *buffer,
        *(val++) = 0;
        while(*val == ' ')
                val++;
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
        if (pmu_kind == PMU_KEYLARGO_BASED &&
            pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
                if (!strcmp(label, "lid_wakeup"))
@@ -1738,7 +1738,7 @@ pmu_present(void)
        return via != 0;
 }
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static LIST_HEAD(sleep_notifiers);
@@ -1769,9 +1769,9 @@ pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* n)
        return 0;
 }
 EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 /* Sleep is broadcast last-to-first */
 static void broadcast_sleep(int when)
@@ -2390,7 +2390,7 @@ powerbook_sleep_3400(void)
        return 0;
 }
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 /*
 * Support for /dev/pmu device
@@ -2573,7 +2573,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
        int error = -EINVAL;
        switch (cmd) {
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
        case PMU_IOC_SLEEP:
                if (!capable(CAP_SYS_ADMIN))
                        return -EACCES;
@@ -2601,7 +2601,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
                        return put_user(0, argp);
                else
                        return put_user(1, argp);
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 #ifdef CONFIG_PMAC_BACKLIGHT_LEGACY
        /* Compatibility ioctl's for backlight */
@@ -2757,7 +2757,7 @@ pmu_polled_request(struct adb_request *req)
 * to do suspend-to-disk.
 */
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 int pmu_sys_suspended;
@@ -2792,7 +2792,7 @@ static int pmu_sys_resume(struct sys_device *sysdev)
        return 0;
 }
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 static struct sysdev_class pmu_sysclass = {
        set_kset_name("pmu"),
@@ -2803,10 +2803,10 @@ static struct sys_device device_pmu = {
 };
 static struct sysdev_driver driver_pmu = {
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
        .suspend        = &pmu_sys_suspend,
        .resume         = &pmu_sys_resume,
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 };
 static int __init init_pmu_sysfs(void)
@@ -2841,10 +2841,10 @@ EXPORT_SYMBOL(pmu_wait_complete);
 EXPORT_SYMBOL(pmu_suspend);
 EXPORT_SYMBOL(pmu_resume);
 EXPORT_SYMBOL(pmu_unlock);
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 EXPORT_SYMBOL(pmu_enable_irled);
 EXPORT_SYMBOL(pmu_battery_count);
 EXPORT_SYMBOL(pmu_batteries);
 EXPORT_SYMBOL(pmu_power_flags);
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index dfdf11c1eec4..e2f84da09e7c 100644
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -818,243 +818,3 @@ pmu_present(void)
 {
        return (pmu_kind != PMU_UNKNOWN);
 }
-#if 0 /* needs some work for 68K */
-/*
- * This struct is used to store config register values for
- * PCI devices which may get powered off when we sleep.
- */
-static struct pci_save {
-        u16     command;
-        u16     cache_lat;
-        u16     intr;
-} *pbook_pci_saves;
-static int n_pbook_pci_saves;
-static inline void
-pbook_pci_save(void)
-{
-        int npci;
-        struct pci_dev *pd = NULL;
-        struct pci_save *ps;
-        npci = 0;
-        while ((pd = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pd)) != NULL)
-                ++npci;
-        n_pbook_pci_saves = npci;
-        if (npci == 0)
-                return;
-        ps = kmalloc(npci * sizeof(*ps), GFP_KERNEL);
-        pbook_pci_saves = ps;
-        if (ps == NULL)
-                return;
-        pd = NULL;
-        while ((pd = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pd)) != NULL) {
-                pci_read_config_word(pd, PCI_COMMAND, &ps->command);
-                pci_read_config_word(pd, PCI_CACHE_LINE_SIZE, &ps->cache_lat);
-                pci_read_config_word(pd, PCI_INTERRUPT_LINE, &ps->intr);
-                ++ps;
-                --npci;
-        }
-}
-static inline void
-pbook_pci_restore(void)
-{
-        u16 cmd;
-        struct pci_save *ps = pbook_pci_saves;
-        struct pci_dev *pd = NULL;
-        int j;
-        while ((pd = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pd)) != NULL) {
-                if (ps->command == 0)
-                        continue;
-                pci_read_config_word(pd, PCI_COMMAND, &cmd);
-                if ((ps->command & ~cmd) == 0)
-                        continue;
-                switch (pd->hdr_type) {
-                case PCI_HEADER_TYPE_NORMAL:
-                        for (j = 0; j < 6; ++j)
-                                pci_write_config_dword(pd,
-                                        PCI_BASE_ADDRESS_0 + j*4,
-                                        pd->resource[j].start);
-                        pci_write_config_dword(pd, PCI_ROM_ADDRESS,
-                               pd->resource[PCI_ROM_RESOURCE].start);
-                        pci_write_config_word(pd, PCI_CACHE_LINE_SIZE,
-                                ps->cache_lat);
-                        pci_write_config_word(pd, PCI_INTERRUPT_LINE,
-                                ps->intr);
-                        pci_write_config_word(pd, PCI_COMMAND, ps->command);
-                        break;
-                        /* other header types not restored at present */
-                }
-        }
-}
-/*
- * Put the powerbook to sleep.
- */
-#define IRQ_ENABLE      ((unsigned int *)0xf3000024)
-#define MEM_CTRL        ((unsigned int *)0xf8000070)
-int powerbook_sleep(void)
-{
-        int ret, i, x;
-        static int save_backlight;
-        static unsigned int save_irqen;
-        unsigned long msr;
-        unsigned int hid0;
-        unsigned long p, wait;
-        struct adb_request sleep_req;
-        /* Notify device drivers */
-        ret = blocking_notifier_call_chain(&sleep_notifier_list,
-                        PBOOK_SLEEP, NULL);
-        if (ret & NOTIFY_STOP_MASK)
-                return -EBUSY;
-        /* Sync the disks. */
-        /* XXX It would be nice to have some way to ensure that
-         * nobody is dirtying any new buffers while we wait. */
-        sys_sync();
-        /* Turn off the display backlight */
-        save_backlight = backlight_enabled;
-        if (save_backlight)
-                pmu_enable_backlight(0);
-        /* Give the disks a little time to actually finish writing */
-        for (wait = jiffies + (HZ/4); time_before(jiffies, wait); )
-                mb();
-        /* Disable all interrupts except pmu */
-        save_irqen = in_le32(IRQ_ENABLE);
-        for (i = 0; i < 32; ++i)
-                if (i != vias->intrs[0].line && (save_irqen & (1 << i)))
-                        disable_irq(i);
-        asm volatile("mtdec %0" : : "r" (0x7fffffff));
-        /* Save the state of PCI config space for some slots */
-        pbook_pci_save();
-        /* Set the memory controller to keep the memory refreshed
-           while we're asleep */
-        for (i = 0x403f; i >= 0x4000; --i) {
-                out_be32(MEM_CTRL, i);
-                do {
-                        x = (in_be32(MEM_CTRL) >> 16) & 0x3ff;
-                } while (x == 0);
-                if (x >= 0x100)
-                        break;
-        }
-        /* Ask the PMU to put us to sleep */
-        pmu_request(&sleep_req, NULL, 5, PMU_SLEEP, 'M', 'A', 'T', 'T');
-        while (!sleep_req.complete)
-                mb();
-        /* displacement-flush the L2 cache - necessary? */
-        for (p = KERNELBASE; p < KERNELBASE + 0x100000; p += 0x1000)
-                i = *(volatile int *)p;
-        asleep = 1;
-        /* Put the CPU into sleep mode */
-        asm volatile("mfspr %0,1008" : "=r" (hid0) :);
-        hid0 = (hid0 & ~(HID0_NAP | HID0_DOZE)) | HID0_SLEEP;
-        asm volatile("mtspr 1008,%0" : : "r" (hid0));
-        local_save_flags(msr);
-        msr |= MSR_POW | MSR_EE;
-        local_irq_restore(msr);
-        udelay(10);
-        /* OK, we're awake again, start restoring things */
-        out_be32(MEM_CTRL, 0x3f);
-        pbook_pci_restore();
-        /* wait for the PMU interrupt sequence to complete */
-        while (asleep)
-                mb();
-        /* reenable interrupts */
-        for (i = 0; i < 32; ++i)
-                if (i != vias->intrs[0].line && (save_irqen & (1 << i)))
-                        enable_irq(i);
-        /* Notify drivers */
-        blocking_notifier_call_chain(&sleep_notifier_list, PBOOK_WAKE, NULL);
-        /* reenable ADB autopoll */
-        pmu_adb_autopoll(adb_dev_map);
-        /* Turn on the screen backlight, if it was on before */
-        if (save_backlight)
-                pmu_enable_backlight(1);
-        /* Wait for the hard disk to spin up */
-        return 0;
-}
-/*
- * Support for /dev/pmu device
- */
-static int pmu_open(struct inode *inode, struct file *file)
-{
-        return 0;
-}
-static ssize_t pmu_read(struct file *file, char *buf,
-                        size_t count, loff_t *ppos)
-{
-        return 0;
-}
-static ssize_t pmu_write(struct file *file, const char *buf,
-                         size_t count, loff_t *ppos)
-{
-        return 0;
-}
-static int pmu_ioctl(struct inode * inode, struct file *filp,
-                     u_int cmd, u_long arg)
-{
-        int error;
-        __u32 value;
-        switch (cmd) {
-            case PMU_IOC_SLEEP:
-                return -ENOSYS;
-            case PMU_IOC_GET_BACKLIGHT:
-                return put_user(backlight_level, (__u32 *)arg);
-            case PMU_IOC_SET_BACKLIGHT:
-                error = get_user(value, (__u32 *)arg);
-                if (!error)
-                        pmu_set_brightness(value);
-                return error;
-            case PMU_IOC_GET_MODEL:
-                return put_user(pmu_kind, (__u32 *)arg);
-        }
-        return -EINVAL;
-}
-static const struct file_operations pmu_device_fops = {
-        .read           = pmu_read,
-        .write          = pmu_write,
-        .ioctl          = pmu_ioctl,
-        .open           = pmu_open,
-};
-static struct miscdevice pmu_device = {
-        PMU_MINOR, "pmu", &pmu_device_fops
-};
-void pmu_device_init(void)
-{
-        if (!via)
-                return;
-        if (misc_register(&pmu_device) < 0)
-                printk(KERN_ERR "via-pmu68k: cannot register misc device.\n");
-}
-#endif /* CONFIG_PMAC_PBOOK */
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 531d4d17d011..34a8c60a254a 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -263,7 +263,7 @@ config DM_MULTIPATH_EMC
 config DM_MULTIPATH_RDAC
        tristate "LSI/Engenio RDAC multipath support (EXPERIMENTAL)"
-        depends on DM_MULTIPATH && BLK_DEV_DM && EXPERIMENTAL
+        depends on DM_MULTIPATH && BLK_DEV_DM && SCSI && EXPERIMENTAL
        ---help---
          Multipath support for LSI/Engenio RDAC.
diff --git a/drivers/md/dm-mpath-rdac.c b/drivers/md/dm-mpath-rdac.c
index 8b776b8cb7f7..16b161345775 100644
--- a/drivers/md/dm-mpath-rdac.c
+++ b/drivers/md/dm-mpath-rdac.c
@@ -292,7 +292,7 @@ static struct request *get_rdac_req(struct rdac_handler *h,
        rq->end_io_data = h;
        rq->timeout = h->timeout;
        rq->cmd_type = REQ_TYPE_BLOCK_PC;
-        rq->cmd_flags = REQ_FAILFAST | REQ_NOMERGE;
+        rq->cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;
        return rq;
 }
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 650991bddd8e..f33a729960ca 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1972,7 +1972,8 @@ static int run(mddev_t *mddev)
                    !test_bit(In_sync, &disk->rdev->flags)) {
                        disk->head_position = 0;
                        mddev->degraded++;
-                        conf->fullsync = 1;
+                        if (disk->rdev)
+                                conf->fullsync = 1;
                }
        }
        if (mddev->degraded == conf->raid_disks) {
@@ -2153,11 +2154,25 @@ static int raid1_reshape(mddev_t *mddev)
        oldpool = conf->r1bio_pool;
        conf->r1bio_pool = newpool;
-        for (d=d2=0; d < conf->raid_disks; d++)
+        for (d = d2 = 0; d < conf->raid_disks; d++) {
-                if (conf->mirrors[d].rdev) {
+                mdk_rdev_t *rdev = conf->mirrors[d].rdev;
-                        conf->mirrors[d].rdev->raid_disk = d2;
+                if (rdev && rdev->raid_disk != d2) {
-                        newmirrors[d2++].rdev = conf->mirrors[d].rdev;
+                        char nm[20];
+                        sprintf(nm, "rd%d", rdev->raid_disk);
+                        sysfs_remove_link(&mddev->kobj, nm);
+                        rdev->raid_disk = d2;
+                        sprintf(nm, "rd%d", rdev->raid_disk);
+                        sysfs_remove_link(&mddev->kobj, nm);
+                        if (sysfs_create_link(&mddev->kobj,
+                                              &rdev->kobj, nm))
+                                printk(KERN_WARNING
+                                       "md/raid1: cannot register "
+                                       "%s for %s\n",
+                                       nm, mdname(mddev));
                }
+                if (rdev)
+                        newmirrors[d2++].rdev = rdev;
+        }
        kfree(conf->mirrors);
        conf->mirrors = newmirrors;
        kfree(conf->poolinfo);
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
index 02a0ea6e1c17..6bf858a436c9 100644
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -135,6 +135,13 @@ static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs
        struct flexcop_device *fc = i2c_get_adapdata(i2c_adap);
        int i, ret = 0;
+        /* Some drivers use 1 byte or 0 byte reads as probes, which this
+         * driver doesn't support.  These probes will always fail, so this
+         * hack makes them always succeed.  If one knew how, it would of
+         * course be better to actually do the read.  */
+        if (num == 1 && msgs[0].flags == I2C_M_RD && msgs[0].len <= 1)
+                return 1;
        if (mutex_lock_interruptible(&fc->i2c_mutex))
                return -ERESTARTSYS;
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index acf026342ec5..bdd797071cb0 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -800,7 +800,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
 }
-static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
+static void dvb_net_sec(struct net_device *dev, const u8 *pkt, int
+pkt_len)
 {
        u8 *eth;
        struct sk_buff *skb;
@@ -902,7 +903,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
         * we rely on the DVB API definition where exactly one complete
         * section is delivered in buffer1
         */
-        dvb_net_sec (dev, (u8*) buffer1, buffer1_len);
+        dvb_net_sec (dev, buffer1, buffer1_len);
        return 0;
 }
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 2c7b158ce7e1..40307f3f6fe3 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1772,6 +1772,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        if (dev->alt_max_pkt_size == NULL) {
                em28xx_errdev("out of memory!\n");
                em28xx_devused&=~(1<<nr);
+                kfree(dev);
                return -ENOMEM;
        }
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 9c0e8d18c2f6..3d81966d8c42 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1196,12 +1196,19 @@ static int pwc_video_open(struct inode *inode, struct file *file)
        return 0;
 }
+static void pwc_cleanup(struct pwc_device *pdev)
+{
+        pwc_remove_sysfs_files(pdev->vdev);
+        video_unregister_device(pdev->vdev);
+}
 /* Note that all cleanup is done in the reverse order as in _open */
 static int pwc_video_close(struct inode *inode, struct file *file)
 {
        struct video_device *vdev = file->private_data;
        struct pwc_device *pdev;
-        int i;
+        int i, hint;
        PWC_DEBUG_OPEN(">> video_close called(vdev = 0x%p).\n", vdev);
@@ -1224,8 +1231,9 @@ static int pwc_video_close(struct inode *inode, struct file *file)
        pwc_isoc_cleanup(pdev);
        pwc_free_buffers(pdev);
+        lock_kernel();
        /* Turn off LEDS and power down camera, but only when not unplugged */
-        if (pdev->error_status != EPIPE) {
+        if (!pdev->unplugged) {
                /* Turn LEDs off */
                if (pwc_set_leds(pdev, 0, 0) < 0)
                        PWC_DEBUG_MODULE("Failed to set LED on/off time.\n");
@@ -1234,9 +1242,19 @@ static int pwc_video_close(struct inode *inode, struct file *file)
                        if (i < 0)
                                PWC_ERROR("Failed to power down camera (%d)\n", i);
                }
+                pdev->vopen--;
+                PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", i);
+        } else {
+                pwc_cleanup(pdev);
+                /* Free memory (don't set pdev to 0 just yet) */
+                kfree(pdev);
+                /* search device_hint[] table if we occupy a slot, by any chance */
+                for (hint = 0; hint < MAX_DEV_HINTS; hint++)
+                        if (device_hint[hint].pdev == pdev)
+                                device_hint[hint].pdev = NULL;
        }
-        pdev->vopen--;
+        unlock_kernel();
-        PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", pdev->vopen);
        return 0;
 }
@@ -1791,21 +1809,21 @@ static void usb_pwc_disconnect(struct usb_interface *intf)
        /* Alert waiting processes */
        wake_up_interruptible(&pdev->frameq);
        /* Wait until device is closed */
-        while (pdev->vopen)
+        if(pdev->vopen) {
-                schedule();
+                pdev->unplugged = 1;
-        /* Device is now closed, so we can safely unregister it */
+        } else {
-        PWC_DEBUG_PROBE("Unregistering video device in disconnect().\n");
+                /* Device is closed, so we can safely unregister it */
-        pwc_remove_sysfs_files(pdev->vdev);
+                PWC_DEBUG_PROBE("Unregistering video device in disconnect().\n");
-        video_unregister_device(pdev->vdev);
+                pwc_cleanup(pdev);
+                /* Free memory (don't set pdev to 0 just yet) */
-        /* Free memory (don't set pdev to 0 just yet) */
+                kfree(pdev);
-        kfree(pdev);
 disconnect_out:
-        /* search device_hint[] table if we occupy a slot, by any chance */
+                /* search device_hint[] table if we occupy a slot, by any chance */
-        for (hint = 0; hint < MAX_DEV_HINTS; hint++)
+                for (hint = 0; hint < MAX_DEV_HINTS; hint++)
-                if (device_hint[hint].pdev == pdev)
+                        if (device_hint[hint].pdev == pdev)
-                        device_hint[hint].pdev = NULL;
+                                device_hint[hint].pdev = NULL;
+        }
        unlock_kernel();
 }
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index 910a04f53920..8e8e5b27e77e 100644
--- a/drivers/media/video/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -193,6 +193,7 @@ struct pwc_device
   char vsnapshot;              /* snapshot mode */
   char vsync;                  /* used by isoc handler */
   char vmirror;                /* for ToUCaM series */
+        char unplugged;
   int cmd_len;
   unsigned char cmd_buf[13];
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index d0fc4fd212e6..7dce318df1bd 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -732,7 +732,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
                lcd_blank(FB_BLANK_POWERDOWN);
        }
-        acpi_bus_generate_event(hotk->device, event,
+        acpi_bus_generate_proc_event(hotk->device, event,
                                hotk->event_count[event % 128]++);
        return;
@@ -1072,7 +1072,8 @@ static void asus_backlight_exit(void)
 }
 #define  ASUS_LED_UNREGISTER(object)                            \
-        led_classdev_unregister(&object##_led)
+        if (object##_led.dev)                                   \
+                led_classdev_unregister(&object##_led)
 static void asus_led_exit(void)
 {
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 91da6880ae93..d38ddce592c0 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -856,6 +856,15 @@ static struct dmi_system_id sony_nc_ids[] = {
                        },
                },
                {
+                        .ident = "Sony Vaio FZ Series",
+                        .callback = sony_nc_C_enable,
+                        .driver_data = sony_C_events,
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ"),
+                        },
+                },
+                {
                        .ident = "Sony Vaio C Series",
                        .callback = sony_nc_C_enable,
                        .driver_data = sony_C_events,
@@ -904,7 +913,7 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)
        dprintk("sony_acpi_notify, event: 0x%.2x\n", ev);
        sony_laptop_report_input_event(ev);
-        acpi_bus_generate_event(sony_nc_acpi_device, 1, ev);
+        acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev);
 }
 static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
@@ -2292,7 +2301,7 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id)
 found:
        sony_laptop_report_input_event(device_event);
-        acpi_bus_generate_event(spic_dev.acpi_dev, 1, device_event);
+        acpi_bus_generate_proc_event(spic_dev.acpi_dev, 1, device_event);
        sonypi_compat_report_event(device_event);
        return IRQ_HANDLED;
@@ -2308,8 +2317,6 @@ static int sony_pic_remove(struct acpi_device *device, int type)
        struct sony_pic_ioport *io, *tmp_io;
        struct sony_pic_irq *irq, *tmp_irq;
-        sonypi_compat_exit();
        if (sony_pic_disable(device)) {
                printk(KERN_ERR DRV_PFX "Couldn't disable device.\n");
                return -ENXIO;
@@ -2319,6 +2326,8 @@ static int sony_pic_remove(struct acpi_device *device, int type)
        release_region(spic_dev.cur_ioport->io.minimum,
                        spic_dev.cur_ioport->io.address_length);
+        sonypi_compat_exit();
        sony_laptop_remove_input();
        /* pf attrs */
@@ -2384,6 +2393,9 @@ static int sony_pic_add(struct acpi_device *device)
                goto err_free_resources;
        }
+        if (sonypi_compat_init())
+                goto err_remove_input;
        /* request io port */
        list_for_each_entry(io, &spic_dev.ioports, list) {
                if (request_region(io->io.minimum, io->io.address_length,
@@ -2398,7 +2410,7 @@ static int sony_pic_add(struct acpi_device *device)
        if (!spic_dev.cur_ioport) {
                printk(KERN_ERR DRV_PFX "Failed to request_region.\n");
                result = -ENODEV;
-                goto err_remove_input;
+                goto err_remove_compat;
        }
        /* request IRQ */
@@ -2438,9 +2450,6 @@ static int sony_pic_add(struct acpi_device *device)
        if (result)
                goto err_remove_pf;
-        if (sonypi_compat_init())
-                goto err_remove_pf;
        return 0;
 err_remove_pf:
@@ -2456,6 +2465,9 @@ err_release_region:
        release_region(spic_dev.cur_ioport->io.minimum,
                        spic_dev.cur_ioport->io.address_length);
+err_remove_compat:
+        sonypi_compat_exit();
 err_remove_input:
        sony_laptop_remove_input();
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index f6cd34a3dbac..bb8956d0c104 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -1190,10 +1190,10 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
                }
                if (sendacpi)
-                        acpi_bus_generate_event(ibm->acpi->device, event, hkey);
+                        acpi_bus_generate_proc_event(ibm->acpi->device, event, hkey);
        } else {
                printk(IBM_ERR "unknown hotkey notification event %d\n", event);
-                acpi_bus_generate_event(ibm->acpi->device, event, 0);
+                acpi_bus_generate_proc_event(ibm->acpi->device, event, 0);
        }
 }
@@ -2162,22 +2162,27 @@ static void dock_notify(struct ibm_struct *ibm, u32 event)
        int docked = dock_docked();
        int pci = ibm->acpi->hid && ibm->acpi->device &&
                acpi_match_device_ids(ibm->acpi->device, ibm_pci_device_ids);
+        int data;
        if (event == 1 && !pci) /* 570 */
-                acpi_bus_generate_event(ibm->acpi->device, event, 1);   /* button */
+                data = 1;       /* button */
        else if (event == 1 && pci)     /* 570 */
-                acpi_bus_generate_event(ibm->acpi->device, event, 3);   /* dock */
+                data = 3;       /* dock */
        else if (event == 3 && docked)
-                acpi_bus_generate_event(ibm->acpi->device, event, 1);   /* button */
+                data = 1;       /* button */
        else if (event == 3 && !docked)
-                acpi_bus_generate_event(ibm->acpi->device, event, 2);   /* undock */
+                data = 2;       /* undock */
        else if (event == 0 && docked)
-                acpi_bus_generate_event(ibm->acpi->device, event, 3);   /* dock */
+                data = 3;       /* dock */
        else {
                printk(IBM_ERR "unknown dock event %d, status %d\n",
                       event, _sta(dock_handle));
-                acpi_bus_generate_event(ibm->acpi->device, event, 0);   /* unknown */
+                data = 0;       /* unknown */
        }
+        acpi_bus_generate_proc_event(ibm->acpi->device, event, data);
+        acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
+                                          ibm->acpi->device->dev.bus_id,
+                                          event, data);
 }
 static int dock_read(char *p)
@@ -2275,7 +2280,10 @@ static int __init bay_init(struct ibm_init_struct *iibm)
 static void bay_notify(struct ibm_struct *ibm, u32 event)
 {
-        acpi_bus_generate_event(ibm->acpi->device, event, 0);
+        acpi_bus_generate_proc_event(ibm->acpi->device, event, 0);
+        acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
+                                          ibm->acpi->device->dev.bus_id,
+                                          event, 0);
 }
 #define bay_occupied(b) (_sta(b##_handle) & 1)
diff --git a/drivers/mtd/maps/lubbock-flash.c b/drivers/mtd/maps/lubbock-flash.c
index 1aa0447c5e66..e8560683b973 100644
--- a/drivers/mtd/maps/lubbock-flash.c
+++ b/drivers/mtd/maps/lubbock-flash.c
@@ -15,9 +15,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/dma-mapping.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
@@ -26,7 +24,7 @@
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/lubbock.h>
+#include <asm/cacheflush.h>
 #define ROM_ADDR        0x00000000
 #define FLASH_ADDR      0x04000000
@@ -35,7 +33,7 @@
 static void lubbock_map_inval_cache(struct map_info *map, unsigned long from, ssize_t len)
 {
-        consistent_sync((char *)map->cached + from, len, DMA_FROM_DEVICE);
+        flush_ioremap_region(map->phys, map->cached, from, len);
 }
 static struct map_info lubbock_maps[2] = { {
diff --git a/drivers/mtd/maps/mainstone-flash.c b/drivers/mtd/maps/mainstone-flash.c
index eaa4bbb868a3..d76487d82dcd 100644
--- a/drivers/mtd/maps/mainstone-flash.c
+++ b/drivers/mtd/maps/mainstone-flash.c
@@ -15,8 +15,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/dma-mapping.h>
-#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
@@ -26,6 +24,7 @@
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/mainstone.h>
+#include <asm/cacheflush.h>
 #define ROM_ADDR        0x00000000
@@ -36,7 +35,7 @@
 static void mainstone_map_inval_cache(struct map_info *map, unsigned long from,
                                      ssize_t len)
 {
-        consistent_sync((char *)map->cached + from, len, DMA_FROM_DEVICE);
+        flush_ioremap_region(map->phys, map->cached, from, len);
 }
 static struct map_info mainstone_maps[2] = { {
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index aca331971201..9b430f20b640 100644
--- a/drivers/mtd/mtdsuper.c
+++ b/drivers/mtd/mtdsuper.c
@@ -70,6 +70,8 @@ static int get_sb_mtd_aux(struct file_system_type *fs_type, int flags,
        DEBUG(1, "MTDSB: New superblock for device %d (\"%s\")\n",
              mtd->index, mtd->name);
+        sb->s_flags = flags;
        ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
        if (ret < 0) {
                up_write(&sb->s_umount);
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 24e7f9ab3f5a..854d80c330ec 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -3934,11 +3934,13 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
                /* Chip reset. */
                REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);
+                /* Reading back any register after chip reset will hang the
+                 * bus on 5706 A0 and A1.  The msleep below provides plenty
+                 * of margin for write posting.
+                 */
                if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
-                    (CHIP_ID(bp) == CHIP_ID_5706_A1)) {
+                    (CHIP_ID(bp) == CHIP_ID_5706_A1))
-                        current->state = TASK_UNINTERRUPTIBLE;
+                        msleep(20);
-                        schedule_timeout(HZ / 50);
-                }
                /* Reset takes approximate 30 usec */
                for (i = 0; i < 10; i++) {
diff --git a/drivers/net/bsd_comp.c b/drivers/net/bsd_comp.c
index 202d4a4ef751..88edb986691a 100644
--- a/drivers/net/bsd_comp.c
+++ b/drivers/net/bsd_comp.c
@@ -406,8 +406,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp)
 * Allocate space for the dictionary. This may be more than one page in
 * length.
 */
-    db->dict = (struct bsd_dict *) vmalloc (hsize *
+    db->dict = vmalloc(hsize * sizeof(struct bsd_dict));
-                                            sizeof (struct bsd_dict));
    if (!db->dict)
      {
        bsd_free (db);
@@ -426,8 +425,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp)
 */
    else
      {
-        db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) *
+        db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));
-                                               sizeof (db->lens[0]));
        if (!db->lens)
          {
            bsd_free (db);
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index ab72563b81ee..20e887de2545 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -50,7 +50,9 @@ typedef irqreturn_t(*intr_handler_t) (int, void *);
 struct vlan_group;
+struct adapter;
 struct port_info {
+        struct adapter *adapter;
        struct vlan_group *vlan_grp;
        const struct port_type_info *port_type;
        u8 port_id;
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 16378004507a..2129210a67c1 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -679,7 +679,8 @@ const struct adapter_info *t3_get_adapter_info(unsigned int board_id);
 int t3_seeprom_read(struct adapter *adapter, u32 addr, u32 *data);
 int t3_seeprom_write(struct adapter *adapter, u32 addr, u32 data);
 int t3_seeprom_wp(struct adapter *adapter, int enable);
-int t3_check_tpsram_version(struct adapter *adapter);
+int t3_get_tp_version(struct adapter *adapter, u32 *vers);
+int t3_check_tpsram_version(struct adapter *adapter, int *must_load);
 int t3_check_tpsram(struct adapter *adapter, u8 *tp_ram, unsigned int size);
 int t3_set_proto_sram(struct adapter *adap, u8 *data);
 int t3_read_flash(struct adapter *adapter, unsigned int addr,
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index dc5d26988bb3..5ab319cfe5de 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -358,11 +358,14 @@ static int init_dummy_netdevs(struct adapter *adap)
                for (j = 0; j < pi->nqsets - 1; j++) {
                        if (!adap->dummy_netdev[dummy_idx]) {
-                                nd = alloc_netdev(0, "", ether_setup);
+                                struct port_info *p;
+                                nd = alloc_netdev(sizeof(*p), "", ether_setup);
                                if (!nd)
                                        goto free_all;
-                                nd->priv = adap;
+                                p = netdev_priv(nd);
+                                p->adapter = adap;
                                nd->weight = 64;
                                set_bit(__LINK_STATE_START, &nd->state);
                                adap->dummy_netdev[dummy_idx] = nd;
@@ -482,7 +485,8 @@ static ssize_t attr_store(struct device *d, struct device_attribute *attr,
 #define CXGB3_SHOW(name, val_expr) \
 static ssize_t format_##name(struct net_device *dev, char *buf) \
 { \
-        struct adapter *adap = dev->priv; \
+        struct port_info *pi = netdev_priv(dev); \
+        struct adapter *adap = pi->adapter; \
        return sprintf(buf, "%u\n", val_expr); \
 } \
 static ssize_t show_##name(struct device *d, struct device_attribute *attr, \
@@ -493,7 +497,8 @@ static ssize_t show_##name(struct device *d, struct device_attribute *attr, \
 static ssize_t set_nfilters(struct net_device *dev, unsigned int val)
 {
-        struct adapter *adap = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adap = pi->adapter;
        int min_tids = is_offload(adap) ? MC5_MIN_TIDS : 0;
        if (adap->flags & FULL_INIT_DONE)
@@ -515,7 +520,8 @@ static ssize_t store_nfilters(struct device *d, struct device_attribute *attr,
 static ssize_t set_nservers(struct net_device *dev, unsigned int val)
 {
-        struct adapter *adap = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adap = pi->adapter;
        if (adap->flags & FULL_INIT_DONE)
                return -EBUSY;
@@ -556,9 +562,10 @@ static struct attribute_group cxgb3_attr_group = {.attrs = cxgb3_attrs };
 static ssize_t tm_attr_show(struct device *d, struct device_attribute *attr,
                            char *buf, int sched)
 {
-        ssize_t len;
+        struct port_info *pi = netdev_priv(to_net_dev(d));
+        struct adapter *adap = pi->adapter;
        unsigned int v, addr, bpt, cpt;
-        struct adapter *adap = to_net_dev(d)->priv;
+        ssize_t len;
        addr = A_TP_TX_MOD_Q1_Q0_RATE_LIMIT - sched / 2;
        rtnl_lock();
@@ -581,10 +588,11 @@ static ssize_t tm_attr_show(struct device *d, struct device_attribute *attr,
 static ssize_t tm_attr_store(struct device *d, struct device_attribute *attr,
                             const char *buf, size_t len, int sched)
 {
+        struct port_info *pi = netdev_priv(to_net_dev(d));
+        struct adapter *adap = pi->adapter;
+        unsigned int val;
        char *endp;
        ssize_t ret;
-        unsigned int val;
-        struct adapter *adap = to_net_dev(d)->priv;
        if (!capable(CAP_NET_ADMIN))
                return -EPERM;
@@ -721,6 +729,7 @@ static void bind_qsets(struct adapter *adap)
 }
 #define FW_FNAME "t3fw-%d.%d.%d.bin"
+#define TPSRAM_NAME "t3%c_protocol_sram-%d.%d.%d.bin"
 static int upgrade_fw(struct adapter *adap)
 {
@@ -739,6 +748,71 @@ static int upgrade_fw(struct adapter *adap)
        }
        ret = t3_load_fw(adap, fw->data, fw->size);
        release_firmware(fw);
+        if (ret == 0)
+                dev_info(dev, "successful upgrade to firmware %d.%d.%d\n",
+                         FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO);
+        else
+                dev_err(dev, "failed to upgrade to firmware %d.%d.%d\n",
+                        FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO);
+        
+        return ret;
+}
+static inline char t3rev2char(struct adapter *adapter)
+{
+        char rev = 0;
+        switch(adapter->params.rev) {
+        case T3_REV_B:
+        case T3_REV_B2:
+                rev = 'b';
+                break;
+        }
+        return rev;
+}
+int update_tpsram(struct adapter *adap)
+{
+        const struct firmware *tpsram;
+        char buf[64];
+        struct device *dev = &adap->pdev->dev;
+        int ret;
+        char rev;
+        
+        rev = t3rev2char(adap);
+        if (!rev)
+                return 0;
+        snprintf(buf, sizeof(buf), TPSRAM_NAME, rev,
+                 TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
+        ret = request_firmware(&tpsram, buf, dev);
+        if (ret < 0) {
+                dev_err(dev, "could not load TP SRAM: unable to load %s\n",
+                        buf);
+                return ret;
+        }
+        
+        ret = t3_check_tpsram(adap, tpsram->data, tpsram->size);
+        if (ret)
+                goto release_tpsram;    
+        ret = t3_set_proto_sram(adap, tpsram->data);
+        if (ret == 0)
+                dev_info(dev,
+                         "successful update of protocol engine "
+                         "to %d.%d.%d\n",
+                         TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
+        else
+                dev_err(dev, "failed to update of protocol engine %d.%d.%d\n",
+                        TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
+        if (ret)
+                dev_err(dev, "loading protocol SRAM failed\n");
+release_tpsram:
+        release_firmware(tpsram);
+        
        return ret;
 }
@@ -755,6 +829,7 @@ static int upgrade_fw(struct adapter *adap)
 static int cxgb_up(struct adapter *adap)
 {
        int err = 0;
+        int must_load;
        if (!(adap->flags & FULL_INIT_DONE)) {
                err = t3_check_fw_version(adap);
@@ -763,6 +838,13 @@ static int cxgb_up(struct adapter *adap)
                if (err)
                        goto out;
+                err = t3_check_tpsram_version(adap, &must_load);
+                if (err == -EINVAL) {
+                        err = update_tpsram(adap);
+                        if (err && must_load)
+                                goto out;
+                }
                err = init_dummy_netdevs(adap);
                if (err)
                        goto out;
@@ -858,8 +940,9 @@ static void schedule_chk_task(struct adapter *adap)
 static int offload_open(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
-        struct t3cdev *tdev = T3CDEV(dev);
+        struct adapter *adapter = pi->adapter;
+        struct t3cdev *tdev = dev2t3cdev(dev);
        int adap_up = adapter->open_device_map & PORT_MASK;
        int err = 0;
@@ -924,10 +1007,10 @@ static int offload_close(struct t3cdev *tdev)
 static int cxgb_open(struct net_device *dev)
 {
-        int err;
-        struct adapter *adapter = dev->priv;
        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        int other_ports = adapter->open_device_map & PORT_MASK;
+        int err;
        if (!adapter->open_device_map && (err = cxgb_up(adapter)) < 0)
                return err;
@@ -951,17 +1034,17 @@ static int cxgb_open(struct net_device *dev)
 static int cxgb_close(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
-        struct port_info *p = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
-        t3_port_intr_disable(adapter, p->port_id);
+        t3_port_intr_disable(adapter, pi->port_id);
        netif_stop_queue(dev);
-        p->phy.ops->power_down(&p->phy, 1);
+        pi->phy.ops->power_down(&pi->phy, 1);
        netif_carrier_off(dev);
-        t3_mac_disable(&p->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);
+        t3_mac_disable(&pi->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);
        spin_lock(&adapter->work_lock); /* sync with update task */
-        clear_bit(p->port_id, &adapter->open_device_map);
+        clear_bit(pi->port_id, &adapter->open_device_map);
        spin_unlock(&adapter->work_lock);
        if (!(adapter->open_device_map & PORT_MASK))
@@ -976,13 +1059,13 @@ static int cxgb_close(struct net_device *dev)
 static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
-        struct port_info *p = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
-        struct net_device_stats *ns = &p->netstats;
+        struct net_device_stats *ns = &pi->netstats;
        const struct mac_stats *pstats;
        spin_lock(&adapter->stats_lock);
-        pstats = t3_mac_update_stats(&p->mac);
+        pstats = t3_mac_update_stats(&pi->mac);
        spin_unlock(&adapter->stats_lock);
        ns->tx_bytes = pstats->tx_octets;
@@ -1015,14 +1098,16 @@ static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
 static u32 get_msglevel(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        return adapter->msg_enable;
 }
 static void set_msglevel(struct net_device *dev, u32 val)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        adapter->msg_enable = val;
 }
@@ -1096,10 +1181,13 @@ static int get_eeprom_len(struct net_device *dev)
 static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        u32 fw_vers = 0;
-        struct adapter *adapter = dev->priv;
+        u32 tp_vers = 0;
        t3_get_fw_version(adapter, &fw_vers);
+        t3_get_tp_version(adapter, &tp_vers);
        strcpy(info->driver, DRV_NAME);
        strcpy(info->version, DRV_VERSION);
@@ -1108,11 +1196,14 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
                strcpy(info->fw_version, "N/A");
        else {
                snprintf(info->fw_version, sizeof(info->fw_version),
-                         "%s %u.%u.%u",
+                         "%s %u.%u.%u TP %u.%u.%u",
                         G_FW_VERSION_TYPE(fw_vers) ? "T" : "N",
                         G_FW_VERSION_MAJOR(fw_vers),
                         G_FW_VERSION_MINOR(fw_vers),
-                         G_FW_VERSION_MICRO(fw_vers));
+                         G_FW_VERSION_MICRO(fw_vers),
+                         G_TP_VERSION_MAJOR(tp_vers),
+                         G_TP_VERSION_MINOR(tp_vers),
+                         G_TP_VERSION_MICRO(tp_vers));
        }
 }
@@ -1136,8 +1227,8 @@ static unsigned long collect_sge_port_stats(struct adapter *adapter,
 static void get_stats(struct net_device *dev, struct ethtool_stats *stats,
                      u64 *data)
 {
-        struct adapter *adapter = dev->priv;
        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        const struct mac_stats *s;
        spin_lock(&adapter->stats_lock);
@@ -1205,7 +1296,8 @@ static inline void reg_block_dump(struct adapter *ap, void *buf,
 static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
                     void *buf)
 {
-        struct adapter *ap = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *ap = pi->adapter;
        /*
         * Version scheme:
@@ -1246,8 +1338,9 @@ static int restart_autoneg(struct net_device *dev)
 static int cxgb3_phys_id(struct net_device *dev, u32 data)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        int i;
-        struct adapter *adapter = dev->priv;
        if (data == 0)
                data = 2;
@@ -1408,8 +1501,8 @@ static int set_rx_csum(struct net_device *dev, u32 data)
 static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 {
-        const struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
-        const struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        const struct qset_params *q = &adapter->params.sge.qset[pi->first_qset];
        e->rx_max_pending = MAX_RX_BUFFERS;
@@ -1425,10 +1518,10 @@ static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 {
-        int i;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        struct qset_params *q;
-        struct adapter *adapter = dev->priv;
+        int i;
-        const struct port_info *pi = netdev_priv(dev);
        if (e->rx_pending > MAX_RX_BUFFERS ||
            e->rx_jumbo_pending > MAX_RX_JUMBO_BUFFERS ||
@@ -1457,7 +1550,8 @@ static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        struct qset_params *qsp = &adapter->params.sge.qset[0];
        struct sge_qset *qs = &adapter->sge.qs[0];
@@ -1471,7 +1565,8 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        struct qset_params *q = adapter->params.sge.qset;
        c->rx_coalesce_usecs = q->coalesce_usecs;
@@ -1481,8 +1576,9 @@ static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,
                      u8 * data)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        int i, err = 0;
-        struct adapter *adapter = dev->priv;
        u8 *buf = kmalloc(EEPROMSIZE, GFP_KERNEL);
        if (!buf)
@@ -1501,10 +1597,11 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,
 static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                      u8 * data)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        u32 aligned_offset, aligned_len, *p;
        u8 *buf;
        int err = 0;
-        u32 aligned_offset, aligned_len, *p;
-        struct adapter *adapter = dev->priv;
        if (eeprom->magic != EEPROM_MAGIC)
                return -EINVAL;
@@ -1592,9 +1689,10 @@ static int in_range(int val, int lo, int hi)
 static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
 {
-        int ret;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        u32 cmd;
-        struct adapter *adapter = dev->priv;
+        int ret;
        if (copy_from_user(&cmd, useraddr, sizeof(cmd)))
                return -EFAULT;
@@ -1923,10 +2021,10 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
 static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 {
-        int ret, mmd;
-        struct adapter *adapter = dev->priv;
-        struct port_info *pi = netdev_priv(dev);
        struct mii_ioctl_data *data = if_mii(req);
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        int ret, mmd;
        switch (cmd) {
        case SIOCGMIIPHY:
@@ -1994,9 +2092,9 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 static int cxgb_change_mtu(struct net_device *dev, int new_mtu)
 {
-        int ret;
-        struct adapter *adapter = dev->priv;
        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        int ret;
        if (new_mtu < 81)       /* accommodate SACK */
                return -EINVAL;
@@ -2013,8 +2111,8 @@ static int cxgb_change_mtu(struct net_device *dev, int new_mtu)
 static int cxgb_set_mac_addr(struct net_device *dev, void *p)
 {
-        struct adapter *adapter = dev->priv;
        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        struct sockaddr *addr = p;
        if (!is_valid_ether_addr(addr->sa_data))
@@ -2050,8 +2148,8 @@ static void t3_synchronize_rx(struct adapter *adap, const struct port_info *p)
 static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
 {
-        struct adapter *adapter = dev->priv;
        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        pi->vlan_grp = grp;
        if (adapter->params.rev > 0)
@@ -2070,8 +2168,8 @@ static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void cxgb_netpoll(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        int qidx;
        for (qidx = pi->first_qset; qidx < pi->first_qset + pi->nqsets; qidx++) {
@@ -2088,42 +2186,6 @@ static void cxgb_netpoll(struct net_device *dev)
 }
 #endif
-#define TPSRAM_NAME "t3%c_protocol_sram-%d.%d.%d.bin"
-int update_tpsram(struct adapter *adap)
-{
-        const struct firmware *tpsram;
-        char buf[64];
-        struct device *dev = &adap->pdev->dev;
-        int ret;
-        char rev;
-        
-        rev = adap->params.rev == T3_REV_B2 ? 'b' : 'a';
-        snprintf(buf, sizeof(buf), TPSRAM_NAME, rev,
-                 TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
-        ret = request_firmware(&tpsram, buf, dev);
-        if (ret < 0) {
-                dev_err(dev, "could not load TP SRAM: unable to load %s\n",
-                        buf);
-                return ret;
-        }
-        
-        ret = t3_check_tpsram(adap, tpsram->data, tpsram->size);
-        if (ret)
-                goto release_tpsram;    
-        ret = t3_set_proto_sram(adap, tpsram->data);
-        if (ret)
-                dev_err(dev, "loading protocol SRAM failed\n");
-release_tpsram:
-        release_firmware(tpsram);
-        
-        return ret;
-}
 /*
 * Periodic accumulation of MAC statistics.
 */
@@ -2433,6 +2495,7 @@ static int __devinit init_one(struct pci_dev *pdev,
                adapter->port[i] = netdev;
                pi = netdev_priv(netdev);
+                pi->adapter = adapter;
                pi->rx_csum_offload = 1;
                pi->nqsets = 1;
                pi->first_qset = i;
@@ -2442,7 +2505,6 @@ static int __devinit init_one(struct pci_dev *pdev,
                netdev->irq = pdev->irq;
                netdev->mem_start = mmio_start;
                netdev->mem_end = mmio_start + mmio_len - 1;
-                netdev->priv = adapter;
                netdev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
                netdev->features |= NETIF_F_LLTX;
                if (pci_using_dac)
@@ -2467,18 +2529,11 @@ static int __devinit init_one(struct pci_dev *pdev,
                SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops);
        }
-        pci_set_drvdata(pdev, adapter->port[0]);
+        pci_set_drvdata(pdev, adapter);
        if (t3_prep_adapter(adapter, ai, 1) < 0) {
                err = -ENODEV;
                goto out_free_dev;
        }
-        err = t3_check_tpsram_version(adapter);
-        if (err == -EINVAL)
-                err = update_tpsram(adapter);
-        if (err)
-                goto out_free_dev;
                
        /*
         * The card is now ready to go.  If any errors occur during device
@@ -2547,11 +2602,10 @@ out_release_regions:
 static void __devexit remove_one(struct pci_dev *pdev)
 {
-        struct net_device *dev = pci_get_drvdata(pdev);
+        struct adapter *adapter = pci_get_drvdata(pdev);
-        if (dev) {
+        if (adapter) {
                int i;
-                struct adapter *adapter = dev->priv;
                t3_sge_stop(adapter);
                sysfs_remove_group(&adapter->port[0]->dev.kobj,
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index e620ed4c3ff0..bdff7baeb59d 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -593,6 +593,16 @@ int cxgb3_alloc_stid(struct t3cdev *tdev, struct cxgb3_client *client,
 EXPORT_SYMBOL(cxgb3_alloc_stid);
+/* Get the t3cdev associated with a net_device */
+struct t3cdev *dev2t3cdev(struct net_device *dev)
+{
+        const struct port_info *pi = netdev_priv(dev);
+        return (struct t3cdev *)pi->adapter;
+}
+EXPORT_SYMBOL(dev2t3cdev);
 static int do_smt_write_rpl(struct t3cdev *dev, struct sk_buff *skb)
 {
        struct cpl_smt_write_rpl *rpl = cplhdr(skb);
@@ -925,7 +935,7 @@ void cxgb_neigh_update(struct neighbour *neigh)
        struct net_device *dev = neigh->dev;
        if (dev && (is_offloading(dev))) {
-                struct t3cdev *tdev = T3CDEV(dev);
+                struct t3cdev *tdev = dev2t3cdev(dev);
                BUG_ON(!tdev);
                t3_l2t_update(tdev, neigh);
@@ -973,9 +983,9 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
                       "device ignored.\n", __FUNCTION__);
                return;
        }
-        tdev = T3CDEV(olddev);
+        tdev = dev2t3cdev(olddev);
        BUG_ON(!tdev);
-        if (tdev != T3CDEV(newdev)) {
+        if (tdev != dev2t3cdev(newdev)) {
                printk(KERN_WARNING "%s: Redirect to different "
                       "offload device ignored.\n", __FUNCTION__);
                return;
diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/cxgb3/cxgb3_offload.h
index f15446a32efc..7a379138b5a6 100644
--- a/drivers/net/cxgb3/cxgb3_offload.h
+++ b/drivers/net/cxgb3/cxgb3_offload.h
@@ -51,6 +51,8 @@ void cxgb3_offload_deactivate(struct adapter *adapter);
 void cxgb3_set_dummy_ops(struct t3cdev *dev);
+struct t3cdev *dev2t3cdev(struct net_device *dev);
 /*
 * Client registration.  Users of T3 driver must register themselves.
 * The T3 driver will call the add function of every client for each T3
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index a2cfd68ac757..58a5f60521ed 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -1073,7 +1073,7 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        unsigned int ndesc, pidx, credits, gen, compl;
        const struct port_info *pi = netdev_priv(dev);
-        struct adapter *adap = dev->priv;
+        struct adapter *adap = pi->adapter;
        struct sge_qset *qs = dev2qset(dev);
        struct sge_txq *q = &qs->txq[TXQ_ETH];
@@ -1326,7 +1326,8 @@ static void restart_ctrlq(unsigned long data)
        struct sk_buff *skb;
        struct sge_qset *qs = (struct sge_qset *)data;
        struct sge_txq *q = &qs->txq[TXQ_CTRL];
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
        spin_lock(&q->lock);
      again:reclaim_completed_tx_imm(q);
@@ -1531,7 +1532,8 @@ static void restart_offloadq(unsigned long data)
        struct sk_buff *skb;
        struct sge_qset *qs = (struct sge_qset *)data;
        struct sge_txq *q = &qs->txq[TXQ_OFLD];
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
        spin_lock(&q->lock);
      again:reclaim_completed_tx(adap, q);
@@ -1675,7 +1677,8 @@ static inline void deliver_partial_bundle(struct t3cdev *tdev,
 */
 static int ofld_poll(struct net_device *dev, int *budget)
 {
-        struct adapter *adapter = dev->priv;
+        const struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
        struct sge_qset *qs = dev2qset(dev);
        struct sge_rspq *q = &qs->rspq;
        int work_done, limit = min(*budget, dev->quota), avail = limit;
@@ -2075,7 +2078,8 @@ static inline int is_pure_response(const struct rsp_desc *r)
 */
 static int napi_rx_handler(struct net_device *dev, int *budget)
 {
-        struct adapter *adap = dev->priv;
+        const struct port_info *pi = netdev_priv(dev);
+        struct adapter *adap = pi->adapter;
        struct sge_qset *qs = dev2qset(dev);
        int effective_budget = min(*budget, dev->quota);
@@ -2205,7 +2209,8 @@ static inline int handle_responses(struct adapter *adap, struct sge_rspq *q)
 irqreturn_t t3_sge_intr_msix(int irq, void *cookie)
 {
        struct sge_qset *qs = cookie;
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
        struct sge_rspq *q = &qs->rspq;
        spin_lock(&q->lock);
@@ -2224,7 +2229,8 @@ irqreturn_t t3_sge_intr_msix(int irq, void *cookie)
 irqreturn_t t3_sge_intr_msix_napi(int irq, void *cookie)
 {
        struct sge_qset *qs = cookie;
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
        struct sge_rspq *q = &qs->rspq;
        spin_lock(&q->lock);
@@ -2508,7 +2514,8 @@ static void sge_timer_cb(unsigned long data)
 {
        spinlock_t *lock;
        struct sge_qset *qs = (struct sge_qset *)data;
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
        if (spin_trylock(&qs->txq[TXQ_ETH].lock)) {
                reclaim_completed_tx(adap, &qs->txq[TXQ_ETH]);
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index dd3149d94ba8..b02d15daf5d9 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -848,16 +848,15 @@ static int t3_write_flash(struct adapter *adapter, unsigned int addr,
 }
 /**
- *      t3_check_tpsram_version - read the tp sram version
+ *      t3_get_tp_version - read the tp sram version
 *      @adapter: the adapter
+ *      @vers: where to place the version
 *
- *      Reads the protocol sram version from serial eeprom.
+ *      Reads the protocol sram version from sram.
 */
-int t3_check_tpsram_version(struct adapter *adapter)
+int t3_get_tp_version(struct adapter *adapter, u32 *vers)
 {
        int ret;
-        u32 vers;
-        unsigned int major, minor;
        /* Get version loaded in SRAM */
        t3_write_reg(adapter, A_TP_EMBED_OP_FIELD0, 0);
@@ -866,7 +865,32 @@ int t3_check_tpsram_version(struct adapter *adapter)
        if (ret)
                return ret;
        
-        vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1);
+        *vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1);
+        return 0;
+}
+/**
+ *      t3_check_tpsram_version - read the tp sram version
+ *      @adapter: the adapter
+ *      @must_load: set to 1 if loading a new microcode image is required
+ *
+ *      Reads the protocol sram version from flash.
+ */
+int t3_check_tpsram_version(struct adapter *adapter, int *must_load)
+{
+        int ret;
+        u32 vers;
+        unsigned int major, minor;
+        if (adapter->params.rev == T3_REV_A)
+                return 0;
+        *must_load = 1;
+        ret = t3_get_tp_version(adapter, &vers);
+        if (ret)
+                return ret;
        major = G_TP_VERSION_MAJOR(vers);
        minor = G_TP_VERSION_MINOR(vers);
@@ -874,6 +898,16 @@ int t3_check_tpsram_version(struct adapter *adapter)
        if (major == TP_VERSION_MAJOR && minor == TP_VERSION_MINOR) 
                return 0;
+        if (major != TP_VERSION_MAJOR)
+                CH_ERR(adapter, "found wrong TP version (%u.%u), "
+                       "driver needs version %d.%d\n", major, minor,
+                       TP_VERSION_MAJOR, TP_VERSION_MINOR);
+        else {
+                *must_load = 0;
+                CH_ERR(adapter, "found wrong TP version (%u.%u), "
+                       "driver compiled for version %d.%d\n", major, minor,
+                       TP_VERSION_MAJOR, TP_VERSION_MINOR);
+        }
        return -EINVAL;
 }
diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/cxgb3/t3cdev.h
index fa4099bc0416..77fcc1a4984e 100644
--- a/drivers/net/cxgb3/t3cdev.h
+++ b/drivers/net/cxgb3/t3cdev.h
@@ -42,9 +42,6 @@
 #define T3CNAMSIZ 16
-/* Get the t3cdev associated with a net_device */
-#define T3CDEV(netdev) (struct t3cdev *)(netdev->priv)
 struct cxgb3_client;
 enum t3ctype {
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index c3de81bf090a..738aa5906514 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -700,6 +700,7 @@ dm9000_init_dm9000(struct net_device *dev)
 static int
 dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
+        unsigned long flags;
        board_info_t *db = (board_info_t *) dev->priv;
        PRINTK3("dm9000_start_xmit\n");
@@ -707,10 +708,7 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (db->tx_pkt_cnt > 1)
                return 1;
-        netif_stop_queue(dev);
+        spin_lock_irqsave(&db->lock, flags);
-        /* Disable all interrupts */
-        iow(db, DM9000_IMR, IMR_PAR);
        /* Move data to DM9000 TX RAM */
        writeb(DM9000_MWCMD, db->io_addr);
@@ -718,12 +716,9 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
        (db->outblk)(db->io_data, skb->data, skb->len);
        db->stats.tx_bytes += skb->len;
+        db->tx_pkt_cnt++;
        /* TX control: First packet immediately send, second packet queue */
-        if (db->tx_pkt_cnt == 0) {
+        if (db->tx_pkt_cnt == 1) {
-                /* First Packet */
-                db->tx_pkt_cnt++;
                /* Set TX length to DM9000 */
                iow(db, DM9000_TXPLL, skb->len & 0xff);
                iow(db, DM9000_TXPLH, (skb->len >> 8) & 0xff);
@@ -732,23 +727,17 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
                iow(db, DM9000_TCR, TCR_TXREQ); /* Cleared after TX complete */
                dev->trans_start = jiffies;     /* save the time stamp */
        } else {
                /* Second packet */
-                db->tx_pkt_cnt++;
                db->queue_pkt_len = skb->len;
+                netif_stop_queue(dev);
        }
+        spin_unlock_irqrestore(&db->lock, flags);
        /* free this SKB */
        dev_kfree_skb(skb);
-        /* Re-enable resource check */
-        if (db->tx_pkt_cnt == 1)
-                netif_wake_queue(dev);
-        /* Re-enable interrupt */
-        iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM);
        return 0;
 }
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 9756211e83ce..db5747490a07 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -76,7 +76,7 @@ MODULE_PARM_DESC(rq1_entries, "Number of entries for Receive Queue 1 "
 MODULE_PARM_DESC(sq_entries, " Number of entries for the Send Queue  "
                 "[2^x - 1], x = [6..14]. Default = "
                 __MODULE_STRING(EHEA_DEF_ENTRIES_SQ) ")");
-MODULE_PARM_DESC(use_mcs, " 0:NAPI, 1:Multiple receive queues, Default = 1 ");
+MODULE_PARM_DESC(use_mcs, " 0:NAPI, 1:Multiple receive queues, Default = 0 ");
 static int port_name_cnt = 0;
 static LIST_HEAD(adapter_list);
@@ -2490,7 +2490,7 @@ static ssize_t ehea_show_port_id(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
        struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev);
-        return sprintf(buf, "0x%X", port->logical_port_id);
+        return sprintf(buf, "%d", port->logical_port_id);
 }
 static DEVICE_ATTR(log_port_id, S_IRUSR | S_IRGRP | S_IROTH, ehea_show_port_id,
@@ -2781,7 +2781,7 @@ static ssize_t ehea_probe_port(struct device *dev,
        u32 logical_port_id;
-        sscanf(buf, "%X", &logical_port_id);
+        sscanf(buf, "%d", &logical_port_id);
        port = ehea_get_port(adapter, logical_port_id);
@@ -2834,7 +2834,7 @@ static ssize_t ehea_remove_port(struct device *dev,
        int i;
        u32 logical_port_id;
-        sscanf(buf, "%X", &logical_port_id);
+        sscanf(buf, "%d", &logical_port_id);
        port = ehea_get_port(adapter, logical_port_id);
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index a36fa6c23fdf..c82e24596074 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -235,6 +235,8 @@ int ehea_destroy_cq(struct ehea_cq *cq)
        if (!cq)
                return 0;
+        hcp_epas_dtor(&cq->epas);
        if ((hret = ehea_destroy_cq_res(cq, NORMAL_FREE)) == H_R_STATE) {
                ehea_error_data(cq->adapter, cq->fw_handle);
                hret = ehea_destroy_cq_res(cq, FORCE_FREE);
@@ -361,6 +363,8 @@ int ehea_destroy_eq(struct ehea_eq *eq)
        if (!eq)
                return 0;
+        hcp_epas_dtor(&eq->epas);
        if ((hret = ehea_destroy_eq_res(eq, NORMAL_FREE)) == H_R_STATE) {
                ehea_error_data(eq->adapter, eq->fw_handle);
                hret = ehea_destroy_eq_res(eq, FORCE_FREE);
@@ -541,6 +545,8 @@ int ehea_destroy_qp(struct ehea_qp *qp)
        if (!qp)
                return 0;
+        hcp_epas_dtor(&qp->epas);
        if ((hret = ehea_destroy_qp_res(qp, NORMAL_FREE)) == H_R_STATE) {
                ehea_error_data(qp->adapter, qp->fw_handle);
                hret = ehea_destroy_qp_res(qp, FORCE_FREE);
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index a93700e5661a..102218c4a907 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -391,7 +391,7 @@ static int __eql_insert_slave(slave_queue_t *queue, slave_t *slave)
                slave_t *duplicate_slave = NULL;
                duplicate_slave = __eql_find_slave_dev(queue, slave->dev);
-                if (duplicate_slave != 0)
+                if (duplicate_slave)
                        eql_kill_one_slave(queue, duplicate_slave);
                list_add(&slave->list, &queue->all_slaves);
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 10f4e3b55168..1938d6dfc863 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -552,7 +552,7 @@ union ring_type {
 #define PHY_OUI_MARVELL 0x5043
 #define PHY_OUI_CICADA  0x03f1
 #define PHY_OUI_VITESSE 0x01c1
-#define PHY_OUI_REALTEK 0x01c1
+#define PHY_OUI_REALTEK 0x0732
 #define PHYID1_OUI_MASK 0x03ff
 #define PHYID1_OUI_SHFT 6
 #define PHYID2_OUI_MASK 0xfc00
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 3ca1e8ece548..0834ef0eddb4 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -48,6 +48,7 @@
 #ifdef CONFIG_SERIAL_8250
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
+#include <linux/serial_reg.h>
 #endif
 #include <linux/netdevice.h>
@@ -1151,13 +1152,41 @@ static int ioc3_is_menet(struct pci_dev *pdev)
 * Also look in ip27-pci.c:pci_fixup_ioc3() for some comments on working
 * around ioc3 oddities in this respect.
 *
- * The IOC3 serials use a 22MHz clock rate with an additional divider by 3.
+ * The IOC3 serials use a 22MHz clock rate with an additional divider which
+ * can be programmed in the SCR register if the DLAB bit is set.
+ *
+ * Register to interrupt zero because we share the interrupt with
+ * the serial driver which we don't properly support yet.
+ *
+ * Can't use UPF_IOREMAP as the whole of IOC3 resources have already been
+ * registered.
 */
+static void __devinit ioc3_8250_register(struct ioc3_uartregs __iomem *uart)
+{
+#define COSMISC_CONSTANT 6
+        struct uart_port port = {
+                .irq            = 0,
+                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 0,
+                .uartclk        = (22000000 << 1) / COSMISC_CONSTANT,
+                .membase        = (unsigned char __iomem *) uart,
+                .mapbase        = (unsigned long) uart,
+        };
+        unsigned char lcr;
+        lcr = uart->iu_lcr;
+        uart->iu_lcr = lcr | UART_LCR_DLAB;
+        uart->iu_scr = COSMISC_CONSTANT,
+        uart->iu_lcr = lcr;
+        uart->iu_lcr;
+        serial8250_register_port(&port);
+}
 static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
 {
-        struct uart_port port;
        /*
         * We need to recognice and treat the fourth MENET serial as it
         * does not have an SuperIO chip attached to it, therefore attempting
@@ -1171,24 +1200,35 @@ static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
                return;
        /*
-         * Register to interrupt zero because we share the interrupt with
+         * Switch IOC3 to PIO mode.  It probably already was but let's be
-         * the serial driver which we don't properly support yet.
+         * paranoid
-         *
-         * Can't use UPF_IOREMAP as the whole of IOC3 resources have already
-         * been registered.
         */
-        memset(&port, 0, sizeof(port));
+        ioc3->gpcr_s = GPCR_UARTA_MODESEL | GPCR_UARTB_MODESEL;
-        port.irq      = 0;
+        ioc3->gpcr_s;
-        port.flags    = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
+        ioc3->gppr_6 = 0;
-        port.iotype   = UPIO_MEM;
+        ioc3->gppr_6;
-        port.regshift = 0;
+        ioc3->gppr_7 = 0;
-        port.uartclk  = 22000000 / 3;
+        ioc3->gppr_7;
+        ioc3->sscr_a = ioc3->sscr_a & ~SSCR_DMA_EN;
-        port.membase  = (unsigned char *) &ioc3->sregs.uarta;
+        ioc3->sscr_a;
-        serial8250_register_port(&port);
+        ioc3->sscr_b = ioc3->sscr_b & ~SSCR_DMA_EN;
+        ioc3->sscr_b;
-        port.membase  = (unsigned char *) &ioc3->sregs.uartb;
+        /* Disable all SA/B interrupts except for SA/B_INT in SIO_IEC. */
-        serial8250_register_port(&port);
+        ioc3->sio_iec &= ~ (SIO_IR_SA_TX_MT | SIO_IR_SA_RX_FULL |
+                            SIO_IR_SA_RX_HIGH | SIO_IR_SA_RX_TIMER |
+                            SIO_IR_SA_DELTA_DCD | SIO_IR_SA_DELTA_CTS |
+                            SIO_IR_SA_TX_EXPLICIT | SIO_IR_SA_MEMERR);
+        ioc3->sio_iec |= SIO_IR_SA_INT;
+        ioc3->sscr_a = 0;
+        ioc3->sio_iec &= ~ (SIO_IR_SB_TX_MT | SIO_IR_SB_RX_FULL |
+                            SIO_IR_SB_RX_HIGH | SIO_IR_SB_RX_TIMER |
+                            SIO_IR_SB_DELTA_DCD | SIO_IR_SB_DELTA_CTS |
+                            SIO_IR_SB_TX_EXPLICIT | SIO_IR_SB_MEMERR);
+        ioc3->sio_iec |= SIO_IR_SB_INT;
+        ioc3->sscr_b = 0;
+        ioc3_8250_register(&ioc3->sregs.uarta);
+        ioc3_8250_register(&ioc3->sregs.uartb);
 }
 #endif
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index bdd5c979bead..4e5101a45c3c 100644
--- a/drivers/net/irda/kingsun-sir.c
+++ b/drivers/net/irda/kingsun-sir.c
@@ -509,12 +509,12 @@ static int kingsun_probe(struct usb_interface *intf,
        spin_lock_init(&kingsun->lock);
        /* Allocate input buffer */
-        kingsun->in_buf = (__u8 *)kmalloc(kingsun->max_rx, GFP_KERNEL);
+        kingsun->in_buf = kmalloc(kingsun->max_rx, GFP_KERNEL);
        if (!kingsun->in_buf)
                goto free_mem;
        /* Allocate output buffer */
-        kingsun->out_buf = (__u8 *)kmalloc(KINGSUN_FIFO_SIZE, GFP_KERNEL);
+        kingsun->out_buf = kmalloc(KINGSUN_FIFO_SIZE, GFP_KERNEL);
        if (!kingsun->out_buf)
                goto free_mem;
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 92b403bf38b0..32bed6bc6c06 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -405,7 +405,7 @@ static void meth_rx(struct net_device* dev, unsigned long int_status)
                                priv->stats.rx_length_errors++;
                                skb = priv->rx_skbs[priv->rx_write];
                        } else {
-                                skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC | GFP_DMA);
+                                skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC);
                                if (!skb) {
                                        /* Ouch! No memory! Drop packet on the floor */
                                        DPRINTK("No mem: dropping packet\n");
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index ae9bb7b7fd67..1c42266bf889 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -72,7 +72,7 @@
 #include "myri10ge_mcp.h"
 #include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.3.1-1.248"
+#define MYRI10GE_VERSION_STR "1.3.2-1.269"
 MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
 MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -2514,26 +2514,20 @@ static void myri10ge_firmware_probe(struct myri10ge_priv *mgp)
 {
        struct pci_dev *pdev = mgp->pdev;
        struct device *dev = &pdev->dev;
-        int cap, status;
+        int status;
-        u16 val;
        mgp->tx.boundary = 4096;
        /*
         * Verify the max read request size was set to 4KB
         * before trying the test with 4KB.
         */
-        cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+        status = pcie_get_readrq(pdev);
-        if (cap < 64) {
+        if (status < 0) {
-                dev_err(dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
-                goto abort;
-        }
-        status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
-        if (status != 0) {
                dev_err(dev, "Couldn't read max read req size: %d\n", status);
                goto abort;
        }
-        if ((val & (5 << 12)) != (5 << 12)) {
+        if (status != 4096) {
-                dev_warn(dev, "Max Read Request size != 4096 (0x%x)\n", val);
+                dev_warn(dev, "Max Read Request size != 4096 (%d)\n", status);
                mgp->tx.boundary = 2048;
        }
        /*
@@ -2850,9 +2844,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        size_t bytes;
        int i;
        int status = -ENXIO;
-        int cap;
        int dac_enabled;
-        u16 val;
        netdev = alloc_etherdev(sizeof(*mgp));
        if (netdev == NULL) {
@@ -2884,19 +2876,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
            = pci_find_capability(pdev, PCI_CAP_ID_VNDR);
        /* Set our max read request to 4KB */
-        cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+        status = pcie_set_readrq(pdev, 4096);
-        if (cap < 64) {
-                dev_err(&pdev->dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
-                goto abort_with_netdev;
-        }
-        status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
-        if (status != 0) {
-                dev_err(&pdev->dev, "Error %d reading PCI_EXP_DEVCTL\n",
-                        status);
-                goto abort_with_netdev;
-        }
-        val = (val & ~PCI_EXP_DEVCTL_READRQ) | (5 << 12);
-        status = pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, val);
        if (status != 0) {
                dev_err(&pdev->dev, "Error %d writing PCI_EXP_DEVCTL\n",
                        status);
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index 3276866b17e2..d72f8f8fcb50 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -649,9 +649,11 @@ enum {
 #define PCIX_INT_VECTOR         (0x10100)
 #define PCIX_INT_MASK           (0x10104)
-#define PCIX_MN_WINDOW          (0x10200)
+#define PCIX_MN_WINDOW_F0       (0x10200)
+#define PCIX_MN_WINDOW(_f)      (PCIX_MN_WINDOW_F0 + (0x20 * (_f)))
 #define PCIX_MS_WINDOW          (0x10204)
-#define PCIX_SN_WINDOW          (0x10208)
+#define PCIX_SN_WINDOW_F0       (0x10208)
+#define PCIX_SN_WINDOW(_f)      (PCIX_SN_WINDOW_F0 + (0x20 * (_f)))
 #define PCIX_CRB_WINDOW         (0x10210)
 #define PCIX_CRB_WINDOW_F0      (0x10210)
 #define PCIX_CRB_WINDOW_F1      (0x10230)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index aac15421bd1e..a7b8d7f23259 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -904,11 +904,11 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter,
                        ddr_mn_window = window;
                        writel(window, PCI_OFFSET_SECOND_RANGE(adapter,
                                                               NETXEN_PCIX_PH_REG
-                                                               (PCIX_MN_WINDOW)));
+                                                               (PCIX_MN_WINDOW(adapter->ahw.pci_func))));
                        /* MUST make sure window is set before we forge on... */
                        readl(PCI_OFFSET_SECOND_RANGE(adapter,
                                                      NETXEN_PCIX_PH_REG
-                                                      (PCIX_MN_WINDOW)));
+                                                      (PCIX_MN_WINDOW(adapter->ahw.pci_func))));
                }
                addr -= (window * NETXEN_WINDOW_ONE);
                addr += NETXEN_PCI_DDR_NET;
@@ -929,11 +929,11 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter,
                        writel((window << 22),
                               PCI_OFFSET_SECOND_RANGE(adapter,
                                                       NETXEN_PCIX_PH_REG
-                                                       (PCIX_SN_WINDOW)));
+                                                       (PCIX_SN_WINDOW(adapter->ahw.pci_func))));
                        /* MUST make sure window is set before we forge on... */
                        readl(PCI_OFFSET_SECOND_RANGE(adapter,
                                                      NETXEN_PCIX_PH_REG
-                                                      (PCIX_SN_WINDOW)));
+                                                      (PCIX_SN_WINDOW(adapter->ahw.pci_func))));
                }
                addr -= (window * 0x400000);
                addr += NETXEN_PCI_QDR_NET;
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 08a62acde8bf..3122d0101638 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -639,10 +639,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                        NETXEN_CRB_NORMALIZE(adapter,
                                NETXEN_ROMUSB_GLB_PEGTUNE_DONE));
                /* Handshake with the card before we register the devices. */
-                writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
-                netxen_pinit_from_rom(adapter, 0);
-                msleep(1);
-                netxen_load_firmware(adapter);
                netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
        }
@@ -750,9 +746,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
        netxen_nic_disable_int(adapter);
-        if (adapter->irq)
-                free_irq(adapter->irq, adapter);
        if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
                init_firmware_done++;
                netxen_free_hw_resources(adapter);
@@ -776,13 +769,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
                }
        }
-        if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
-                pci_disable_msi(pdev);
        vfree(adapter->cmd_buf_arr);
-        pci_disable_device(pdev);
        if (adapter->portnum == 0) {
                if (init_firmware_done) {
                        i = 100;
@@ -833,12 +821,19 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
                }
        }
+        if (adapter->irq)
+                free_irq(adapter->irq, adapter);
+        if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
+                pci_disable_msi(pdev);
        iounmap(adapter->ahw.db_base);
        iounmap(adapter->ahw.pci_base0);
        iounmap(adapter->ahw.pci_base1);
        iounmap(adapter->ahw.pci_base2);
        pci_release_regions(pdev);
+        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);
        free_netdev(netdev);
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index a8b74cdab1ea..e275df8c55bc 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -364,7 +364,7 @@ EXPORT_SYMBOL(genphy_config_advert);
 */
 int genphy_setup_forced(struct phy_device *phydev)
 {
-        int ctl = BMCR_RESET;
+        int ctl = 0;
        phydev->pause = phydev->asym_pause = 0;
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index ef3325b69233..9293c82ef2af 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1726,7 +1726,7 @@ ppp_decompress_frame(struct ppp *ppp, struct sk_buff *skb)
                }
                /* the decompressor still expects the A/C bytes in the hdr */
                len = ppp->rcomp->decompress(ppp->rc_state, skb->data - 2,
-                                skb->len + 2, ns->data, ppp->mru + PPP_HDRLEN);
+                                skb->len + 2, ns->data, obuff_size);
                if (len < 0) {
                        /* Pass the compressed frame to pppd as an
                           error indication. */
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 13d1c0a2a25f..e56503918436 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -556,7 +556,6 @@ static int gelic_net_stop(struct net_device *netdev)
 {
        struct gelic_net_card *card = netdev_priv(netdev);
-        netif_poll_disable(netdev);
        netif_stop_queue(netdev);
        /* turn off DMA, force end */
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 384b4685e977..0fb74cb51c4b 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -726,7 +726,7 @@ err_out:
        return err;
 }
-static void __exit sgiseeq_remove(struct platform_device *pdev)
+static int __exit sgiseeq_remove(struct platform_device *pdev)
 {
        struct net_device *dev = platform_get_drvdata(pdev);
        struct sgiseeq_private *sp = netdev_priv(dev);
@@ -735,6 +735,8 @@ static void __exit sgiseeq_remove(struct platform_device *pdev)
        free_page((unsigned long) sp->srings);
        free_netdev(dev);
        platform_set_drvdata(pdev, NULL);
+        return 0;
 }
 static struct platform_driver sgiseeq_driver = {
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index e7a2eadcc3b0..e6d937ec6886 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -51,7 +51,7 @@
 #include "sky2.h"
 #define DRV_NAME                "sky2"
-#define DRV_VERSION             "1.16"
+#define DRV_VERSION             "1.17"
 #define PFX                     DRV_NAME " "
 /*
@@ -99,10 +99,6 @@ static int disable_msi = 0;
 module_param(disable_msi, int, 0);
 MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
-static int idle_timeout = 100;
-module_param(idle_timeout, int, 0);
-MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)");
 static const struct pci_device_id sky2_id_table[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */
        { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */
@@ -219,9 +215,12 @@ static void sky2_power_on(struct sky2_hw *hw)
        else
                sky2_write8(hw, B2_Y2_CLK_GATE, 0);
-        if (hw->chip_id == CHIP_ID_YUKON_EC_U || hw->chip_id == CHIP_ID_YUKON_EX) {
+        if (hw->chip_id == CHIP_ID_YUKON_EC_U ||
+            hw->chip_id == CHIP_ID_YUKON_EX) {
                u32 reg;
+                sky2_pci_write32(hw, PCI_DEV_REG3, 0);
                reg = sky2_pci_read32(hw, PCI_DEV_REG4);
                /* set all bits to 0 except bits 15..12 and 8 */
                reg &= P_ASPM_CONTROL_MSK;
@@ -238,6 +237,8 @@ static void sky2_power_on(struct sky2_hw *hw)
                reg = sky2_read32(hw, B2_GP_IO);
                reg |= GLB_GPIO_STAT_RACE_DIS;
                sky2_write32(hw, B2_GP_IO, reg);
+                sky2_read32(hw, B2_GP_IO);
        }
 }
@@ -696,8 +697,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
        int i;
        const u8 *addr = hw->dev[port]->dev_addr;
-        sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_SET);
+        sky2_write8(hw, SK_REG(port, GPHY_CTRL), GPC_RST_SET);
-        sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_CLR);
+        sky2_write8(hw, SK_REG(port, GPHY_CTRL), GPC_RST_CLR);
        sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_RST_CLR);
@@ -1619,6 +1620,9 @@ static int sky2_down(struct net_device *dev)
        if (netif_msg_ifdown(sky2))
                printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
+        if (netif_carrier_ok(dev) && --hw->active == 0)
+                del_timer(&hw->watchdog_timer);
        /* Stop more packets from being queued */
        netif_stop_queue(dev);
@@ -1739,6 +1743,10 @@ static void sky2_link_up(struct sky2_port *sky2)
        netif_carrier_on(sky2->netdev);
+        if (hw->active++ == 0)
+                mod_timer(&hw->watchdog_timer, jiffies + 1);
        /* Turn on link LED */
        sky2_write8(hw, SK_REG(port, LNK_LED_REG),
                    LINKLED_ON | LINKLED_BLINK_OFF | LINKLED_LINKSYNC_OFF);
@@ -1790,6 +1798,11 @@ static void sky2_link_down(struct sky2_port *sky2)
        netif_carrier_off(sky2->netdev);
+        /* Stop watchdog if both ports are not active */
+        if (--hw->active == 0)
+                del_timer(&hw->watchdog_timer);
        /* Turn on link LED */
        sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF);
@@ -2421,25 +2434,20 @@ static void sky2_le_error(struct sky2_hw *hw, unsigned port,
        sky2_write32(hw, Q_ADDR(q, Q_CSR), BMU_CLR_IRQ_CHK);
 }
-/* If idle then force a fake soft NAPI poll once a second
+/* Check for lost IRQ once a second */
- * to work around cases where sharing an edge triggered interrupt.
+static void sky2_watchdog(unsigned long arg)
- */
-static inline void sky2_idle_start(struct sky2_hw *hw)
-{
-        if (idle_timeout > 0)
-                mod_timer(&hw->idle_timer,
-                          jiffies + msecs_to_jiffies(idle_timeout));
-}
-static void sky2_idle(unsigned long arg)
 {
        struct sky2_hw *hw = (struct sky2_hw *) arg;
-        struct net_device *dev = hw->dev[0];
-        if (__netif_rx_schedule_prep(dev))
+        if (sky2_read32(hw, B0_ISRC)) {
-                __netif_rx_schedule(dev);
+                struct net_device *dev = hw->dev[0];
-        mod_timer(&hw->idle_timer, jiffies + msecs_to_jiffies(idle_timeout));
+                if (__netif_rx_schedule_prep(dev))
+                        __netif_rx_schedule(dev);
+        }
+        if (hw->active > 0)
+                mod_timer(&hw->watchdog_timer, round_jiffies(jiffies + HZ));
 }
 /* Hardware/software error handling */
@@ -2727,8 +2735,6 @@ static void sky2_restart(struct work_struct *work)
        struct net_device *dev;
        int i, err;
-        del_timer_sync(&hw->idle_timer);
        rtnl_lock();
        sky2_write32(hw, B0_IMSK, 0);
        sky2_read32(hw, B0_IMSK);
@@ -2757,8 +2763,6 @@ static void sky2_restart(struct work_struct *work)
                }
        }
-        sky2_idle_start(hw);
        rtnl_unlock();
 }
@@ -4025,11 +4029,9 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                        sky2_show_addr(dev1);
        }
-        setup_timer(&hw->idle_timer, sky2_idle, (unsigned long) hw);
+        setup_timer(&hw->watchdog_timer, sky2_watchdog, (unsigned long) hw);
        INIT_WORK(&hw->restart_work, sky2_restart);
-        sky2_idle_start(hw);
        pci_set_drvdata(pdev, hw);
        return 0;
@@ -4064,7 +4066,7 @@ static void __devexit sky2_remove(struct pci_dev *pdev)
        if (!hw)
                return;
-        del_timer_sync(&hw->idle_timer);
+        del_timer_sync(&hw->watchdog_timer);
        flush_scheduled_work();
@@ -4108,7 +4110,6 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
        if (!hw)
                return 0;
-        del_timer_sync(&hw->idle_timer);
        netif_poll_disable(hw->dev[0]);
        for (i = 0; i < hw->ports; i++) {
@@ -4174,7 +4175,7 @@ static int sky2_resume(struct pci_dev *pdev)
        }
        netif_poll_enable(hw->dev[0]);
-        sky2_idle_start(hw);
        return 0;
 out:
        dev_err(&pdev->dev, "resume failed (%d)\n", err);
@@ -4191,7 +4192,6 @@ static void sky2_shutdown(struct pci_dev *pdev)
        if (!hw)
                return;
-        del_timer_sync(&hw->idle_timer);
        netif_poll_disable(hw->dev[0]);
        for (i = 0; i < hw->ports; i++) {
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index dce4d276d443..72e12b7cfa40 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -2045,12 +2045,13 @@ struct sky2_hw {
        u8                   chip_rev;
        u8                   pmd_type;
        u8                   ports;
+        u8                   active;
        struct sky2_status_le *st_le;
        u32                  st_idx;
        dma_addr_t           st_dma;
-        struct timer_list    idle_timer;
+        struct timer_list    watchdog_timer;
        struct work_struct   restart_work;
        int                  msi;
        wait_queue_head_t    msi_wait;
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 65bd20fac820..3fd4735006f5 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -957,7 +957,7 @@ slip_close(struct tty_struct *tty)
  *                     STANDARD SLIP ENCAPSULATION                      *
  ************************************************************************/
-int
+static int
 slip_esc(unsigned char *s, unsigned char *d, int len)
 {
        unsigned char *ptr = d;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 58740428dd07..9034a05734ef 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -64,8 +64,8 @@
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.80"
+#define DRV_MODULE_VERSION      "3.81"
-#define DRV_MODULE_RELDATE      "August 2, 2007"
+#define DRV_MODULE_RELDATE      "September 5, 2007"
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -7127,6 +7127,10 @@ static int tg3_open(struct net_device *dev)
                } else if (pci_enable_msi(tp->pdev) == 0) {
                        u32 msi_mode;
+                        /* Hardware bug - MSI won't work if INTX disabled. */
+                        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
+                                pci_intx(tp->pdev, 1);
                        msi_mode = tr32(MSGINT_MODE);
                        tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE);
                        tp->tg3_flags2 |= TG3_FLG2_USING_MSI;
@@ -12172,6 +12176,11 @@ static int tg3_resume(struct pci_dev *pdev)
        if (err)
                return err;
+        /* Hardware bug - MSI won't work if INTX disabled. */
+        if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) &&
+            (tp->tg3_flags2 & TG3_FLG2_USING_MSI))
+                pci_intx(tp->pdev, 1);
        netif_device_attach(dev);
        tg3_full_lock(tp, 0);
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 70db38c0ced9..56829f82be4a 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -267,7 +267,10 @@ static void ibm_handle_events(acpi_handle handle, u32 event, void *context)
        if (subevent == 0x80) {
                dbg("%s: generationg bus event\n", __FUNCTION__);
-                acpi_bus_generate_event(note->device, note->event, detail);
+                acpi_bus_generate_proc_event(note->device, note->event, detail);
+                acpi_bus_generate_netlink_event(note->device->pnp.device_class,
+                                                  note->device->dev.bus_id,
+                                                  note->event, detail);
        } else
                note->event = event;
 }
@@ -399,7 +402,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
        status = acpi_get_object_info(handle, &info_buffer);
        if (ACPI_FAILURE(status)) {
-                err("%s:  Failed to get device information", __FUNCTION__);
+                err("%s:  Failed to get device information\n", __FUNCTION__);
                return 0;
        }
        info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index 79ff6b4de3a6..37d72f123a80 100644
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -1746,10 +1746,8 @@ static void pushbutton_helper_thread(unsigned long data)
 static int event_thread(void* data)
 {
        struct controller *ctrl;
-        lock_kernel();
        daemonize("phpd_event");
-        
-        unlock_kernel();
        while (1) {
                dbg("!!!!event_thread sleeping\n");
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index c6e132d7c0f7..4c36e80f6d26 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -5,12 +5,7 @@ extern int pci_uevent(struct device *dev, char **envp, int num_envp,
 extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_cleanup_rom(struct pci_dev *dev);
-extern int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
-                                  resource_size_t size, resource_size_t align,
-                                  resource_size_t min, unsigned int type_mask,
-                                  void (*alignf)(void *, struct resource *,
-                                              resource_size_t, resource_size_t),
-                                  void *alignf_data);
 /* Firmware callbacks */
 extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
 extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state);
@@ -35,7 +30,6 @@ static inline int pci_proc_detach_bus(struct pci_bus *bus) { return 0; }
 /* Functions for PCI Hotplug drivers to use */
 extern unsigned int pci_do_scan_bus(struct pci_bus *bus);
-extern int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap);
 extern void pci_remove_legacy_files(struct pci_bus *bus);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 34b8dae0d90f..27e00b2d7b5b 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -653,20 +653,20 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass
        sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
+        /* Has only triggered on CardBus, fixup is in yenta_socket */
        while (bus->parent) {
                if ((child->subordinate > bus->subordinate) ||
                    (child->number > bus->subordinate) ||
                    (child->number < bus->number) ||
                    (child->subordinate < bus->number)) {
-                        printk(KERN_WARNING "PCI: Bus #%02x (-#%02x) is "
+                        pr_debug("PCI: Bus #%02x (-#%02x) is %s"
-                               "hidden behind%s bridge #%02x (-#%02x)%s\n",
+                                "hidden behind%s bridge #%02x (-#%02x)\n",
-                               child->number, child->subordinate,
+                                child->number, child->subordinate,
-                               bus->self->transparent ? " transparent" : " ",
+                                (bus->number > child->subordinate &&
-                               bus->number, bus->subordinate,
+                                 bus->subordinate < child->number) ?
-                               pcibios_assign_all_busses() ? " " :
+                                        "wholly " : " partially",
-                               " (try 'pci=assign-busses')");
+                                bus->self->transparent ? " transparent" : " ",
-                        printk(KERN_WARNING "Please report the result to "
+                                bus->number, bus->subordinate);
-                               "<bk@suse.de> to fix this permanently\n");
                }
                bus = bus->parent;
        }
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index c559085c89a5..2d40f437b9fc 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -947,7 +947,7 @@ static void k8t_sound_hostbridge(struct pci_dev *dev)
        unsigned char val;
        pci_read_config_byte(dev, 0x50, &val);
-        if (val == 0x88 || val == 0xc8) {
+        if (val == 0xc8) {
                /* Assume it's probably a MSI-K8T-Neo2Fir */
                printk(KERN_INFO "PCI: MSI-K8T-Neo2Fir, attempting to turn soundcard ON\n");
                pci_write_config_byte(dev, 0x50, val & (~0x40));
@@ -1485,7 +1485,7 @@ static void __devinit quirk_e100_interrupt(struct pci_dev *dev)
        iounmap(csr);
 }
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_e100_interrupt);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_e100_interrupt);
 static void __devinit fixup_rev1_53c810(struct pci_dev* dev)
 {
@@ -1650,6 +1650,9 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCN
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000_PCIX, quirk_disable_all_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_all_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RD580, quirk_disable_all_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RX790, quirk_disable_all_msi);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS690, quirk_disable_all_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi);
 /* Disable MSI on chipsets that are known to not support it */
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index b6a4f02b01d1..6c0440c20e31 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -25,13 +25,13 @@ static const struct pnp_card_device_id *match_card(struct pnp_card_driver *drv,
                                int found;
                                struct pnp_dev *dev;
-                                if (i == PNP_MAX_DEVICES
+                                if (i == PNP_MAX_DEVICES ||
-                                    || !*drv_id->devs[i].id)
+                                    !*drv_id->devs[i].id)
                                        return drv_id;
                                found = 0;
                                card_for_each_dev(card, dev) {
-                                        if (compare_pnp_id
+                                        if (compare_pnp_id(dev->id,
-                                            (dev->id, drv_id->devs[i].id)) {
+                                                   drv_id->devs[i].id)) {
                                                found = 1;
                                                break;
                                        }
@@ -183,7 +183,7 @@ static int pnp_interface_attach_card(struct pnp_card *card)
        return 0;
-      err_name:
+err_name:
        device_remove_file(&card->dev, &dev_attr_name);
        return rc;
 }
@@ -321,10 +321,10 @@ struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
                pos = pos->next;
        }
-      done:
+done:
        return NULL;
-      found:
+found:
        dev->card_link = clink;
        dev->dev.driver = &drv->link.driver;
        if (pnp_bus_type.probe(&dev->dev))
@@ -334,7 +334,7 @@ struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
        return dev;
-      err_out:
+err_out:
        dev->dev.driver = NULL;
        dev->card_link = NULL;
        return NULL;
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 61066fdb9e6d..d5964feb14de 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -52,9 +52,6 @@ int pnp_register_protocol(struct pnp_protocol *protocol)
        int nodenum;
        struct list_head *pos;
-        if (!protocol)
-                return -EINVAL;
        INIT_LIST_HEAD(&protocol->devices);
        INIT_LIST_HEAD(&protocol->cards);
        nodenum = 0;
@@ -94,8 +91,6 @@ static void pnp_free_ids(struct pnp_dev *dev)
        struct pnp_id *id;
        struct pnp_id *next;
-        if (!dev)
-                return;
        id = dev->id;
        while (id) {
                next = id->next;
@@ -143,7 +138,7 @@ int __pnp_add_device(struct pnp_dev *dev)
 */
 int pnp_add_device(struct pnp_dev *dev)
 {
-        if (!dev || !dev->protocol || dev->card)
+        if (dev->card)
                return -EINVAL;
        dev->dev.parent = &dev->protocol->dev;
        sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 30b8f6f3258a..2fa64a6b25c8 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -118,7 +118,7 @@ static int pnp_device_probe(struct device *dev)
                goto fail;
        return error;
-      fail:
+fail:
        pnp_device_detach(pnp_dev);
        return error;
 }
@@ -232,10 +232,6 @@ int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev)
 {
        struct pnp_id *ptr;
-        if (!id)
-                return -EINVAL;
-        if (!dev)
-                return -EINVAL;
        id->next = NULL;
        ptr = dev->id;
        while (ptr && ptr->next)
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index fe6684e13e82..a0cfb75bbb8d 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -459,7 +459,8 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
                up(&pnp_res_mutex);
                goto done;
        }
-      done:
+done:
        if (retval < 0)
                return retval;
        return count;
@@ -499,10 +500,10 @@ int pnp_interface_attach_device(struct pnp_dev *dev)
        return 0;
-      err_res:
+err_res:
        device_remove_file(&dev->dev, &dev_attr_resources);
-      err_opt:
+err_opt:
        device_remove_file(&dev->dev, &dev_attr_options);
-      err:
+err:
        return rc;
 }
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index b4e2aa995b53..b035d60a1dcc 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -47,9 +47,6 @@
 #if 0
 #define ISAPNP_REGION_OK
 #endif
-#if 0
-#define ISAPNP_DEBUG
-#endif
 int isapnp_disable;             /* Disable ISA PnP */
 static int isapnp_rdp;          /* Read Data Port */
@@ -93,7 +90,6 @@ MODULE_LICENSE("GPL");
 static unsigned char isapnp_checksum_value;
 static DEFINE_MUTEX(isapnp_cfg_mutex);
-static int isapnp_detected;
 static int isapnp_csn_count;
 /* some prototypes */
@@ -335,7 +331,7 @@ static int __init isapnp_isolate(void)
                } else if (iteration > 1) {
                        break;
                }
-              __next:
+__next:
                if (csn == 255)
                        break;
                checksum = 0x6a;
@@ -733,7 +729,7 @@ static int __init isapnp_create_device(struct pnp_card *card,
                               "isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n",
                               type, dev->number, card->number);
                }
-              __skip:
+__skip:
                if (size > 0)
                        isapnp_skip_bytes(size);
        }
@@ -788,7 +784,7 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
                               "isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n",
                               type, card->number);
                }
-              __skip:
+__skip:
                if (size > 0)
                        isapnp_skip_bytes(size);
        }
@@ -940,9 +936,6 @@ EXPORT_SYMBOL(isapnp_protocol);
 EXPORT_SYMBOL(isapnp_present);
 EXPORT_SYMBOL(isapnp_cfg_begin);
 EXPORT_SYMBOL(isapnp_cfg_end);
-#if 0
-EXPORT_SYMBOL(isapnp_read_byte);
-#endif
 EXPORT_SYMBOL(isapnp_write_byte);
 static int isapnp_read_resources(struct pnp_dev *dev,
@@ -993,6 +986,7 @@ static int isapnp_get_resources(struct pnp_dev *dev,
                                struct pnp_resource_table *res)
 {
        int ret;
        pnp_init_resource_table(res);
        isapnp_cfg_begin(dev->card->number, dev->number);
        ret = isapnp_read_resources(dev, res);
@@ -1046,7 +1040,7 @@ static int isapnp_set_resources(struct pnp_dev *dev,
 static int isapnp_disable_resources(struct pnp_dev *dev)
 {
-        if (!dev || !dev->active)
+        if (!dev->active)
                return -EINVAL;
        isapnp_cfg_begin(dev->card->number, dev->number);
        isapnp_deactivate(dev->number);
@@ -1069,7 +1063,6 @@ static int __init isapnp_init(void)
        struct pnp_dev *dev;
        if (isapnp_disable) {
-                isapnp_detected = 0;
                printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
                return 0;
        }
@@ -1117,7 +1110,6 @@ static int __init isapnp_init(void)
                }
                isapnp_set_rdp();
        }
-        isapnp_detected = 1;
        if (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff) {
                cards = isapnp_isolate();
                if (cards < 0 || (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff)) {
@@ -1125,7 +1117,6 @@ static int __init isapnp_init(void)
                        release_region(_PIDXR, 1);
 #endif
                        release_region(_PNPWRP, 1);
-                        isapnp_detected = 0;
                        printk(KERN_INFO
                               "isapnp: No Plug & Play device found\n");
                        return 0;
@@ -1148,13 +1139,12 @@ static int __init isapnp_init(void)
                        }
                }
        }
-        if (cards) {
+        if (cards)
                printk(KERN_INFO
                       "isapnp: %i Plug & Play card%s detected total\n", cards,
                       cards > 1 ? "s" : "");
-        } else {
+        else
                printk(KERN_INFO "isapnp: No Plug & Play card found\n");
-        }
        isapnp_proc_init();
        return 0;
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index 3fbc0f9ffc26..560ccb640816 100644
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -112,33 +112,6 @@ static int isapnp_proc_attach_device(struct pnp_dev *dev)
        return 0;
 }
-#ifdef MODULE
-static int __exit isapnp_proc_detach_device(struct pnp_dev *dev)
-{
-        struct pnp_card *bus = dev->card;
-        struct proc_dir_entry *de;
-        char name[16];
-        if (!(de = bus->procdir))
-                return -EINVAL;
-        sprintf(name, "%02x", dev->number);
-        remove_proc_entry(name, de);
-        return 0;
-}
-static int __exit isapnp_proc_detach_bus(struct pnp_card *bus)
-{
-        struct proc_dir_entry *de;
-        char name[16];
-        if (!(de = bus->procdir))
-                return -EINVAL;
-        sprintf(name, "%02x", bus->number);
-        remove_proc_entry(name, isapnp_proc_bus_dir);
-        return 0;
-}
-#endif                          /* MODULE */
 int __init isapnp_proc_init(void)
 {
        struct pnp_dev *dev;
@@ -149,21 +122,3 @@ int __init isapnp_proc_init(void)
        }
        return 0;
 }
-#ifdef MODULE
-int __exit isapnp_proc_done(void)
-{
-        struct pnp_dev *dev;
-        struct pnp_bus *card;
-        isapnp_for_each_dev(dev) {
-                isapnp_proc_detach_device(dev);
-        }
-        isapnp_for_each_card(card) {
-                isapnp_proc_detach_bus(card);
-        }
-        if (isapnp_proc_bus_dir)
-                remove_proc_entry("isapnp", proc_bus);
-        return 0;
-}
-#endif                          /* MODULE */
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 3bda513a6bd3..0826287eef53 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -21,9 +21,6 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
        resource_size_t *start, *end;
        unsigned long *flags;
-        if (!dev || !rule)
-                return -EINVAL;
        if (idx >= PNP_MAX_PORT) {
                pnp_err
                    ("More than 4 ports is incompatible with pnp specifications.");
@@ -66,9 +63,6 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
        resource_size_t *start, *end;
        unsigned long *flags;
-        if (!dev || !rule)
-                return -EINVAL;
        if (idx >= PNP_MAX_MEM) {
                pnp_err
                    ("More than 8 mems is incompatible with pnp specifications.");
@@ -127,9 +121,6 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
                5, 10, 11, 12, 9, 14, 15, 7, 3, 4, 13, 0, 1, 6, 8, 2
        };
-        if (!dev || !rule)
-                return -EINVAL;
        if (idx >= PNP_MAX_IRQ) {
                pnp_err
                    ("More than 2 irqs is incompatible with pnp specifications.");
@@ -181,9 +172,6 @@ static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
                1, 3, 5, 6, 7, 0, 2, 4
        };
-        if (!dev || !rule)
-                return -EINVAL;
        if (idx >= PNP_MAX_DMA) {
                pnp_err
                    ("More than 2 dmas is incompatible with pnp specifications.");
@@ -390,7 +378,7 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
        up(&pnp_res_mutex);
        return 1;
-      fail:
+fail:
        pnp_clean_resource_table(&dev->res);
        up(&pnp_res_mutex);
        return 0;
@@ -410,8 +398,6 @@ int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
        int i;
        struct pnp_resource_table *bak;
-        if (!dev || !res)
-                return -EINVAL;
        if (!pnp_can_configure(dev))
                return -ENODEV;
        bak = pnp_alloc(sizeof(struct pnp_resource_table));
@@ -444,7 +430,7 @@ int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
        kfree(bak);
        return 0;
-      fail:
+fail:
        dev->res = *bak;
        up(&pnp_res_mutex);
        kfree(bak);
@@ -460,9 +446,6 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
        struct pnp_option *dep;
        int i = 1;
-        if (!dev)
-                return -EINVAL;
        if (!pnp_can_configure(dev)) {
                pnp_dbg("Device %s does not support resource configuration.",
                        dev->dev.bus_id);
@@ -541,8 +524,6 @@ int pnp_activate_dev(struct pnp_dev *dev)
 {
        int error;
-        if (!dev)
-                return -EINVAL;
        if (dev->active)
                return 0;       /* the device is already active */
@@ -568,8 +549,6 @@ int pnp_disable_dev(struct pnp_dev *dev)
 {
        int error;
-        if (!dev)
-                return -EINVAL;
        if (!dev->active)
                return 0;       /* the device is already disabled */
@@ -596,8 +575,6 @@ int pnp_disable_dev(struct pnp_dev *dev)
 void pnp_resource_change(struct resource *resource, resource_size_t start,
                         resource_size_t size)
 {
-        if (resource == NULL)
-                return;
        resource->flags &= ~(IORESOURCE_AUTO | IORESOURCE_UNSET);
        resource->start = start;
        resource->end = start + size - 1;
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 616fc72190bf..a5a372222d69 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -248,9 +248,9 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
        num++;
        return AE_OK;
-      err1:
+err1:
        kfree(dev_id);
-      err:
+err:
        kfree(dev);
        return -EINVAL;
 }
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index ce5027feb3da..0e3b8d0ff06b 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -34,19 +34,17 @@
 */
 static int irq_flags(int triggering, int polarity)
 {
-        int flag;
        if (triggering == ACPI_LEVEL_SENSITIVE) {
                if (polarity == ACPI_ACTIVE_LOW)
-                        flag = IORESOURCE_IRQ_LOWLEVEL;
+                        return IORESOURCE_IRQ_LOWLEVEL;
                else
-                        flag = IORESOURCE_IRQ_HIGHLEVEL;
+                        return IORESOURCE_IRQ_HIGHLEVEL;
        } else {
                if (polarity == ACPI_ACTIVE_LOW)
-                        flag = IORESOURCE_IRQ_LOWEDGE;
+                        return IORESOURCE_IRQ_LOWEDGE;
                else
-                        flag = IORESOURCE_IRQ_HIGHEDGE;
+                        return IORESOURCE_IRQ_HIGHEDGE;
        }
-        return flag;
 }
 static void decode_irq_flags(int flag, int *triggering, int *polarity)
@@ -242,8 +240,7 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res
 static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                                              void *data)
 {
-        struct pnp_resource_table *res_table =
+        struct pnp_resource_table *res_table = data;
-            (struct pnp_resource_table *)data;
        int i;
        switch (res->type) {
@@ -566,8 +563,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                                           void *data)
 {
        int priority = 0;
-        struct acpipnp_parse_option_s *parse_data =
+        struct acpipnp_parse_option_s *parse_data = data;
-            (struct acpipnp_parse_option_s *)data;
        struct pnp_dev *dev = parse_data->dev;
        struct pnp_option *option = parse_data->option;
@@ -705,7 +701,7 @@ static int pnpacpi_supported_resource(struct acpi_resource *res)
 static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
                                           void *data)
 {
-        int *res_cnt = (int *)data;
+        int *res_cnt = data;
        if (pnpacpi_supported_resource(res))
                (*res_cnt)++;
@@ -714,7 +710,7 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
 static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
 {
-        struct acpi_resource **resource = (struct acpi_resource **)data;
+        struct acpi_resource **resource = data;
        if (pnpacpi_supported_resource(res)) {
                (*resource)->type = res->type;
@@ -886,8 +882,7 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
        int i = 0;
        /* pnpacpi_build_resource_template allocates extra mem */
        int res_cnt = (buffer->length - 1) / sizeof(struct acpi_resource) - 1;
-        struct acpi_resource *resource =
+        struct acpi_resource *resource = buffer->pointer;
-            (struct acpi_resource *)buffer->pointer;
        int port = 0, irq = 0, dma = 0, mem = 0;
        pnp_dbg("res cnt %d", res_cnt);
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 3692a099b45f..0691f473e9d4 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -419,7 +419,6 @@ static void __init build_devlist(void)
 static int pnpbios_disabled;
 int pnpbios_dont_use_current_config;
-#ifndef MODULE
 static int __init pnpbios_setup(char *str)
 {
        int invert;
@@ -443,7 +442,6 @@ static int __init pnpbios_setup(char *str)
 }
 __setup("pnpbios=", pnpbios_setup);
-#endif
 /* PnP BIOS signature: "$PnP" */
 #define PNP_SIGNATURE   (('$' << 0) + ('P' << 8) + ('n' << 16) + ('P' << 24))
@@ -591,6 +589,7 @@ subsys_initcall(pnpbios_init);
 static int __init pnpbios_thread_init(void)
 {
        struct task_struct *task;
 #if defined(CONFIG_PPC_MERGE)
        if (check_legacy_ioport(PNPBIOS_BASE))
                return 0;
@@ -606,48 +605,7 @@ static int __init pnpbios_thread_init(void)
        return 0;
 }
-#ifndef MODULE
-/* init/main.c calls pnpbios_init early */
 /* Start the kernel thread later: */
 module_init(pnpbios_thread_init);
-#else
-/*
- * N.B.: Building pnpbios as a module hasn't been fully implemented
- */
-MODULE_LICENSE("GPL");
-static int __init pnpbios_init_all(void)
-{
-        int r;
-        r = pnpbios_init();
-        if (r)
-                return r;
-        r = pnpbios_thread_init();
-        if (r)
-                return r;
-        return 0;
-}
-static void __exit pnpbios_exit(void)
-{
-#ifdef CONFIG_HOTPLUG
-        unloading = 1;
-        wait_for_completion(&unload_sem);
-#endif
-        pnpbios_proc_exit();
-        /* We ought to free resources here */
-        return;
-}
-module_init(pnpbios_init_all);
-module_exit(pnpbios_exit);
-#endif
 EXPORT_SYMBOL(pnpbios_protocol);
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 9c8c07701b65..9d9841f24a85 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -212,7 +212,7 @@ static int proc_write_node(struct file *file, const char __user * buf,
                goto out;
        }
        ret = count;
-      out:
+out:
        kfree(node);
        return ret;
 }
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index 04ecd7b67230..3fabf11b0027 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -238,7 +238,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(unsigned char *p,
                        break;
                default:        /* an unkown tag */
-                      len_err:
+len_err:
                        printk(KERN_ERR
                               "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
                               tag, len);
@@ -298,6 +298,7 @@ static void pnpbios_parse_fixed_mem32_option(unsigned char *p, int size,
                                             struct pnp_option *option)
 {
        struct pnp_mem *mem;
        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
        if (!mem)
                return;
@@ -468,7 +469,7 @@ static unsigned char *pnpbios_parse_resource_option_data(unsigned char *p,
                        return p + 2;
                default:        /* an unkown tag */
-                      len_err:
+len_err:
                        printk(KERN_ERR
                               "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
                               tag, len);
@@ -562,7 +563,7 @@ static unsigned char *pnpbios_parse_compatible_ids(unsigned char *p,
                        break;
                default:        /* an unkown tag */
-                      len_err:
+len_err:
                        printk(KERN_ERR
                               "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
                               tag, len);
@@ -756,7 +757,7 @@ static unsigned char *pnpbios_encode_allocated_resource_data(unsigned char *p,
                        break;
                default:        /* an unkown tag */
-                      len_err:
+len_err:
                        printk(KERN_ERR
                               "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
                               tag, len);
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index ea6ec14a0559..ef1286900db3 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -47,9 +47,6 @@ struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev)
 {
        struct pnp_option *option;
-        if (!dev)
-                return NULL;
        option = pnp_build_option(PNP_RES_PRIORITY_PREFERRED);
        /* this should never happen but if it does we'll try to continue */
@@ -64,9 +61,6 @@ struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
 {
        struct pnp_option *option;
-        if (!dev)
-                return NULL;
        option = pnp_build_option(priority);
        if (dev->dependent) {
@@ -83,11 +77,6 @@ int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
 {
        struct pnp_irq *ptr;
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
        ptr = option->irq;
        while (ptr && ptr->next)
                ptr = ptr->next;
@@ -112,11 +101,6 @@ int pnp_register_dma_resource(struct pnp_option *option, struct pnp_dma *data)
 {
        struct pnp_dma *ptr;
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
        ptr = option->dma;
        while (ptr && ptr->next)
                ptr = ptr->next;
@@ -132,11 +116,6 @@ int pnp_register_port_resource(struct pnp_option *option, struct pnp_port *data)
 {
        struct pnp_port *ptr;
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
        ptr = option->port;
        while (ptr && ptr->next)
                ptr = ptr->next;
@@ -152,11 +131,6 @@ int pnp_register_mem_resource(struct pnp_option *option, struct pnp_mem *data)
 {
        struct pnp_mem *ptr;
-        if (!option)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
        ptr = option->mem;
        while (ptr && ptr->next)
                ptr = ptr->next;
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 80c4a8463065..1cb33cac1237 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -892,7 +892,7 @@ static int m41t80_remove(struct i2c_client *client)
 static struct i2c_driver m41t80_driver = {
        .driver = {
-                .name = "m41t80",
+                .name = "rtc-m41t80",
        },
        .probe = m41t80_probe,
        .remove = m41t80_remove,
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index d94170728075..3e183cfee10f 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -13,7 +13,7 @@
 *
 * 24-May-2006: Raphael Assenat <raph@8d.com>
 *                - Major rework
- *                              Converted to rtc_device and uses the SPI layer.
+ *                              Converted to rtc_device and uses the SPI layer.
 *
 * ??-???-2005: Someone at Compulab
 *                - Initial driver creation.
@@ -259,11 +259,11 @@ static int __devexit max6902_remove(struct spi_device *spi)
 static struct spi_driver max6902_driver = {
        .driver = {
-                .name   = "max6902",
+                .name   = "rtc-max6902",
                .bus    = &spi_bus_type,
                .owner  = THIS_MODULE,
        },
-        .probe  = max6902_probe,
+        .probe  = max6902_probe,
        .remove = __devexit_p(max6902_remove),
 };
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c
index f50f3fc353cd..839462659afa 100644
--- a/drivers/rtc/rtc-rs5c348.c
+++ b/drivers/rtc/rtc-rs5c348.c
@@ -226,7 +226,7 @@ static int __devexit rs5c348_remove(struct spi_device *spi)
 static struct spi_driver rs5c348_driver = {
        .driver = {
-                .name   = "rs5c348",
+                .name   = "rtc-rs5c348",
                .bus    = &spi_bus_type,
                .owner  = THIS_MODULE,
        },
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index eccac1c3b71b..d32c60dbdd82 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -24,6 +24,7 @@
 #include <asm/s390_ext.h>
 #include <asm/todclk.h>
 #include <asm/vtoc.h>
+#include <asm/diag.h>
 #include "dasd_int.h"
 #include "dasd_diag.h"
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 4f2f81b16cfa..2edd5fb6d3dc 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -21,6 +21,7 @@
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
 #include <asm/ebcdic.h>
+#include <asm/diag.h>
 #include "raw3270.h"
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index 04b19bdc09da..d70a6e65bf14 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -14,6 +14,7 @@
 #include <asm/cio.h>
 #include <asm/ccwdev.h>
 #include <asm/debug.h>
+#include <asm/diag.h>
 #include "vmur.h"
@@ -68,8 +69,26 @@ static struct ccw_driver ur_driver = {
        .set_offline    = ur_set_offline,
 };
+static DEFINE_MUTEX(vmur_mutex);
 /*
 * Allocation, freeing, getting and putting of urdev structures
+ *
+ * Each ur device (urd) contains a reference to its corresponding ccw device
+ * (cdev) using the urd->cdev pointer. Each ccw device has a reference to the
+ * ur device using the cdev->dev.driver_data pointer.
+ *
+ * urd references:
+ * - ur_probe gets a urd reference, ur_remove drops the reference
+ *   (cdev->dev.driver_data)
+ * - ur_open gets a urd reference, ur_relase drops the reference
+ *   (urf->urd)
+ *
+ * cdev references:
+ * - urdev_alloc get a cdev reference (urd->cdev)
+ * - urdev_free drops the cdev reference (urd->cdev)
+ *
+ * Setting and clearing of cdev->dev.driver_data is protected by the ccwdev lock
 */
 static struct urdev *urdev_alloc(struct ccw_device *cdev)
 {
@@ -78,42 +97,61 @@ static struct urdev *urdev_alloc(struct ccw_device *cdev)
        urd = kzalloc(sizeof(struct urdev), GFP_KERNEL);
        if (!urd)
                return NULL;
-        urd->cdev = cdev;
        urd->reclen = cdev->id.driver_info;
        ccw_device_get_id(cdev, &urd->dev_id);
        mutex_init(&urd->io_mutex);
        mutex_init(&urd->open_mutex);
+        atomic_set(&urd->ref_count,  1);
+        urd->cdev = cdev;
+        get_device(&cdev->dev);
        return urd;
 }
 static void urdev_free(struct urdev *urd)
 {
+        TRACE("urdev_free: %p\n", urd);
+        if (urd->cdev)
+                put_device(&urd->cdev->dev);
        kfree(urd);
 }
-/*
+static void urdev_get(struct urdev *urd)
- * This is how the character device driver gets a reference to a
+{
- * ur device. When this call returns successfully, a reference has
+        atomic_inc(&urd->ref_count);
- * been taken (by get_device) on the underlying kobject. The recipient
+}
- * of this urdev pointer must eventually drop it with urdev_put(urd)
- * which does the corresponding put_device().
+static struct urdev *urdev_get_from_cdev(struct ccw_device *cdev)
- */
+{
+        struct urdev *urd;
+        unsigned long flags;
+        spin_lock_irqsave(get_ccwdev_lock(cdev), flags);
+        urd = cdev->dev.driver_data;
+        if (urd)
+                urdev_get(urd);
+        spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);
+        return urd;
+}
 static struct urdev *urdev_get_from_devno(u16 devno)
 {
        char bus_id[16];
        struct ccw_device *cdev;
+        struct urdev *urd;
        sprintf(bus_id, "0.0.%04x", devno);
        cdev = get_ccwdev_by_busid(&ur_driver, bus_id);
        if (!cdev)
                return NULL;
+        urd = urdev_get_from_cdev(cdev);
-        return cdev->dev.driver_data;
+        put_device(&cdev->dev);
+        return urd;
 }
 static void urdev_put(struct urdev *urd)
 {
-        put_device(&urd->cdev->dev);
+        if (atomic_dec_and_test(&urd->ref_count))
+                urdev_free(urd);
 }
 /*
@@ -245,6 +283,7 @@ static void ur_int_handler(struct ccw_device *cdev, unsigned long intparm,
                return;
        }
        urd = cdev->dev.driver_data;
+        BUG_ON(!urd);
        /* On special conditions irb is an error pointer */
        if (IS_ERR(irb))
                urd->io_request_rc = PTR_ERR(irb);
@@ -262,9 +301,15 @@ static void ur_int_handler(struct ccw_device *cdev, unsigned long intparm,
 static ssize_t ur_attr_reclen_show(struct device *dev,
                                   struct device_attribute *attr, char *buf)
 {
-        struct urdev *urd = dev->driver_data;
+        struct urdev *urd;
+        int rc;
-        return sprintf(buf, "%zu\n", urd->reclen);
+        urd = urdev_get_from_cdev(to_ccwdev(dev));
+        if (!urd)
+                return -ENODEV;
+        rc = sprintf(buf, "%zu\n", urd->reclen);
+        urdev_put(urd);
+        return rc;
 }
 static DEVICE_ATTR(reclen, 0444, ur_attr_reclen_show, NULL);
@@ -379,31 +424,6 @@ static ssize_t ur_write(struct file *file, const char __user *udata,
        return do_write(urf->urd, udata, count, urf->dev_reclen, ppos);
 }
-static int do_diag_14(unsigned long rx, unsigned long ry1,
-                      unsigned long subcode)
-{
-        register unsigned long _ry1 asm("2") = ry1;
-        register unsigned long _ry2 asm("3") = subcode;
-        int rc = 0;
-        asm volatile(
-#ifdef CONFIG_64BIT
-                "   sam31\n"
-                "   diag    %2,2,0x14\n"
-                "   sam64\n"
-#else
-                "   diag    %2,2,0x14\n"
-#endif
-                "   ipm     %0\n"
-                "   srl     %0,28\n"
-                : "=d" (rc), "+d" (_ry2)
-                : "d" (rx), "d" (_ry1)
-                : "cc");
-        TRACE("diag 14: subcode=0x%lx, cc=%i\n", subcode, rc);
-        return rc;
-}
 /*
 * diagnose code 0x14 subcode 0x0028 - position spool file to designated
 *                                     record
@@ -415,7 +435,7 @@ static int diag_position_to_record(int devno, int record)
 {
        int cc;
-        cc = do_diag_14(record, devno, 0x28);
+        cc = diag14(record, devno, 0x28);
        switch (cc) {
        case 0:
                return 0;
@@ -440,7 +460,7 @@ static int diag_read_file(int devno, char *buf)
 {
        int cc;
-        cc = do_diag_14((unsigned long) buf, devno, 0x00);
+        cc = diag14((unsigned long) buf, devno, 0x00);
        switch (cc) {
        case 0:
                return 0;
@@ -533,7 +553,7 @@ static int diag_read_next_file_info(struct file_control_block *buf, int spid)
 {
        int cc;
-        cc = do_diag_14((unsigned long) buf, spid, 0xfff);
+        cc = diag14((unsigned long) buf, spid, 0xfff);
        switch (cc) {
        case 0:
                return 0;
@@ -750,64 +770,63 @@ static struct file_operations ur_fops = {
 /*
 * ccw_device infrastructure:
- *     ur_probe gets its own ref to the device (i.e. get_device),
+ *     ur_probe creates the struct urdev (with refcount = 1), the device
- *     creates the struct urdev, the device attributes, sets up
+ *     attributes, sets up the interrupt handler and validates the virtual
- *     the interrupt handler and validates the virtual unit record device.
+ *     unit record device.
- *     ur_remove removes the device attributes, frees the struct urdev
+ *     ur_remove removes the device attributes and drops the reference to
- *     and drops (put_device) the ref to the device we got in ur_probe.
+ *     struct urdev.
+ *
+ *     ur_probe, ur_remove, ur_set_online and ur_set_offline are serialized
+ *     by the vmur_mutex lock.
+ *
+ *     urd->char_device is used as indication that the online function has
+ *     been completed successfully.
 */
 static int ur_probe(struct ccw_device *cdev)
 {
        struct urdev *urd;
        int rc;
-        TRACE("ur_probe: cdev=%p state=%d\n", cdev, *(int *) cdev->private);
+        TRACE("ur_probe: cdev=%p\n", cdev);
-        if (!get_device(&cdev->dev))
-                return -ENODEV;
+        mutex_lock(&vmur_mutex);
        urd = urdev_alloc(cdev);
        if (!urd) {
                rc = -ENOMEM;
-                goto fail;
+                goto fail_unlock;
        }
        rc = ur_create_attributes(&cdev->dev);
        if (rc) {
                rc = -ENOMEM;
-                goto fail;
+                goto fail_urdev_put;
        }
-        cdev->dev.driver_data = urd;
        cdev->handler = ur_int_handler;
        /* validate virtual unit record device */
        urd->class = get_urd_class(urd);
        if (urd->class < 0) {
                rc = urd->class;
-                goto fail;
+                goto fail_remove_attr;
        }
        if ((urd->class != DEV_CLASS_UR_I) && (urd->class != DEV_CLASS_UR_O)) {
                rc = -ENOTSUPP;
-                goto fail;
+                goto fail_remove_attr;
        }
+        spin_lock_irq(get_ccwdev_lock(cdev));
+        cdev->dev.driver_data = urd;
+        spin_unlock_irq(get_ccwdev_lock(cdev));
+        mutex_unlock(&vmur_mutex);
        return 0;
-fail:
+fail_remove_attr:
-        urdev_free(urd);
-        put_device(&cdev->dev);
-        return rc;
-}
-static void ur_remove(struct ccw_device *cdev)
-{
-        struct urdev *urd = cdev->dev.driver_data;
-        TRACE("ur_remove\n");
-        if (cdev->online)
-                ur_set_offline(cdev);
        ur_remove_attributes(&cdev->dev);
-        urdev_free(urd);
+fail_urdev_put:
-        put_device(&cdev->dev);
+        urdev_put(urd);
+fail_unlock:
+        mutex_unlock(&vmur_mutex);
+        return rc;
 }
 static int ur_set_online(struct ccw_device *cdev)
@@ -816,20 +835,29 @@ static int ur_set_online(struct ccw_device *cdev)
        int minor, major, rc;
        char node_id[16];
-        TRACE("ur_set_online: cdev=%p state=%d\n", cdev,
+        TRACE("ur_set_online: cdev=%p\n", cdev);
-              *(int *) cdev->private);
-        if (!try_module_get(ur_driver.owner))
+        mutex_lock(&vmur_mutex);
-                return -EINVAL;
+        urd = urdev_get_from_cdev(cdev);
+        if (!urd) {
+                /* ur_remove already deleted our urd */
+                rc = -ENODEV;
+                goto fail_unlock;
+        }
+        if (urd->char_device) {
+                /* Another ur_set_online was faster */
+                rc = -EBUSY;
+                goto fail_urdev_put;
+        }
-        urd = (struct urdev *) cdev->dev.driver_data;
        minor = urd->dev_id.devno;
        major = MAJOR(ur_first_dev_maj_min);
        urd->char_device = cdev_alloc();
        if (!urd->char_device) {
                rc = -ENOMEM;
-                goto fail_module_put;
+                goto fail_urdev_put;
        }
        cdev_init(urd->char_device, &ur_fops);
@@ -858,29 +886,79 @@ static int ur_set_online(struct ccw_device *cdev)
                TRACE("ur_set_online: device_create rc=%d\n", rc);
                goto fail_free_cdev;
        }
+        urdev_put(urd);
+        mutex_unlock(&vmur_mutex);
        return 0;
 fail_free_cdev:
        cdev_del(urd->char_device);
-fail_module_put:
+        urd->char_device = NULL;
-        module_put(ur_driver.owner);
+fail_urdev_put:
+        urdev_put(urd);
+fail_unlock:
+        mutex_unlock(&vmur_mutex);
        return rc;
 }
-static int ur_set_offline(struct ccw_device *cdev)
+static int ur_set_offline_force(struct ccw_device *cdev, int force)
 {
        struct urdev *urd;
+        int rc;
-        TRACE("ur_set_offline: cdev=%p cdev->private=%p state=%d\n",
+        TRACE("ur_set_offline: cdev=%p\n", cdev);
-                cdev, cdev->private, *(int *) cdev->private);
+        urd = urdev_get_from_cdev(cdev);
-        urd = (struct urdev *) cdev->dev.driver_data;
+        if (!urd)
+                /* ur_remove already deleted our urd */
+                return -ENODEV;
+        if (!urd->char_device) {
+                /* Another ur_set_offline was faster */
+                rc = -EBUSY;
+                goto fail_urdev_put;
+        }
+        if (!force && (atomic_read(&urd->ref_count) > 2)) {
+                /* There is still a user of urd (e.g. ur_open) */
+                TRACE("ur_set_offline: BUSY\n");
+                rc = -EBUSY;
+                goto fail_urdev_put;
+        }
        device_destroy(vmur_class, urd->char_device->dev);
        cdev_del(urd->char_device);
-        module_put(ur_driver.owner);
+        urd->char_device = NULL;
+        rc = 0;
-        return 0;
+fail_urdev_put:
+        urdev_put(urd);
+        return rc;
+}
+static int ur_set_offline(struct ccw_device *cdev)
+{
+        int rc;
+        mutex_lock(&vmur_mutex);
+        rc = ur_set_offline_force(cdev, 0);
+        mutex_unlock(&vmur_mutex);
+        return rc;
+}
+static void ur_remove(struct ccw_device *cdev)
+{
+        unsigned long flags;
+        TRACE("ur_remove\n");
+        mutex_lock(&vmur_mutex);
+        if (cdev->online)
+                ur_set_offline_force(cdev, 1);
+        ur_remove_attributes(&cdev->dev);
+        spin_lock_irqsave(get_ccwdev_lock(cdev), flags);
+        urdev_put(cdev->dev.driver_data);
+        cdev->dev.driver_data = NULL;
+        spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);
+        mutex_unlock(&vmur_mutex);
 }
 /*
diff --git a/drivers/s390/char/vmur.h b/drivers/s390/char/vmur.h
index 2b3c564e0472..fa959644735a 100644
--- a/drivers/s390/char/vmur.h
+++ b/drivers/s390/char/vmur.h
@@ -70,6 +70,7 @@ struct urdev {
        size_t reclen;                  /* Record length for *write* CCWs */
        int class;                      /* VM device class */
        int io_request_rc;              /* return code from I/O request */
+        atomic_t ref_count;             /* reference counter */
 };
 /*
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 02fd00b55e1b..34a796913b06 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -594,6 +594,9 @@ alloc_cmb (struct ccw_device *cdev)
                        free_pages((unsigned long)mem, get_order(size));
                } else if (!mem) {
                        /* no luck */
+                        printk(KERN_WARNING "cio: failed to allocate area "
+                               "for measuring %d subchannels\n",
+                               cmb_area.num_channels);
                        ret = -ENOMEM;
                        goto out;
                } else {
@@ -1279,13 +1282,6 @@ init_cmf(void)
        case CMF_BASIC:
                format_string = "basic";
                cmbops = &cmbops_basic;
-                if (cmb_area.num_channels > 4096 || cmb_area.num_channels < 1) {
-                        printk(KERN_ERR "cio: Basic channel measurement "
-                               "facility can only use 1 to 4096 devices\n"
-                               KERN_ERR "when the cmf driver is built"
-                               " as a loadable module\n");
-                        return 1;
-                }
                break;
        case CMF_EXTENDED:
                format_string = "extended";
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 297659fa0e26..e44d92eac8e9 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -117,7 +117,10 @@ static int ccw_uevent(struct device *dev, char **envp, int num_envp,
        snprint_alias(modalias_buf, sizeof(modalias_buf), id, "");
        ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &len,
                             "MODALIAS=%s", modalias_buf);
-        return ret;
+        if (ret)
+                return ret;
+        envp[i] = NULL;
+        return 0;
 }
 struct bus_type ccw_bus_type;
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index 60b9347f7c92..f232832f2b22 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -17,6 +17,7 @@
 #include <asm/delay.h>
 #include <asm/cio.h>
 #include <asm/lowcore.h>
+#include <asm/diag.h>
 #include "cio.h"
 #include "cio_debug.h"
@@ -25,51 +26,6 @@
 #include "ioasm.h"
 /*
- * diag210 is used under VM to get information about a virtual device
- */
-int
-diag210(struct diag210 * addr)
-{
-        /*
-         * diag 210 needs its data below the 2GB border, so we
-         * use a static data area to be sure
-         */
-        static struct diag210 diag210_tmp;
-        static DEFINE_SPINLOCK(diag210_lock);
-        unsigned long flags;
-        int ccode;
-        spin_lock_irqsave(&diag210_lock, flags);
-        diag210_tmp = *addr;
-#ifdef CONFIG_64BIT
-        asm volatile(
-                "       lhi     %0,-1\n"
-                "       sam31\n"
-                "       diag    %1,0,0x210\n"
-                "0:     ipm     %0\n"
-                "       srl     %0,28\n"
-                "1:     sam64\n"
-                EX_TABLE(0b,1b)
-                : "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");
-#else
-        asm volatile(
-                "       lhi     %0,-1\n"
-                "       diag    %1,0,0x210\n"
-                "0:     ipm     %0\n"
-                "       srl     %0,28\n"
-                "1:\n"
-                EX_TABLE(0b,1b)
-                : "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");
-#endif
-        *addr = diag210_tmp;
-        spin_unlock_irqrestore(&diag210_lock, flags);
-        return ccode;
-}
-/*
 * Input :
 *   devno - device number
 *   ps    - pointer to sense ID data area
@@ -349,5 +305,3 @@ ccw_device_sense_id_irq(struct ccw_device *cdev, enum dev_event dev_event)
                break;
        }
 }
-EXPORT_SYMBOL(diag210);
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 03347aed2b3e..d8d479876ec7 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -195,6 +195,8 @@ qdio_do_eqbs(struct qdio_q *q, unsigned char *state,
 again:
        ccq = do_eqbs(irq->sch_token, state, q_no, start, cnt);
        rc = qdio_check_ccq(q, ccq);
+        if ((ccq == 96) && (tmp_cnt != *cnt))
+                rc = 0;
        if (rc == 1) {
                QDIO_DBF_TEXT5(1,trace,"eqAGAIN");
                goto again;
@@ -740,7 +742,8 @@ qdio_get_outbound_buffer_frontier(struct qdio_q *q)
        first_not_to_check=f+qdio_min(atomic_read(&q->number_of_buffers_used),
                                      (QDIO_MAX_BUFFERS_PER_Q-1));
-        if ((!q->is_iqdio_q)&&(!q->hydra_gives_outbound_pcis))
+        if (((!q->is_iqdio_q) && (!q->hydra_gives_outbound_pcis)) ||
+                 (q->queue_type == QDIO_IQDIO_QFMT_ASYNCH))
                SYNC_MEMORY;
 check_next:
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index ec18bae05df0..6d4959807abc 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -1178,9 +1178,9 @@ qeth_ipaddr_to_string(enum qeth_prot_versions proto, const __u8 *addr,
                      char *buf)
 {
        if (proto == QETH_PROT_IPV4)
-                return qeth_ipaddr4_to_string(addr, buf);
+                qeth_ipaddr4_to_string(addr, buf);
        else if (proto == QETH_PROT_IPV6)
-                return qeth_ipaddr6_to_string(addr, buf);
+                qeth_ipaddr6_to_string(addr, buf);
 }
 static inline int
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 57f69434fbf9..f3e6fbeb2123 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -561,7 +561,7 @@ qeth_set_offline(struct ccwgroup_device *cgdev)
 }
 static int
-qeth_wait_for_threads(struct qeth_card *card, unsigned long threads);
+qeth_threads_running(struct qeth_card *card, unsigned long threads);
 static void
@@ -576,8 +576,7 @@ qeth_remove_device(struct ccwgroup_device *cgdev)
        if (!card)
                return;
-        if (qeth_wait_for_threads(card, 0xffffffff))
+        wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
-                return;
        if (cgdev->state == CCWGROUP_ONLINE){
                card->use_hard_stop = 1;
@@ -1542,16 +1541,21 @@ qeth_idx_write_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob)
        card = CARD_FROM_CDEV(channel->ccwdev);
        if (!(QETH_IS_IDX_ACT_POS_REPLY(iob->data))) {
-                PRINT_ERR("IDX_ACTIVATE on write channel device %s: negative "
+                if (QETH_IDX_ACT_CAUSE_CODE(iob->data) == 0x19)
-                          "reply\n", CARD_WDEV_ID(card));
+                        PRINT_ERR("IDX_ACTIVATE on write channel device %s: "
+                                "adapter exclusively used by another host\n",
+                                CARD_WDEV_ID(card));
+                else
+                        PRINT_ERR("IDX_ACTIVATE on write channel device %s: "
+                                "negative reply\n", CARD_WDEV_ID(card));
                goto out;
        }
        memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2);
        if ((temp & ~0x0100) != qeth_peer_func_level(card->info.func_level)) {
                PRINT_WARN("IDX_ACTIVATE on write channel device %s: "
-                           "function level mismatch "
+                        "function level mismatch "
-                           "(sent: 0x%x, received: 0x%x)\n",
+                        "(sent: 0x%x, received: 0x%x)\n",
-                           CARD_WDEV_ID(card), card->info.func_level, temp);
+                        CARD_WDEV_ID(card), card->info.func_level, temp);
                goto out;
        }
        channel->state = CH_STATE_UP;
@@ -1597,8 +1601,13 @@ qeth_idx_read_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob)
                        goto out;
        }
        if (!(QETH_IS_IDX_ACT_POS_REPLY(iob->data))) {
-                PRINT_ERR("IDX_ACTIVATE on read channel device %s: negative "
+                if (QETH_IDX_ACT_CAUSE_CODE(iob->data) == 0x19)
-                          "reply\n", CARD_RDEV_ID(card));
+                        PRINT_ERR("IDX_ACTIVATE on read channel device %s: "
+                                "adapter exclusively used by another host\n",
+                                CARD_RDEV_ID(card));
+                else
+                        PRINT_ERR("IDX_ACTIVATE on read channel device %s: "
+                                "negative reply\n", CARD_RDEV_ID(card));
                goto out;
        }
@@ -1613,8 +1622,8 @@ qeth_idx_read_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob)
        memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2);
        if (temp != qeth_peer_func_level(card->info.func_level)) {
                PRINT_WARN("IDX_ACTIVATE on read channel device %s: function "
-                           "level mismatch (sent: 0x%x, received: 0x%x)\n",
+                        "level mismatch (sent: 0x%x, received: 0x%x)\n",
-                           CARD_RDEV_ID(card), card->info.func_level, temp);
+                        CARD_RDEV_ID(card), card->info.func_level, temp);
                goto out;
        }
        memcpy(&card->token.issuer_rm_r,
@@ -2496,7 +2505,7 @@ qeth_rebuild_skb_fake_ll_tr(struct qeth_card *card, struct sk_buff *skb,
        struct iphdr *ip_hdr;
        QETH_DBF_TEXT(trace,5,"skbfktr");
-        skb_set_mac_header(skb, -QETH_FAKE_LL_LEN_TR);
+        skb_set_mac_header(skb, (int)-QETH_FAKE_LL_LEN_TR);
        /* this is a fake ethernet header */
        fake_hdr = tr_hdr(skb);
@@ -2804,13 +2813,16 @@ qeth_queue_input_buffer(struct qeth_card *card, int index)
                if (newcount < count) {
                        /* we are in memory shortage so we switch back to
                           traditional skb allocation and drop packages */
-                        if (atomic_cmpxchg(&card->force_alloc_skb, 0, 1))
+                        if (!atomic_read(&card->force_alloc_skb) &&
-                                printk(KERN_WARNING
+                            net_ratelimit())
-                                        "qeth: switch to alloc skb\n");
+                                PRINT_WARN("Switch to alloc skb\n");
+                        atomic_set(&card->force_alloc_skb, 3);
                        count = newcount;
                } else {
-                        if (atomic_cmpxchg(&card->force_alloc_skb, 1, 0))
+                        if ((atomic_read(&card->force_alloc_skb) == 1) &&
-                                printk(KERN_WARNING "qeth: switch to sg\n");
+                            net_ratelimit())
+                                PRINT_WARN("Switch to sg\n");
+                        atomic_add_unless(&card->force_alloc_skb, -1, 0);
                }
                /*
@@ -3354,10 +3366,12 @@ out_freeoutq:
        while (i > 0)
                kfree(card->qdio.out_qs[--i]);
        kfree(card->qdio.out_qs);
+        card->qdio.out_qs = NULL;
 out_freepool:
        qeth_free_buffer_pool(card);
 out_freeinq:
        kfree(card->qdio.in_q);
+        card->qdio.in_q = NULL;
 out_nomem:
        atomic_set(&card->qdio.state, QETH_QDIO_UNINITIALIZED);
        return -ENOMEM;
@@ -3373,16 +3387,20 @@ qeth_free_qdio_buffers(struct qeth_card *card)
                QETH_QDIO_UNINITIALIZED)
                return;
        kfree(card->qdio.in_q);
+        card->qdio.in_q = NULL;
        /* inbound buffer pool */
        qeth_free_buffer_pool(card);
        /* free outbound qdio_qs */
-        for (i = 0; i < card->qdio.no_out_queues; ++i){
+        if (card->qdio.out_qs) {
-                for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
+                for (i = 0; i < card->qdio.no_out_queues; ++i) {
-                        qeth_clear_output_buffer(card->qdio.out_qs[i],
+                        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
-                                        &card->qdio.out_qs[i]->bufs[j]);
+                                qeth_clear_output_buffer(card->qdio.out_qs[i],
-                kfree(card->qdio.out_qs[i]);
+                                                &card->qdio.out_qs[i]->bufs[j]);
+                        kfree(card->qdio.out_qs[i]);
+                }
+                kfree(card->qdio.out_qs);
+                card->qdio.out_qs = NULL;
        }
-        kfree(card->qdio.out_qs);
 }
 static void
@@ -3393,7 +3411,7 @@ qeth_clear_qdio_buffers(struct qeth_card *card)
        QETH_DBF_TEXT(trace, 2, "clearqdbf");
        /* clear outbound buffers to free skbs */
        for (i = 0; i < card->qdio.no_out_queues; ++i)
-                if (card->qdio.out_qs[i]){
+                if (card->qdio.out_qs && card->qdio.out_qs[i]) {
                        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
                                qeth_clear_output_buffer(card->qdio.out_qs[i],
                                                &card->qdio.out_qs[i]->bufs[j]);
@@ -4553,6 +4571,53 @@ qeth_get_elements_no(struct qeth_card *card, void *hdr,
        return elements_needed;
 }
+static void qeth_tx_csum(struct sk_buff *skb)
+{
+        int tlen;
+        if (skb->protocol == htons(ETH_P_IP)) {
+                tlen = ntohs(ip_hdr(skb)->tot_len) - (ip_hdr(skb)->ihl << 2);
+                switch (ip_hdr(skb)->protocol) {
+                case IPPROTO_TCP:
+                        tcp_hdr(skb)->check = 0;
+                        tcp_hdr(skb)->check = csum_tcpudp_magic(
+                                ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,
+                                tlen, ip_hdr(skb)->protocol,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        tlen, 0));
+                        break;
+                case IPPROTO_UDP:
+                        udp_hdr(skb)->check = 0;
+                        udp_hdr(skb)->check = csum_tcpudp_magic(
+                                ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,
+                                tlen, ip_hdr(skb)->protocol,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        tlen, 0));
+                        break;
+                }
+        } else if (skb->protocol == htons(ETH_P_IPV6)) {
+                switch (ipv6_hdr(skb)->nexthdr) {
+                case IPPROTO_TCP:
+                        tcp_hdr(skb)->check = 0;
+                        tcp_hdr(skb)->check = csum_ipv6_magic(
+                                &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
+                                ipv6_hdr(skb)->payload_len,
+                                ipv6_hdr(skb)->nexthdr,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        ipv6_hdr(skb)->payload_len, 0));
+                        break;
+                case IPPROTO_UDP:
+                        udp_hdr(skb)->check = 0;
+                        udp_hdr(skb)->check = csum_ipv6_magic(
+                                &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
+                                ipv6_hdr(skb)->payload_len,
+                                ipv6_hdr(skb)->nexthdr,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        ipv6_hdr(skb)->payload_len, 0));
+                        break;
+                }
+        }
+}
 static int
 qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
@@ -4638,12 +4703,22 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                elements_needed += elems;
        }
+        if ((large_send == QETH_LARGE_SEND_NO) &&
+            (skb->ip_summed == CHECKSUM_PARTIAL))
+                qeth_tx_csum(new_skb);
        if (card->info.type != QETH_CARD_TYPE_IQD)
                rc = qeth_do_send_packet(card, queue, new_skb, hdr,
                                         elements_needed, ctx);
-        else
+        else {
+                if ((skb->protocol == htons(ETH_P_ARP)) &&
+                    (card->dev->flags & IFF_NOARP)) {
+                        __qeth_free_new_skb(skb, new_skb);
+                        return -EPERM;
+                }
                rc = qeth_do_send_packet_fast(card, queue, new_skb, hdr,
                                              elements_needed, ctx);
+        }
        if (!rc) {
                card->stats.tx_packets++;
                card->stats.tx_bytes += tx_bytes;
@@ -6385,20 +6460,18 @@ qeth_deregister_addr_entry(struct qeth_card *card, struct qeth_ipaddr *addr)
 static u32
 qeth_ethtool_get_tx_csum(struct net_device *dev)
 {
-        /* We may need to say that we support tx csum offload if
+        return (dev->features & NETIF_F_HW_CSUM) != 0;
-         * we do EDDP or TSO. There are discussions going on to
-         * enforce rules in the stack and in ethtool that make
-         * SG and TSO depend on HW_CSUM. At the moment there are
-         * no such rules....
-         * If we say yes here, we have to checksum outbound packets
-         * any time. */
-        return 0;
 }
 static int
 qeth_ethtool_set_tx_csum(struct net_device *dev, u32 data)
 {
-        return -EINVAL;
+        if (data)
+                dev->features |= NETIF_F_HW_CSUM;
+        else
+                dev->features &= ~NETIF_F_HW_CSUM;
+        return 0;
 }
 static u32
@@ -7412,7 +7485,8 @@ qeth_start_ipa_tso(struct qeth_card *card)
        }
        if (rc && (card->options.large_send == QETH_LARGE_SEND_TSO)){
                card->options.large_send = QETH_LARGE_SEND_NO;
-                card->dev->features &= ~ (NETIF_F_TSO | NETIF_F_SG);
+                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                                NETIF_F_HW_CSUM);
        }
        return rc;
 }
@@ -7552,22 +7626,26 @@ qeth_set_large_send(struct qeth_card *card, enum qeth_large_send_types type)
        card->options.large_send = type;
        switch (card->options.large_send) {
        case QETH_LARGE_SEND_EDDP:
-                card->dev->features |= NETIF_F_TSO | NETIF_F_SG;
+                card->dev->features |= NETIF_F_TSO | NETIF_F_SG |
+                                        NETIF_F_HW_CSUM;
                break;
        case QETH_LARGE_SEND_TSO:
                if (qeth_is_supported(card, IPA_OUTBOUND_TSO)){
-                        card->dev->features |= NETIF_F_TSO | NETIF_F_SG;
+                        card->dev->features |= NETIF_F_TSO | NETIF_F_SG |
+                                                NETIF_F_HW_CSUM;
                } else {
                        PRINT_WARN("TSO not supported on %s. "
                                   "large_send set to 'no'.\n",
                                   card->dev->name);
-                        card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG);
+                        card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                                NETIF_F_HW_CSUM);
                        card->options.large_send = QETH_LARGE_SEND_NO;
                        rc = -EOPNOTSUPP;
                }
                break;
        default: /* includes QETH_LARGE_SEND_NO */
-                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG);
+                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                        NETIF_F_HW_CSUM);
                break;
        }
        if (card->state == CARD_STATE_UP)
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h
index 1d8083c91765..6de2da5ed5fd 100644
--- a/drivers/s390/net/qeth_mpc.h
+++ b/drivers/s390/net/qeth_mpc.h
@@ -565,6 +565,7 @@ extern unsigned char IDX_ACTIVATE_WRITE[];
 #define QETH_IDX_ACT_QDIO_DEV_REALADDR(buffer) (buffer+0x20)
 #define QETH_IS_IDX_ACT_POS_REPLY(buffer) (((buffer)[0x08]&3)==2)
 #define QETH_IDX_REPLY_LEVEL(buffer) (buffer+0x12)
+#define QETH_IDX_ACT_CAUSE_CODE(buffer) (buffer)[0x09]
 #define PDU_ENCAPSULATION(buffer) \
        (buffer + *(buffer + (*(buffer+0x0b)) + \
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index bb0287ad1aac..2cc3f3a0e393 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -1760,10 +1760,10 @@ qeth_remove_device_attributes(struct device *dev)
 {
        struct qeth_card *card = dev->driver_data;
-        if (card->info.type == QETH_CARD_TYPE_OSN)
+        if (card->info.type == QETH_CARD_TYPE_OSN) {
-                return sysfs_remove_group(&dev->kobj,
+                sysfs_remove_group(&dev->kobj, &qeth_osn_device_attr_group);
-                                          &qeth_osn_device_attr_group);
+                return;
+        }
        sysfs_remove_group(&dev->kobj, &qeth_device_attr_group);
        sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group);
        sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group);
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index ab5ec1feaf4e..90aa53fc4f3e 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -1503,7 +1503,7 @@ zfcp_gid_pn_buffers_alloc(struct zfcp_gid_pn_data **gid_pn, mempool_t *pool)
                        data->ct.pool = pool;
                }
        } else {
-                data = kmalloc(sizeof(struct zfcp_gid_pn_data), GFP_ATOMIC);
+                data = kmem_cache_alloc(zfcp_data.gid_pn_cache, GFP_ATOMIC);
        }
        if (NULL == data)
@@ -1531,7 +1531,7 @@ static void zfcp_gid_pn_buffers_free(struct zfcp_gid_pn_data *gid_pn)
        if (gid_pn->ct.pool)
                mempool_free(gid_pn, gid_pn->ct.pool);
        else
-                kfree(gid_pn);
+                kmem_cache_free(zfcp_data.gid_pn_cache, gid_pn);
 }
 /**
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 81daa8204bfe..c6899efdc8f6 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -640,13 +640,9 @@ int
 zfcp_qdio_sbals_from_scsicmnd(struct zfcp_fsf_req *fsf_req,
                              unsigned long sbtype, struct scsi_cmnd *scsi_cmnd)
 {
-        if (scsi_sg_count(scsi_cmnd))
+        return zfcp_qdio_sbals_from_sg(fsf_req, sbtype, scsi_sglist(scsi_cmnd),
-                return zfcp_qdio_sbals_from_sg(fsf_req, sbtype,
+                                       scsi_sg_count(scsi_cmnd),
-                                               scsi_sglist(scsi_cmnd),
+                                       ZFCP_MAX_SBALS_PER_REQ);
-                                               scsi_sg_count(scsi_cmnd),
-                                               ZFCP_MAX_SBALS_PER_REQ);
-        else
-                return 0;
 }
 /**
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 0acf6db0a08d..ad7eb4a9261c 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -764,7 +764,9 @@ zfcp_reset_fc_host_stats(struct Scsi_Host *shost)
                return;
        ret = zfcp_fsf_exchange_port_data(NULL, adapter, data);
-        if (ret == 0) {
+        if (ret) {
+                kfree(data);
+        } else {
                adapter->stats_reset = jiffies/HZ;
                old_data = adapter->stats_reset_data;
                adapter->stats_reset_data = data; /* finally freed in
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index d2b3898b750a..6f2c71ef47ee 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -367,6 +367,7 @@ config SCSI_3W_9XXX
 config SCSI_7000FASST
        tristate "7000FASST SCSI support"
        depends on ISA && SCSI && ISA_DMA_API
+        select CHECK_SIGNATURE
        help
          This driver supports the Western Digital 7000 SCSI host adapter
          family.  Some information is in the source:
@@ -388,6 +389,7 @@ config SCSI_AHA152X
        tristate "Adaptec AHA152X/2825 support"
        depends on ISA && SCSI && !64BIT
        select SCSI_SPI_ATTRS
+        select CHECK_SIGNATURE
        ---help---
          This is a driver for the AHA-1510, AHA-1520, AHA-1522, and AHA-2825
          SCSI host adapters. It also works for the AVA-1505, but the IRQ etc.
@@ -583,6 +585,7 @@ config SCSI_DTC3280
        tristate "DTC3180/3280 SCSI support"
        depends on ISA && SCSI
        select SCSI_SPI_ATTRS
+        select CHECK_SIGNATURE
        help
          This is support for DTC 3180/3280 SCSI Host Adapters.  Please read
          the SCSI-HOWTO, available from
@@ -657,6 +660,7 @@ config SCSI_EATA_PIO
 config SCSI_FUTURE_DOMAIN
        tristate "Future Domain 16xx SCSI/AHA-2920A support"
        depends on (ISA || PCI) && SCSI
+        select CHECK_SIGNATURE
        ---help---
          This is support for Future Domain's 16-bit SCSI host adapters
          (TMC-1660/1680, TMC-1650/1670, TMC-3260, TMC-1610M/MER/MEX) and
@@ -1324,6 +1328,7 @@ config SCSI_LPFC
 config SCSI_SEAGATE
        tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support"
        depends on X86 && ISA && SCSI
+        select CHECK_SIGNATURE
        ---help---
          These are 8-bit SCSI controllers; the ST-01 is also supported by
          this driver.  It is explained in section 3.9 of the SCSI-HOWTO,
@@ -1397,6 +1402,7 @@ config SCSI_T128
        tristate "Trantor T128/T128F/T228 SCSI support"
        depends on ISA && SCSI
        select SCSI_SPI_ATTRS
+        select CHECK_SIGNATURE
        ---help---
          This is support for a SCSI host adapter. It is explained in section
          3.11 of the SCSI-HOWTO, available from
@@ -1561,7 +1567,7 @@ config A3000_SCSI
          built-in SCSI controller, say Y. Otherwise, say N.
          To compile this driver as a module, choose M here: the
-          module will be called wd33c93.
+          module will be called a3000.
 config A2091_SCSI
        tristate "A2091/A590 WD33C93A support"
@@ -1571,7 +1577,7 @@ config A2091_SCSI
          say N.
          To compile this driver as a module, choose M here: the
-          module will be called wd33c93.
+          module will be called a2091.
 config GVP11_SCSI
        tristate "GVP Series II WD33C93A support"
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 5606d1e62978..efceed451b46 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -737,12 +737,19 @@ check_mgmt:
                 */
                conn->ctask = list_entry(conn->xmitqueue.next,
                                         struct iscsi_cmd_task, running);
-                if (conn->ctask->state == ISCSI_TASK_PENDING) {
+                switch (conn->ctask->state) {
+                case ISCSI_TASK_ABORTING:
+                        break;
+                case ISCSI_TASK_PENDING:
                        iscsi_prep_scsi_cmd_pdu(conn->ctask);
                        conn->session->tt->init_cmd_task(conn->ctask);
+                        /* fall through */
+                default:
+                        conn->ctask->state = ISCSI_TASK_RUNNING;
+                        break;
                }
-                conn->ctask->state = ISCSI_TASK_RUNNING;
                list_move_tail(conn->xmitqueue.next, &conn->run_list);
                rc = iscsi_xmit_ctask(conn);
                if (rc)
                        goto again;
@@ -1049,7 +1056,9 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc,
        ctask->mtask = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)hdr,
                                            NULL, 0);
        if (!ctask->mtask) {
+                spin_unlock_bh(&session->lock);
                iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+                spin_lock_bh(&session->lock)
                debug_scsi("abort sent failure [itt 0x%x]\n", ctask->itt);
                return -EPERM;
        }
@@ -1066,6 +1075,7 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc,
                debug_scsi("abort set timeout [itt 0x%x]\n", ctask->itt);
        }
        spin_unlock_bh(&session->lock);
+        mutex_unlock(&session->eh_mutex);
        scsi_queue_work(session->host, &conn->xmitwork);
        /*
@@ -1083,6 +1093,7 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc,
        if (signal_pending(current))
                flush_signals(current);
        del_timer_sync(&conn->tmabort_timer);
+        mutex_lock(&session->eh_mutex);
        spin_lock_bh(&session->lock);
        return 0;
 }
@@ -1158,31 +1169,45 @@ static void fail_command(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,
        __iscsi_put_ctask(ctask);
 }
+static void iscsi_suspend_tx(struct iscsi_conn *conn)
+{
+        set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
+        scsi_flush_work(conn->session->host);
+}
+static void iscsi_start_tx(struct iscsi_conn *conn)
+{
+        clear_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
+        scsi_queue_work(conn->session->host, &conn->xmitwork);
+}
 int iscsi_eh_abort(struct scsi_cmnd *sc)
 {
+        struct Scsi_Host *host = sc->device->host;
+        struct iscsi_session *session = iscsi_hostdata(host->hostdata);
        struct iscsi_cmd_task *ctask;
        struct iscsi_conn *conn;
-        struct iscsi_session *session;
        int rc;
+        mutex_lock(&session->eh_mutex);
+        spin_lock_bh(&session->lock);
        /*
         * if session was ISCSI_STATE_IN_RECOVERY then we may not have
         * got the command.
         */
        if (!sc->SCp.ptr) {
                debug_scsi("sc never reached iscsi layer or it completed.\n");
+                spin_unlock_bh(&session->lock);
+                mutex_unlock(&session->eh_mutex);
                return SUCCESS;
        }
        ctask = (struct iscsi_cmd_task *)sc->SCp.ptr;
        conn = ctask->conn;
-        session = conn->session;
        conn->eh_abort_cnt++;
        debug_scsi("aborting [sc %p itt 0x%x]\n", sc, ctask->itt);
-        spin_lock_bh(&session->lock);
        /*
         * If we are not logged in or we have started a new session
         * then let the host reset code handle this
@@ -1219,6 +1244,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
        switch (conn->tmabort_state) {
        case TMABORT_SUCCESS:
                spin_unlock_bh(&session->lock);
+                iscsi_suspend_tx(conn);
                /*
                 * clean up task if aborted. grab the recv lock as a writer
                 */
@@ -1227,11 +1253,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
                fail_command(conn, ctask, DID_ABORT << 16);
                spin_unlock(&session->lock);
                write_unlock_bh(conn->recv_lock);
-                /*
+                iscsi_start_tx(conn);
-                 * make sure xmit thread is not still touching the
-                 * ctask/scsi_cmnd
-                 */
-                scsi_flush_work(session->host);
                goto success_unlocked;
        case TMABORT_NOT_FOUND:
                if (!ctask->sc) {
@@ -1251,12 +1273,14 @@ success:
        spin_unlock_bh(&session->lock);
 success_unlocked:
        debug_scsi("abort success [sc %lx itt 0x%x]\n", (long)sc, ctask->itt);
+        mutex_unlock(&session->eh_mutex);
        return SUCCESS;
 failed:
        spin_unlock_bh(&session->lock);
 failed_unlocked:
        debug_scsi("abort failed [sc %lx itt 0x%x]\n", (long)sc, ctask->itt);
+        mutex_unlock(&session->eh_mutex);
        return FAILED;
 }
 EXPORT_SYMBOL_GPL(iscsi_eh_abort);
@@ -1403,6 +1427,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit,
        session->max_cmdsn = initial_cmdsn + 1;
        session->max_r2t = 1;
        session->tt = iscsit;
+        mutex_init(&session->eh_mutex);
        /* initialize SCSI PDU commands pool */
        if (iscsi_pool_init(&session->cmdpool, session->cmds_max,
@@ -1736,9 +1761,22 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
 {
        int old_stop_stage;
+        mutex_lock(&session->eh_mutex);
        spin_lock_bh(&session->lock);
        if (conn->stop_stage == STOP_CONN_TERM) {
                spin_unlock_bh(&session->lock);
+                mutex_unlock(&session->eh_mutex);
+                return;
+        }
+        /*
+         * The LLD either freed/unset the lock on us, or userspace called
+         * stop but did not create a proper connection (connection was never
+         * bound or it was unbound then stop was called).
+         */
+        if (!conn->recv_lock) {
+                spin_unlock_bh(&session->lock);
+                mutex_unlock(&session->eh_mutex);
                return;
        }
@@ -1755,9 +1793,9 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
        old_stop_stage = conn->stop_stage;
        conn->stop_stage = flag;
        conn->c_stage = ISCSI_CONN_STOPPED;
-        set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
        spin_unlock_bh(&session->lock);
-        scsi_flush_work(session->host);
+        iscsi_suspend_tx(conn);
        write_lock_bh(conn->recv_lock);
        set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
@@ -1786,6 +1824,7 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
        fail_all_commands(conn);
        flush_control_queues(session, conn);
        spin_unlock_bh(&session->lock);
+        mutex_unlock(&session->eh_mutex);
 }
 void iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 563d18f4ff50..c6680348b648 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -2050,21 +2050,18 @@ qla25xx_fw_dump_failed:
 void
 qla2x00_dump_regs(scsi_qla_host_t *ha)
 {
+        int i;
        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+        struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24;
+        uint16_t __iomem *mbx_reg;
+        mbx_reg = IS_FWI2_CAPABLE(ha) ? &reg24->mailbox0:
+            MAILBOX_REG(ha, reg, 0);
        printk("Mailbox registers:\n");
-        printk("scsi(%ld): mbox 0 0x%04x \n",
+        for (i = 0; i < 6; i++)
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 0));
+                printk("scsi(%ld): mbox %d 0x%04x \n", ha->host_no, i,
-        printk("scsi(%ld): mbox 1 0x%04x \n",
+                    RD_REG_WORD(mbx_reg++));
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 1));
-        printk("scsi(%ld): mbox 2 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 2));
-        printk("scsi(%ld): mbox 3 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 3));
-        printk("scsi(%ld): mbox 4 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 4));
-        printk("scsi(%ld): mbox 5 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 5));
 }
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 27ae3a532a55..c1964866a423 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1502,7 +1502,6 @@ typedef struct {
        uint8_t node_name[WWN_SIZE];
        uint8_t port_name[WWN_SIZE];
        uint8_t fabric_port_name[WWN_SIZE];
-        uint16_t fp_speeds;
        uint16_t fp_speed;
 } sw_info_t;
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index b06cbb8580d3..a7e23583f899 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -295,6 +295,8 @@ qla2x00_gid_pt(scsi_qla_host_t *ha, sw_info_t *list)
                        list[i].d_id.b.domain = gid_data->port_id[0];
                        list[i].d_id.b.area = gid_data->port_id[1];
                        list[i].d_id.b.al_pa = gid_data->port_id[2];
+                        memset(list[i].fabric_port_name, 0, WWN_SIZE);
+                        list[i].fp_speed = PORT_SPEED_UNKNOWN;
                        /* Last one exit. */
                        if (gid_data->control_byte & BIT_7) {
@@ -1707,8 +1709,6 @@ qla2x00_gfpn_id(scsi_qla_host_t *ha, sw_info_t *list)
        for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                /* Issue GFPN_ID */
-                memset(list[i].fabric_port_name, 0, WWN_SIZE);
                /* Prepare common MS IOCB */
                ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GFPN_ID_REQ_SIZE,
                    GFPN_ID_RSP_SIZE);
@@ -1821,8 +1821,6 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
        for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                /* Issue GFPN_ID */
-                list[i].fp_speeds = list[i].fp_speed = 0;
                /* Prepare common MS IOCB */
                ms_pkt = qla24xx_prep_ms_fm_iocb(ha, GPSC_REQ_SIZE,
                    GPSC_RSP_SIZE);
@@ -1858,9 +1856,21 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
                        }
                        rval = QLA_FUNCTION_FAILED;
                } else {
-                        /* Save portname */
+                        /* Save port-speed */
-                        list[i].fp_speeds = ct_rsp->rsp.gpsc.speeds;
+                        switch (be16_to_cpu(ct_rsp->rsp.gpsc.speed)) {
-                        list[i].fp_speed = ct_rsp->rsp.gpsc.speed;
+                        case BIT_15:
+                                list[i].fp_speed = PORT_SPEED_1GB;
+                                break;
+                        case BIT_14:
+                                list[i].fp_speed = PORT_SPEED_2GB;
+                                break;
+                        case BIT_13:
+                                list[i].fp_speed = PORT_SPEED_4GB;
+                                break;
+                        case BIT_11:
+                                list[i].fp_speed = PORT_SPEED_8GB;
+                                break;
+                        }
                        DEBUG2_3(printk("scsi(%ld): GPSC ext entry - "
                            "fpn %02x%02x%02x%02x%02x%02x%02x%02x speeds=%04x "
@@ -1873,8 +1883,8 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
                            list[i].fabric_port_name[5],
                            list[i].fabric_port_name[6],
                            list[i].fabric_port_name[7],
-                            be16_to_cpu(list[i].fp_speeds),
+                            be16_to_cpu(ct_rsp->rsp.gpsc.speeds),
-                            be16_to_cpu(list[i].fp_speed)));
+                            be16_to_cpu(ct_rsp->rsp.gpsc.speed)));
                }
                /* Last device exit. */
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 374abe19b547..1a058ec9bd0c 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2079,17 +2079,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *ha)
                }
                /* Base iIDMA settings on HBA port speed. */
-                switch (ha->link_data_rate) {
+                fcport->fp_speed = ha->link_data_rate;
-                case PORT_SPEED_1GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_15);
-                        break;
-                case PORT_SPEED_2GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_14);
-                        break;
-                case PORT_SPEED_4GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_13);
-                        break;
-                }
                qla2x00_update_fcport(ha, fcport);
@@ -2130,38 +2120,25 @@ static void
 qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
 {
 #define LS_UNKNOWN      2
-        static char *link_speeds[5] = { "1", "2", "?", "4" };
+        static char *link_speeds[5] = { "1", "2", "?", "4", "8" };
        int rval;
-        uint16_t port_speed, mb[6];
+        uint16_t mb[6];
        if (!IS_IIDMA_CAPABLE(ha))
                return;
-        switch (be16_to_cpu(fcport->fp_speed)) {
+        if (fcport->fp_speed == PORT_SPEED_UNKNOWN) {
-        case BIT_15:
-                port_speed = PORT_SPEED_1GB;
-                break;
-        case BIT_14:
-                port_speed = PORT_SPEED_2GB;
-                break;
-        case BIT_13:
-                port_speed = PORT_SPEED_4GB;
-                break;
-        default:
                DEBUG2(printk("scsi(%ld): %02x%02x%02x%02x%02x%02x%02x%02x -- "
-                    "unsupported FM port operating speed (%04x).\n",
+                    "unsupported FM port operating speed.\n",
                    ha->host_no, fcport->port_name[0], fcport->port_name[1],
                    fcport->port_name[2], fcport->port_name[3],
                    fcport->port_name[4], fcport->port_name[5],
-                    fcport->port_name[6], fcport->port_name[7],
+                    fcport->port_name[6], fcport->port_name[7]));
-                    be16_to_cpu(fcport->fp_speed)));
-                port_speed = PORT_SPEED_UNKNOWN;
-                break;
-        }
-        if (port_speed == PORT_SPEED_UNKNOWN)
                return;
+        }
-        rval = qla2x00_set_idma_speed(ha, fcport->loop_id, port_speed, mb);
+        rval = qla2x00_set_idma_speed(ha, fcport->loop_id, fcport->fp_speed,
+            mb);
        if (rval != QLA_SUCCESS) {
                DEBUG2(printk("scsi(%ld): Unable to adjust iIDMA "
                    "%02x%02x%02x%02x%02x%02x%02x%02x -- %04x %x %04x %04x.\n",
@@ -2169,12 +2146,12 @@ qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
                    fcport->port_name[2], fcport->port_name[3],
                    fcport->port_name[4], fcport->port_name[5],
                    fcport->port_name[6], fcport->port_name[7], rval,
-                    port_speed, mb[0], mb[1]));
+                    fcport->fp_speed, mb[0], mb[1]));
        } else {
                DEBUG2(qla_printk(KERN_INFO, ha,
                    "iIDMA adjusted to %s GB/s on "
                    "%02x%02x%02x%02x%02x%02x%02x%02x.\n",
-                    link_speeds[port_speed], fcport->port_name[0],
+                    link_speeds[fcport->fp_speed], fcport->port_name[0],
                    fcport->port_name[1], fcport->port_name[2],
                    fcport->port_name[3], fcport->port_name[4],
                    fcport->port_name[5], fcport->port_name[6],
@@ -3354,7 +3331,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
                        spin_lock_irqsave(&ha->hardware_lock, flags);
-                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) {
+                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
+                            !IS_QLA25XX(ha)) {
                                /*
                                 * Disable SRAM, Instruction RAM and GP RAM
                                 * parity.
@@ -3370,7 +3348,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
                        spin_lock_irqsave(&ha->hardware_lock, flags);
-                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) {
+                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
+                            !IS_QLA25XX(ha)) {
                                /* Enable proper parity */
                                if (IS_QLA2300(ha))
                                        /* SRAM parity */
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 50539da467bf..eecae9905ece 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -490,6 +490,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
                ha->flags.gpsc_supported = 1;
+                ha->flags.management_server_logged_in = 0;
                break;
        case MBA_CHG_IN_CONNECTION:     /* Change in connection mode */
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 93c0c7e4f08f..acca898ce0a2 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1564,7 +1564,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
        struct Scsi_Host *host;
        scsi_qla_host_t *ha;
        unsigned long   flags = 0;
-        char pci_info[20];
+        char pci_info[30];
        char fw_str[30];
        struct scsi_host_template *sht;
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index dd1f8ceb79c4..18095b9b76f4 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
 * Driver version
 */
-#define QLA2XXX_VERSION      "8.02.00-k2"
+#define QLA2XXX_VERSION      "8.02.00-k3"
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    2
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 301313002f6b..f94109cbb46e 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -129,7 +129,16 @@ struct uart_8250_port {
        unsigned char           mcr;
        unsigned char           mcr_mask;       /* mask of user bits */
        unsigned char           mcr_force;      /* mask of forced bits */
-        unsigned char           lsr_break_flag;
+        /*
+         * Some bits in registers are cleared on a read, so they must
+         * be saved whenever the register is read but the bits will not
+         * be immediately processed.
+         */
+#define LSR_SAVE_FLAGS UART_LSR_BRK_ERROR_BITS
+        unsigned char           lsr_saved_flags;
+#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA
+        unsigned char           msr_saved_flags;
        /*
         * We provide a per-port pm hook.
@@ -1238,6 +1247,7 @@ static void serial8250_start_tx(struct uart_port *port)
                if (up->bugs & UART_BUG_TXEN) {
                        unsigned char lsr, iir;
                        lsr = serial_in(up, UART_LSR);
+                        up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
                        iir = serial_in(up, UART_IIR) & 0x0f;
                        if ((up->port.type == PORT_RM9000) ?
                                (lsr & UART_LSR_THRE &&
@@ -1290,18 +1300,10 @@ receive_chars(struct uart_8250_port *up, unsigned int *status)
                flag = TTY_NORMAL;
                up->port.icount.rx++;
-#ifdef CONFIG_SERIAL_8250_CONSOLE
+                lsr |= up->lsr_saved_flags;
-                /*
+                up->lsr_saved_flags = 0;
-                 * Recover the break flag from console xmit
-                 */
-                if (up->port.line == up->port.cons->index) {
-                        lsr |= up->lsr_break_flag;
-                        up->lsr_break_flag = 0;
-                }
-#endif
-                if (unlikely(lsr & (UART_LSR_BI | UART_LSR_PE |
+                if (unlikely(lsr & UART_LSR_BRK_ERROR_BITS)) {
-                                    UART_LSR_FE | UART_LSR_OE))) {
                        /*
                         * For statistics only
                         */
@@ -1392,6 +1394,8 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
 {
        unsigned int status = serial_in(up, UART_MSR);
+        status |= up->msr_saved_flags;
+        up->msr_saved_flags = 0;
        if (status & UART_MSR_ANY_DELTA && up->ier & UART_IER_MSI &&
            up->port.info != NULL) {
                if (status & UART_MSR_TERI)
@@ -1591,7 +1595,8 @@ static void serial8250_timeout(unsigned long data)
 static void serial8250_backup_timeout(unsigned long data)
 {
        struct uart_8250_port *up = (struct uart_8250_port *)data;
-        unsigned int iir, ier = 0;
+        unsigned int iir, ier = 0, lsr;
+        unsigned long flags;
        /*
         * Must disable interrupts or else we risk racing with the interrupt
@@ -1610,9 +1615,13 @@ static void serial8250_backup_timeout(unsigned long data)
         * the "Diva" UART used on the management processor on many HP
         * ia64 and parisc boxes.
         */
+        spin_lock_irqsave(&up->port.lock, flags);
+        lsr = serial_in(up, UART_LSR);
+        up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
+        spin_unlock_irqrestore(&up->port.lock, flags);
        if ((iir & UART_IIR_NO_INT) && (up->ier & UART_IER_THRI) &&
            (!uart_circ_empty(&up->port.info->xmit) || up->port.x_char) &&
-            (serial_in(up, UART_LSR) & UART_LSR_THRE)) {
+            (lsr & UART_LSR_THRE)) {
                iir &= ~(UART_IIR_ID | UART_IIR_NO_INT);
                iir |= UART_IIR_THRI;
        }
@@ -1631,13 +1640,14 @@ static unsigned int serial8250_tx_empty(struct uart_port *port)
 {
        struct uart_8250_port *up = (struct uart_8250_port *)port;
        unsigned long flags;
-        unsigned int ret;
+        unsigned int lsr;
        spin_lock_irqsave(&up->port.lock, flags);
-        ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
+        lsr = serial_in(up, UART_LSR);
+        up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
        spin_unlock_irqrestore(&up->port.lock, flags);
-        return ret;
+        return lsr & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
 }
 static unsigned int serial8250_get_mctrl(struct uart_port *port)
@@ -1708,8 +1718,7 @@ static inline void wait_for_xmitr(struct uart_8250_port *up, int bits)
        do {
                status = serial_in(up, UART_LSR);
-                if (status & UART_LSR_BI)
+                up->lsr_saved_flags |= status & LSR_SAVE_FLAGS;
-                        up->lsr_break_flag = UART_LSR_BI;
                if (--tmout == 0)
                        break;
@@ -1718,8 +1727,12 @@ static inline void wait_for_xmitr(struct uart_8250_port *up, int bits)
        /* Wait up to 1s for flow control if necessary */
        if (up->port.flags & UPF_CONS_FLOW) {
-                tmout = 1000000;
+                unsigned int tmout;
-                while (!(serial_in(up, UART_MSR) & UART_MSR_CTS) && --tmout) {
+                for (tmout = 1000000; tmout; tmout--) {
+                        unsigned int msr = serial_in(up, UART_MSR);
+                        up->msr_saved_flags |= msr & MSR_SAVE_FLAGS;
+                        if (msr & UART_MSR_CTS)
+                                break;
                        udelay(1);
                        touch_nmi_watchdog();
                }
@@ -1889,6 +1902,18 @@ static int serial8250_startup(struct uart_port *port)
        spin_unlock_irqrestore(&up->port.lock, flags);
        /*
+         * Clear the interrupt registers again for luck, and clear the
+         * saved flags to avoid getting false values from polling
+         * routines or the previous session.
+         */
+        serial_inp(up, UART_LSR);
+        serial_inp(up, UART_RX);
+        serial_inp(up, UART_IIR);
+        serial_inp(up, UART_MSR);
+        up->lsr_saved_flags = 0;
+        up->msr_saved_flags = 0;
+        /*
         * Finally, enable interrupts.  Note: Modem status interrupts
         * are set via set_termios(), which will be occurring imminently
         * anyway, so we don't enable them here.
@@ -1906,14 +1931,6 @@ static int serial8250_startup(struct uart_port *port)
                (void) inb_p(icp);
        }
-        /*
-         * And clear the interrupt registers again for luck.
-         */
-        (void) serial_inp(up, UART_LSR);
-        (void) serial_inp(up, UART_RX);
-        (void) serial_inp(up, UART_IIR);
-        (void) serial_inp(up, UART_MSR);
        return 0;
 }
@@ -2484,6 +2501,16 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
        wait_for_xmitr(up, BOTH_EMPTY);
        serial_out(up, UART_IER, ier);
+        /*
+         *      The receive handling will happen properly because the
+         *      receive ready bit will still be set; it is not cleared
+         *      on read.  However, modem control will not, we must
+         *      call it if we have saved something in the saved flags
+         *      while processing with interrupts off.
+         */
+        if (up->msr_saved_flags)
+                check_modem_status(up);
        if (locked)
                spin_unlock(&up->port.lock);
        local_irq_restore(flags);
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 5e485876f54c..1ea1ed82c352 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -580,6 +580,138 @@ static int pci_netmos_init(struct pci_dev *dev)
        return num_serial;
 }
+/*
+ * ITE support by Niels de Vos <niels.devos@wincor-nixdorf.com>
+ *
+ * These chips are available with optionally one parallel port and up to
+ * two serial ports. Unfortunately they all have the same product id.
+ *
+ * Basic configuration is done over a region of 32 I/O ports. The base
+ * ioport is called INTA or INTC, depending on docs/other drivers.
+ *
+ * The region of the 32 I/O ports is configured in POSIO0R...
+ */
+/* registers */
+#define ITE_887x_MISCR          0x9c
+#define ITE_887x_INTCBAR        0x78
+#define ITE_887x_UARTBAR        0x7c
+#define ITE_887x_PS0BAR         0x10
+#define ITE_887x_POSIO0         0x60
+/* I/O space size */
+#define ITE_887x_IOSIZE         32
+/* I/O space size (bits 26-24; 8 bytes = 011b) */
+#define ITE_887x_POSIO_IOSIZE_8         (3 << 24)
+/* I/O space size (bits 26-24; 32 bytes = 101b) */
+#define ITE_887x_POSIO_IOSIZE_32        (5 << 24)
+/* Decoding speed (1 = slow, 2 = medium, 3 = fast) */
+#define ITE_887x_POSIO_SPEED            (3 << 29)
+/* enable IO_Space bit */
+#define ITE_887x_POSIO_ENABLE           (1 << 31)
+static int pci_ite887x_init(struct pci_dev *dev)
+{
+        /* inta_addr are the configuration addresses of the ITE */
+        static const short inta_addr[] = { 0x2a0, 0x2c0, 0x220, 0x240, 0x1e0,
+                                                        0x200, 0x280, 0 };
+        int ret, i, type;
+        struct resource *iobase = NULL;
+        u32 miscr, uartbar, ioport;
+        /* search for the base-ioport */
+        i = 0;
+        while (inta_addr[i] && iobase == NULL) {
+                iobase = request_region(inta_addr[i], ITE_887x_IOSIZE,
+                                                                "ite887x");
+                if (iobase != NULL) {
+                        /* write POSIO0R - speed | size | ioport */
+                        pci_write_config_dword(dev, ITE_887x_POSIO0,
+                                ITE_887x_POSIO_ENABLE | ITE_887x_POSIO_SPEED |
+                                ITE_887x_POSIO_IOSIZE_32 | inta_addr[i]);
+                        /* write INTCBAR - ioport */
+                        pci_write_config_dword(dev, ITE_887x_INTCBAR, inta_addr[i]);
+                        ret = inb(inta_addr[i]);
+                        if (ret != 0xff) {
+                                /* ioport connected */
+                                break;
+                        }
+                        release_region(iobase->start, ITE_887x_IOSIZE);
+                        iobase = NULL;
+                }
+                i++;
+        }
+        if (!inta_addr[i]) {
+                printk(KERN_ERR "ite887x: could not find iobase\n");
+                return -ENODEV;
+        }
+        /* start of undocumented type checking (see parport_pc.c) */
+        type = inb(iobase->start + 0x18) & 0x0f;
+        switch (type) {
+        case 0x2:       /* ITE8871 (1P) */
+        case 0xa:       /* ITE8875 (1P) */
+                ret = 0;
+                break;
+        case 0xe:       /* ITE8872 (2S1P) */
+                ret = 2;
+                break;
+        case 0x6:       /* ITE8873 (1S) */
+                ret = 1;
+                break;
+        case 0x8:       /* ITE8874 (2S) */
+                ret = 2;
+                break;
+        default:
+                moan_device("Unknown ITE887x", dev);
+                ret = -ENODEV;
+        }
+        /* configure all serial ports */
+        for (i = 0; i < ret; i++) {
+                /* read the I/O port from the device */
+                pci_read_config_dword(dev, ITE_887x_PS0BAR + (0x4 * (i + 1)),
+                                                                &ioport);
+                ioport &= 0x0000FF00;   /* the actual base address */
+                pci_write_config_dword(dev, ITE_887x_POSIO0 + (0x4 * (i + 1)),
+                        ITE_887x_POSIO_ENABLE | ITE_887x_POSIO_SPEED |
+                        ITE_887x_POSIO_IOSIZE_8 | ioport);
+                /* write the ioport to the UARTBAR */
+                pci_read_config_dword(dev, ITE_887x_UARTBAR, &uartbar);
+                uartbar &= ~(0xffff << (16 * i));       /* clear half the reg */
+                uartbar |= (ioport << (16 * i));        /* set the ioport */
+                pci_write_config_dword(dev, ITE_887x_UARTBAR, uartbar);
+                /* get current config */
+                pci_read_config_dword(dev, ITE_887x_MISCR, &miscr);
+                /* disable interrupts (UARTx_Routing[3:0]) */
+                miscr &= ~(0xf << (12 - 4 * i));
+                /* activate the UART (UARTx_En) */
+                miscr |= 1 << (23 - i);
+                /* write new config with activated UART */
+                pci_write_config_dword(dev, ITE_887x_MISCR, miscr);
+        }
+        if (ret <= 0) {
+                /* the device has no UARTs if we get here */
+                release_region(iobase->start, ITE_887x_IOSIZE);
+        }
+        return ret;
+}
+static void __devexit pci_ite887x_exit(struct pci_dev *dev)
+{
+        u32 ioport;
+        /* the ioport is bit 0-15 in POSIO0R */
+        pci_read_config_dword(dev, ITE_887x_POSIO0, &ioport);
+        ioport &= 0xffff;
+        release_region(ioport, ITE_887x_IOSIZE);
+}
 static int
 pci_default_setup(struct serial_private *priv, struct pciserial_board *board,
                  struct uart_port *port, int idx)
@@ -653,6 +785,18 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
                .setup          = pci_default_setup,
        },
        /*
+         * ITE
+         */
+        {
+                .vendor         = PCI_VENDOR_ID_ITE,
+                .device         = PCI_DEVICE_ID_ITE_8872,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = pci_ite887x_init,
+                .setup          = pci_default_setup,
+                .exit           = __devexit_p(pci_ite887x_exit),
+        },
+        /*
         * Panacom
         */
        {
@@ -933,6 +1077,7 @@ enum pci_board_num_t {
        pbn_b1_2_1250000,
+        pbn_b1_bt_1_115200,
        pbn_b1_bt_2_921600,
        pbn_b1_1_1382400,
@@ -983,6 +1128,7 @@ enum pci_board_num_t {
        pbn_exar_XR17C152,
        pbn_exar_XR17C154,
        pbn_exar_XR17C158,
+        pbn_pasemi_1682M,
 };
 /*
@@ -1211,6 +1357,13 @@ static struct pciserial_board pci_boards[] __devinitdata = {
                .uart_offset    = 8,
        },
+        [pbn_b1_bt_1_115200] = {
+                .flags          = FL_BASE1|FL_BASE_BARS,
+                .num_ports      = 1,
+                .base_baud      = 115200,
+                .uart_offset    = 8,
+        },
        [pbn_b1_bt_2_921600] = {
                .flags          = FL_BASE1|FL_BASE_BARS,
                .num_ports      = 2,
@@ -1498,6 +1651,18 @@ static struct pciserial_board pci_boards[] __devinitdata = {
                .base_baud      = 921600,
                .uart_offset    = 0x200,
        },
+        /*
+         * PA Semi PWRficient PA6T-1682M on-chip UART
+         */
+        [pbn_pasemi_1682M] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 1,
+                .base_baud      = 8333333,
+        },
+};
+static const struct pci_device_id softmodem_blacklist[] = {
+        { PCI_VDEVICE ( AL, 0x5457 ), }, /* ALi Corporation M5457 AC'97 Modem */
 };
 /*
@@ -1508,6 +1673,7 @@ static struct pciserial_board pci_boards[] __devinitdata = {
 static int __devinit
 serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board)
 {
+        const struct pci_device_id *blacklist;
        int num_iomem, num_port, first_port = -1, i;
        
        /*
@@ -1522,6 +1688,18 @@ serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board)
            (dev->class & 0xff) > 6)
                return -ENODEV;
+        /*
+         * Do not access blacklisted devices that are known not to
+         * feature serial ports.
+         */
+        for (blacklist = softmodem_blacklist;
+             blacklist < softmodem_blacklist + ARRAY_SIZE(softmodem_blacklist);
+             blacklist++) {
+                if (dev->vendor == blacklist->vendor &&
+                    dev->device == blacklist->device)
+                        return -ENODEV;
+        }
        num_iomem = num_port = 0;
        for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) {
                if (pci_resource_flags(dev, i) & IORESOURCE_IO) {
@@ -2364,6 +2542,13 @@ static struct pci_device_id serial_pci_tbl[] = {
        {       PCI_VENDOR_ID_TOPIC, PCI_DEVICE_ID_TOPIC_TP560,
                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                pbn_b0_1_115200 },
+        /*
+         * ITE
+         */
+        {       PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8872,
+                PCI_ANY_ID, PCI_ANY_ID,
+                0, 0,
+                pbn_b1_bt_1_115200 },
        /*
         * IntaShield IS-200
@@ -2382,6 +2567,13 @@ static struct pci_device_id serial_pci_tbl[] = {
                PCI_SUBVENDOR_ID_PERLE, PCI_SUBDEVICE_ID_PCI_RAS8,
                0, 0, pbn_b2_8_921600 },
        /*
+         * PA Semi PA6T-1682M on-chip UART
+         */
+        {       PCI_VENDOR_ID_PASEMI, 0xa004,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_pasemi_1682M },
+        /*
         * These entries match devices with class COMMUNICATION_SERIAL,
         * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
         */
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 030a6063541d..a055f58f342f 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1146,11 +1146,14 @@ static void uart_set_termios(struct tty_struct *tty, struct ktermios *old_termio
        /*
         * These are the bits that are used to setup various
-         * flags in the low level driver.
+         * flags in the low level driver. We can ignore the Bfoo
+         * bits in c_cflag; c_[io]speed will always be set
+         * appropriately by set_termios() in tty_ioctl.c
         */
 #define RELEVANT_IFLAG(iflag)   ((iflag) & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
        if ((cflag ^ old_termios->c_cflag) == 0 &&
+            tty->termios->c_ospeed == old_termios->c_ospeed &&
+            tty->termios->c_ispeed == old_termios->c_ispeed &&
            RELEVANT_IFLAG(tty->termios->c_iflag ^ old_termios->c_iflag) == 0)
                return;
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index b8f91e018b21..0930e2a85514 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -37,7 +37,7 @@
 #include <asm/io.h>
-static char *serial_version = "1.09";
+static char *serial_version = "1.10";
 static char *serial_name = "TX39/49 Serial driver";
 #define PASS_LIMIT      256
@@ -436,8 +436,10 @@ static unsigned int serial_txx9_get_mctrl(struct uart_port *port)
        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
        unsigned int ret;
-        ret =  ((sio_in(up, TXX9_SIFLCR) & TXX9_SIFLCR_RTSSC) ? 0 : TIOCM_RTS)
+        /* no modem control lines */
-                | ((sio_in(up, TXX9_SICISR) & TXX9_SICISR_CTSS) ? 0 : TIOCM_CTS);
+        ret = TIOCM_CAR | TIOCM_DSR;
+        ret |= (sio_in(up, TXX9_SIFLCR) & TXX9_SIFLCR_RTSSC) ? 0 : TIOCM_RTS;
+        ret |= (sio_in(up, TXX9_SICISR) & TXX9_SICISR_CTSS) ? 0 : TIOCM_CTS;
        return ret;
 }
@@ -557,6 +559,12 @@ serial_txx9_set_termios(struct uart_port *port, struct ktermios *termios,
        unsigned long flags;
        unsigned int baud, quot;
+        /*
+         * We don't support modem control lines.
+         */
+        termios->c_cflag &= ~(HUPCL | CMSPAR);
+        termios->c_cflag |= CLOCAL;
        cval = sio_in(up, TXX9_SILCR);
        /* byte size and parity */
        cval &= ~TXX9_SILCR_UMODE_MASK;
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 79b13685bdfa..e074943feff5 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1198,10 +1198,11 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up)
        if (up->port.type == PORT_UNKNOWN)
                return -ENODEV;
-        printk("%s: %s port at %lx, irq %u\n",
+        printk("%s: %s port at %llx, irq %u\n",
               to_of_device(up->port.dev)->node->full_name,
               (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",
-               up->port.mapbase, up->port.irq);
+               (unsigned long long) up->port.mapbase,
+               up->port.irq);
 #ifdef CONFIG_SERIO
        serio = &up->serio;
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 1d262c0c613f..283bef0d24cb 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1431,14 +1431,16 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
                        return err;
                }
        } else {
-                printk(KERN_INFO "%s: Keyboard at MMIO 0x%lx (irq = %d) "
+                printk(KERN_INFO "%s: Keyboard at MMIO 0x%llx (irq = %d) "
                       "is a %s\n",
-                       op->dev.bus_id, up[0].port.mapbase, op->irqs[0],
+                       op->dev.bus_id,
-                       sunzilog_type (&up[0].port));
+                       (unsigned long long) up[0].port.mapbase,
-                printk(KERN_INFO "%s: Mouse at MMIO 0x%lx (irq = %d) "
+                       op->irqs[0], sunzilog_type(&up[0].port));
+                printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) "
                       "is a %s\n",
-                       op->dev.bus_id, up[1].port.mapbase, op->irqs[0],
+                       op->dev.bus_id,
-                       sunzilog_type (&up[1].port));
+                       (unsigned long long) up[1].port.mapbase,
+                       op->irqs[0], sunzilog_type(&up[1].port));
        }
        dev_set_drvdata(&op->dev, &up[0]);
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index ad144054da30..b0469749310a 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -251,7 +251,7 @@ atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer)
                xfer->rx_dma = dma_map_single(dev,
                                xfer->rx_buf, xfer->len,
                                DMA_FROM_DEVICE);
-                if (dma_mapping_error(xfer->tx_dma)) {
+                if (dma_mapping_error(xfer->rx_dma)) {
                        if (xfer->tx_buf)
                                dma_unmap_single(dev,
                                                xfer->tx_dma, xfer->len,
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 48587c27050d..f540ed77a102 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -1303,8 +1303,9 @@ static int bfin5xx_spi_resume(struct platform_device *pdev)
 #define bfin5xx_spi_resume NULL
 #endif                          /* CONFIG_PM */
+MODULE_ALIAS("bfin-spi-master");        /* for platform bus hotplug */
 static struct platform_driver bfin5xx_spi_driver = {
-        .driver         = {
+        .driver = {
                .name   = "bfin-spi-master",
                .owner  = THIS_MODULE,
        },
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index aee9ad6f633c..bd9177f51de9 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1735,7 +1735,7 @@ static int spi_imx_resume(struct platform_device *pdev)
 static struct platform_driver driver = {
        .driver = {
-                .name = "imx-spi",
+                .name = "spi_imx",
                .bus = &platform_bus_type,
                .owner = THIS_MODULE,
        },
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 2adf856e44c2..fcbf1b8a5264 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -530,6 +530,7 @@ static int __devexit mpc83xx_spi_remove(struct platform_device *dev)
        return 0;
 }
+MODULE_ALIAS("mpc83xx_spi");                    /* for platform bus hotplug */
 static struct platform_driver mpc83xx_spi_driver = {
        .probe = mpc83xx_spi_probe,
        .remove = __devexit_p(mpc83xx_spi_remove),
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 5cf48123e0ef..e9b683f7d7b3 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -427,6 +427,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev)
 #define s3c24xx_spi_resume  NULL
 #endif
+MODULE_ALIAS("s3c2410_spi");                    /* for platform bus hotplug */
 static struct platform_driver s3c24xx_spidrv = {
        .probe          = s3c24xx_spi_probe,
        .remove         = s3c24xx_spi_remove,
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index 611ac22b7cdc..0fa25e2e80fe 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -180,7 +180,7 @@ static struct platform_driver s3c2410_spigpio_drv = {
        .suspend        = s3c2410_spigpio_suspend,
        .resume         = s3c2410_spigpio_resume,
        .driver         = {
-                .name   = "s3c24xx-spi-gpio",
+                .name   = "spi_s3c24xx_gpio",
                .owner  = THIS_MODULE,
        },
 };
diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c
index 08e981c40646..b7f4bb239eaf 100644
--- a/drivers/spi/spi_txx9.c
+++ b/drivers/spi/spi_txx9.c
@@ -453,7 +453,7 @@ static int __exit txx9spi_remove(struct platform_device *dev)
 static struct platform_driver txx9spi_driver = {
        .remove = __exit_p(txx9spi_remove),
        .driver = {
-                .name = "txx9spi",
+                .name = "spi_txx9",
                .owner = THIS_MODULE,
        },
 };
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index f0bf9a68e96b..5d04f520c123 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -21,7 +21,7 @@
 #include <syslib/virtex_devices.h>
-#define XILINX_SPI_NAME "xspi"
+#define XILINX_SPI_NAME "xilinx_spi"
 /* Register definitions as per "OPB Serial Peripheral Interface (SPI) (v1.00e)
 * Product Specification", DS464
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 63436892688c..7580aa5da0f8 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -21,6 +21,7 @@ config USB_ARCH_HAS_HCD
        default y if USB_ARCH_HAS_EHCI
        default y if PCMCIA && !M32R                    # sl811_cs
        default y if ARM                                # SL-811
+        default y if SUPERH                             # r8a66597-hcd
        default PCI
 # many non-PCI SOC chips embed OHCI
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 02c52f8d5dbf..a73e714288e5 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -456,7 +456,6 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
                                 int* actual_length)
 {
        struct timer_list timer;
-        int status = urb->status;
        init_timer(&timer);
        timer.expires = jiffies + msecs_to_jiffies(CMD_TIMEOUT);
@@ -468,7 +467,7 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
        if (actual_length)
                *actual_length = urb->actual_length;
-        return status;
+        return urb->status; /* must read status after completion */
 }
 static int cxacru_cm(struct cxacru_data *instance, enum cxacru_cm_request cm,
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index a1a1c9d467e0..29807d048b04 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -1721,9 +1721,12 @@ static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
        ret = uea_boot(sc);
        if (ret < 0)
-                goto error;
+                goto error_rm_grp;
        return 0;
+error_rm_grp:
+        sysfs_remove_group(&intf->dev.kobj, &attr_grp);
 error:
        kfree(sc);
        return ret;
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index fe940e0536e0..f51e22490edf 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -921,6 +921,10 @@ skip_normal_probe:
                        return -EINVAL;
                }
        }
+        /* Accept probe requests only for the control interface */
+        if (intf != control_interface)
+                return -ENODEV;
        
        if (usb_interface_claimed(data_interface)) { /* valid in this context */
                dev_dbg(&intf->dev,"The data interface isn't available");
@@ -1109,10 +1113,12 @@ static void acm_disconnect(struct usb_interface *intf)
                return;
        }
        if (acm->country_codes){
-                device_remove_file(&intf->dev, &dev_attr_wCountryCodes);
+                device_remove_file(&acm->control->dev,
-                device_remove_file(&intf->dev, &dev_attr_iCountryCodeRelDate);
+                                &dev_attr_wCountryCodes);
+                device_remove_file(&acm->control->dev,
+                                &dev_attr_iCountryCodeRelDate);
        }
-        device_remove_file(&intf->dev, &dev_attr_bmCapabilities);
+        device_remove_file(&acm->control->dev, &dev_attr_bmCapabilities);
        acm->dev = NULL;
        usb_set_intfdata(acm->control, NULL);
        usb_set_intfdata(acm->data, NULL);
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 654857493a82..a1ad11d0c47c 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -1224,6 +1224,8 @@ static int usb_autopm_do_device(struct usb_device *udev, int inc_usage_cnt)
        udev->auto_pm = 1;
        udev->pm_usage_cnt += inc_usage_cnt;
        WARN_ON(udev->pm_usage_cnt < 0);
+        if (inc_usage_cnt)
+                udev->last_busy = jiffies;
        if (inc_usage_cnt >= 0 && udev->pm_usage_cnt > 0) {
                if (udev->state == USB_STATE_SUSPENDED)
                        status = usb_resume_both(udev);
@@ -1232,8 +1234,6 @@ static int usb_autopm_do_device(struct usb_device *udev, int inc_usage_cnt)
                else if (inc_usage_cnt)
                        udev->last_busy = jiffies;
        } else if (inc_usage_cnt <= 0 && udev->pm_usage_cnt <= 0) {
-                if (inc_usage_cnt)
-                        udev->last_busy = jiffies;
                status = usb_suspend_both(udev, PMSG_SUSPEND);
        }
        usb_pm_unlock(udev);
@@ -1342,16 +1342,15 @@ static int usb_autopm_do_interface(struct usb_interface *intf,
        else {
                udev->auto_pm = 1;
                intf->pm_usage_cnt += inc_usage_cnt;
+                udev->last_busy = jiffies;
                if (inc_usage_cnt >= 0 && intf->pm_usage_cnt > 0) {
                        if (udev->state == USB_STATE_SUSPENDED)
                                status = usb_resume_both(udev);
                        if (status != 0)
                                intf->pm_usage_cnt -= inc_usage_cnt;
-                        else if (inc_usage_cnt)
+                        else
                                udev->last_busy = jiffies;
                } else if (inc_usage_cnt <= 0 && intf->pm_usage_cnt <= 0) {
-                        if (inc_usage_cnt)
-                                udev->last_busy = jiffies;
                        status = usb_suspend_both(udev, PMSG_SUSPEND);
                }
        }
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index e341a1da517f..f7b337feb3ea 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1644,9 +1644,10 @@ static int finish_port_resume(struct usb_device *udev)
         * and device drivers will know about any resume quirks.
         */
        if (status == 0) {
+                devstatus = 0;
                status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
                if (status >= 0)
-                        status = (status == 2 ? 0 : -ENODEV);
+                        status = (status > 0 ? 0 : -ENODEV);
        }
        if (status) {
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index b6bd05e3d439..d8f7b089a8f0 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -637,12 +637,12 @@ int usb_get_descriptor(struct usb_device *dev, unsigned char type, unsigned char
        memset(buf,0,size);     // Make sure we parse really received data
        for (i = 0; i < 3; ++i) {
-                /* retry on length 0 or stall; some devices are flakey */
+                /* retry on length 0 or error; some devices are flakey */
                result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
                                USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
                                (type << 8) + index, 0, buf, size,
                                USB_CTRL_GET_TIMEOUT);
-                if (result == 0 || result == -EPIPE)
+                if (result <= 0 && result != -ETIMEDOUT)
                        continue;
                if (result > 1 && ((u8 *)buf)[1] != type) {
                        result = -EPROTO;
@@ -1358,6 +1358,30 @@ static int usb_if_uevent(struct device *dev, char **envp, int num_envp,
        usb_dev = interface_to_usbdev(intf);
        alt = intf->cur_altsetting;
+#ifdef CONFIG_USB_DEVICEFS
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "DEVICE=/proc/bus/usb/%03d/%03d",
+                           usb_dev->bus->busnum, usb_dev->devnum))
+                return -ENOMEM;
+#endif
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "PRODUCT=%x/%x/%x",
+                           le16_to_cpu(usb_dev->descriptor.idVendor),
+                           le16_to_cpu(usb_dev->descriptor.idProduct),
+                           le16_to_cpu(usb_dev->descriptor.bcdDevice)))
+                return -ENOMEM;
+        if (add_uevent_var(envp, num_envp, &i,
+                           buffer, buffer_size, &length,
+                           "TYPE=%d/%d/%d",
+                           usb_dev->descriptor.bDeviceClass,
+                           usb_dev->descriptor.bDeviceSubClass,
+                           usb_dev->descriptor.bDeviceProtocol))
+                return -ENOMEM;
        if (add_uevent_var(envp, num_envp, &i,
                   buffer, buffer_size, &length,
                   "INTERFACE=%d/%d/%d",
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index b7917c5a3c6f..9e467118dc94 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -30,6 +30,8 @@
 static const struct usb_device_id usb_quirk_list[] = {
        /* HP 5300/5370C scanner */
        { USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 },
+        /* Hewlett-Packard PhotoSmart 720 / PhotoSmart 935 (storage) */
+        { USB_DEVICE(0x03f0, 0x4002), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
        /* Acer Peripherals Inc. (now BenQ Corp.) Prisa 640BU */
        { USB_DEVICE(0x04a5, 0x207e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
        /* Benq S2W 3300U */
@@ -56,6 +58,8 @@ static const struct usb_device_id usb_quirk_list[] = {
        { USB_DEVICE(0x04b8, 0x0121), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
        /* Seiko Epson Corp.*/
        { USB_DEVICE(0x04b8, 0x0122), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Samsung ML-2010 printer */
+        { USB_DEVICE(0x04e8, 0x326c), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
        /* Samsung ML-2510 Series printer */
        { USB_DEVICE(0x04e8, 0x327e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
        /* Elsa MicroLink 56k (V.250) */
@@ -64,12 +68,20 @@ static const struct usb_device_id usb_quirk_list[] = {
        { USB_DEVICE(0x05d8, 0x4005), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
        /* Agfa Snapscan1212u */
        { USB_DEVICE(0x06bd, 0x2061), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Seagate RSS LLC */
+        { USB_DEVICE(0x0bc2, 0x3000), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
        /* Umax [hex] Astra 3400U */
        { USB_DEVICE(0x1606, 0x0060), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
        /* Philips PSC805 audio device */
        { USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },
+        /* Alcor multi-card reader */
+        { USB_DEVICE(0x058f, 0x6366), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+        /* Canon EOS 5D in PC Connection mode */
+        { USB_DEVICE(0x04a9, 0x3101), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
        /* RIM Blackberry */
        { USB_DEVICE(0x0fca, 0x0001), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
        { USB_DEVICE(0x0fca, 0x0004), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index f2fbdc7fe376..d008d1360a7a 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -34,8 +34,6 @@
 * bypassing some hardware (and driver) issues.  UML could help too.
 */
-#define DEBUG
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index be7a1bd2823b..965ad7bec7b7 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -599,7 +599,6 @@ enum fsg_buffer_state {
 struct fsg_buffhd {
        void                            *buf;
-        dma_addr_t                      dma;
        enum fsg_buffer_state           state;
        struct fsg_buffhd               *next;
@@ -1295,6 +1294,7 @@ static int class_setup_req(struct fsg_dev *fsg,
        struct usb_request      *req = fsg->ep0req;
        int                     value = -EOPNOTSUPP;
        u16                     w_index = le16_to_cpu(ctrl->wIndex);
+        u16                     w_value = le16_to_cpu(ctrl->wValue);
        u16                     w_length = le16_to_cpu(ctrl->wLength);
        if (!fsg->config)
@@ -1308,7 +1308,7 @@ static int class_setup_req(struct fsg_dev *fsg,
                        if (ctrl->bRequestType != (USB_DIR_OUT |
                                        USB_TYPE_CLASS | USB_RECIP_INTERFACE))
                                break;
-                        if (w_index != 0) {
+                        if (w_index != 0 || w_value != 0) {
                                value = -EDOM;
                                break;
                        }
@@ -1324,7 +1324,7 @@ static int class_setup_req(struct fsg_dev *fsg,
                        if (ctrl->bRequestType != (USB_DIR_IN |
                                        USB_TYPE_CLASS | USB_RECIP_INTERFACE))
                                break;
-                        if (w_index != 0) {
+                        if (w_index != 0 || w_value != 0) {
                                value = -EDOM;
                                break;
                        }
@@ -1343,7 +1343,7 @@ static int class_setup_req(struct fsg_dev *fsg,
                        if (ctrl->bRequestType != (USB_DIR_OUT |
                                        USB_TYPE_CLASS | USB_RECIP_INTERFACE))
                                break;
-                        if (w_index != 0) {
+                        if (w_index != 0 || w_value != 0) {
                                value = -EDOM;
                                break;
                        }
@@ -2611,7 +2611,6 @@ static int send_status(struct fsg_dev *fsg)
                fsg->intr_buffhd = bh;          // Point to the right buffhd
                fsg->intreq->buf = bh->inreq->buf;
-                fsg->intreq->dma = bh->inreq->dma;
                fsg->intreq->context = bh;
                start_transfer(fsg, fsg->intr_in, fsg->intreq,
                                &fsg->intreq_busy, &bh->state);
@@ -3200,7 +3199,6 @@ reset:
                if ((rc = alloc_request(fsg, fsg->bulk_out, &bh->outreq)) != 0)
                        goto reset;
                bh->inreq->buf = bh->outreq->buf = bh->buf;
-                bh->inreq->dma = bh->outreq->dma = bh->dma;
                bh->inreq->context = bh->outreq->context = bh;
                bh->inreq->complete = bulk_in_complete;
                bh->outreq->complete = bulk_out_complete;
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
index 10b2b33b8698..d57bcfbc08a5 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/drivers/usb/gadget/fsl_usb2_udc.c
@@ -1277,31 +1277,32 @@ static void setup_received_irq(struct fsl_udc *udc,
        udc_reset_ep_queue(udc, 0);
+        /* We process some stardard setup requests here */
        switch (setup->bRequest) {
-                /* Request that need Data+Status phase from udc */
        case USB_REQ_GET_STATUS:
-                if ((setup->bRequestType & (USB_DIR_IN | USB_TYPE_STANDARD))
+                /* Data+Status phase from udc */
+                if ((setup->bRequestType & (USB_DIR_IN | USB_TYPE_MASK))
                                        != (USB_DIR_IN | USB_TYPE_STANDARD))
                        break;
                ch9getstatus(udc, setup->bRequestType, wValue, wIndex, wLength);
-                break;
+                return;
-                /* Requests that need Status phase from udc */
        case USB_REQ_SET_ADDRESS:
+                /* Status phase from udc */
                if (setup->bRequestType != (USB_DIR_OUT | USB_TYPE_STANDARD
                                                | USB_RECIP_DEVICE))
                        break;
                ch9setaddress(udc, wValue, wIndex, wLength);
-                break;
+                return;
-                /* Handled by udc, no data, status by udc */
        case USB_REQ_CLEAR_FEATURE:
        case USB_REQ_SET_FEATURE:
-        {       /* status transaction */
+                /* Status phase from udc */
+        {
                int rc = -EOPNOTSUPP;
-                if ((setup->bRequestType & USB_RECIP_MASK)
+                if ((setup->bRequestType & (USB_RECIP_MASK | USB_TYPE_MASK))
-                                == USB_RECIP_ENDPOINT) {
+                                == (USB_RECIP_ENDPOINT | USB_TYPE_STANDARD)) {
                        int pipe = get_pipe_by_windex(wIndex);
                        struct fsl_ep *ep;
@@ -1315,8 +1316,9 @@ static void setup_received_irq(struct fsl_udc *udc,
                                                ? 1 : 0);
                        spin_lock(&udc->lock);
-                } else if ((setup->bRequestType & USB_RECIP_MASK)
+                } else if ((setup->bRequestType & (USB_RECIP_MASK
-                                == USB_RECIP_DEVICE) {
+                                | USB_TYPE_MASK)) == (USB_RECIP_DEVICE
+                                | USB_TYPE_STANDARD)) {
                        /* Note: The driver has not include OTG support yet.
                         * This will be set when OTG support is added */
                        if (!udc->gadget.is_otg)
@@ -1329,39 +1331,42 @@ static void setup_received_irq(struct fsl_udc *udc,
                                        USB_DEVICE_A_ALT_HNP_SUPPORT)
                                udc->gadget.a_alt_hnp_support = 1;
                        rc = 0;
-                }
+                } else
+                        break;
                if (rc == 0) {
                        if (ep0_prime_status(udc, EP_DIR_IN))
                                ep0stall(udc);
                }
-                break;
+                return;
        }
-                /* Requests handled by gadget */
-        default:
-                if (wLength) {
-                        /* Data phase from gadget, status phase from udc */
-                        udc->ep0_dir = (setup->bRequestType & USB_DIR_IN)
-                                        ?  USB_DIR_IN : USB_DIR_OUT;
-                        spin_unlock(&udc->lock);
-                        if (udc->driver->setup(&udc->gadget,
-                                        &udc->local_setup_buff) < 0)
-                                ep0stall(udc);
-                        spin_lock(&udc->lock);
-                        udc->ep0_state = (setup->bRequestType & USB_DIR_IN)
-                                        ?  DATA_STATE_XMIT : DATA_STATE_RECV;
-                } else {
+        default:
-                        /* No data phase, IN status from gadget */
-                        udc->ep0_dir = USB_DIR_IN;
-                        spin_unlock(&udc->lock);
-                        if (udc->driver->setup(&udc->gadget,
-                                        &udc->local_setup_buff) < 0)
-                                ep0stall(udc);
-                        spin_lock(&udc->lock);
-                        udc->ep0_state = WAIT_FOR_OUT_STATUS;
-                }
                break;
        }
+        /* Requests handled by gadget */
+        if (wLength) {
+                /* Data phase from gadget, status phase from udc */
+                udc->ep0_dir = (setup->bRequestType & USB_DIR_IN)
+                                ?  USB_DIR_IN : USB_DIR_OUT;
+                spin_unlock(&udc->lock);
+                if (udc->driver->setup(&udc->gadget,
+                                &udc->local_setup_buff) < 0)
+                        ep0stall(udc);
+                spin_lock(&udc->lock);
+                udc->ep0_state = (setup->bRequestType & USB_DIR_IN)
+                                ?  DATA_STATE_XMIT : DATA_STATE_RECV;
+        } else {
+                /* No data phase, IN status from gadget */
+                udc->ep0_dir = USB_DIR_IN;
+                spin_unlock(&udc->lock);
+                if (udc->driver->setup(&udc->gadget,
+                                &udc->local_setup_buff) < 0)
+                        ep0stall(udc);
+                spin_lock(&udc->lock);
+                udc->ep0_state = WAIT_FOR_OUT_STATUS;
+        }
 }
 /* Process request for Data or Status phase of ep0
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 72b4ebbf132d..1407ad1c8128 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -967,7 +967,7 @@ static int pxa2xx_udc_pullup(struct usb_gadget *_gadget, int is_active)
        udc = container_of(_gadget, struct pxa2xx_udc, gadget);
        /* not all boards support pullup control */
-        if (!udc->mach->udc_command)
+        if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
                return -EOPNOTSUPP;
        is_active = (is_active != 0);
@@ -2309,7 +2309,7 @@ static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state)
 {
        struct pxa2xx_udc       *udc = platform_get_drvdata(dev);
-        if (!udc->mach->udc_command)
+        if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
                WARN("USB host won't detect disconnect!\n");
        pullup(udc, 0);
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 2f529828c74d..565d6ef4c4cf 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -237,7 +237,7 @@ config USB_SL811_CS
          module will be called "sl811_cs".
 config USB_R8A66597_HCD
-        tristate "R8A66597 HCD suppoort"
+        tristate "R8A66597 HCD support"
        depends on USB
        help
          The R8A66597 is a USB 2.0 host and peripheral controller.
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c
index 5d1b12aad776..b1d19268cb23 100644
--- a/drivers/usb/host/ehci-au1xxx.c
+++ b/drivers/usb/host/ehci-au1xxx.c
@@ -1,8 +1,6 @@
 /*
 * EHCI HCD (Host Controller Driver) for USB.
 *
- * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
- *
 * Bus Glue for AMD Alchemy Au1xxx
 *
 * Based on "ohci-au1xxx.c" by Matt Porter <mporter@kernel.crashing.org>
@@ -196,6 +194,9 @@ static const struct hc_driver ehci_au1xxx_hc_driver = {
        /*
         * basic lifecycle operations
+         *
+         * FIXME -- ehci_init() doesn't do enough here.
+         * See ehci-ppc-soc for a complete implementation.
         */
        .reset = ehci_init,
        .start = ehci_run,
diff --git a/drivers/usb/host/ehci-ppc-soc.c b/drivers/usb/host/ehci-ppc-soc.c
index c2cedb09ed8b..4f99b0eb27bc 100644
--- a/drivers/usb/host/ehci-ppc-soc.c
+++ b/drivers/usb/host/ehci-ppc-soc.c
@@ -6,7 +6,7 @@
 * Bus Glue for PPC On-Chip EHCI driver
 * Tested on AMCC 440EPx
 *
- * Based on "ehci-au12xx.c" by David Brownell <dbrownell@users.sourceforge.net>
+ * Based on "ehci-au1xxx.c" by K.Boge <karsten.boge@amd.com>
 *
 * This file is licenced under the GPL.
 */
@@ -15,6 +15,24 @@
 extern int usb_disabled(void);
+/* called during probe() after chip reset completes */
+static int ehci_ppc_soc_setup(struct usb_hcd *hcd)
+{
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+        int             retval;
+        retval = ehci_halt(ehci);
+        if (retval)
+                return retval;
+        retval = ehci_init(hcd);
+        if (retval)
+                return retval;
+        ehci->sbrn = 0x20;
+        return ehci_reset(ehci);
+}
 /**
 * usb_ehci_ppc_soc_probe - initialize PPC-SoC-based HCDs
 * Context: !in_interrupt()
@@ -120,7 +138,7 @@ static const struct hc_driver ehci_ppc_soc_hc_driver = {
        /*
         * basic lifecycle operations
         */
-        .reset = ehci_init,
+        .reset = ehci_ppc_soc_setup,
        .start = ehci_run,
        .stop = ehci_stop,
        .shutdown = ehci_shutdown,
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 6f9e43e9a6ca..f61c6cdd06f2 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -74,7 +74,7 @@ urb_print (struct urb * urb, char * str, int small)
 #define ohci_dbg_sw(ohci, next, size, format, arg...) \
        do { \
-        if (next) { \
+        if (next != NULL) { \
                unsigned s_len; \
                s_len = scnprintf (*next, *size, format, ## arg ); \
                *size -= s_len; *next += s_len; \
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index d60f1985320c..40a1de4c256e 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -2208,8 +2208,6 @@ static int __init r8a66597_probe(struct platform_device *pdev)
 clean_up:
        if (reg)
                iounmap(reg);
-        if (res)
-                release_mem_region(res->start, 1);
        return ret;
 }
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 7f765ec038cd..b88eb3c62c02 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -1520,12 +1520,15 @@ static void u132_hcd_endp_work_scheduler(struct work_struct *work)
                }
        }
 }
+#ifdef CONFIG_PM
 static void port_power(struct u132 *u132, int pn, int is_on)
 {
        u132->port[pn].power = is_on;
 }
+#endif
 static void u132_power(struct u132 *u132, int is_on)
 {
        struct usb_hcd *hcd = u132_to_hcd(u132)
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index cff6fd190a28..77bb893bf2e9 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -18,7 +18,6 @@
 static struct usb_device_id id_table [] = {
        { USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera Wireless KPC650/Passport */
-        { USB_DEVICE(0x413c, 0x8115) }, /* Dell Wireless HSDPA 5500 */
        { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index e67ce25f7512..86724e885704 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -383,6 +383,10 @@ static void belkin_sa_set_termios (struct usb_serial_port *port, struct ktermios
        }
        baud = tty_get_baud_rate(port->tty);
+        if (baud == 0) {
+                dbg("%s - tty_get_baud_rate says 0 baud", __FUNCTION__);
+                return;
+        }
        urb_value = BELKIN_SA_BAUD(baud);
        /* Clip to maximum speed */
        if (urb_value == 0)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 7b1673a44077..1370c423d7c2 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -538,6 +538,8 @@ static struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) },
        { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },
+        { USB_DEVICE(EVOLUTION_VID, EVO_HYBRID_PID) },
+        { USB_DEVICE(EVOLUTION_VID, EVO_RCM4_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index d9e49716db13..c70e1de6389e 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -430,6 +430,9 @@
 */
 #define EVOLUTION_VID           0xDEEE  /* Vendor ID */
 #define EVOLUTION_ER1_PID       0x0300  /* ER1 Control Module */
+#define EVO_8U232AM_PID 0x02FF  /* Evolution robotics RCM2 (FT232AM)*/
+#define EVO_HYBRID_PID          0x0302  /* Evolution robotics RCM4 PID (FT232BM)*/
+#define EVO_RCM4_PID            0x0303  /* Evolution robotics RCM4 PID */
 /* Pyramid Computer GmbH */
 #define FTDI_PYRAMID_PID        0xE6C8  /* Pyramid Appliance Display */
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 04bd3b7a2985..f1c90cfe7251 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1,7 +1,7 @@
 /*
 * Garmin GPS driver
 *
- * Copyright (C) 2006 Hermann Kneissel herkne@users.sourceforge.net
+ * Copyright (C) 2006,2007 Hermann Kneissel herkne@users.sourceforge.net
 *
 * The latest version of the driver can be found at
 * http://sourceforge.net/projects/garmin-gps/
@@ -34,6 +34,7 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <asm/uaccess.h>
+#include <asm/atomic.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
@@ -52,7 +53,7 @@ static int debug = 0;
 */
 #define VERSION_MAJOR   0
-#define VERSION_MINOR   28
+#define VERSION_MINOR   31
 #define _STR(s) #s
 #define _DRIVER_VERSION(a,b) "v" _STR(a) "." _STR(b)
@@ -141,6 +142,8 @@ struct garmin_data {
        __u8   inbuffer [GPS_IN_BUFSIZ];  /* tty -> usb */
        __u8   outbuffer[GPS_OUT_BUFSIZ]; /* usb -> tty */
        __u8   privpkt[4*6];
+        atomic_t req_count;
+        atomic_t resp_count;
        spinlock_t lock;
        struct list_head pktlist;
 };
@@ -171,8 +174,6 @@ struct garmin_data {
 #define CLEAR_HALT_REQUIRED       0x0001
 #define FLAGS_QUEUING             0x0100
-#define FLAGS_APP_RESP_SEEN       0x0200
-#define FLAGS_APP_REQ_SEEN        0x0400
 #define FLAGS_DROP_DATA           0x0800
 #define FLAGS_GSP_SKIP            0x1000
@@ -186,7 +187,8 @@ struct garmin_data {
 /* function prototypes */
 static void gsp_next_packet(struct garmin_data * garmin_data_p);
 static int  garmin_write_bulk(struct usb_serial_port *port,
-                             const unsigned char *buf, int count);
+                             const unsigned char *buf, int count,
+                             int dismiss_ack);
 /* some special packets to be send or received */
 static unsigned char const GARMIN_START_SESSION_REQ[]
@@ -233,9 +235,7 @@ static struct usb_driver garmin_driver = {
 static inline int noResponseFromAppLayer(struct garmin_data * garmin_data_p)
 {
-        return ((garmin_data_p->flags
+        return atomic_read(&garmin_data_p->req_count) == atomic_read(&garmin_data_p->resp_count);
-                                & (FLAGS_APP_REQ_SEEN|FLAGS_APP_RESP_SEEN))
-                == FLAGS_APP_REQ_SEEN);
 }
@@ -463,7 +463,7 @@ static int gsp_rec_packet(struct garmin_data * garmin_data_p, int count)
        usbdata[2] = __cpu_to_le32(size);
        garmin_write_bulk (garmin_data_p->port, garmin_data_p->inbuffer,
-                           GARMIN_PKTHDR_LENGTH+size);
+                           GARMIN_PKTHDR_LENGTH+size, 0);
        /* if this was an abort-transfer command, flush all
           queued data. */
@@ -818,7 +818,7 @@ static int nat_receive(struct garmin_data * garmin_data_p,
                        if (garmin_data_p->insize >= len) {
                                garmin_write_bulk (garmin_data_p->port,
                                                   garmin_data_p->inbuffer,
-                                                   len);
+                                                   len, 0);
                                garmin_data_p->insize = 0;
                                /* if this was an abort-transfer command,
@@ -893,10 +893,11 @@ static int garmin_clear(struct garmin_data * garmin_data_p)
        struct usb_serial_port *port = garmin_data_p->port;
-        if (port != NULL && garmin_data_p->flags & FLAGS_APP_RESP_SEEN) {
+        if (port != NULL && atomic_read(&garmin_data_p->resp_count)) {
                /* send a terminate command */
                status = garmin_write_bulk(port, GARMIN_STOP_TRANSFER_REQ,
-                                           sizeof(GARMIN_STOP_TRANSFER_REQ));
+                                           sizeof(GARMIN_STOP_TRANSFER_REQ),
+                                           1);
        }
        /* flush all queued data */
@@ -939,7 +940,8 @@ static int garmin_init_session(struct usb_serial_port *port)
                dbg("%s - starting session ...", __FUNCTION__);
                garmin_data_p->state = STATE_ACTIVE;
                status = garmin_write_bulk(port, GARMIN_START_SESSION_REQ,
-                                           sizeof(GARMIN_START_SESSION_REQ));
+                                           sizeof(GARMIN_START_SESSION_REQ),
+                                           0);
                if (status >= 0) {
@@ -950,7 +952,8 @@ static int garmin_init_session(struct usb_serial_port *port)
                        /* not needed, but the win32 driver does it too ... */
                        status = garmin_write_bulk(port,
                                                   GARMIN_START_SESSION_REQ2,
-                                                   sizeof(GARMIN_START_SESSION_REQ2));
+                                                   sizeof(GARMIN_START_SESSION_REQ2),
+                                                   0);
                        if (status >= 0) {
                                status = 0;
                                spin_lock_irqsave(&garmin_data_p->lock, flags);
@@ -987,6 +990,8 @@ static int garmin_open (struct usb_serial_port *port, struct file *filp)
        garmin_data_p->mode  = initial_mode;
        garmin_data_p->count = 0;
        garmin_data_p->flags = 0;
+        atomic_set(&garmin_data_p->req_count, 0);
+        atomic_set(&garmin_data_p->resp_count, 0);
        spin_unlock_irqrestore(&garmin_data_p->lock, flags);
        /* shutdown any bulk reads that might be going on */
@@ -1035,28 +1040,39 @@ static void garmin_write_bulk_callback (struct urb *urb)
 {
        unsigned long flags;
        struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
-        struct garmin_data * garmin_data_p = usb_get_serial_port_data(port);
        int status = urb->status;
-        /* free up the transfer buffer, as usb_free_urb() does not do this */
+        if (port) {
-        kfree (urb->transfer_buffer);
+                struct garmin_data * garmin_data_p = usb_get_serial_port_data(port);
-        dbg("%s - port %d", __FUNCTION__, port->number);
+                dbg("%s - port %d", __FUNCTION__, port->number);
-        if (status) {
+                if (GARMIN_LAYERID_APPL == getLayerId(urb->transfer_buffer)
-                dbg("%s - nonzero write bulk status received: %d",
+                    && (garmin_data_p->mode == MODE_GARMIN_SERIAL))  {
-                        __FUNCTION__, status);
+                        gsp_send_ack(garmin_data_p, ((__u8 *)urb->transfer_buffer)[4]);
-                spin_lock_irqsave(&garmin_data_p->lock, flags);
+                }
-                garmin_data_p->flags |= CLEAR_HALT_REQUIRED;
-                spin_unlock_irqrestore(&garmin_data_p->lock, flags);
+                if (status) {
+                        dbg("%s - nonzero write bulk status received: %d",
+                            __FUNCTION__, urb->status);
+                        spin_lock_irqsave(&garmin_data_p->lock, flags);
+                        garmin_data_p->flags |= CLEAR_HALT_REQUIRED;
+                        spin_unlock_irqrestore(&garmin_data_p->lock, flags);
+                }
+                usb_serial_port_softint(port);
        }
-        usb_serial_port_softint(port);
+        /* Ignore errors that resulted from garmin_write_bulk with dismiss_ack=1 */
+        /* free up the transfer buffer, as usb_free_urb() does not do this */
+        kfree (urb->transfer_buffer);
 }
 static int garmin_write_bulk (struct usb_serial_port *port,
-                              const unsigned char *buf, int count)
+                              const unsigned char *buf, int count,
+                              int dismiss_ack)
 {
        unsigned long flags;
        struct usb_serial *serial = port->serial;
@@ -1093,13 +1109,12 @@ static int garmin_write_bulk (struct usb_serial_port *port,
                                usb_sndbulkpipe (serial->dev,
                                port->bulk_out_endpointAddress),
                                buffer, count,
-                                garmin_write_bulk_callback, port);
+                                garmin_write_bulk_callback,
+                                dismiss_ack ? NULL : port);
        urb->transfer_flags |= URB_ZERO_PACKET;
        if (GARMIN_LAYERID_APPL == getLayerId(buffer)) {
-                spin_lock_irqsave(&garmin_data_p->lock, flags);
+                atomic_inc(&garmin_data_p->req_count);
-                garmin_data_p->flags |= FLAGS_APP_REQ_SEEN;
-                spin_unlock_irqrestore(&garmin_data_p->lock, flags);
                if (garmin_data_p->mode == MODE_GARMIN_SERIAL)  {
                        pkt_clear(garmin_data_p);
                        garmin_data_p->state = STATE_GSP_WAIT_DATA;
@@ -1114,13 +1129,6 @@ static int garmin_write_bulk (struct usb_serial_port *port,
                        "failed with status = %d\n",
                                __FUNCTION__, status);
                count = status;
-        } else {
-                if (GARMIN_LAYERID_APPL == getLayerId(buffer)
-                    && (garmin_data_p->mode == MODE_GARMIN_SERIAL))  {
-                        gsp_send_ack(garmin_data_p, buffer[4]);
-                }
        }
        /* we are done with this urb, so let the host driver
@@ -1135,7 +1143,6 @@ static int garmin_write_bulk (struct usb_serial_port *port,
 static int garmin_write (struct usb_serial_port *port,
                         const unsigned char *buf, int count)
 {
-        unsigned long flags;
        int pktid, pktsiz, len;
        struct garmin_data * garmin_data_p = usb_get_serial_port_data(port);
        __le32 *privpkt = (__le32 *)garmin_data_p->privpkt;
@@ -1186,9 +1193,7 @@ static int garmin_write (struct usb_serial_port *port,
                                break;
                        case PRIV_PKTID_RESET_REQ:
-                                spin_lock_irqsave(&garmin_data_p->lock, flags);
+                                atomic_inc(&garmin_data_p->req_count);
-                                garmin_data_p->flags |= FLAGS_APP_REQ_SEEN;
-                                spin_unlock_irqrestore(&garmin_data_p->lock, flags);
                                break;
                        case PRIV_PKTID_SET_DEF_MODE:
@@ -1241,8 +1246,6 @@ static int garmin_chars_in_buffer (struct usb_serial_port *port)
 static void garmin_read_process(struct garmin_data * garmin_data_p,
                                 unsigned char *data, unsigned data_length)
 {
-        unsigned long flags;
        if (garmin_data_p->flags & FLAGS_DROP_DATA) {
                /* abort-transfer cmd is actice */
                dbg("%s - pkt dropped", __FUNCTION__);
@@ -1254,9 +1257,7 @@ static void garmin_read_process(struct garmin_data * garmin_data_p,
                   the device */
                if (0 == memcmp(data, GARMIN_APP_LAYER_REPLY,
                                sizeof(GARMIN_APP_LAYER_REPLY))) {
-                        spin_lock_irqsave(&garmin_data_p->lock, flags);
+                        atomic_inc(&garmin_data_p->resp_count);
-                        garmin_data_p->flags |= FLAGS_APP_RESP_SEEN;
-                        spin_unlock_irqrestore(&garmin_data_p->lock, flags);
                }
                /* if throttling is active or postprecessing is required
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 0455c1552ae9..6a3a704b5849 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -545,6 +545,7 @@ static struct usb_device_id ipaq_id_table [] = {
        { USB_DEVICE(0x413C, 0x4009) }, /* Dell Axim USB Sync */
        { USB_DEVICE(0x4505, 0x0010) }, /* Smartphone */
        { USB_DEVICE(0x5E04, 0xCE00) }, /* SAGEM Wireless Assistant */
+        { USB_DEVICE(0x0BB4, 0x00CF) }, /* HTC smartphone modems */
        { }                             /* Terminating entry */
 };
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 84c12b5f1271..4cb3c165742b 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -110,6 +110,7 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define HUAWEI_PRODUCT_E220                     0x1003
 #define NOVATELWIRELESS_VENDOR_ID               0x1410
+#define DELL_VENDOR_ID                          0x413C
 #define ANYDATA_VENDOR_ID                       0x16d5
 #define ANYDATA_PRODUCT_ADU_E100A               0x6501
@@ -119,8 +120,6 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define BANDRICH_PRODUCT_C100_1                 0x1002
 #define BANDRICH_PRODUCT_C100_2                 0x1003
-#define DELL_VENDOR_ID                          0x413C
 static struct usb_device_id option_ids[] = {
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -171,11 +170,16 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2110) }, /* Novatel Merlin ES620 / Merlin ES720 / Ovation U720 */
        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2130) }, /* Novatel Merlin ES620 SM Bus */
        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2410) }, /* Novatel EU740 */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8114) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8115) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8116) }, /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8117) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8118) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8128) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */
        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },
        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
        { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
        { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8118) },         /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard */
        { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index d7db71eca520..833ada47fc54 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -818,19 +818,17 @@ static int oti6858_ioctl(struct usb_serial_port *port, struct file *file,
        switch (cmd) {
                case TCGETS:
-                        if (copy_to_user(user_arg, port->tty->termios,
+                        if (kernel_termios_to_user_termios((struct ktermios __user *)arg,
-                                                sizeof(struct ktermios))) {
+                                                           port->tty->termios))
                                return -EFAULT;
-                        }
                        return 0;
                case TCSETS:
                case TCSETSW:   /* FIXME: this is not the same! */
                case TCSETSF:   /* FIXME: this is not the same! */
-                        if (copy_from_user(port->tty->termios, user_arg,
+                        if (user_termios_to_kernel_termios(port->tty->termios,
-                                                sizeof(struct ktermios))) {
+                                                (struct ktermios __user *)arg))
                                return -EFAULT;
-                        }
                        oti6858_set_termios(port, NULL);
                        return 0;
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 86899d55d8d8..51669b7622bb 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -74,13 +74,13 @@
 #include <linux/usb/serial.h>
-#ifndef CONFIG_USB_SAFE_PADDED
+#ifndef CONFIG_USB_SERIAL_SAFE_PADDED
-#define CONFIG_USB_SAFE_PADDED 0
+#define CONFIG_USB_SERIAL_SAFE_PADDED 0
 #endif
 static int debug;
 static int safe = 1;
-static int padded = CONFIG_USB_SAFE_PADDED;
+static int padded = CONFIG_USB_SERIAL_SAFE_PADDED;
 #define DRIVER_VERSION "v0.0b"
 #define DRIVER_AUTHOR "sl@lineo.com, tbr@lineo.com"
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 7d84a7647e81..30e08c0bcdc2 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -104,6 +104,8 @@ static struct usb_device_id id_table [] = {
                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
        { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_TJ25_ID),
                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
+        { USB_DEVICE(ACER_VENDOR_ID, ACER_S10_ID),
+                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
        { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SCH_I330_ID), 
                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
        { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SPH_I500_ID), 
diff --git a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h
index 4ce6f62a6f39..57229cf66477 100644
--- a/drivers/usb/serial/visor.h
+++ b/drivers/usb/serial/visor.h
@@ -48,6 +48,9 @@
 #define SONY_CLIE_UX50_ID               0x0144
 #define SONY_CLIE_TJ25_ID               0x0169
+#define ACER_VENDOR_ID                  0x0502
+#define ACER_S10_ID                     0x0001
 #define SAMSUNG_VENDOR_ID               0x04E8
 #define SAMSUNG_SCH_I330_ID             0x8001
 #define SAMSUNG_SPH_I500_ID             0x6601
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index d8d008d42946..2d92ce31018f 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -342,7 +342,7 @@ UNUSUAL_DEV(  0x04b0, 0x040d, 0x0100, 0x0100,
                US_FL_FIX_CAPACITY),
 /* Reported by Emil Larsson <emil@swip.net> */
-UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0100,
+UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0101,
                "NIKON",
                "NIKON DSC D80",
                US_SC_DEVICE, US_PR_DEVICE, NULL,
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 28842d208bb0..25e557d4fe6b 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -112,13 +112,6 @@ module_param(delay_use, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(delay_use, "seconds to delay before using a new device");
-/* These are used to make sure the module doesn't unload before all the
- * threads have exited.
- */
-static atomic_t total_threads = ATOMIC_INIT(0);
-static DECLARE_COMPLETION(threads_gone);
 /*
 * The entries in this table correspond, line for line,
 * with the entries of us_unusual_dev_list[].
@@ -879,9 +872,6 @@ static void quiesce_and_remove_host(struct us_data *us)
        usb_stor_stop_transport(us);
        wake_up(&us->delay_wait);
-        /* It doesn't matter if the SCSI-scanning thread is still running.
-         * The thread will exit when it sees the DISCONNECTING flag. */
        /* queuecommand won't accept any new commands and the control
         * thread won't execute a previously-queued command.  If there
         * is such a command pending, complete it with an error. */
@@ -891,12 +881,16 @@ static void quiesce_and_remove_host(struct us_data *us)
                scsi_lock(host);
                us->srb->scsi_done(us->srb);
                us->srb = NULL;
+                complete(&us->notify);          /* in case of an abort */
                scsi_unlock(host);
        }
        mutex_unlock(&us->dev_mutex);
        /* Now we own no commands so it's safe to remove the SCSI host */
        scsi_remove_host(host);
+        /* Wait for the SCSI-scanning thread to stop */
+        wait_for_completion(&us->scanning_done);
 }
 /* Second stage of disconnect processing: deallocate all resources */
@@ -947,9 +941,8 @@ retry:
                /* Should we unbind if no devices were detected? */
        }
-        scsi_host_put(us_to_host(us));
        usb_autopm_put_interface(us->pusb_intf);
-        complete_and_exit(&threads_gone, 0);
+        complete_and_exit(&us->scanning_done, 0);
 }
@@ -984,6 +977,7 @@ static int storage_probe(struct usb_interface *intf,
        init_MUTEX_LOCKED(&(us->sema));
        init_completion(&(us->notify));
        init_waitqueue_head(&us->delay_wait);
+        init_completion(&us->scanning_done);
        /* Associate the us_data structure with the USB device */
        result = associate_dev(us, intf);
@@ -1033,11 +1027,6 @@ static int storage_probe(struct usb_interface *intf,
                goto BadDevice;
        }
-        /* Take a reference to the host for the scanning thread and
-         * count it among all the threads we have launched.  Then
-         * start it up. */
-        scsi_host_get(us_to_host(us));
-        atomic_inc(&total_threads);
        usb_autopm_get_interface(intf); /* dropped in the scanning thread */
        wake_up_process(th);
@@ -1104,16 +1093,6 @@ static void __exit usb_stor_exit(void)
        US_DEBUGP("-- calling usb_deregister()\n");
        usb_deregister(&usb_storage_driver) ;
-        /* Don't return until all of our control and scanning threads
-         * have exited.  Since each thread signals threads_gone as its
-         * last act, we have to call wait_for_completion the right number
-         * of times.
-         */
-        while (atomic_read(&total_threads) > 0) {
-                wait_for_completion(&threads_gone);
-                atomic_dec(&total_threads);
-        }
        usb_usual_clear_present(USB_US_TYPE_STOR);
 }
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 6445665b1577..8d87503e2560 100644
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -150,6 +150,7 @@ struct us_data {
        struct semaphore        sema;            /* to sleep thread on      */
        struct completion       notify;          /* thread begin/end        */
        wait_queue_head_t       delay_wait;      /* wait during scan, reset */
+        struct completion       scanning_done;   /* wait for scan thread    */
        /* subdriver information */
        void                    *extra;          /* Any extra data          */
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 80a81eccad36..832e4613673a 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -115,6 +115,52 @@ static int nocursor = 0;
 module_param(nocursor, int, 0644);
 MODULE_PARM_DESC(nocursor, "cursor enable/disable");
+/* fb_blank
+ * Blank the screen. Depending on the mode, the screen will be
+ * activated with the backlight color, or desactivated
+ */
+static int au1100fb_fb_blank(int blank_mode, struct fb_info *fbi)
+{
+        struct au1100fb_device *fbdev = to_au1100fb_device(fbi);
+        print_dbg("fb_blank %d %p", blank_mode, fbi);
+        switch (blank_mode) {
+        case VESA_NO_BLANKING:
+                        /* Turn on panel */
+                        fbdev->regs->lcd_control |= LCD_CONTROL_GO;
+#ifdef CONFIG_MIPS_PB1100
+                        if (drv_info.panel_idx == 1) {
+                                au_writew(au_readw(PB1100_G_CONTROL)
+                                          | (PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
+                        PB1100_G_CONTROL);
+                        }
+#endif
+                au_sync();
+                break;
+        case VESA_VSYNC_SUSPEND:
+        case VESA_HSYNC_SUSPEND:
+        case VESA_POWERDOWN:
+                        /* Turn off panel */
+                        fbdev->regs->lcd_control &= ~LCD_CONTROL_GO;
+#ifdef CONFIG_MIPS_PB1100
+                        if (drv_info.panel_idx == 1) {
+                                au_writew(au_readw(PB1100_G_CONTROL)
+                                          & ~(PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
+                        PB1100_G_CONTROL);
+                        }
+#endif
+                au_sync();
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
 /*
 * Set hardware with var settings. This will enable the controller with a specific
 * mode, normally validated with the fb_check_var method
@@ -272,52 +318,6 @@ int au1100fb_fb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned
        return 0;
 }
-/* fb_blank
- * Blank the screen. Depending on the mode, the screen will be
- * activated with the backlight color, or desactivated
- */
-int au1100fb_fb_blank(int blank_mode, struct fb_info *fbi)
-{
-        struct au1100fb_device *fbdev = to_au1100fb_device(fbi);
-        print_dbg("fb_blank %d %p", blank_mode, fbi);
-        switch (blank_mode) {
-        case VESA_NO_BLANKING:
-                        /* Turn on panel */
-                        fbdev->regs->lcd_control |= LCD_CONTROL_GO;
-#ifdef CONFIG_MIPS_PB1100
-                        if (drv_info.panel_idx == 1) {
-                                au_writew(au_readw(PB1100_G_CONTROL)
-                                          | (PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
-                        PB1100_G_CONTROL);
-                        }
-#endif
-                au_sync();
-                break;
-        case VESA_VSYNC_SUSPEND:
-        case VESA_HSYNC_SUSPEND:
-        case VESA_POWERDOWN:
-                        /* Turn off panel */
-                        fbdev->regs->lcd_control &= ~LCD_CONTROL_GO;
-#ifdef CONFIG_MIPS_PB1100
-                        if (drv_info.panel_idx == 1) {
-                                au_writew(au_readw(PB1100_G_CONTROL)
-                                          & ~(PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
-                        PB1100_G_CONTROL);
-                        }
-#endif
-                au_sync();
-                break;
-        default:
-                break;
-        }
-        return 0;
-}
 /* fb_pan_display
 * Pan display in x and/or y as specified
 */
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 718b9f83736e..833b10c84064 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -233,9 +233,9 @@ static u8 bw2regs_66hz[] __devinitdata = {
        0x10, 0x20,     0
 };
-static void __devinit bw2_do_default_mode(struct bw2_par *par,
+static int __devinit bw2_do_default_mode(struct bw2_par *par,
-                                          struct fb_info *info,
+                                         struct fb_info *info,
-                                          int *linebytes)
+                                         int *linebytes)
 {
        u8 status, mon;
        u8 *p;
@@ -266,17 +266,18 @@ static void __devinit bw2_do_default_mode(struct bw2_par *par,
                break;
        case BWTWO_SR_ID_NOCONN:
-                return;
+                return 0;
        default:
-                prom_printf("bw2: can't handle SR %02x\n",
+                printk(KERN_ERR "bw2: can't handle SR %02x\n",
-                            status);
+                       status);
-                prom_halt();
+                return -EINVAL;
        }
        for ( ; *p; p += 2) {
                u8 __iomem *regp = &((u8 __iomem *)par->regs)[p[0]];
                sbus_writeb(p[1], regp);
        }
+        return 0;
 }
 static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match)
@@ -312,8 +313,11 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
        if (!par->regs)
                goto out_release_fb;
-        if (!of_find_property(dp, "width", NULL))
+        if (!of_find_property(dp, "width", NULL)) {
-                bw2_do_default_mode(par, info, &linebytes);
+                err = bw2_do_default_mode(par, info, &linebytes);
+                if (err)
+                        goto out_unmap_regs;
+        }
        par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 5741b46ade1b..a5c7fb331527 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -315,7 +315,7 @@ static u_char cg3_dacvals[] __devinitdata = {
        4, 0xff,        5, 0x00,        6, 0x70,        7, 0x00,        0
 };
-static void __devinit cg3_do_default_mode(struct cg3_par *par)
+static int __devinit cg3_do_default_mode(struct cg3_par *par)
 {
        enum cg3_type type;
        u8 *p;
@@ -332,10 +332,9 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par)
                        else
                                type = CG3_AT_66HZ;
                } else {
-                        prom_printf("cgthree: can't handle SR %02x\n",
+                        printk(KERN_ERR "cgthree: can't handle SR %02x\n",
-                                    status);
+                               status);
-                        prom_halt();
+                        return -EINVAL;
-                        return;
                }
        }
@@ -351,6 +350,7 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par)
                regp = (u8 __iomem *)&par->regs->cmap.control;
                sbus_writeb(p[1], regp);
        }
+        return 0;
 }
 static int __devinit cg3_probe(struct of_device *op,
@@ -400,8 +400,11 @@ static int __devinit cg3_probe(struct of_device *op,
        cg3_blank(0, info);
-        if (!of_find_property(dp, "width", NULL))
+        if (!of_find_property(dp, "width", NULL)) {
-                cg3_do_default_mode(par);
+                err = cg3_do_default_mode(par);
+                if (err)
+                        goto out_unmap_screen;
+        }
        if (fb_alloc_cmap(&info->cmap, 256, 0))
                goto out_unmap_screen;
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 49643969f9f8..a22ccf9485a4 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -145,7 +145,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION
         oriented.
 config STI_CONSOLE
-        tristate "STI text console" 
+        bool "STI text console"
        depends on PARISC
        default y
        help
@@ -182,7 +182,7 @@ config FONT_8x8
 config FONT_8x16
        bool "VGA 8x16 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || STI_CONSOLE || USB_SISUSBVGA_CON 
+        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON
        default y if !SPARC && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 7fa1afeae8dc..dda0586ab3f3 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -738,9 +738,8 @@ const struct consw newport_con = {
 #ifdef MODULE
 static int __init newport_console_init(void)
 {
        if (!sgi_gfxaddr)
-                return NULL;
+                return 0;
        if (!npregs)
                npregs = (struct newport_regs *)/* ioremap cannot fail */
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 870017d44970..e9ab657f0bb7 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -232,18 +232,14 @@ sti_bmove(struct sti_struct *sti, int src_y, int src_x,
 }
-/* FIXME: Do we have another solution for this ? */
+static void sti_flush(unsigned long start, unsigned long end)
-static void sti_flush(unsigned long from, unsigned long len)
 {
-        flush_data_cache();
+        flush_icache_range(start, end);
-        flush_kernel_dcache_range(from, len);
-        flush_icache_range(from, from+len);
 }
 void __devinit
 sti_rom_copy(unsigned long base, unsigned long count, void *dest)
 {
-        unsigned long dest_len = count;
        unsigned long dest_start = (unsigned long) dest;
        /* this still needs to be revisited (see arch/parisc/mm/init.c:246) ! */
@@ -260,7 +256,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void *dest)
                dest++;
        }
-        sti_flush(dest_start, dest_len);
+        sti_flush(dest_start, (unsigned long)dest);
 }
@@ -663,7 +659,6 @@ sti_bmode_font_raw(struct sti_cooked_font *f)
 static void __devinit
 sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
 {
-        unsigned long dest_len = count;
        unsigned long dest_start = (unsigned long) dest;
        while (count) {
@@ -672,7 +667,8 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
                base += 4;
                dest++;
        }
-        sti_flush(dest_start, dest_len);
+        sti_flush(dest_start, (unsigned long)dest);
 }
 static struct sti_rom * __devinit
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 5715b8ad0ddc..94f4511023d8 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -1391,7 +1391,7 @@ init_imstt(struct fb_info *info)
                }
        }
-#if USE_NV_MODES && defined(CONFIG_PPC)
+#if USE_NV_MODES && defined(CONFIG_PPC32)
        {
                int vmode = init_vmode, cmode = init_cmode;
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 2fbd8dd16df5..6840dfebe4d4 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -170,22 +170,24 @@ void __w1_remove_master_device(struct w1_master *dev)
 void w1_remove_master_device(struct w1_bus_master *bm)
 {
-        struct w1_master *dev = NULL;
+        struct w1_master *dev, *found = NULL;
        list_for_each_entry(dev, &w1_masters, w1_master_entry) {
                if (!dev->initialized)
                        continue;
-                if (dev->bus_master->data == bm->data)
+                if (dev->bus_master->data == bm->data) {
+                        found = dev;
                        break;
+                }
        }
-        if (!dev) {
+        if (!found) {
                printk(KERN_ERR "Device doesn't exist.\n");
                return;
        }
-        __w1_remove_master_device(dev);
+        __w1_remove_master_device(found);
 }
 EXPORT_SYMBOL(w1_add_master_device);
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index 9130f1c12c26..808b4f8675c5 100644
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -78,7 +78,7 @@ static ssize_t zorro_read_config(struct kobject *kobj,
 static struct bin_attribute zorro_config_attr = {
        .attr = {
                .name = "config",
-                .mode = S_IRUGO | S_IWUSR,
+                .mode = S_IRUGO,
        },
        .size = sizeof(struct ConfigDev),
        .read = zorro_read_config,