lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 72/90] USB: EHCI: ehci-mv: fix error handling in mv_ehci_probe()
    Date
    From: Tang Bin <tangbin@cmss.chinamobile.com>

    [ Upstream commit c856b4b0fdb5044bca4c0acf9a66f3b5cc01a37a ]

    If the function platform_get_irq() failed, the negative value
    returned will not be detected here. So fix error handling in
    mv_ehci_probe(). And when get irq failed, the function
    platform_get_irq() logs an error message, so remove redundant
    message here.

    Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
    Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
    Link: https://lore.kernel.org/r/20200508114305.15740-1-tangbin@cmss.chinamobile.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/host/ehci-mv.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
    index 849806a75f1ce..273736e1d33fa 100644
    --- a/drivers/usb/host/ehci-mv.c
    +++ b/drivers/usb/host/ehci-mv.c
    @@ -197,9 +197,8 @@ static int mv_ehci_probe(struct platform_device *pdev)
    hcd->regs = ehci_mv->op_regs;

    hcd->irq = platform_get_irq(pdev, 0);
    - if (!hcd->irq) {
    - dev_err(&pdev->dev, "Cannot get irq.");
    - retval = -ENODEV;
    + if (hcd->irq < 0) {
    + retval = hcd->irq;
    goto err_disable_clk;
    }

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-09-18 04:17    [W:3.375 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site