diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-09 06:19:41 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-09 06:19:41 +0400 |
| commit | 8a3e1c670e503ddd6f6c373b307f38b783ee3a50 (patch) | |
| tree | 03094e8425b750d2693a271ebc89b49312e5476a /drivers/ata/libata-pmp.c | |
| parent | e026892c85571e12f11abffde5a90bcc704d663e (diff) | |
| parent | 60d5019be8acef268f4676d229c490186d338fbc (diff) | |
| download | linux-8a3e1c670e503ddd6f6c373b307f38b783ee3a50.tar.xz | |
Merge branch 'merge'
Conflicts:
arch/powerpc/sysdev/fsl_soc.c
Diffstat (limited to 'drivers/ata/libata-pmp.c')
| -rw-r--r-- | drivers/ata/libata-pmp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c index 0f9386d4a5a0..7daf4c0f6216 100644 --- a/drivers/ata/libata-pmp.c +++ b/drivers/ata/libata-pmp.c @@ -322,9 +322,12 @@ static void sata_pmp_quirks(struct ata_port *ap) if (vendor == 0x1095 && devid == 0x3726) { /* sil3726 quirks */ ata_port_for_each_link(link, ap) { - /* class code report is unreliable */ + /* Class code report is unreliable and SRST + * times out under certain configurations. + */ if (link->pmp < 5) - link->flags |= ATA_LFLAG_ASSUME_ATA; + link->flags |= ATA_LFLAG_NO_SRST | + ATA_LFLAG_ASSUME_ATA; /* port 5 is for SEMB device and it doesn't like SRST */ if (link->pmp == 5) |