diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-08 16:37:50 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:25 -0400 |
| commit | f792068e43a3a156139569304b29ec8fc5dec4e3 (patch) | |
| tree | 53b27f2ab564f2b7fe0a88e3ad816e9614cb5590 /drivers/ata | |
| parent | 45db2f6c95eee7c6622ea1b3edb9abafba58e3ab (diff) | |
| download | lwn-f792068e43a3a156139569304b29ec8fc5dec4e3.tar.gz lwn-f792068e43a3a156139569304b29ec8fc5dec4e3.zip | |
libata: cable logic
The cable detect isolation patch inadvertently removed 40 wire short
cable handling. Put it back
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index f60988f5e01b..2556ea29defb 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4033,6 +4033,10 @@ static int cable_is_40wire(struct ata_port *ap) /* If the controller thinks we are 80 wire, we are */ if (ap->cbl == ATA_CBL_PATA80 || ap->cbl == ATA_CBL_SATA) return 0; + /* If the system is known to be 40 wire short cable (eg laptop), + then we allow 80 wire modes even if the drive isn't sure */ + if (ap->cbl == ATA_CBL_PATA40_SHORT) + return 0; /* If the controller doesn't know we scan - Note: We look for all 40 wire detects at this point. |