Fix merge error
SVN-Revision: 17534
This commit is contained in:
parent
1941a86b15
commit
caa8d2f9dc
@ -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
Block a user