From 24a96ae0e34e743f3ee00501ad38f1cb4aa31429 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Mon, 28 Apr 2008 23:44:38 +0200
Subject: [PATCH] siimage: do clocking register posting earlier in
 setup_mmio_siimage()

Do clocking register posting earlier in setup_mmio_siimage()
to match code in init_chipset_siimage().

This is a preparation for the next patch which merges PCI and MMIO
code paths together.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/pci/siimage.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 076a476c3e3..f0c4234baca 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -521,7 +521,9 @@ static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name)
 			writeb(tmpbyte & ~0x20, ioaddr + 0x4A);
 			break;
 	}
-	
+
+	tmpbyte = readb(ioaddr + 0x4A);
+
 	writeb(      0x72, ioaddr + 0xA1);
 	writew(    0x328A, ioaddr + 0xA2);
 	writel(0x62DD62DD, ioaddr + 0xA4);
@@ -540,8 +542,6 @@ static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name)
 		writel(0x00680000, ioaddr + 0x1C8);
 	}
 
-	tmpbyte = readb(ioaddr + 0x4A);
-
 	proc_reports_siimage(dev, (tmpbyte>>4), name);
 	return 1;
 }
-- 
2.41.3