Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27172/arch/ppc/platforms
Modified Files:
gc-rsw.c
Log Message:
Don't re-enable an IRQ we didn't disable in the first place; from dmesg:
"enable_irq(1) unbalanced"
Index: gc-rsw.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gc-rsw.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gc-rsw.c 30 Jan 2004 14:13:16 -0000 1.5
+++ gc-rsw.c 16 Jun 2004 15:17:16 -0000 1.6
@@ -40,17 +40,17 @@
static int gc_rsw_init(void)
{
- if (request_irq(RSW_IRQ, gc_rsw_handler, 0, "GameCube Reset Switch", 0) < 0) {
+ int err;
+
+ err = request_irq(RSW_IRQ, gc_rsw_handler, 0, "GameCube Reset Switch", 0);
+ if (err)
printk(KERN_ERR "gc_rsw: Request irq%d failed\n", RSW_IRQ);
- } else {
- enable_irq(RSW_IRQ);
- }
- return 0;
+
+ return err;
}
static void gc_rsw_exit(void)
{
- disable_irq(RSW_IRQ);
free_irq(RSW_IRQ, 0);
}
|
