Merge git://git.denx.de/u-boot

[oweals/u-boot.git] / drivers / usb / host / ehci-hcd.c

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 3a0d32ee2ba1f0e3c9d49500e4570103e0f70487..c85dbcecfa739fb2b43a3e162ac5ed441c29cfca 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -15,6 +15,7 @@
 #include <usb.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <watchdog.h>
 #include <linux/compiler.h>
 
@@ -302,7 +303,7 @@ static void ehci_update_endpt2_dev_n_port(struct usb_device *udev,
 
        ttdev = udev;
        parent = udev->dev;
-       uparent = dev_get_parentdata(parent);
+       uparent = dev_get_parent_priv(parent);
 
        while (uparent->speed != USB_SPEED_HIGH) {
                struct udevice *dev = parent;
@@ -312,9 +313,9 @@ static void ehci_update_endpt2_dev_n_port(struct usb_device *udev,
                        return;
                }
 
-               ttdev = dev_get_parentdata(dev);
+               ttdev = dev_get_parent_priv(dev);
                parent = dev->parent;
-               uparent = dev_get_parentdata(parent);
+               uparent = dev_get_parent_priv(parent);
        }
        parent_devnum = uparent->devnum;
 #else
@@ -1645,8 +1646,10 @@ int ehci_register(struct udevice *dev, struct ehci_hccr *hccr,
        ctrl->hcor = hcor;
        ctrl->priv = ctrl;
 
-       if (init == USB_INIT_DEVICE)
+       ctrl->init = init;
+       if (ctrl->init == USB_INIT_DEVICE)
                goto done;
+
        ret = ehci_reset(ctrl);
        if (ret)
                goto err;
@@ -1666,6 +1669,9 @@ int ehci_deregister(struct udevice *dev)
 {
        struct ehci_ctrl *ctrl = dev_get_priv(dev);
 
+       if (ctrl->init == USB_INIT_DEVICE)
+               return 0;
+
        ehci_shutdown(ctrl);
 
        return 0;