Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp1861155ybj; Wed, 6 May 2020 06:45:54 -0700 (PDT) X-Google-Smtp-Source: APiQypLZ4u5Tu+rHn0KGjab9xZTour6A6FkSmAK1Ep4ZRRars8/5cSQtrmX5Oxms6ujyuZ0sqaLQ X-Received: by 2002:aa7:d514:: with SMTP id y20mr7066744edq.28.1588772753687; Wed, 06 May 2020 06:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588772753; cv=none; d=google.com; s=arc-20160816; b=Ey+B9eAstBdt8uaQTusHEHEBSB0GS/IN2e5RNlmp3jxAuRRQ0UpgzskkhBkRJHL+O/ tMv33FEOK6JHqMElH3FQzpUB9A6pXRmt5ISBRYMjY1BXa2HzpRv+oV/QbodbtzHTiGQF 3AfQ8fDarwBajLc9BV8yyOc7zM7AxXGvbxfbUnana9gN4bjWSprvGfCvXlnJZDrxcSPw /FPDv3Ou/SQbCbsIvJySji81Jos3LGNBO5GyvtXmo/hQvlm+x1hFBKnBX7qdH1V982AJ pgmr7d/Rn/c8+hsPhlV5h16Yj2/B6lSaoLt2ENviyvcrBQ3beubfzGiRRuEqigtCnzEz djoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=3UgvC5doEiTJxuhbWNQ/U3SU346yMlRkyVtZl65koT8=; b=DSZnEtIiITCP0420pgpkMl4SLX0mZrsh6PgIMi2zlrcS3j2EAY5i6vWq3iCHlvNpSO 6mLiN0tCt6CYslFRUweM0ujn9zeX7AEOW6u7U0P+/HybSPDkQc138pZOZqqPIbQ+nh9j Ulw7aqb1bOeYh+dUxQoWO3wc9tlKrBRMBf3BmyR/qm1PDHnZF/KIKIlYb2CUKYUivtxp 3fThcjzsvTcM3cZ1F26Wmqh+Z1rWRd0K+Nd+FWfeV0NHo3REj6lR/88GGNkHGrg6h7cZ 4VZvfdzZXdrOAY3JUnaR8nXNRQBG/jT8pq5svxpUyn85XZ4czKDBa2dWu4g5T387FhHz /ogg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bq12si1168698ejb.472.2020.05.06.06.45.29; Wed, 06 May 2020 06:45:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728726AbgEFNnn (ORCPT + 99 others); Wed, 6 May 2020 09:43:43 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:3825 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728248AbgEFNnm (ORCPT ); Wed, 6 May 2020 09:43:42 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id AA80028CC3C2A4686EED; Wed, 6 May 2020 21:43:36 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.487.0; Wed, 6 May 2020 21:43:29 +0800 From: Wei Yongjun To: , , , CC: Wei Yongjun , , , Subject: [PATCH -next v2] staging: kpc2000: fix error return code in kp2000_pcie_probe() Date: Wed, 6 May 2020 13:47:35 +0000 Message-ID: <20200506134735.102041-1-weiyongjun1@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506125255.90336-1-weiyongjun1@huawei.com> References: <20200506125255.90336-1-weiyongjun1@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- v1 -> v2: fix code aligns and add fixes --- drivers/staging/kpc2000/kpc2000/core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/kpc2000/kpc2000/core.c b/drivers/staging/kpc2000/kpc2000/core.c index 7b00d7069e21..358d7b2f4ad1 100644 --- 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; }