From 2fe3bf2753c652ae7616b37bde2c4a805bba5989 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Wed, 15 Apr 2009 01:32:17 +0000
Subject: [PATCH] --- yaml --- r: 149769 b: refs/heads/master c:
 8d4dd5cff892e18a34422852c05a88b79ff978ed h: refs/heads/master i:   149767:
 be144a304cee2997958a1f66d6587c20bfd6c07b v: v3

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

diff --git a/[refs] b/[refs]
index 4c7e8312c3e0..99fffba0dce1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e28532f7e63c3011f7b3c1516cfebd5321bdd15
+refs/heads/master: 8d4dd5cff892e18a34422852c05a88b79ff978ed
diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c
index f8396fb30326..e03b1773966d 100644
--- a/trunk/drivers/net/fec.c
+++ b/trunk/drivers/net/fec.c
@@ -1660,11 +1660,10 @@ int __init fec_enet_init(struct net_device *dev, int index)
 	struct bufdesc *bdp, *cbd_base;
 	int 		i, j;
 
-	/* Allocate memory for buffer descriptors.
-	*/
-	mem_addr = (unsigned long)dma_alloc_coherent(NULL, PAGE_SIZE,
-			&fep->bd_dma, GFP_KERNEL);
-	if (mem_addr == 0) {
+	/* Allocate memory for buffer descriptors. */
+	cbd_base = dma_alloc_coherent(NULL, PAGE_SIZE, &fep->bd_dma,
+			GFP_KERNEL);
+	if (!cbd_base) {
 		printk("FEC: allocate descriptor memory failed?\n");
 		return -ENOMEM;
 	}
@@ -1698,10 +1697,7 @@ int __init fec_enet_init(struct net_device *dev, int index)
 	}
 #endif
 
-	cbd_base = (struct bufdesc *)mem_addr;
-
-	/* Set receive and transmit descriptor base.
-	*/
+	/* Set receive and transmit descriptor base. */
 	fep->rx_bd_base = cbd_base;
 	fep->tx_bd_base = cbd_base + RX_RING_SIZE;