1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index 64254416a178..08685c4cf231 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -2181,10 +2181,12 @@ _ctl_ioctl_main(struct file *file, unsigned int cmd, void __user *arg,
                 return -EAGAIN;
 
         state = (file->f_flags & O_NONBLOCK) ? NON_BLOCKING : BLOCKING;
-        if (state == NON_BLOCKING && !mutex_trylock(&ioc->ctl_cmds.mutex))
-                return -EAGAIN;
-        else if (mutex_lock_interruptible(&ioc->ctl_cmds.mutex))
+        if (state == NON_BLOCKING) {
+                if (!mutex_trylock(&ioc->ctl_cmds.mutex))
+                        return -EAGAIN;
+        } else if (mutex_lock_interruptible(&ioc->ctl_cmds.mutex)) {
                 return -ERESTARTSYS;
+        }
 
         switch (cmd) {
         case MPT2IOCINFO: