lkml.org 
[lkml]   [2019]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 030/114] p54: drop device reference count if fails to enable device
    Date
    From: Pan Bian <bianpan2016@163.com>

    commit 8149069db81853570a665f5e5648c0e526dc0e43 upstream.

    The function p54p_probe takes an extra reference count of the PCI
    device. However, the extra reference count is not dropped when it fails
    to enable the PCI device. This patch fixes the bug.

    Cc: stable@vger.kernel.org
    Signed-off-by: Pan Bian <bianpan2016@163.com>
    Acked-by: Christian Lamparter <chunkeey@gmail.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/wireless/intersil/p54/p54pci.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/wireless/intersil/p54/p54pci.c
    +++ b/drivers/net/wireless/intersil/p54/p54pci.c
    @@ -554,7 +554,7 @@ static int p54p_probe(struct pci_dev *pd
    err = pci_enable_device(pdev);
    if (err) {
    dev_err(&pdev->dev, "Cannot enable new PCI device\n");
    - return err;
    + goto err_put;
    }

    mem_addr = pci_resource_start(pdev, 0);
    @@ -639,6 +639,7 @@ static int p54p_probe(struct pci_dev *pd
    pci_release_regions(pdev);
    err_disable_dev:
    pci_disable_device(pdev);
    +err_put:
    pci_dev_put(pdev);
    return err;
    }

    \
     
     \ /
      Last update: 2019-05-23 21:19    [W:4.355 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site