lkml.org 
[lkml]   [2022]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 059/171] usb: dwc3: xilinx: Fix error handling when getting USB3 PHY
    Date
    From: Robert Hancock <robert.hancock@calian.com>

    commit 2cc9b1c93b1c4caa2d971856c0780fb5f7d04692 upstream.

    The code that looked up the USB3 PHY was ignoring all errors other than
    EPROBE_DEFER in an attempt to handle the PHY not being present. Fix and
    simplify the code by using devm_phy_optional_get and dev_err_probe so
    that a missing PHY is not treated as an error and unexpected errors
    are handled properly.

    Fixes: 84770f028fab ("usb: dwc3: Add driver for Xilinx platforms")
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Robert Hancock <robert.hancock@calian.com>
    Link: https://lore.kernel.org/r/20220126000253.1586760-3-robert.hancock@calian.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/usb/dwc3/dwc3-xilinx.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/drivers/usb/dwc3/dwc3-xilinx.c
    +++ b/drivers/usb/dwc3/dwc3-xilinx.c
    @@ -102,12 +102,12 @@ static int dwc3_xlnx_init_zynqmp(struct
    int ret;
    u32 reg;

    - usb3_phy = devm_phy_get(dev, "usb3-phy");
    - if (PTR_ERR(usb3_phy) == -EPROBE_DEFER) {
    - ret = -EPROBE_DEFER;
    + usb3_phy = devm_phy_optional_get(dev, "usb3-phy");
    + if (IS_ERR(usb3_phy)) {
    + ret = PTR_ERR(usb3_phy);
    + dev_err_probe(dev, ret,
    + "failed to get USB3 PHY\n");
    goto err;
    - } else if (IS_ERR(usb3_phy)) {
    - usb3_phy = NULL;
    }

    /*

    \
     
     \ /
      Last update: 2022-01-31 12:40    [W:2.758 / U:0.824 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site