From e7e982d69c43b89f7e19b63479c8b2e880fbd75c Mon Sep 17 00:00:00 2001 From: Vincent Palatin Date: Mon, 9 Jan 2012 08:32:36 +0000 Subject: eth: remove usb-ethernet devices before re-enumerating them Fix the crash when running several times usb_init() with a USB ethernet device plugged. Signed-off-by: Vincent Palatin Tested-by: Wolfgang Grandegger --- net/eth.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'net/eth.c') diff --git a/net/eth.c b/net/eth.c index b4b9b4341f..3fb5fb6857 100644 --- a/net/eth.c +++ b/net/eth.c @@ -224,6 +224,35 @@ int eth_register(struct eth_device *dev) return 0; } +int eth_unregister(struct eth_device *dev) +{ + struct eth_device *cur; + + /* No device */ + if (!eth_devices) + return -1; + + for (cur = eth_devices; cur->next != eth_devices && cur->next != dev; + cur = cur->next) + ; + + /* Device not found */ + if (cur->next != dev) + return -1; + + cur->next = dev->next; + + if (eth_devices == dev) + eth_devices = dev->next == eth_devices ? NULL : dev->next; + + if (eth_current == dev) { + eth_current = eth_devices; + eth_current_changed(); + } + + return 0; +} + int eth_initialize(bd_t *bis) { int num_devices = 0; -- cgit v1.2.1