diff options
| author |   Julia Lawall <julia@diku.dk> | 2010-04-27 14:05:20 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 09:20:34 -0700 |
| commit | c61fae964a5ee04c4e4a01caecaf778c2e26e589 (patch) | |
| tree | 428b757db833d033256f6e36d287d424336550fd /drivers/serial/pmac_zilog.c | |
| parent | serial: 8250_pnp - add Fujitsu Wacom device (diff) | |
| download | linux-dev-c61fae964a5ee04c4e4a01caecaf778c2e26e589.tar.xz linux-dev-c61fae964a5ee04c4e4a01caecaf778c2e26e589.zip | |
serial: drivers/serial/pmac_zilog.c: add missing unlock
In an error handling case the lock is not unlocked.
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 (...) { <+...
* spin_lock_irqsave (E1,...);
... when != E1
* return ...;
...+> }
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial/pmac_zilog.c')
| -rw-r--r-- | drivers/serial/pmac_zilog.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 4eaa043ca2a8..700e10833bf9 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -752,8 +752,10 @@ static void pmz_break_ctl(struct uart_port *port, int break_state) uap->curregs[R5] = new_reg; /* NOTE: Not subject to 'transmitter active' rule. */ - if (ZS_IS_ASLEEP(uap)) + if (ZS_IS_ASLEEP(uap)) { + spin_unlock_irqrestore(&port->lock, flags); return; + } write_zsreg(uap, R5, uap->curregs[R5]); } |