projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sata_promise: fix error decode regression
[powerpc.git]
/
drivers
/
ata
/
sata_promise.c
diff --git
a/drivers/ata/sata_promise.c
b/drivers/ata/sata_promise.c
index
baa8368
..
a7916d7
100644
(file)
--- 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"
#include "sata_promise.h"
#define DRV_NAME "sata_promise"
-#define DRV_VERSION "2.0
4
"
+#define DRV_VERSION "2.0
5
"
enum {
enum {
@@
-650,9
+650,12
@@
static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc,
| PDC_PCI_SYS_ERR | PDC1_PCI_PARITY_ERR))
ac_err_mask |= AC_ERR_HOST_BUS;
| PDC_PCI_SYS_ERR | PDC1_PCI_PARITY_ERR))
ac_err_mask |= AC_ERR_HOST_BUS;
- ehi->action |= ATA_EH_SOFTRESET;
+ if (sata_scr_valid(ap))
+ ehi->serror |= pdc_sata_scr_read(ap, SCR_ERROR);
+
qc->err_mask |= ac_err_mask;
qc->err_mask |= ac_err_mask;
- ata_port_freeze(ap);
+
+ pdc_reset_port(ap);
}
static inline unsigned int pdc_host_intr( struct ata_port *ap,
}
static inline unsigned int pdc_host_intr( struct ata_port *ap,