From 83f9fe81e02222817f21f15195b66c17e3923db2 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Tue, 24 Jun 2008 22:16:00 +0100
Subject: [PATCH] --- yaml --- r: 103099 b: refs/heads/master c:
 9088fa4fa2f0b10bf4d9a17381a5ec3485751cb7 h: refs/heads/master i:   103097:
 bf2b5faad447efc886e422f9efce92523e5d4cd9   103095:
 e638b83b5ec852b507be0b1bb930135bc9006246 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/dm9000.c | 24 ++++--------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 111f7a5c1e21..75a3860d403b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d406b3c76b369a7b043470719761aa6ee1a38d1
+refs/heads/master: 9088fa4fa2f0b10bf4d9a17381a5ec3485751cb7
diff --git a/trunk/drivers/net/dm9000.c b/trunk/drivers/net/dm9000.c
index 73270d93ae38..79bdd9e29a01 100644
--- a/trunk/drivers/net/dm9000.c
+++ b/trunk/drivers/net/dm9000.c
@@ -505,12 +505,6 @@ dm9000_poll_work(struct work_struct *w)
 static void
 dm9000_release_board(struct platform_device *pdev, struct board_info *db)
 {
-	if (db->data_res == NULL) {
-		if (db->addr_res != NULL)
-			release_mem_region((unsigned long)db->io_addr, 4);
-		return;
-	}
-
 	/* unmap our resources */
 
 	iounmap(db->io_addr);
@@ -518,15 +512,11 @@ dm9000_release_board(struct platform_device *pdev, struct board_info *db)
 
 	/* release the resources */
 
-	if (db->data_req != NULL) {
-		release_resource(db->data_req);
-		kfree(db->data_req);
-	}
+	release_resource(db->data_req);
+	kfree(db->data_req);
 
-	if (db->addr_req != NULL) {
-		release_resource(db->addr_req);
-		kfree(db->addr_req);
-	}
+	release_resource(db->addr_req);
+	kfree(db->addr_req);
 }
 
 static unsigned char dm9000_type_to_char(enum dm9000_type type)
@@ -580,12 +570,6 @@ dm9000_probe(struct platform_device *pdev)
 
 	INIT_DELAYED_WORK(&db->phy_poll, dm9000_poll_work);
 
-
-	if (pdev->num_resources < 3) {
-		ret = -ENODEV;
-		goto out;
-	}
-
 	db->addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	db->data_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 	db->irq_res  = platform_get_resource(pdev, IORESOURCE_IRQ, 0);