Title: [7349] trunk/drivers/input/keyboard/opencores-kbd.c: opencores-kbd: make sure to release memory we requested
- Revision
- 7349
- Author
- vapier
- Date
- 2009-09-16 00:08:00 -0400 (Wed, 16 Sep 2009)
Log Message
opencores-kbd: make sure to release memory we requested
Modified Paths
Diff
Modified: trunk/drivers/input/keyboard/opencores-kbd.c (7348 => 7349)
--- trunk/drivers/input/keyboard/opencores-kbd.c 2009-09-16 02:50:37 UTC (rev 7348)
+++ trunk/drivers/input/keyboard/opencores-kbd.c 2009-09-16 04:08:00 UTC (rev 7349)
@@ -17,6 +17,7 @@
struct opencores_kbd {
struct input_dev *input;
+ struct resource *addr_res;
void __iomem *addr;
int irq;
unsigned short keycodes[128];
@@ -62,6 +63,7 @@
goto err_free_mem;
}
+ opencores_kbd->addr_res = res;
res = request_mem_region(res->start, resource_size(res), pdev->name);
if (!res) {
dev_err(&pdev->dev, "failed to request I/O memory\n");
@@ -142,6 +144,9 @@
free_irq(opencores_kbd->irq, opencores_kbd);
+ iounmap(opencores_kbd->addr);
+ release_mem_region(opencores_kbd->addr_res->start,
+ resource_size(opencores_kbd->addr_res));
input_unregister_device(opencores_kbd->input);
kfree(opencores_kbd);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits