From f2accd104a92def46948443333f50b3798dbe433 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Wed, 23 Apr 2008 23:44:03 +0200
Subject: [PATCH] --- yaml --- r: 95379 b: refs/heads/master c:
 770f867991155f9c9e36a845a142f770d55ee67c h: refs/heads/master i:   95377:
 4fc77bad60cb48abb29a15e5f0364b02a72b5aad   95375:
 760e9a22f12e8830ef6370f546dee226789e2144 v: v3

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

diff --git a/[refs] b/[refs]
index fc406b743db3..07999dd2896d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a0a83107c01a8dba04fa40ddb29ff021d4f8112
+refs/heads/master: 770f867991155f9c9e36a845a142f770d55ee67c
diff --git a/trunk/drivers/net/arm/am79c961a.c b/trunk/drivers/net/arm/am79c961a.c
index ba6bd03a015f..a637910b02dd 100644
--- a/trunk/drivers/net/arm/am79c961a.c
+++ b/trunk/drivers/net/arm/am79c961a.c
@@ -693,11 +693,15 @@ static int __init am79c961_probe(struct platform_device *pdev)
 	 * done by the ether bootp loader.
 	 */
 	dev->base_addr = res->start;
-	dev->irq = platform_get_irq(pdev, 0);
+	ret = platform_get_irq(pdev, 0);
 
-	ret = -ENODEV;
-	if (dev->irq < 0)
+	if (ret < 0) {
+		ret = -ENODEV;
 		goto nodev;
+	}
+	dev->irq = ret;
+
+	ret = -ENODEV;
 	if (!request_region(dev->base_addr, 0x18, dev->name))
 		goto nodev;