From ca02b8ac6c4e9aada4861325cd311ce7462858f2 Mon Sep 17 00:00:00 2001
From: Alexey Khoroshilov <khoroshilov@ispras.ru>
Date: Tue, 28 Aug 2012 18:38:02 +0400
Subject: [PATCH] --- yaml --- r: 328885 b: refs/heads/master c:
 b656688a90175d4c424a2f02264863ede7e82d7b h: refs/heads/master i:   328883:
 bff32bfcebf8aab8341356fbb4785777338fe3bc v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/scsi/mpt2sas/mpt2sas_ctl.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d1e727334399..bf2dfe754a55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2b0599de5450e11bc41be2432a161f86d816ae3
+refs/heads/master: b656688a90175d4c424a2f02264863ede7e82d7b
diff --git a/trunk/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/trunk/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index 64254416a178..08685c4cf231 100644
--- a/trunk/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/trunk/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: