From 5091651234d1ca0d892a2dc99ba28c435de5e308 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Tue, 24 Aug 2010 06:52:46 +0000
Subject: [PATCH] --- yaml --- r: 210133 b: refs/heads/master c:
 4169591fd7c260b2b0b4e8f4d51f63f5b15ad78a h: refs/heads/master i:   210131:
 5efdd5e9f37ea2cdea6d6304fa786ecaa6b97579 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/pxa168_eth.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f84b72060026..b064ffe16fe0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef24b16b5d67c815874ed2d0e2581db629661ba3
+refs/heads/master: 4169591fd7c260b2b0b4e8f4d51f63f5b15ad78a
diff --git a/trunk/drivers/net/pxa168_eth.c b/trunk/drivers/net/pxa168_eth.c
index ecc64d750cce..857a68115a5c 100644
--- a/trunk/drivers/net/pxa168_eth.c
+++ b/trunk/drivers/net/pxa168_eth.c
@@ -1414,10 +1414,8 @@ static int ethernet_phy_setup(struct net_device *dev)
 {
 	struct pxa168_eth_private *pep = netdev_priv(dev);
 
-	if (pep->pd != NULL) {
-		if (pep->pd->init)
-			pep->pd->init();
-	}
+	if (pep->pd->init)
+		pep->pd->init();
 	pep->phy = phy_scan(pep, pep->pd->phy_addr & 0x1f);
 	if (pep->phy != NULL)
 		phy_init(pep, pep->pd->speed, pep->pd->duplex);