diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-04-30 01:23:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-04-30 01:23:44 -0700 |
| commit | afae6f7c365789d7751133f09324aa00bd5b595d (patch) | |
| tree | 182b29cbf32a40391f49173693f73231685d0fcc | |
| parent | 7769f772b364f504261620011b00f73ee090802b (diff) | |
| download | history-afae6f7c365789d7751133f09324aa00bd5b595d.tar.gz | |
Fix PIIX bugs from mergev2.5.12
| -rw-r--r-- | drivers/ide/piix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c index 1409648e0fc91..01c904ee77c7c 100644 --- a/drivers/ide/piix.c +++ b/drivers/ide/piix.c @@ -331,9 +331,9 @@ static int piix_set_drive(ide_drive_t *drive, unsigned char speed) if ((err = ide_config_drive_speed(drive, speed))) return err; - if (speed > XFER_UDMA_2 && (piix_config->flags & PIIX_UDMA >= PIIX_UDMA_66)) + if (speed > XFER_UDMA_2 && (piix_config->flags & PIIX_UDMA) >= PIIX_UDMA_66) umul = 2; - if (speed > XFER_UDMA_4 && (piix_config->flags & PIIX_UDMA >= PIIX_UDMA_100)) + if (speed > XFER_UDMA_4 && (piix_config->flags & PIIX_UDMA) >= PIIX_UDMA_100) umul = 4; T = 1000000000 / piix_clock; @@ -465,7 +465,7 @@ unsigned int __init pci_init_piix(struct pci_dev *dev, const char *name) switch (piix_config->flags & PIIX_UDMA) { case PIIX_UDMA_66: - if (piix->config && PIIX_VICTORY) { + if (piix_config->flags && PIIX_VICTORY) { pci_read_config_byte(dev, PIIX_IDESTAT, &t); piix_80w = ((t & 2) ? 1 : 0) | ((t & 1) ? 2 : 0); break; |