From f9495a373fba5712aa37d0ee512fbfccb4e68b29 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 8 Apr 2008 16:37:50 +0100 Subject: [PATCH] --- yaml --- r: 89286 b: refs/heads/master c: f792068e43a3a156139569304b29ec8fc5dec4e3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c87073845f32..da1cc944b1de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45db2f6c95eee7c6622ea1b3edb9abafba58e3ab +refs/heads/master: f792068e43a3a156139569304b29ec8fc5dec4e3 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index f60988f5e01b..2556ea29defb 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/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.