diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-17 09:45:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-17 09:45:58 +0200 |
| commit | 9fbf82c7641408386ddad162fd70234a574fcd3e (patch) | |
| tree | 85cbad08cdca621aa7dd1fd51a1198063a3de75b /drivers/usb/musb | |
| parent | 216e0e563d81ff9a16627b3d95cbfe5fa88153d7 (diff) | |
| parent | d07f6ca923ea0927a1024dfccafc5b53b61cfecc (diff) | |
| download | linux-9fbf82c7641408386ddad162fd70234a574fcd3e.tar.gz linux-9fbf82c7641408386ddad162fd70234a574fcd3e.tar.bz2 linux-9fbf82c7641408386ddad162fd70234a574fcd3e.zip | |
Merge 5.13-rc2 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/mediatek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c index eebeadd26946..6b92d037d8fc 100644 --- a/drivers/usb/musb/mediatek.c +++ b/drivers/usb/musb/mediatek.c @@ -518,8 +518,8 @@ static int mtk_musb_probe(struct platform_device *pdev) glue->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); if (IS_ERR(glue->xceiv)) { - dev_err(dev, "fail to getting usb-phy %d\n", ret); ret = PTR_ERR(glue->xceiv); + dev_err(dev, "fail to getting usb-phy %d\n", ret); goto err_unregister_usb_phy; } |