From c95af6f9dd0f19a6d6dac64c25d59ee713ecc905 Mon Sep 17 00:00:00 2001
From: Finn Thain <fthain@telegraphics.com.au>
Date: Tue, 1 Jun 2010 02:18:32 +0000
Subject: [PATCH] --- yaml --- r: 202639 b: refs/heads/master c:
 38454db3f0b694df929073a5a867edf30551d950 h: refs/heads/master i:   202637:
 629c4f6377d82a6be78ab141ae4b2e2dc900de95   202635:
 5d6b96762e503848c9b19db8ab000ce6354dfcb1   202631:
 bba75b4de0f621a66f0e66e5e4c8449d45408b58   202623:
 8ebc8d008879281728497348def7b2d443da955d v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/net/mac8390.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 34813d3f1ca8..4f50e3bfcc90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1f8fc57c046903b5e7c891f2922592d5f775af3
+refs/heads/master: 38454db3f0b694df929073a5a867edf30551d950
diff --git a/trunk/drivers/net/mac8390.c b/trunk/drivers/net/mac8390.c
index 1136c9a22b67..6b14cfef46c2 100644
--- a/trunk/drivers/net/mac8390.c
+++ b/trunk/drivers/net/mac8390.c
@@ -641,12 +641,13 @@ static int __init mac8390_initdev(struct net_device *dev,
 
 static int mac8390_open(struct net_device *dev)
 {
+	int err;
+
 	__ei_open(dev);
-	if (request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev)) {
-		pr_info("%s: unable to get IRQ %d.\n", dev->name, dev->irq);
-		return -EAGAIN;
-	}
-	return 0;
+	err = request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev);
+	if (err)
+		pr_info("%s: unable to get IRQ %d\n", dev->name, dev->irq);
+	return err;
 }
 
 static int mac8390_close(struct net_device *dev)