diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-21 07:48:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-21 07:48:42 +0200 |
| commit | 38f061c5714265fa8481cc0b7795aa8fe81b45be (patch) | |
| tree | e145112bc2ddcbd1fdd8c7d582603f253e0ef3f4 /drivers/ide/pci/pdc202xx_new.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha... (diff) | |
| parent | ide-disk: workaround for buggy HPA support on ST340823A (take 3) (diff) | |
| download | linux-38f061c5714265fa8481cc0b7795aa8fe81b45be.tar.xz linux-38f061c5714265fa8481cc0b7795aa8fe81b45be.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-disk: workaround for buggy HPA support on ST340823A (take 3)
hpt34x: fix CONFIG_HPT34X_AUTODMA=n handling
triflex: add missing ->dma_base check
pdc202xx_old: add missing ->dma_base check
pdc202xx_new: add missing ->dma_base check
cs5530: add missing ->dma_base check
ide: ide_config_drive_speed() bugfixes
ide: add cable detection for early UDMA66 devices (take 3)
ide-pmac: fix drive->init_speed reporting
ide: config_drive_for_dma() fixes
ide-cris: fix ->set_pio_mode method to set transfer mode on the device
ide: fix hidden dependencies on CONFIG_IDE_GENERIC
ide: make CONFIG_IDE_GENERIC default to N
Diffstat (limited to 'drivers/ide/pci/pdc202xx_new.c')
| -rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index 8a66a2871b3a..f6db2f37efad 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c @@ -378,6 +378,9 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha int f, r; u8 pll_ctl0, pll_ctl1; + if (dma_base == 0) + return -EFAULT; + #ifdef CONFIG_PPC_PMAC apple_kiwi_init(dev); #endif @@ -494,15 +497,18 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif) hwif->speedproc = &pdcnew_tune_chipset; hwif->resetproc = &pdcnew_reset; + hwif->err_stops_fifo = 1; + hwif->drives[0].autotune = hwif->drives[1].autotune = 1; + if (hwif->dma_base == 0) + return; + hwif->atapi_dma = 1; hwif->ultra_mask = hwif->cds->udma_mask; hwif->mwdma_mask = 0x07; - hwif->err_stops_fifo = 1; - hwif->ide_dma_check = &pdcnew_config_drive_xfer_rate; if (hwif->cbl != ATA_CBL_PATA40_SHORT) |