From 6a5f4addf4e6beed6ec4e0d8cf911f94e7dba832 Mon Sep 17 00:00:00 2001 From: Eilon Greenstein Date: Wed, 14 Jan 2009 06:43:52 +0000 Subject: [PATCH] --- yaml --- r: 130115 b: refs/heads/master c: 693fc0d14334859430733ab902adac182fdd8153 h: refs/heads/master i: 130113: 4ea55f46aca68925e8769c1e4839f42a62868fe1 130111: 809068d987f6ae5054811660b3dd20aef2588557 v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x_main.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index f3b783ceaf42..2b2eeca79539 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70b9986ca4baaf6deb6f0e01d50f72457579adea +refs/heads/master: 693fc0d14334859430733ab902adac182fdd8153 diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c index ce98ecf8cb1c..911067586a4a 100644 --- a/trunk/drivers/net/bnx2x_main.c +++ b/trunk/drivers/net/bnx2x_main.c @@ -10269,17 +10269,15 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, return rc; } - rc = register_netdev(dev); - if (rc) { - dev_err(&pdev->dev, "Cannot register net device\n"); - goto init_one_exit; - } - pci_set_drvdata(pdev, dev); rc = bnx2x_init_bp(bp); + if (rc) + goto init_one_exit; + + rc = register_netdev(dev); if (rc) { - unregister_netdev(dev); + dev_err(&pdev->dev, "Cannot register net device\n"); goto init_one_exit; }