diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 13:30:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 13:30:07 +1000 |
| commit | f00694fc79793455160a2de98132d8d592450ec7 (patch) | |
| tree | 4d9412379aa5b1ec59cf0884ad9a2b07aee4fa97 | |
| parent | 4e145ecdafcbb6e9684d2c70b64c314a13ba5226 (diff) | |
| parent | b74c43156c0caf392d93baae3df8e1788f799646 (diff) | |
Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'
| -rw-r--r-- | drivers/usb/chipidea/ci_hdrc_msm.c | 2 | ||||
| -rw-r--r-- | drivers/usb/chipidea/udc.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 0bdfcdcbf7a5..bb626120296f 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -251,7 +251,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) if (ret) goto err_mux; - ulpi_node = of_find_node_by_name(pdev->dev.of_node, "ulpi"); + ulpi_node = of_find_node_by_name(of_node_get(pdev->dev.of_node), "ulpi"); if (ulpi_node) { phy_node = of_get_next_available_child(ulpi_node, NULL); ci->hsic = of_device_is_compatible(phy_node, "qcom,usb-hsic-phy"); diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index d68b125796f9..6502c13331e8 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -944,7 +944,6 @@ isr_setup_status_complete(struct usb_ep *ep, struct usb_request *req) */ static int isr_setup_status_phase(struct ci_hdrc *ci) { - int retval; struct ci_hw_ep *hwep; /* @@ -960,9 +959,7 @@ static int isr_setup_status_phase(struct ci_hdrc *ci) ci->status->context = ci; ci->status->complete = isr_setup_status_complete; - retval = _ep_queue(&hwep->ep, ci->status, GFP_ATOMIC); - - return retval; + return _ep_queue(&hwep->ep, ci->status, GFP_ATOMIC); } /** |