From patchwork Mon Jun 1 17:54:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 224959 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1BF5C433DF for ; Mon, 1 Jun 2020 18:45:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9819C206C3 for ; Mon, 1 Jun 2020 18:45:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037147; bh=74mmgenOw4MmKp1UIPKTZunpiAwuag71URypgKevze8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=X1AVHmdHsUHZNWdS4ubQar0Euw42Pmus2bXIFxlYDK5HVEAUzeW2EKXCZlySKwFoD GN3b0kCQRwhVPfXeCM0m91yL+kOFWdFQ0o8bdCAMq8DTykwhg19qkmS74c9HxYLPBh ZUuETr12rbnhzkzj+Hi1QexKPl/2aTMJ1q12znQo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730109AbgFASJO (ORCPT ); Mon, 1 Jun 2020 14:09:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:55590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730344AbgFASJN (ORCPT ); Mon, 1 Jun 2020 14:09:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A5A5A21531; Mon, 1 Jun 2020 18:09:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034953; bh=74mmgenOw4MmKp1UIPKTZunpiAwuag71URypgKevze8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h2qkOodMwz+twJ4CAHA3qN+hGaI7tsFgA539Mk/rqE5HYFcpqvhMCbsvUbowXJBy4 3ZB/t9QBPan+wbmOWUdWvc4xqteuQnoh8Ga0gs19V7GlNgxXgm12KTP3hdOT8UywAT uoujZISDvEEpp0Od3Ji8EPsgu1BJOODi+OXREd9s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qiushi Wu , Jason Gunthorpe , Sasha Levin Subject: [PATCH 5.4 086/142] RDMA/pvrdma: Fix missing pci disable in pvrdma_pci_probe() Date: Mon, 1 Jun 2020 19:54:04 +0200 Message-Id: <20200601174046.833868195@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174037.904070960@linuxfoundation.org> References: <20200601174037.904070960@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Qiushi Wu [ Upstream commit db857e6ae548f0f4f4a0f63fffeeedf3cca21f9d ] In function pvrdma_pci_probe(), pdev was not disabled in one error path. Thus replace the jump target “err_free_device” by "err_disable_pdev". Fixes: 29c8d9eba550 ("IB: Add vmw_pvrdma driver") Link: https://lore.kernel.org/r/20200523030457.16160-1-wu000273@umn.edu Signed-off-by: Qiushi Wu Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c index e580ae9cc55a..780fd2dfc07e 100644 --- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c +++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c @@ -829,7 +829,7 @@ static int pvrdma_pci_probe(struct pci_dev *pdev, !(pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) { dev_err(&pdev->dev, "PCI BAR region not MMIO\n"); ret = -ENOMEM; - goto err_free_device; + goto err_disable_pdev; } ret = pci_request_regions(pdev, DRV_NAME);