diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2009-11-12 12:50:06 -0600 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-11-13 08:45:54 +0100 |
| commit | 8721c81f6480e2c9acbf92078383953f825d1057 (patch) | |
| tree | a0ccf01bd22f1685462235866843e04a4859677f /drivers/block | |
| parent | 5c07a311a80adb0138fc08e8279c60255d88d0b8 (diff) | |
| download | blackbird-op-linux-8721c81f6480e2c9acbf92078383953f825d1057.tar.gz blackbird-op-linux-8721c81f6480e2c9acbf92078383953f825d1057.zip | |
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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss.c | 7 | ||||
| -rw-r--r-- | drivers/block/cciss_scsi.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 1bd313dcf6af..eab81c6c0ca5 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 237d2b353652..5d0e46dc3632 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); |
