| To: | Jeb Cramer <cramer@xxxxxxxxx>, "Feldman, Scott" <scott.feldman@xxxxxxxxx>, Jeff Garzik <jgarzik@xxxxxxxxx> |
|---|---|
| Subject: | [PATCH] e1000 -- handle register_netdev errors |
| From: | Stephen Hemminger <shemminger@xxxxxxxx> |
| Date: | Thu, 15 Jan 2004 13:59:20 -0800 |
| Cc: | netdev@xxxxxxxxxxx |
| Organization: | Open Source Development Lab |
| Sender: | netdev-bounce@xxxxxxxxxxx |
Patch against 2.6.1, but probably applies to 2.4 as well.
E1000 driver was not handling failures of register_netdev
diff -Nru a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c Thu Jan 15 13:59:07 2004
+++ b/drivers/net/e1000/e1000_main.c Thu Jan 15 13:59:07 2004
@@ -508,7 +508,9 @@
INIT_WORK(&adapter->tx_timeout_task,
(void (*)(void *))e1000_tx_timeout_task, netdev);
- register_netdev(netdev);
+ err = register_netdev(netdev);
+ if (err)
+ goto err_register;
/* we're going to reset, so assume we have no link for now */
@@ -553,6 +555,7 @@
cards_found++;
return 0;
+err_register:
err_sw_init:
err_eeprom:
iounmap(adapter->hw.hw_addr);
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [Fwd: [PATCH] add sysfs class support for raw devices [06/10]], Jeff Garzik |
|---|---|
| Next by Date: | [PATCH] ixgb fixes, Stephen Hemminger |
| Previous by Thread: | [Fwd: [PATCH] add sysfs class support for raw devices [06/10]], Jeff Garzik |
| Next by Thread: | [PATCH] ixgb fixes, Stephen Hemminger |
| Indexes: | [Date] [Thread] [Top] [All Lists] |