diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-20 00:32:29 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-20 00:32:29 +0200 |
| commit | e9a0765eac3c8df7094fd49f94ae83d80cbe4128 (patch) | |
| tree | a1d2330b453275c5080b42df47dd3fc1136717b2 /drivers/ide | |
| parent | 3dfd6433ff4d037262a4b8bede022e1d4bac06e3 (diff) | |
| download | op-kernel-dev-e9a0765eac3c8df7094fd49f94ae83d80cbe4128.zip op-kernel-dev-e9a0765eac3c8df7094fd49f94ae83d80cbe4128.tar.gz | |
cmd64x: always set hwif->chipset for CMD646
hwif->chipset should be set to ide_cmd646 also when DMA base is invalid.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/pci/cmd64x.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index adee2ef..69cdbfb 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c @@ -506,6 +506,9 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif) hwif->set_pio_mode = &cmd64x_set_pio_mode; hwif->set_dma_mode = &cmd64x_set_dma_mode; + if (dev->device == PCI_DEVICE_ID_CMD_646) + hwif->chipset = ide_cmd646; + if (!hwif->dma_base) return; @@ -535,7 +538,6 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif) hwif->ide_dma_test_irq = &cmd648_ide_dma_test_irq; break; case PCI_DEVICE_ID_CMD_646: - hwif->chipset = ide_cmd646; if (dev->revision == 0x01) { hwif->ide_dma_end = &cmd646_1_ide_dma_end; break; |
