---

yaml --- r: 122177 b: refs/heads/master c: 99da1a8 h: refs/heads/master i: 122175: f612b7a v: v3
git-mirror · Nov 26, 2008 · 21bcb39 · 21bcb39
1 parent 9b369a9
commit 21bcb39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a098397d562e2ce5aca7b9b007a4954d88ef8f5e
+refs/heads/master: 99da1a8a6dc549630733e1cc246265d282fc214e
diff --git a/trunk/drivers/net/depca.c b/trunk/drivers/net/depca.c
@@ -1556,6 +1556,7 @@ static int __init depca_isa_probe (struct platform_device *device)
 #ifdef CONFIG_EISA
 static int __init depca_eisa_probe (struct device *device)
 {
+	enum depca_type adapter = unknown;
 	struct eisa_device *edev;
 	struct net_device *dev;
 	struct depca_private *lp;
@@ -1574,7 +1575,11 @@ static int __init depca_eisa_probe (struct device *device)
 	 * the EISA configuration structures (yet... :-), just rely on
 	 * the ISA probing to sort it out... */
 
-	depca_shmem_probe (&mem_start);
+	adapter = depca_shmem_probe (&mem_start);
+	if (adapter == unknown) {
+		status = -ENODEV;
+		goto out_free;
+	}
 
 	dev->base_addr = ioaddr;
 	dev->irq = irq;