lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd64x: always set hwif->chipset for CMD646

Browse Source 
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>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2007-10-20 00:32:29 +02:00
parent 3dfd6433ff
commit e9a0765eac
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ide/pci/cmd64x.c
View File

@@ -506,6 +506,9 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
hwif->set_pio_mode = &cmd64x_set_pio_mode; hwif->set_pio_mode = &cmd64x_set_pio_mode;
hwif->set_dma_mode = &cmd64x_set_dma_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) if (!hwif->dma_base)
return; 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; hwif->ide_dma_test_irq = &cmd648_ide_dma_test_irq;
break; break;
case PCI_DEVICE_ID_CMD_646: case PCI_DEVICE_ID_CMD_646:
hwif->chipset = ide_cmd646;
if (dev->revision == 0x01) { if (dev->revision == 0x01) {
hwif->ide_dma_end = &cmd646_1_ide_dma_end; hwif->ide_dma_end = &cmd646_1_ide_dma_end;
break; break;