leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb_ether: register usb ethernet gadget at each eth init

Browse Source 
Since the ether may not be the only one usb gadget would be used
in the uboot, it is neccessary to do the register each time the
eth begin to work to make usb gadget driver less confussed when
we want to use two different usb gadget at the same time.

Usb gadget driver could simple ignore the register operation, if
it find the driver has been registered already.

Signed-off-by: Lei Wen <leiwen@marvell.com>
This commit is contained in:
Lei Wen 2010-12-01 23:43:43 +08:00 committed by Remy Bohmer
parent 3f1266d6d5
commit 988ee3e3f0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/gadget/ether.c
View File

@ -1456,6 +1456,7 @@ static void eth_unbind(struct usb_gadget *gadget)
/* unregister_netdev (dev->net);*/
/* free_netdev(dev->net);*/
dev->gadget = NULL;
set_gadget_data(gadget, NULL);
}
@ -1788,6 +1789,8 @@ static int usb_eth_init(struct eth_device *netdev, bd_t *bd)
error("received NULL ptr");
goto fail;
}
if (usb_gadget_register_driver(&eth_driver) < 0)
goto fail;
dev->network_started = 0;
@ -1895,7 +1898,12 @@ void usb_eth_halt(struct eth_device *netdev)
return;
}
/* If the gadget not registered, simple return */
if (!dev->gadget)
return;
usb_gadget_disconnect(dev->gadget);
usb_gadget_unregister_driver(&eth_driver);
}
static struct usb_gadget_driver eth_driver = {
@ -1957,10 +1965,6 @@ int usb_eth_initialize(bd_t *bi)
if (status)
goto fail;
status = usb_gadget_register_driver(&eth_driver);
if (status < 0)
goto fail;
eth_register(netdev);
return 0;