From: Markus Pargmann Date: Tue, 22 Jul 2014 02:09:43 +0000 (+0800) Subject: usb: ci_hdrc_imx: Return -EINVAL for missing USB PHY X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=16853d7bcb6dd5806534c63051580472b4aa4560;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git usb: ci_hdrc_imx: Return -EINVAL for missing USB PHY -ENODEV is interpreted by the generic driver probing function as a non-matching driver. This leads to a missing probe failure message. Also a missing USB PHY is more of an invalid configuration of the usb driver because it is necessary. This patch returns -EINVAL if devm_usb_get_phy_by_phandle() returned -ENODEV. Signed-off-by: Markus Pargmann Signed-off-by: Peter Chen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c index 2e58f8dfd311..65444b02bd68 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.c +++ b/drivers/usb/chipidea/ci_hdrc_imx.c @@ -133,6 +133,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) data->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "fsl,usbphy", 0); if (IS_ERR(data->phy)) { ret = PTR_ERR(data->phy); + /* Return -EINVAL if no usbphy is available */ + if (ret == -ENODEV) + ret = -EINVAL; goto err_clk; }