Skip to contentSkip to conversation

Input: omap-keypad - fix a wrong free_irq() parameter

PATCH Applied Axel Lin 2 participants 2 messages Apr 28, 2011

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 Input: omap-keypad - fix a wrong free_irq() parameter

In current implementation, 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 <[email protected]>
---
 drivers/input/keyboard/omap-keypad.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/input/keyboard/omap-keypad.c +3 -3
index 0e2a19c..f23a743 100644
@@ -413,7 +413,7 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
 	return 0;
 err5:
 	for (i = irq_idx - 1; i >=0; i--)
-		free_irq(row_gpios[i], NULL);
+		free_irq(row_gpios[i], omap_kp);
 err4:
 	input_unregister_device(omap_kp->input);
 	input_dev = NULL;

@@ -444,11 +444,11 @@ static int __devexit omap_kp_remove(struct platform_device *pdev)
 			gpio_free(col_gpios[i]);
 		for (i = 0; i < omap_kp->rows; i++) {
 			gpio_free(row_gpios[i]);
-			free_irq(gpio_to_irq(row_gpios[i]), NULL);
+			free_irq(gpio_to_irq(row_gpios[i]), omap_kp);
 		}
 	} else {
 		omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
-		free_irq(omap_kp->irq, NULL);
+		free_irq(omap_kp->irq, omap_kp);
 	}
 
 	del_timer_sync(&omap_kp->timer);
Signature · 1 line
1.7.1
maintainer Applied
#1 lore raw
Quoted 3 lines · Axel Lin

In current implementation, free_irq() was using NULL rather than the driver data as the data pointer so free_irq() wouldn't have matched.

Applied, thanks Axel.

Signature · 1 line
Dmitry