summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-01-10 13:38:46 +0900
committerJeff Garzik <jeff@garzik.org>2008-01-10 16:53:12 -0500
commit8048307dbc3cfc30690b131e786fb57157fbdb11 (patch)
tree44564349e6e54fef1813071325252700bc8b1cba /drivers
parentaf183748044cefb1050ab47519e6bdcfcecec226 (diff)
downloadlinux-3.10-8048307dbc3cfc30690b131e786fb57157fbdb11.tar.gz
linux-3.10-8048307dbc3cfc30690b131e786fb57157fbdb11.tar.bz2
linux-3.10-8048307dbc3cfc30690b131e786fb57157fbdb11.zip
libata-pmp: 4726 hates SRST
4726 hates SRST even on non-config ports. Don't use it. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/libata-pmp.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index c0c4dbcde09..caef2bbd4a8 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -495,14 +495,12 @@ static void sata_pmp_quirks(struct ata_port *ap)
/* SError.N need a kick in the ass to get working */
link->flags |= ATA_LFLAG_HRST_TO_RESUME;
- /* class code report is unreliable */
- if (link->pmp < 5)
- link->flags |= ATA_LFLAG_ASSUME_ATA;
-
- /* The config device, which can be either at
- * port 0 or 5, locks up on SRST.
+ /* Class code report is unreliable and SRST
+ * times out under certain configurations.
+ * Config device can be at port 0 or 5 and
+ * locks up on SRST.
*/
- if (link->pmp == 0 || link->pmp == 5)
+ if (link->pmp <= 5)
link->flags |= ATA_LFLAG_NO_SRST |
ATA_LFLAG_ASSUME_ATA;