Browse Source

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>
Roel Kluin 17 years ago
parent
commit
c0f2a9d75a
2 changed files with 3 additions and 0 deletions
  1. 1 0
      arch/mips/kernel/irixsig.c
  2. 2 0
      arch/mips/vr41xx/common/icu.c

+ 1 - 0
arch/mips/kernel/irixsig.c

@@ -430,6 +430,7 @@ asmlinkage int irix_sigprocmask(int how, irix_sigset_t __user *new,
 			break;
 			break;
 
 
 		default:
 		default:
+			spin_unlock_irq(&current->sighand->siglock);
 			return -EINVAL;
 			return -EINVAL;
 		}
 		}
 		recalc_sigpending();
 		recalc_sigpending();

+ 2 - 0
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;
 		intassign1 |= (uint16_t)assign << 9;
 		break;
 		break;
 	default:
 	default:
+		spin_unlock_irq(&desc->lock);
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}
 
 
@@ -592,6 +593,7 @@ static inline int set_sysint2_assign(unsigned int irq, unsigned char assign)
 		intassign3 |= (uint16_t)assign << 12;
 		intassign3 |= (uint16_t)assign << 12;
 		break;
 		break;
 	default:
 	default:
+		spin_unlock_irq(&desc->lock);
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}