projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream/wm8974' into for-2.6.33
[cascardo/linux.git]
/
drivers
/
scsi
/
libsas
/
sas_ata.c
diff --git
a/drivers/scsi/libsas/sas_ata.c
b/drivers/scsi/libsas/sas_ata.c
index
e187298
..
e155011
100644
(file)
--- a/
drivers/scsi/libsas/sas_ata.c
+++ b/
drivers/scsi/libsas/sas_ata.c
@@
-398,7
+398,7
@@
void sas_ata_task_abort(struct sas_task *task)
/* Bounce SCSI-initiated commands to the SCSI EH */
if (qc->scsicmd) {
-
scsi_req_abort_cmd(qc->scsicmd
);
+
blk_abort_request(qc->scsicmd->request
);
scsi_schedule_eh(qc->scsicmd->device->host);
return;
}