aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMike Rapoport <mike@compulab.co.il>2007-10-18 03:23:11 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-19 23:00:01 -0400
commit418d6f871b7bab19e9f12a6c0e4713a15d6bae10 (patch)
tree3e3d0a24c902efe688686de050096b63ae24f9f6 /drivers/net
parent4fa4d23fa20de67df919030c1216295664866ad7 (diff)
DM9000 initialization fix
DM9000 driver returns success even if it is failed to detect the chip. Below patch fixes it. Signed-off-by: Mike Rapoport <mike@compulab.co.il> drivers/net/dm9000.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/dm9000.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 27ac010900ab..3286d2a0a870 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -542,7 +542,8 @@ dm9000_probe(struct platform_device *pdev)
542 542
543 if (id_val != DM9000_ID) { 543 if (id_val != DM9000_ID) {
544 printk("%s: wrong id: 0x%08x\n", CARDNAME, id_val); 544 printk("%s: wrong id: 0x%08x\n", CARDNAME, id_val);
545 goto release; 545 ret = -ENODEV;
546 goto out;
546 } 547 }
547 548
548 /* from this point we assume that we have found a DM9000 */ 549 /* from this point we assume that we have found a DM9000 */
@@ -602,8 +603,7 @@ dm9000_probe(struct platform_device *pdev)
602 } 603 }
603 return 0; 604 return 0;
604 605
605 release: 606out:
606 out:
607 printk("%s: not found (%d).\n", CARDNAME, ret); 607 printk("%s: not found (%d).\n", CARDNAME, ret);
608 608
609 dm9000_release_board(pdev, db); 609 dm9000_release_board(pdev, db);