cciss: Fix weird usage of ENXIO in cciss_scsi.c

cciss: Fix weird usage of ENXIO in cciss_scsi.c

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

2 files changed, 3 insertions, 6 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 1bd313dcf6a..eab81c6c0ca 100644
--- a/drivers/block/cciss.c
+++ b/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/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 237d2b35365..5d0e46dc363 100644
--- a/drivers/block/cciss_scsi.c
+++ b/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);