Advertisement
Guest User

Untitled

a guest
Aug 16th, 2017
54
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.04 KB | None | 0 0
  1. diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
  2. index 25c8c10..64f12c9 100644
  3. --- a/drivers/usb/host/ehci-mxc.c
  4. +++ b/drivers/usb/host/ehci-mxc.c
  5. @@ -172,15 +172,17 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
  6. }
  7. clk_enable(priv->usbclk);
  8.  
  9. - if (!cpu_is_mx35() && !cpu_is_mx25()) {
  10. - priv->ahbclk = clk_get(dev, "usb_ahb");
  11. - if (IS_ERR(priv->ahbclk)) {
  12. - ret = PTR_ERR(priv->ahbclk);
  13. - goto err_clk_ahb;
  14. - }
  15. + priv->ahbclk = clk_get(dev, "usb_ahb");
  16. + if (!IS_ERR(priv->ahbclk))
  17. clk_enable(priv->ahbclk);
  18. + else if (priv->ahbclk == IS_ERR(priv->ahbclk))
  19. + priv->ahbclk = NULL;
  20. + else {
  21. + ret = PTR_ERR(priv->ahbclk);
  22. + goto err_clk_ahb;
  23. }
  24.  
  25. +
  26. /* "dr" device has its own clock on i.MX51 */
  27. if (cpu_is_mx51() && (pdev->id == 0)) {
  28. priv->phy1clk = clk_get(dev, "usb_phy1");
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement