Fix merge error

SVN-Revision: 17534
This commit is contained in:
Michael Büsch 2009-09-06 20:43:44 +00:00
parent 1941a86b15
commit caa8d2f9dc

View file

@ -214,7 +214,7 @@
+ u32 tmp, flags = 0;
+
+ hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev,
+ dev->dev->bus_id);
+ dev_name(dev->dev));
+ if (!hcd)
+ goto err_dev_disable;
+