From 139d3e276664bbd424e1b7404f22ffe3e2435cd3 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 12 Nov 2009 12:50:06 -0600
Subject: [PATCH] --- yaml --- r: 172958 b: refs/heads/master c:
 8721c81f6480e2c9acbf92078383953f825d1057 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/cciss.c      | 7 ++-----
 trunk/drivers/block/cciss_scsi.c | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6380f805eed5..3dbf1b6ed5c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c07a311a80adb0138fc08e8279c60255d88d0b8
+refs/heads/master: 8721c81f6480e2c9acbf92078383953f825d1057
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 1bd313dcf6af..eab81c6c0ca5 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -422,12 +422,9 @@ cciss_proc_write(struct file *file, const char __user *buf,
 	if (strncmp(ENGAGE_SCSI, buffer, sizeof ENGAGE_SCSI - 1) == 0) {
 		struct seq_file *seq = file->private_data;
 		ctlr_info_t *h = seq->private;
-		int rc;
 
-		rc = cciss_engage_scsi(h->ctlr);
-		if (rc != 0)
-			err = -rc;
-		else
+		err = cciss_engage_scsi(h->ctlr);
+		if (err == 0)
 			err = length;
 	} else
 #endif /* CONFIG_CISS_SCSI_TAPE */
diff --git a/trunk/drivers/block/cciss_scsi.c b/trunk/drivers/block/cciss_scsi.c
index 237d2b353652..5d0e46dc3632 100644
--- a/trunk/drivers/block/cciss_scsi.c
+++ b/trunk/drivers/block/cciss_scsi.c
@@ -1547,7 +1547,7 @@ cciss_engage_scsi(int ctlr)
 	if (sa->registered) {
 		printk("cciss%d: SCSI subsystem already engaged.\n", ctlr);
 		spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);
-		return ENXIO;
+		return -ENXIO;
 	}
 	sa->registered = 1;
 	spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);