diff options
author | Roel Kluin <12o3l@tiscali.nl> | 2007-11-14 17:00:06 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 18:45:42 -0800 |
commit | c0f2a9d75aed1a4be40c3975b94fd39066bd11bb (patch) | |
tree | 9d73066a4d79d07dd8da0d3eece2924b7308292b | |
parent | 5c6ff79d0908df0d281c05b5b693eaba55b06e0f (diff) | |
download | op-kernel-dev-c0f2a9d75aed1a4be40c3975b94fd39066bd11bb.zip op-kernel-dev-c0f2a9d75aed1a4be40c3975b94fd39066bd11bb.tar.gz |
mips: undo locking on error path returns
[akpm@linux-foundation.org: coding-style cleanups]
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/mips/kernel/irixsig.c | 1 | ||||
-rw-r--r-- | arch/mips/vr41xx/common/icu.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index 33506ff..5b10ac1 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c @@ -430,6 +430,7 @@ asmlinkage int irix_sigprocmask(int how, irix_sigset_t __user *new, break; default: + spin_unlock_irq(¤t->sighand->siglock); return -EINVAL; } recalc_sigpending(); diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c index 1899601..3f23d9f 100644 --- a/arch/mips/vr41xx/common/icu.c +++ b/arch/mips/vr41xx/common/icu.c @@ -525,6 +525,7 @@ static inline int set_sysint1_assign(unsigned int irq, unsigned char assign) intassign1 |= (uint16_t)assign << 9; break; default: + spin_unlock_irq(&desc->lock); return -EINVAL; } @@ -592,6 +593,7 @@ static inline int set_sysint2_assign(unsigned int irq, unsigned char assign) intassign3 |= (uint16_t)assign << 12; break; default: + spin_unlock_irq(&desc->lock); return -EINVAL; } |