Merge tag 'staging-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / staging / kpc2000 / kpc2000 / core.c

diff --git a/drivers/staging/kpc2000/kpc2000/core.c b/drivers/staging/kpc2000/kpc2000/core.c
index 7b00d7069e21971963216d645885118f368d4e98..358d7b2f4ad189fdade4f35def7ac1e99f60a003 100644 (file)
--- a/drivers/staging/kpc2000/kpc2000/core.c
+++ b/drivers/staging/kpc2000/kpc2000/core.c
@@ -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;
        }