1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index b60be7b0decf..518f2a25d91e 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1713,8 +1713,8 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 for (i = 0; i < SX_NBOARDS; i++)
                         sx_dprintk(SX_DEBUG_FIRMWARE, "<%x> ", boards[i].flags);
                 sx_dprintk(SX_DEBUG_FIRMWARE, "\n");
-                unlock_kernel();
-                return -EIO;
+                rc = -EIO;
+                goto out;
         }
 
         switch (cmd) {
@@ -1746,8 +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.  */
-                        return -EPERM;
+                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)
@@ -1787,7 +1789,7 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                                                 nbytes - i : SX_CHUNK_SIZE)) {
                                         kfree(tmp);
                                         rc = -EFAULT;
-                                        break;
+                                        goto out;
                                 }
                                 memcpy_toio(board->base2 + offset + i, tmp,
                                                 (i + SX_CHUNK_SIZE > nbytes) ?
@@ -1844,6 +1846,7 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 rc = -ENOTTY;
                 break;
         }
+out:
         unlock_kernel();
         func_exit();
         return rc;