---

yaml --- r: 95379 b: refs/heads/master c: 770f867 h: refs/heads/master i: 95377: 4fc77ba 95375: 760e9a2 v: v3
git-mirror · Apr 29, 2008 · f2accd1 · f2accd1
1 parent f64e9b2
commit f2accd1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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;