From ce94df422af49dbb5317314560d68b0d7429fe3a Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sun, 2 Dec 2012 08:36:22 -0500
Subject: [PATCH] --- yaml --- r: 345050 b: refs/heads/master c:
 709edecd4eaaa210ea9296c6d8ec5e9cedf1abe3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 35e9f2206e4f..5a9b0b72463e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3748f193552ba21a8239c56eb616d946c47607e7
+refs/heads/master: 709edecd4eaaa210ea9296c6d8ec5e9cedf1abe3
diff --git a/trunk/drivers/mfd/sta2x11-mfd.c b/trunk/drivers/mfd/sta2x11-mfd.c
index 6fb0938a9665..009b4b7721eb 100644
--- a/trunk/drivers/mfd/sta2x11-mfd.c
+++ b/trunk/drivers/mfd/sta2x11-mfd.c
@@ -116,12 +116,14 @@ u32 __sta2x11_mfd_mask(struct pci_dev *pdev, u32 reg, u32 mask, u32 val,
 	struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev);
 	u32 r;
 	unsigned long flags;
-	void __iomem *regs = mfd->regs[index];
+	void __iomem *regs;
 
 	if (!mfd) {
 		dev_warn(&pdev->dev, ": can't access sctl regs\n");
 		return 0;
 	}
+
+	regs = mfd->regs[index];
 	if (!regs) {
 		dev_warn(&pdev->dev, ": system ctl not initialized\n");
 		return 0;