From 7b02e5ca2838dadcece0266ebacf8fbb3fbefc3c Mon Sep 17 00:00:00 2001
From: Yan Burman <burman.yan@gmail.com>
Date: Tue, 19 Dec 2006 13:08:48 -0800
Subject: [PATCH] --- yaml --- r: 45053 b: refs/heads/master c:
 ebf5112ca7a714a3961a322459747059cbf41d7b h: refs/heads/master i:   45051:
 8f01708da8c740350ea696ae20d7720922adf093 v: v3

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

diff --git a/[refs] b/[refs]
index 430533b37a22..977f6eacc89a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a960f7e350de5d087b88a4c06df236e0f4186fd
+refs/heads/master: ebf5112ca7a714a3961a322459747059cbf41d7b
diff --git a/trunk/drivers/net/arm/ep93xx_eth.c b/trunk/drivers/net/arm/ep93xx_eth.c
index 8ebd68e2af98..dd698b033a62 100644
--- a/trunk/drivers/net/arm/ep93xx_eth.c
+++ b/trunk/drivers/net/arm/ep93xx_eth.c
@@ -780,12 +780,10 @@ static struct ethtool_ops ep93xx_ethtool_ops = {
 struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data)
 {
 	struct net_device *dev;
-	struct ep93xx_priv *ep;
 
 	dev = alloc_etherdev(sizeof(struct ep93xx_priv));
 	if (dev == NULL)
 		return NULL;
-	ep = netdev_priv(dev);
 
 	memcpy(dev->dev_addr, data->dev_addr, ETH_ALEN);
 
@@ -840,9 +838,9 @@ static int ep93xx_eth_probe(struct platform_device *pdev)
 	struct ep93xx_priv *ep;
 	int err;
 
-	data = pdev->dev.platform_data;
 	if (pdev == NULL)
 		return -ENODEV;
+	data = pdev->dev.platform_data;
 
 	dev = ep93xx_dev_alloc(data);
 	if (dev == NULL) {