projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/phy-rcar-gen2-usb-to-v3.15' into backport/v3...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
usb
/
host
/
ehci-msm.c
diff --git
a/drivers/usb/host/ehci-msm.c
b/drivers/usb/host/ehci-msm.c
index
f341651
..
fea9b15
100644
(file)
--- a/
drivers/usb/host/ehci-msm.c
+++ b/
drivers/usb/host/ehci-msm.c
@@
-125,7
+125,7
@@
static int ehci_msm_probe(struct platform_device *pdev)
goto put_hcd;
}
goto put_hcd;
}
- hcd->phy = phy;
+ hcd->
usb_
phy = phy;
device_init_wakeup(&pdev->dev, 1);
/*
* OTG device parent of HCD takes care of putting
device_init_wakeup(&pdev->dev, 1);
/*
* OTG device parent of HCD takes care of putting
@@
-152,7
+152,7
@@
static int ehci_msm_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
pm_runtime_set_suspended(&pdev->dev);
pm_runtime_disable(&pdev->dev);
pm_runtime_set_suspended(&pdev->dev);
- otg_set_host(hcd->phy->otg, NULL);
+ otg_set_host(hcd->
usb_
phy->otg, NULL);
/* FIXME: need to call usb_remove_hcd() here? */
/* FIXME: need to call usb_remove_hcd() here? */