3 files changed, 47 insertions, 22 deletions

diff --git a/drivers/input/mouse/maplemouse.c b/drivers/input/mouse/maplemouse.c
index d196abfb68bc..5f278176eb9b 100644
--- a/drivers/input/mouse/maplemouse.c
+++ b/drivers/input/mouse/maplemouse.c
@@ -2,8 +2,8 @@
  *      SEGA Dreamcast mouse driver
  *      Based on drivers/usb/usbmouse.c
  *
- *      Copyright Yaegashi Takeshi, 2001
- *      Adrian McMenamin, 2008
+ *      Copyright (c) Yaegashi Takeshi, 2001
+ *      Copyright (c) Adrian McMenamin, 2008 - 2009
  */
 
 #include <linux/kernel.h>
@@ -29,7 +29,7 @@ static void dc_mouse_callback(struct mapleq *mq)
         struct maple_device *mapledev = mq->dev;
         struct dc_mouse *mse = maple_get_drvdata(mapledev);
         struct input_dev *dev = mse->dev;
-        unsigned char *res = mq->recvbuf;
+        unsigned char *res = mq->recvbuf->buf;
 
         buttons = ~res[8];
         relx = *(unsigned short *)(res + 12) - 512;
@@ -47,7 +47,7 @@ static void dc_mouse_callback(struct mapleq *mq)
 
 static int dc_mouse_open(struct input_dev *dev)
 {
-        struct dc_mouse *mse = dev->dev.platform_data;
+        struct dc_mouse *mse = maple_get_drvdata(to_maple_dev(&dev->dev));
 
         maple_getcond_callback(mse->mdev, dc_mouse_callback, HZ/50,
                 MAPLE_FUNC_MOUSE);
@@ -57,29 +57,33 @@ static int dc_mouse_open(struct input_dev *dev)
 
 static void dc_mouse_close(struct input_dev *dev)
 {
-        struct dc_mouse *mse = dev->dev.platform_data;
+        struct dc_mouse *mse = maple_get_drvdata(to_maple_dev(&dev->dev));
 
         maple_getcond_callback(mse->mdev, dc_mouse_callback, 0,
                 MAPLE_FUNC_MOUSE);
 }
 
-
+/* allow the mouse to be used */
 static int __devinit probe_maple_mouse(struct device *dev)
 {
         struct maple_device *mdev = to_maple_dev(dev);
         struct maple_driver *mdrv = to_maple_driver(dev->driver);
+        int error;
         struct input_dev *input_dev;
         struct dc_mouse *mse;
-        int error;
 
         mse = kzalloc(sizeof(struct dc_mouse), GFP_KERNEL);
-        input_dev = input_allocate_device();
-
-        if (!mse || !input_dev) {
+        if (!mse) {
                 error = -ENOMEM;
                 goto fail;
         }
 
+        input_dev = input_allocate_device();
+        if (!input_dev) {
+                error = -ENOMEM;
+                goto fail_nomem;
+        }
+
         mse->dev = input_dev;
         mse->mdev = mdev;
 
@@ -89,25 +93,24 @@ static int __devinit probe_maple_mouse(struct device *dev)
                 BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
         input_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y) |
                 BIT_MASK(REL_WHEEL);
-        input_dev->name = mdev->product_name;
-        input_dev->id.bustype = BUS_HOST;
         input_dev->open = dc_mouse_open;
         input_dev->close = dc_mouse_close;
+        input_dev->name = mdev->product_name;
+        input_dev->id.bustype = BUS_HOST;
+        error = input_register_device(input_dev);
+        if (error)
+                goto fail_register;
 
         mdev->driver = mdrv;
         maple_set_drvdata(mdev, mse);
 
-        error = input_register_device(input_dev);
-        if (error)
-                goto fail;
-
-        return 0;
+        return error;
 
-fail:
+fail_register:
         input_free_device(input_dev);
-        maple_set_drvdata(mdev, NULL);
+fail_nomem:
         kfree(mse);
-        mdev->driver = NULL;
+fail:
         return error;
 }
 
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index e29cdc13a199..a28c06d686e1 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -107,7 +107,7 @@ static void amba_kmi_close(struct serio *io)
         clk_disable(kmi->clk);
 }
 
-static int amba_kmi_probe(struct amba_device *dev, void *id)
+static int amba_kmi_probe(struct amba_device *dev, struct amba_id *id)
 {
         struct amba_kmi_port *kmi;
         struct serio *io;
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index bfe49243f38b..1c9410d1822c 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -819,6 +819,7 @@ static const struct parisc_device_id hp_sdc_tbl[] = {
 MODULE_DEVICE_TABLE(parisc, hp_sdc_tbl);
 
 static int __init hp_sdc_init_hppa(struct parisc_device *d);
+static struct delayed_work moduleloader_work;
 
 static struct parisc_driver hp_sdc_driver = {
         .name =         "hp_sdc",
@@ -930,8 +931,15 @@ static int __init hp_sdc_init(void)
 
 #if defined(__hppa__)
 
+static void request_module_delayed(struct work_struct *work)
+{
+        request_module("hp_sdc_mlc");
+}
+
 static int __init hp_sdc_init_hppa(struct parisc_device *d)
 {
+        int ret;
+
         if (!d)
                 return 1;
         if (hp_sdc.dev != NULL)
@@ -944,13 +952,26 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d)
         hp_sdc.data_io          = d->hpa.start + 0x800;
         hp_sdc.status_io        = d->hpa.start + 0x801;
 
-        return hp_sdc_init();
+        INIT_DELAYED_WORK(&moduleloader_work, request_module_delayed);
+
+        ret = hp_sdc_init();
+        /* after sucessfull initialization give SDC some time to settle
+         * and then load the hp_sdc_mlc upper layer driver */
+        if (!ret)
+                schedule_delayed_work(&moduleloader_work,
+                        msecs_to_jiffies(2000));
+
+        return ret;
 }
 
 #endif /* __hppa__ */
 
 static void hp_sdc_exit(void)
 {
+        /* do nothing if we don't have a SDC */
+        if (!hp_sdc.dev)
+                return;
+
         write_lock_irq(&hp_sdc.lock);
 
         /* Turn off all maskable "sub-function" irq's. */
@@ -969,6 +990,7 @@ static void hp_sdc_exit(void)
         tasklet_kill(&hp_sdc.task);
 
 #if defined(__hppa__)
+        cancel_delayed_work_sync(&moduleloader_work);
         if (unregister_parisc_driver(&hp_sdc_driver))
                 printk(KERN_WARNING PREFIX "Error unregistering HP SDC");
 #endif