From 437862d52c05689454bb3e87c57b00746e0cf1bf Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 1 Dec 2008 12:24:46 +0000
Subject: [PATCH] --- yaml --- r: 122435 b: refs/heads/master c:
 a316084c2f18fd5371f81cfcfc8348a71c4a6fe8 h: refs/heads/master i:   122433:
 8824dc24fd0fd775e3025706e2af63074d9d755c   122431:
 71329ab85d6c6e2a963422ecf877df3ad6c342a9 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/net/smc911x.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 084a7224e0b1..69b7cf38d1d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd568fc3fe46fd87087717811d2f9ed27bb71558
+refs/heads/master: a316084c2f18fd5371f81cfcfc8348a71c4a6fe8
diff --git a/trunk/drivers/net/smc911x.c b/trunk/drivers/net/smc911x.c
index 21d823c0892c..bf3aa2a1effe 100644
--- a/trunk/drivers/net/smc911x.c
+++ b/trunk/drivers/net/smc911x.c
@@ -2048,9 +2048,6 @@ static int __devinit smc911x_probe(struct net_device *dev)
  */
 static int __devinit smc911x_drv_probe(struct platform_device *pdev)
 {
-#ifdef SMC_DYNAMIC_BUS_CONFIG
-	struct smc911x_platdata *pd = pdev->dev.platform_data;
-#endif
 	struct net_device *ndev;
 	struct resource *res;
 	struct smc911x_local *lp;
@@ -2085,11 +2082,14 @@ static int __devinit smc911x_drv_probe(struct platform_device *pdev)
 	lp = netdev_priv(ndev);
 	lp->netdev = ndev;
 #ifdef SMC_DYNAMIC_BUS_CONFIG
-	if (!pd) {
-		ret = -EINVAL;
-		goto release_both;
+	{
+		struct smc911x_platdata *pd = pdev->dev.platform_data;
+		if (!pd) {
+			ret = -EINVAL;
+			goto release_both;
+		}
+		memcpy(&lp->cfg, pd, sizeof(lp->cfg));
 	}
-	memcpy(&lp->cfg, pd, sizeof(lp->cfg));
 #endif
 
 	addr = ioremap(res->start, SMC911X_IO_EXTENT);