summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-01-14 17:29:43 +0800
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-04-25 18:37:20 +0800
commit66e657476c3ba19e9fa6b6653983a4cb5727d2a6 (patch)
treece0d013b2a9898b817e00cd0ce5c49721b926009
parent60e03c64b0c7e6f3aedcf2c9328aa105de3ba11d (diff)
downloadbarebox-66e657476c3ba19e9fa6b6653983a4cb5727d2a6.tar.gz
barebox-66e657476c3ba19e9fa6b6653983a4cb5727d2a6.tar.xz
usb: fix driver name
use the usb_driver name otherwise we will have a NULL driver entry in devinfo Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--drivers/usb/core/usb.c1
-rw-r--r--drivers/usb/storage/usb.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 7039a2cb75..f10bcad0b2 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1275,6 +1275,7 @@ static int usb_hub_probe(struct usb_device *dev, int ifnum)
int usb_driver_register(struct usb_driver *drv)
{
+ drv->driver.name = drv->name;
drv->driver.bus = &usb_bus_type;
return register_driver(&drv->driver);
}
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 5f15464711..fa3691af15 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -621,7 +621,6 @@ static struct usb_driver usb_storage_driver = {
static int __init usb_stor_init(void)
{
- usb_storage_driver.name = usb_storage_driver.driver.name;
return usb_driver_register(&usb_storage_driver);
}
device_initcall(usb_stor_init);