patch-2.4.19 linux-2.4.19/drivers/sbus/char/uctrl.c

• Lines: 29
• Date: Fri Aug 2 17:39:44 2002
• Orig file: linux-2.4.18/drivers/sbus/char/uctrl.c
• Orig date: Wed Oct 10 23:42:47 2001

diff -urN linux-2.4.18/drivers/sbus/char/uctrl.c linux-2.4.19/drivers/sbus/char/uctrl.c
@@ -389,15 +389,11 @@
 	if(!driver->irq) 
 		driver->irq = tmp_irq[0].pri;
 
-	request_irq(driver->irq, uctrl_interrupt, 0, 
-		    "uctrl", driver);
-
-	enable_irq(driver->irq);
+	request_irq(driver->irq, uctrl_interrupt, 0, "uctrl", driver);
 
 	if (misc_register(&uctrl_dev)) {
 		printk("%s: unable to get misc minor %d\n",
 		       __FUNCTION__, uctrl_dev.minor);
-		disable_irq(driver->irq);
 		free_irq(driver->irq, driver);
 		return -ENODEV;
 	}
@@ -414,10 +410,8 @@
 	struct uctrl_driver *driver = &drv;
 
 	misc_deregister(&uctrl_dev);
-	if (driver->irq) {
-		disable_irq(driver->irq);
+	if (driver->irq)
 		free_irq(driver->irq, driver);
-	}
 	if (driver->regs)
 		driver->regs = 0;
 }