[PATCH] drivers/char/amiserial.c: Add local_irq_restore in errorhandling code

[Julia Lawall]

From: Julia Lawall <julia@xxxxxxx>

The gotos to the labels fail_free_irq and fail_unregister only occur
between local_irq_save and local_irq_restore, so it would seem that this
code should also call local_irq_restore.

The semantic match that detects this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@rl@
expression l;
position p;
expression E,E1,E2;
@@

local_irq_save(l);
<... when != local_irq_restore(l)
     when != spin_unlock_irqrestore(E,l)
if (...) { ... when != local_irq_restore(l)
               when != spin_unlock_irqrestore(E1,l)
*    return@p ...;
}
...>
(
spin_unlock_irqrestore(E2,l);
|
local_irq_restore(l);
)
</smpl>

Signed-off-by: Julia Lawall <julia@xxxxxxx>

---
 drivers/char/amiserial.c            |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 6c32fbf..2131ecb 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -2056,6 +2056,7 @@ fail_free_irq:
 	free_irq(IRQ_AMIGA_TBE, state);
 fail_unregister:
 	tty_unregister_driver(serial_driver);
+	local_irq_restore(flags);
 fail_release_mem_region:
 	release_mem_region(CUSTOM_PHYSADDR+0x30, 4);
 fail_put_tty_driver:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/