diff options
author | Roel Kluin <12o3l@tiscali.nl> | 2007-11-14 20:00:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 21:45:42 -0500 |
commit | c0f2a9d75aed1a4be40c3975b94fd39066bd11bb (patch) | |
tree | 9d73066a4d79d07dd8da0d3eece2924b7308292b /arch/mips | |
parent | 5c6ff79d0908df0d281c05b5b693eaba55b06e0f (diff) |
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>
Diffstat (limited to 'arch/mips')
-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 33506ff25910..5b10ac133ec8 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, | |||
430 | break; | 430 | break; |
431 | 431 | ||
432 | default: | 432 | default: |
433 | spin_unlock_irq(¤t->sighand->siglock); | ||
433 | return -EINVAL; | 434 | return -EINVAL; |
434 | } | 435 | } |
435 | recalc_sigpending(); | 436 | recalc_sigpending(); |
diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c index 1899601e5862..3f23d9fda662 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) | |||
525 | intassign1 |= (uint16_t)assign << 9; | 525 | intassign1 |= (uint16_t)assign << 9; |
526 | break; | 526 | break; |
527 | default: | 527 | default: |
528 | spin_unlock_irq(&desc->lock); | ||
528 | return -EINVAL; | 529 | return -EINVAL; |
529 | } | 530 | } |
530 | 531 | ||
@@ -592,6 +593,7 @@ static inline int set_sysint2_assign(unsigned int irq, unsigned char assign) | |||
592 | intassign3 |= (uint16_t)assign << 12; | 593 | intassign3 |= (uint16_t)assign << 12; |
593 | break; | 594 | break; |
594 | default: | 595 | default: |
596 | spin_unlock_irq(&desc->lock); | ||
595 | return -EINVAL; | 597 | return -EINVAL; |
596 | } | 598 | } |
597 | 599 | ||