From 2757de75fec6f1e470a7de27ae4114160be6d4af Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 18 Jan 2010 18:15:47 +0100 Subject: [PATCH] --- yaml --- r: 183167 b: refs/heads/master c: 3403c24529ddfb4a47f5cfe8496370997f1b0758 h: refs/heads/master i: 183165: f4c2b2dedc6106bd621dcf3d79298f52efc2a26b 183163: 50f2be7aadb5e6fc697e7762d71898ca940a78a6 183159: acdc0421e2ce63811bb115c4298effce659cc7df 183151: 626624b87e3b06967056bf663b947196718805ac 183135: 81c007c7fb23dbbc05918705a2376721a2d79804 183103: 23a206070190ef9dd0b8831a09384f4d5984107a 183039: d334c0353973d60ff3c09d740a23ae48de0482b0 v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_cypress.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6439346948f1..45601cace12e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ebf473860e8166e3d4f152a02e22b9cdddcd440 +refs/heads/master: 3403c24529ddfb4a47f5cfe8496370997f1b0758 diff --git a/trunk/drivers/ata/pata_cypress.c b/trunk/drivers/ata/pata_cypress.c index 8fb040bf7361..ff6c37de5a12 100644 --- a/trunk/drivers/ata/pata_cypress.c +++ b/trunk/drivers/ata/pata_cypress.c @@ -62,14 +62,16 @@ static void cy82c693_set_piomode(struct ata_port *ap, struct ata_device *adev) return; } - time_16 = clamp_val(t.recover, 0, 15) | (clamp_val(t.active, 0, 15) << 4); - time_8 = clamp_val(t.act8b, 0, 15) | (clamp_val(t.rec8b, 0, 15) << 4); + time_16 = clamp_val(t.recover - 1, 0, 15) | + (clamp_val(t.active - 1, 0, 15) << 4); + time_8 = clamp_val(t.act8b - 1, 0, 15) | + (clamp_val(t.rec8b - 1, 0, 15) << 4); if (adev->devno == 0) { pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr); addr &= ~0x0F; /* Mask bits */ - addr |= clamp_val(t.setup, 0, 15); + addr |= clamp_val(t.setup - 1, 0, 15); pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr); pci_write_config_byte(pdev, CY82_IDE_MASTER_IOR, time_16); @@ -79,7 +81,7 @@ static void cy82c693_set_piomode(struct ata_port *ap, struct ata_device *adev) pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr); addr &= ~0xF0; /* Mask bits */ - addr |= (clamp_val(t.setup, 0, 15) << 4); + addr |= (clamp_val(t.setup - 1, 0, 15) << 4); pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr); pci_write_config_byte(pdev, CY82_IDE_SLAVE_IOR, time_16);