projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[linux-2.6-block.git]
/
drivers
/
scsi
/
libsas
/
sas_ata.c
diff --git
a/drivers/scsi/libsas/sas_ata.c
b/drivers/scsi/libsas/sas_ata.c
index 827cfb132f21db5d083d939897a37eb7d60cf02b..0996f866f14c374bfa15ab69229af5cd14936d65 100644
(file)
--- a/
drivers/scsi/libsas/sas_ata.c
+++ b/
drivers/scsi/libsas/sas_ata.c
@@
-498,7
+498,7
@@
static int sas_execute_task(struct sas_task *task, void *buffer, int size,
goto ex_err;
}
wait_for_completion(&task->completion);
- res = -E
TASK
;
+ res = -E
COMM
;
if (task->task_state_flags & SAS_TASK_STATE_ABORTED) {
int res2;
SAS_DPRINTK("task aborted, flags:0x%x\n",