aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2009-02-20 15:38:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-20 17:57:49 -0800
commit9b6d25100ace1dcf9750803ff08f6b61f840be79 (patch)
treee1250e7ce784354cbe779df16fb51222c17b6952
parentad444684b78f12fb3f45a733722e2cbfe102d25c (diff)
downloadlinux-2.6.38-lt-ux500-9b6d25100ace1dcf9750803ff08f6b61f840be79.tar.gz
sx.c: fix dbl statement if - add missing braces
Caused by 736d54533aed (sx.c: fix missed unlock_kernel() on error path in sx_fw_ioctl()). You guys keep breaking things this way in every single kernel release in at least couple of places... :-( Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Acked-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/sx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index f146e90404f..d7c416566bd 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1746,9 +1746,10 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
sx_dprintk(SX_DEBUG_FIRMWARE, "returning type= %ld\n", rc);
break;
case SXIO_DO_RAMTEST:
- if (sx_initialized) /* Already initialized: better not ramtest the board. */
+ if (sx_initialized) { /* Already initialized: better not ramtest the board. */
rc = -EPERM;
break;
+ }
if (IS_SX_BOARD(board)) {
rc = do_memtest(board, 0, 0x7000);
if (!rc)