diff options
| author | Mikael Pettersson <mikpe@it.uu.se> | 2007-05-06 22:12:31 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-05-09 20:15:46 -0400 |
| commit | 8ffcfd9d0dc735071379760c23317f15904f9056 (patch) | |
| tree | f2c83d453ebb8410eb5ed1ccae216248cabdaa42 /drivers/ata | |
| parent | 48be6b18336567a795bc41e4526f9adfb3a3d68e (diff) | |
| download | linux-8ffcfd9d0dc735071379760c23317f15904f9056.tar.gz linux-8ffcfd9d0dc735071379760c23317f15904f9056.tar.bz2 linux-8ffcfd9d0dc735071379760c23317f15904f9056.zip | |
sata_promise: fix another error decode regression
The sata_promise error decode update changed pdc_host_intr()
to return and not complete the qc after detecting an error.
Unfortunately not completing the qc:s causes them to always
time out on error, which is wrong and has nasty side-effects.
This patch updates pdc_error_intr() to call ata_port_abort(),
similar to ahci and sata_sil24. Doing this is important as it
makes EH see the original error and not a bogus timeout.
Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/sata_promise.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index f56549b90aa6..753402ec5716 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c @@ -45,7 +45,7 @@ #include "sata_promise.h" #define DRV_NAME "sata_promise" -#define DRV_VERSION "2.05" +#define DRV_VERSION "2.06" enum { @@ -653,6 +653,8 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc, qc->err_mask |= ac_err_mask; pdc_reset_port(ap); + + ata_port_abort(ap); } static inline unsigned int pdc_host_intr( struct ata_port *ap, |