From 1e4932803fea40e1b8c4e5ee70ad06fdb68cc89d Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 20 Oct 2007 00:32:29 +0200
Subject: [PATCH] --- yaml --- r: 71739 b: refs/heads/master c:
 e9a0765eac3c8df7094fd49f94ae83d80cbe4128 h: refs/heads/master i:   71737:
 774ab917497478b33a2b2842b5c260dc4f9f4254   71735:
 f52fecf6a0e58ba3e3160249acd1b2276c575990 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/ide/pci/cmd64x.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 24d1ee1c0b3b..7babbddaa030 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dfd6433ff4d037262a4b8bede022e1d4bac06e3
+refs/heads/master: e9a0765eac3c8df7094fd49f94ae83d80cbe4128
diff --git a/trunk/drivers/ide/pci/cmd64x.c b/trunk/drivers/ide/pci/cmd64x.c
index adee2ef6fd71..69cdbfb86bbf 100644
--- a/trunk/drivers/ide/pci/cmd64x.c
+++ b/trunk/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;