summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ultrastor.c
diff options
context:
space:
mode:
author <hch@lst.de>2005-04-11 05:19:25 +0200
committerJames Bottomley <jejb@titanic>2005-04-18 19:33:41 +0200
commit2bc474c3646efba67bdc83b7fc7d8ee7562e0106 (patch)
treee27a7c4392259688a25b3f8ca21668eb1e7fa201 /drivers/scsi/ultrastor.c
parent[PATCH] scsi: remove meaningless scsi_cmnd->serial_number_at_timeout field (diff)
downloadlinux-2bc474c3646efba67bdc83b7fc7d8ee7562e0106.tar.xz
linux-2bc474c3646efba67bdc83b7fc7d8ee7562e0106.zip
[PATCH] kill old EH constants
Fix up two drivers that incorrectly were using the old return values for their new-style EH methods and kill off scsi_obsolete.h that defined the constants. The initio driver has all these constansts defined locally and uses them internally, I'll fix that up some time later. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/ultrastor.c')
-rw-r--r--drivers/scsi/ultrastor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index 7484916fe2aa..a00095cc74c6 100644
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -945,7 +945,7 @@ static int ultrastor_abort(Scsi_Cmnd *SCpnt)
config.mscp[mscp_index].SCint, SCpnt);
#endif
if (config.mscp[mscp_index].SCint == 0)
- return SCSI_ABORT_NOT_RUNNING;
+ return FAILURE;
if (config.mscp[mscp_index].SCint != SCpnt) panic("Bad abort");
config.mscp[mscp_index].SCint = NULL;
@@ -1020,7 +1020,7 @@ static int ultrastor_host_reset(Scsi_Cmnd * SCpnt)
#endif
spin_unlock_irqrestore(host->host_lock, flags);
- return SCSI_RESET_SUCCESS;
+ return SUCCESS;
}