staging: kpc2000: fix error return code in kp2000_pcie_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 6 May 2020 13:47:35 +0000 (13:47 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 May 2020 12:00:20 +0000 (14:00 +0200)
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function. Also
removed var 'rv' since we can use 'err' instead.

Fixes: 7dc7967fc39a ("staging: kpc2000: add initial set of Daktronics drivers")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Cc: stable <stable@vger.kernel.org>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20200506134735.102041-1-weiyongjun1@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/kpc2000/kpc2000/core.c

index 7b00d70..358d7b2 100644 (file)
@@ -298,7 +298,6 @@ static int kp2000_pcie_probe(struct pci_dev *pdev,
 {
        int err = 0;
        struct kp2000_device *pcard;
-       int rv;
        unsigned long reg_bar_phys_addr;
        unsigned long reg_bar_phys_len;
        unsigned long dma_bar_phys_addr;
@@ -445,11 +444,11 @@ static int kp2000_pcie_probe(struct pci_dev *pdev,
        if (err < 0)
                goto err_release_dma;
 
-       rv = request_irq(pcard->pdev->irq, kp2000_irq_handler, IRQF_SHARED,
-                        pcard->name, pcard);
-       if (rv) {
+       err = request_irq(pcard->pdev->irq, kp2000_irq_handler, IRQF_SHARED,
+                         pcard->name, pcard);
+       if (err) {
                dev_err(&pcard->pdev->dev,
-                       "%s: failed to request_irq: %d\n", __func__, rv);
+                       "%s: failed to request_irq: %d\n", __func__, err);
                goto err_disable_msi;
        }