diff options
| author | Julia Lawall <julia@diku.dk> | 2010-03-29 17:35:24 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-04-17 17:54:38 +0200 |
| commit | 42d284b986105a6ed5ac386818cae093532b2c55 (patch) | |
| tree | 5441ac464dda59ce7e0885ccfb6f1e2b6da430ef | |
| parent | serial_cs: MD55x support (PCMCIA GPRS/EDGE modem) (kernel 2.6.33) (diff) | |
| download | linux-42d284b986105a6ed5ac386818cae093532b2c55.tar.xz linux-42d284b986105a6ed5ac386818cae093532b2c55.zip | |
drivers/pcmcia: Add missing local_irq_restore
Use local_irq_restore in this error-handling case just like in the one just
below.
A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@r exists@
expression E1;
identifier f;
@@
f (...) { <+...
* local_irq_save (E1,...);
... when != E1
* return ...;
...+> }
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| -rw-r--r-- | drivers/pcmcia/db1xxx_ss.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c index 6206408e196c..2d48196a48cd 100644 --- a/drivers/pcmcia/db1xxx_ss.c +++ b/drivers/pcmcia/db1xxx_ss.c @@ -166,8 +166,10 @@ static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock) ret = request_irq(sock->insert_irq, db1200_pcmcia_cdirq, IRQF_DISABLED, "pcmcia_insert", sock); - if (ret) + if (ret) { + local_irq_restore(flags); goto out1; + } ret = request_irq(sock->eject_irq, db1200_pcmcia_cdirq, IRQF_DISABLED, "pcmcia_eject", sock); |