Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2833265pxv; Mon, 12 Jul 2021 03:04:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzDHdf0bhZI97h07Hj6227Ys5Pbl5prlK8mB/aQWcgmFov8QH9uZfyFciShi/1Q2OG2bx+ X-Received: by 2002:a05:6602:3404:: with SMTP id n4mr19756047ioz.19.1626084292982; Mon, 12 Jul 2021 03:04:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626084292; cv=none; d=google.com; s=arc-20160816; b=ktjXs9o32pYFPKojKYldpJ25ViMIm/5//EZUq3f8ASjRJmja7GIWXdhk4FZD9hPSWi pFjvuAVg4RdsgP77YnWKKyPbLSFq8hxBnzf0YiWceJdB5D+iZ0C7HzaqJ/T0aJQU/ZtD BcK/PSIWI33eKFgnvSJPVPJbVq7Nn+YPcDTkij2IRwQyasIeSxvcAwD8uJj2L9FRngEf PuoaEJWSh+3uZnP7niYYR5AVBKcTk6WTAeQZEx6Tm+p+b19lGpH8xvp5M6pGCZIyutI7 gIgzPKT4d5lGyBl0vbrKA5hprRtQxppJB9RnMYAZq0byJfdjZIWswnM82d4kvDEUVpda EudQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=F7L0z0VRrIywKKkcm6GkfobqOL/gD9FQZy5ulDifhaA=; b=TmrvlVvDedLi8enkvrY8zHEnCXdrqqNEx8iaDfv+o0xGLYdIlxzrbHm/LPqGMidQoK RP7oKgVLygo8mvQf17ffWuN/m5l+pwWeLc/k6h05rTvyHkzWqJNj+qqiDXNE/tCpv2Uv paHl88hyQA31JkhsmYzIn1Z+WsRvTkxDWvm4LOPIcHB0XQGD+gwzJdbmXBEUkx448AWv ls758jEYH4cerMC8/zWGgl/rqfpO3oSHgGW3WMScbECI4gI+h1S7jkLjdaTuvtLyOAuA I46ia9EvlbotaS+qXKeijqHXhIdVZK/SRcRQM4VTVIQ8q82WaUruIqqRQYE52fwpSUNW 8fZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=thcNHfc9; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m11si17503635ilj.100.2021.07.12.03.04.41; Mon, 12 Jul 2021 03:04:52 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=thcNHfc9; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345176AbhGLHZD (ORCPT + 99 others); Mon, 12 Jul 2021 03:25:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:57966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239628AbhGLG6S (ORCPT ); Mon, 12 Jul 2021 02:58:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 329ED613C2; Mon, 12 Jul 2021 06:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072926; bh=ColcVunOEivafELs8vpM14A7pTRl7GBX15wcEfwa6gs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=thcNHfc9eFkAHn2i4apUwhd8bMITUZQSzPW+FeEpKUXYrhpVCF9fvOdD+/5q6IDWH +37lEAE1as/sMIm41IzB0IhBIAKWaMT3j8lU5DvqWnQRwiVr1E7ZtHecS3s57tILZe 46xUYcr/vx4N6pXUrC89SwWbKVyTqi1BvS4D1Xes= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Manivannan Sadhasivam Subject: [PATCH 5.12 067/700] bus: mhi: pci-generic: Add missing pci_disable_pcie_error_reporting() calls Date: Mon, 12 Jul 2021 08:02:30 +0200 Message-Id: <20210712060934.178689634@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060924.797321836@linuxfoundation.org> References: <20210712060924.797321836@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET commit a25d144fb883c73506ba384de476bbaff8220a95 upstream. If an error occurs after a 'pci_enable_pcie_error_reporting()' call, it must be undone by a corresponding 'pci_disable_pcie_error_reporting()' call Add the missing call in the error handling path of the probe and in the remove function. Cc: Fixes: b012ee6bfe2a ("mhi: pci_generic: Add PCI error handlers") Signed-off-by: Christophe JAILLET Reviewed-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/f70c14701f4922d67e717633c91b6c481b59f298.1623445348.git.christophe.jaillet@wanadoo.fr Signed-off-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/20210621161616.77524-6-manivannan.sadhasivam@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/bus/mhi/pci_generic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/bus/mhi/pci_generic.c +++ b/drivers/bus/mhi/pci_generic.c @@ -470,7 +470,7 @@ static int mhi_pci_probe(struct pci_dev err = mhi_register_controller(mhi_cntrl, mhi_cntrl_config); if (err) - return err; + goto err_disable_reporting; /* MHI bus does not power up the controller by default */ err = mhi_prepare_for_power_up(mhi_cntrl); @@ -496,6 +496,8 @@ err_unprepare: mhi_unprepare_after_power_down(mhi_cntrl); err_unregister: mhi_unregister_controller(mhi_cntrl); +err_disable_reporting: + pci_disable_pcie_error_reporting(pdev); return err; } @@ -514,6 +516,7 @@ static void mhi_pci_remove(struct pci_de } mhi_unregister_controller(mhi_cntrl); + pci_disable_pcie_error_reporting(pdev); } static void mhi_pci_shutdown(struct pci_dev *pdev)