From patchwork Tue Sep 29 11:01:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 291025 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=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 99F3CC4727F for ; Tue, 29 Sep 2020 11:56:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58F9520756 for ; Tue, 29 Sep 2020 11:56:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601380585; bh=XE4eHs+egJ2xsDJ8p8Inl6VS8i15SJW8hYD9IQgUc90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n6Wvbts1YdPYXm5IhhizNcpSa+XVKUA8XPHxf9YL18rO9OdoEUfiKrlFAUGLt9/gI ZTfsOHsVLAk6iV6wYOGN51UfqLIUACNlXBBzcydAXUIi8tXnW2jSdUhh9Fz8KW8oAF mQ4wibprkvjtuBuQuhqcu9BzHCCThSjAPlWSyg8k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731270AbgI2L4Y (ORCPT ); Tue, 29 Sep 2020 07:56:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:42822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730842AbgI2LoF (ORCPT ); Tue, 29 Sep 2020 07:44:05 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 35EB7206F7; Tue, 29 Sep 2020 11:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379844; bh=XE4eHs+egJ2xsDJ8p8Inl6VS8i15SJW8hYD9IQgUc90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rAHHKufX0OH14uNHkkDw86FPqPYshnSZ8J3uo1wYx4sLw3P9hr0XtLMUAZw+aLYGt DrNpENd09JyozlT8tESGLcZbq80sVMccZAJaGPZeLwHYnBFBDH6z2HLRwVyWZBEbwS c0nhKU6Sk1n9Xq/1asOHCl+05aOVA7L+TPxKVi/c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jing Xiangfeng , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.4 342/388] atm: eni: fix the missed pci_disable_device() for eni_init_one() Date: Tue, 29 Sep 2020 13:01:13 +0200 Message-Id: <20200929110027.016578538@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929110010.467764689@linuxfoundation.org> References: <20200929110010.467764689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jing Xiangfeng [ Upstream commit c2b947879ca320ac5505c6c29a731ff17da5e805 ] eni_init_one() misses to call pci_disable_device() in an error path. Jump to err_disable to fix it. Fixes: ede58ef28e10 ("atm: remove deprecated use of pci api") Signed-off-by: Jing Xiangfeng Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/atm/eni.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index 9d0d65efcd94e..bedaebd5a4956 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c @@ -2245,7 +2245,7 @@ static int eni_init_one(struct pci_dev *pci_dev, rc = dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(32)); if (rc < 0) - goto out; + goto err_disable; rc = -ENOMEM; eni_dev = kmalloc(sizeof(struct eni_dev), GFP_KERNEL);