From ea4c3cb92ce1b60aa7a4094f4f1778f6e7f06211 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 26 Jul 2007 18:37:28 +0100 Subject: [PATCH] --- yaml --- r: 68079 b: refs/heads/master c: e708eb9bc0515f36d77477877e74b6b9056b5879 h: refs/heads/master i: 68077: 7db56d1622c610c891ec7610720b0a2d731d6728 68075: 3a86793c5833d5047abde9933971cc5f5404b64d 68071: 6eb8ac88642c7653693a231943d7670c804c1d18 68063: dbf26bffb33420774deba6e8c73fd05f1c9fba21 v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_amd.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 59032ccd0bf0..7ad25f9d9de9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1ddb4b6a2c9b2c72991eb8640ef2f50691ac502 +refs/heads/master: e708eb9bc0515f36d77477877e74b6b9056b5879 diff --git a/trunk/drivers/ata/pata_amd.c b/trunk/drivers/ata/pata_amd.c index 46f829c838b3..c95922f8cc5e 100644 --- a/trunk/drivers/ata/pata_amd.c +++ b/trunk/drivers/ata/pata_amd.c @@ -270,6 +270,9 @@ static int nv_cable_detect(struct ata_port *ap) pci_read_config_word(pdev, 0x62 - 2 * ap->port_no, &udma); if ((udma & 0xC4) == 0xC4 || (udma & 0xC400) == 0xC400) cbl = ATA_CBL_PATA80; + /* And a triple check across suspend/resume with ACPI around */ + if (ata_acpi_cbl_80wire(ap)) + cbl = ATA_CBL_PATA80; return cbl; }