Input: rpckbd - fix a leak of the IRQ during init failure

AxelLin · dtor · commit e28e1d93e959 · 2011-04-02T21:47:53.000-07:00
In rpckbd_open prror path, free_irq() was using NULL rather than the
driver data as the data pointer so free_irq() wouldn't have matched.

Signed-off-by: Axel Lin &lt;axel.lin@gmail.com&gt;
Signed-off-by: Dmitry Torokhov &lt;dtor@mail.ru&gt;
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
@@ -90,7 +90,7 @@ static int rpckbd_open(struct serio *port)
 
 	if (request_irq(IRQ_KEYBOARDTX, rpckbd_tx, 0, "rpckbd", port) != 0) {
 		printk(KERN_ERR "rpckbd.c: Could not allocate keyboard transmit IRQ\n");
-		free_irq(IRQ_KEYBOARDRX, NULL);
+		free_irq(IRQ_KEYBOARDRX, port);
 		return -EBUSY;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ static int rpckbd_open(struct serio *port)`
`90`	`90`
`91`	`91`	`if (request_irq(IRQ_KEYBOARDTX, rpckbd_tx, 0, "rpckbd", port) != 0) {`
`92`	`92`	`printk(KERN_ERR "rpckbd.c: Could not allocate keyboard transmit IRQ\n");`
`93`		`- free_irq(IRQ_KEYBOARDRX, NULL);`
	`93`	`+ free_irq(IRQ_KEYBOARDRX, port);`
`94`	`94`	`return -EBUSY;`
`95`	`95`	`}`
`96`	`96`