From 6fd5b9897b51d80ca9bd7f020f83e52e9c44a21c Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Thu, 3 Dec 2009 20:32:10 +0100 Subject: [PATCH] --- yaml --- r: 172879 b: refs/heads/master c: ed869ff0c70d482de0dc97c3138ff42cbf87aed5 h: refs/heads/master i: 172877: 030aef66f9e6635b346c924401c913c882616e14 172875: 2b272d07e82fc76e712b3559dd2ef91a9fddfedd 172871: 0043e18b30d494b7dcb55e6a04b36e52d2bee0c7 172863: 1cabe66632c30f8f1b1638391b73b03b1e83234b v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_it8213.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d7f2bc4c5267..d4f09bb5c164 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 088ccb53a341b5c0afab67e392b053ebb0bf7b2b +refs/heads/master: ed869ff0c70d482de0dc97c3138ff42cbf87aed5 diff --git a/trunk/drivers/ata/pata_it8213.c b/trunk/drivers/ata/pata_it8213.c index 092af531aa09..f0bf77ad371f 100644 --- a/trunk/drivers/ata/pata_it8213.c +++ b/trunk/drivers/ata/pata_it8213.c @@ -92,18 +92,17 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) { 2, 1 }, { 2, 3 }, }; - if (pio > 2) - control |= 1; /* TIME1 enable */ + if (pio > 1) + control |= 1; /* TIME */ if (ata_pio_need_iordy(adev)) /* PIO 3/4 require IORDY */ - control |= 2; /* IORDY enable */ + control |= 2; /* IE */ /* Bit 2 is set for ATAPI on the IT8213 - reverse of ICH/PIIX */ if (adev->class != ATA_DEV_ATA) - control |= 4; + control |= 4; /* PPE */ pci_read_config_word(dev, idetm_port, &idetm_data); - /* Enable PPE, IE and TIME as appropriate */ - + /* Set PPE, IE, and TIME as appropriate */ if (adev->devno == 0) { idetm_data &= 0xCCF0; idetm_data |= control; @@ -122,7 +121,7 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) pci_write_config_byte(dev, 0x44, slave_data); } - idetm_data |= 0x4000; /* Ensure SITRE is enabled */ + idetm_data |= 0x4000; /* Ensure SITRE is set */ pci_write_config_word(dev, idetm_port, idetm_data); }