summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aic94xx
diff options
context:
space:
mode:
authorJames Bottomley2010-07-27 22:51:13 +0200
committerJames Bottomley2010-07-28 16:07:49 +0200
commitdf64d3caab8db6ae17dacd229a03d7689a10c432 (patch)
tree247fe4f9f39b22186e42e7f4687dd62c2690e47b /drivers/scsi/aic94xx
parent[SCSI] mptfusion: release resources in error return path (diff)
downloadkernel-qcow2-linux-df64d3caab8db6ae17dacd229a03d7689a10c432.tar.gz
kernel-qcow2-linux-df64d3caab8db6ae17dacd229a03d7689a10c432.tar.xz
kernel-qcow2-linux-df64d3caab8db6ae17dacd229a03d7689a10c432.zip
[SCSI] Unify SAM_ and SAM_STAT_ macros
We have two separate definitions for identical constants with nearly the same name. One comes from the generic headers in scsi.h; the other is an enum in libsas.h ... it's causing confusion about which one is correct (fortunately they both are). Fix this by eliminating the libsas.h duplicate Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/aic94xx')
-rw-r--r--drivers/scsi/aic94xx/aic94xx_task.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index 75d20f72501f..532d212b6b2c 100644
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -223,7 +223,7 @@ Again:
switch (opcode) {
case TC_NO_ERROR:
ts->resp = SAS_TASK_COMPLETE;
- ts->stat = SAM_GOOD;
+ ts->stat = SAM_STAT_GOOD;
break;
case TC_UNDERRUN:
ts->resp = SAS_TASK_COMPLETE;