lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 321/846] Bluetooth: hci_bcm: Check for error irq
    Date
    From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

    [ Upstream commit b38cd3b42fba66cc538edb9cf77e07881f43f8e2 ]

    For the possible failure of the platform_get_irq(), the returned irq
    could be error number and will finally cause the failure of the
    request_irq().
    Consider that platform_get_irq() can now in certain cases return
    -EPROBE_DEFER, and the consequences of letting request_irq() effectively
    convert that into -EINVAL, even at probe time rather than later on.
    So it might be better to check just now.

    Fixes: 0395ffc1ee05 ("Bluetooth: hci_bcm: Add PM for BCM devices")
    Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/bluetooth/hci_bcm.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
    index ef54afa293574..7abf99f0ee399 100644
    --- a/drivers/bluetooth/hci_bcm.c
    +++ b/drivers/bluetooth/hci_bcm.c
    @@ -1188,7 +1188,12 @@ static int bcm_probe(struct platform_device *pdev)
    return -ENOMEM;

    dev->dev = &pdev->dev;
    - dev->irq = platform_get_irq(pdev, 0);
    +
    + ret = platform_get_irq(pdev, 0);
    + if (ret < 0)
    + return ret;
    +
    + dev->irq = ret;

    /* Initialize routing field to an unused value */
    dev->pcm_int_params[0] = 0xff;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 21:52    [W:3.176 / U:0.708 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site