diff options
author | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 16:51:13 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-28 10:07:49 -0400 |
commit | df64d3caab8db6ae17dacd229a03d7689a10c432 (patch) | |
tree | 247fe4f9f39b22186e42e7f4687dd62c2690e47b /drivers/scsi/libsas/sas_scsi_host.c | |
parent | 653c42d552d0fd0b05485442aed45dd2d62269c0 (diff) |
[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/libsas/sas_scsi_host.c')
-rw-r--r-- | drivers/scsi/libsas/sas_scsi_host.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index a7890c6d878e..f0cfba9a1fc8 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c | |||
@@ -113,10 +113,10 @@ static void sas_scsi_task_done(struct sas_task *task) | |||
113 | case SAS_ABORTED_TASK: | 113 | case SAS_ABORTED_TASK: |
114 | hs = DID_ABORT; | 114 | hs = DID_ABORT; |
115 | break; | 115 | break; |
116 | case SAM_CHECK_COND: | 116 | case SAM_STAT_CHECK_CONDITION: |
117 | memcpy(sc->sense_buffer, ts->buf, | 117 | memcpy(sc->sense_buffer, ts->buf, |
118 | min(SCSI_SENSE_BUFFERSIZE, ts->buf_valid_size)); | 118 | min(SCSI_SENSE_BUFFERSIZE, ts->buf_valid_size)); |
119 | stat = SAM_CHECK_COND; | 119 | stat = SAM_STAT_CHECK_CONDITION; |
120 | break; | 120 | break; |
121 | default: | 121 | default: |
122 | stat = ts->stat; | 122 | stat = ts->stat; |