drivers/input/serio/hp_sdc.c: fix crash when removing hp_sdc module

[sfrench/cifs-2.6.git] / drivers / input / serio / hp_sdc.c

diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 0d395979b2d19c2a35ddb31e6d8c915c363fcfd9..1c9410d1822c5b0817f079f275ac3b380a36798b 100644 (file)
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -323,7 +323,7 @@ static void hp_sdc_tasklet(unsigned long foo)
                         * it back to the application. and be less verbose.
                         */
                        printk(KERN_WARNING PREFIX "read timeout (%ius)!\n",
-                              tv.tv_usec - hp_sdc.rtv.tv_usec);
+                              (int)(tv.tv_usec - hp_sdc.rtv.tv_usec));
                        curr->idx += hp_sdc.rqty;
                        hp_sdc.rqty = 0;
                        tmp = curr->seq[curr->actidx];
@@ -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