Fix merge error
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17534 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
d139045e9b
commit
cfd409ad80
|
@ -214,7 +214,7 @@
|
||||||
+ u32 tmp, flags = 0;
|
+ u32 tmp, flags = 0;
|
||||||
+
|
+
|
||||||
+ hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev,
|
+ hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev,
|
||||||
+ dev->dev->bus_id);
|
+ dev_name(dev->dev));
|
||||||
+ if (!hcd)
|
+ if (!hcd)
|
||||||
+ goto err_dev_disable;
|
+ goto err_dev_disable;
|
||||||
+
|
+
|
||||||
|
|
Loading…
Reference in New Issue