Skip to contentSkip to conversation

cmd64x: always set hwif->chipset for CMD646

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Sep 11, 2007 – Sep 15, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 1/10 cmd64x: always set hwif->chipset for CMD646

hwif->chipset should be set to ide_cmd646 also when DMA base is invalid.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/pci/cmd64x.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ide/pci/cmd64x.c +3 -1
Index: b/drivers/ide/pci/cmd64x.c
===================================================================
@@ -506,6 +506,9 @@ static void __devinit init_hwif_cmd64x(i
 	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(i
 		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;