From: Helge Deller <deller@xxxxxx>
On parisc machines, which don't have HIL, removing the hilkbd module
panics the kernel. Fix this by adding proper implementations for the
probe and remove functions to the parisc_driver structure.
A few functions were renamed to clean up the code and make it easier
readable.
Disable the MODULE_DEVICE_TABLE() macro on parisc since the kernel module
autoloader should instead prefer the hp_sdc driver which takes care of
full HIL support, including HIL mouse and HIL tablets.
Signed-off-by: Helge Deller <deller@xxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Frans Pop <elendil@xxxxxxxxx>
Cc: Kyle McMartin <kyle@xxxxxxxxxxx>
Cc: Grant Grundler <grundler@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/input/keyboard/hilkbd.c | 63 ++++++++++++++++++++----------
1 file changed, 43 insertions(+), 20 deletions(-)
diff -puN drivers/input/keyboard/hilkbd.c~input-keyboard-hilkbdc-fix-crash-when-removing-hilkbd-module drivers/input/keyboard/hilkbd.c
--- a/drivers/input/keyboard/hilkbd.c~input-keyboard-hilkbdc-fix-crash-when-removing-hilkbd-module
+++ a/drivers/input/keyboard/hilkbd.c
@@ -198,9 +198,8 @@ static void hil_do(unsigned char cmd, un
}
-/* initialise HIL */
-static int __init
-hil_keyb_init(void)
+/* initialize HIL */
+static int __init hil_keyb_init(void)
{
unsigned char c;
unsigned int i, kbid;
@@ -308,13 +307,39 @@ err1:
return err;
}
+static void __exit hil_keyb_exit(void)
+{
+ /* exit if there is no HIL keyboard */
+ if (!hil_dev.dev)
+ return;
+
+ if (HIL_IRQ) {
+ disable_irq(HIL_IRQ);
+ free_irq(HIL_IRQ, hil_dev.dev_id);
+ }
+
+ /* Turn off interrupts */
+ hil_do(HIL_INTOFF, NULL, 0);
+
+ input_unregister_device(hil_dev.dev);
+
+ hil_dev.dev = NULL;
+
+#if defined(CONFIG_HP300)
+ release_region(HILBASE+HIL_DATA, 2);
+#endif
+}
#if defined(CONFIG_PARISC)
-static int __init
-hil_init_chip(struct parisc_device *dev)
+static int __init hil_probe_chip(struct parisc_device *dev)
{
+ /* Only allow one HIL keyboard */
+ if (hil_dev.dev)
+ return -ENODEV;
+
if (!dev->irq) {
- printk(KERN_WARNING "HIL: IRQ not found for HIL bus at 0x%08lx\n", dev->hpa.start);
+ printk(KERN_WARNING "HIL: IRQ not found for HIL bus at 0x%p\n",
+ (void *)dev->hpa.start);
return -ENODEV;
}
@@ -327,17 +352,27 @@ hil_init_chip(struct parisc_device *dev)
return hil_keyb_init();
}
+static int __exit hil_remove_chip(struct parisc_device *dev)
+{
+ hil_keyb_exit();
+ return 0;
+}
+
static struct parisc_device_id hil_tbl[] = {
{ HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00073 },
{ 0, }
};
+#if 0
+/* Disabled to avoid conflicts with the HP SDC HIL drivers */
MODULE_DEVICE_TABLE(parisc, hil_tbl);
+#endif
static struct parisc_driver hil_driver = {
.name = "hil",
.id_table = hil_tbl,
- .probe = hil_init_chip,
+ .probe = hil_probe_chip,
+ .remove = hil_remove_chip,
};
#endif /* CONFIG_PARISC */
@@ -354,22 +389,10 @@ static int __init hil_init(void)
static void __exit hil_exit(void)
{
- if (HIL_IRQ) {
- disable_irq(HIL_IRQ);
- free_irq(HIL_IRQ, hil_dev.dev_id);
- }
-
- /* Turn off interrupts */
- hil_do(HIL_INTOFF, NULL, 0);
-
- input_unregister_device(hil_dev.dev);
-
- hil_dev.dev = NULL;
-
#if defined(CONFIG_PARISC)
unregister_parisc_driver(&hil_driver);
#else
- release_region(HILBASE+HIL_DATA, 2);
+ hil_keyb_exit();
#endif
}
_
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
