lkml.org 
[lkml]   [2003]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: [2.6 RFC/PATCH] Input: possible deadlock in i8042
Date
===================================================================


ChangeSet@1.1513, 2003-11-30 23:38:00-05:00, dtor_core@ameritech.net
Input: Unregister port not only when there us no free IRQ
available but also when write to control register
failed.

Use serio_unregister_port_delayed in i8042_open to
avoid deadlock on serio_sem.

Also logging moved a bit


i8042.c | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)


===================================================================



diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
--- a/drivers/input/serio/i8042.c Mon Dec 1 01:15:56 2003
+++ b/drivers/input/serio/i8042.c Mon Dec 1 01:15:56 2003
@@ -231,21 +231,29 @@
if (request_irq(values->irq, i8042_interrupt,
SA_SHIRQ, "i8042", i8042_request_irq_cookie)) {
printk(KERN_ERR "i8042.c: Can't get irq %d for %s, unregistering the port.\n", values->irq, values->name);
- values->exists = 0;
- serio_unregister_port(port);
- return -1;
+ goto irq_fail;
}

i8042_ctr |= values->irqen;

if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
- printk(KERN_ERR "i8042.c: Can't write CTR while opening %s.\n", values->name);
- return -1;
+ printk(KERN_ERR "i8042.c: Can't write CTR while opening %s, unregistering the port\n", values->name);
+ goto ctr_fail;
}

i8042_interrupt(0, NULL, NULL);

return 0;
+
+ctr_fail:
+ i8042_ctr &= ~values->irqen;
+ free_irq(values->irq, i8042_request_irq_cookie);
+
+irq_fail:
+ values->exists = 0;
+ serio_unregister_port_delayed(port);
+
+ return -1;
}

/*
@@ -691,13 +699,13 @@
return -1;
}

- serio_register_port(port);
-
printk(KERN_INFO "serio: i8042 %s port at %#lx,%#lx irq %d\n",
values->name,
(unsigned long) I8042_DATA_REG,
(unsigned long) I8042_COMMAND_REG,
values->irq);
+
+ serio_register_port(port);

return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:59    [W:0.047 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site