From f792068e43a3a156139569304b29ec8fc5dec4e3 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 8 Apr 2008 16:37:50 +0100 Subject: [PATCH] libata: cable logic The cable detect isolation patch inadvertently removed 40 wire short cable handling. Put it back Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik --- drivers/ata/libata-core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index f60988f5e0..2556ea29de 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. -- 2.39.5