diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /drivers/ata/libata-pmp.c | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ata/libata-pmp.c')
| -rw-r--r-- | drivers/ata/libata-pmp.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c index c0c4dbcde091..caef2bbd4a8a 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) | |||
| 495 | /* SError.N need a kick in the ass to get working */ | 495 | /* SError.N need a kick in the ass to get working */ |
| 496 | link->flags |= ATA_LFLAG_HRST_TO_RESUME; | 496 | link->flags |= ATA_LFLAG_HRST_TO_RESUME; |
| 497 | 497 | ||
| 498 | /* class code report is unreliable */ | 498 | /* Class code report is unreliable and SRST |
| 499 | if (link->pmp < 5) | 499 | * times out under certain configurations. |
| 500 | link->flags |= ATA_LFLAG_ASSUME_ATA; | 500 | * Config device can be at port 0 or 5 and |
| 501 | 501 | * locks up on SRST. | |
| 502 | /* The config device, which can be either at | ||
| 503 | * port 0 or 5, locks up on SRST. | ||
| 504 | */ | 502 | */ |
| 505 | if (link->pmp == 0 || link->pmp == 5) | 503 | if (link->pmp <= 5) |
| 506 | link->flags |= ATA_LFLAG_NO_SRST | | 504 | link->flags |= ATA_LFLAG_NO_SRST | |
| 507 | ATA_LFLAG_ASSUME_ATA; | 505 | ATA_LFLAG_ASSUME_ATA; |
| 508 | 506 | ||