From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B897D3BBA0E; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; cv=none; b=bqQdYUj0f7ch5qCP/YDqx0M5IsuIOzuZ+DtIlMfYGRF5xupP4Zb7oBWDDwyBfzxf9aGVot47c0fq/G92CxLM/P9iqJBMf4r5Q1vobGdlltAlwZArTBmvTpQ3m2RgS9ThQ06NSzSXmFeuOKel9kyTPM0ou9Ivl9YnJ4d9tY/vmWY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=AN/WmZLURrd95pC2sN/jR4hEhb/ZR49KwdyAN70jqWg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bAffb/hrlij4pblxtRpYfVsq0wuW1VZezKq9cpmQrVriXsxOI3UJo7HS3z0O3KEF3mmX6CDfAnHAltOQhltnHQT69W+vc1caB1D1T6jT88c7HlfaxdcMoH/OjdhfQpSVJTmTnLxVIGSmUmenaMrUtlt90+96JZ/Rw2Th3y5g36Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VTHTZRdA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VTHTZRdA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61B75C2BCB7; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=AN/WmZLURrd95pC2sN/jR4hEhb/ZR49KwdyAN70jqWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VTHTZRdAeGmFp4gUzDerqn4axWzR68XQs5/R6BzowCNQbauvdNH8YHBdRB8Y4UVjk TcPN24QjtxoiJhze/P70dhFrpuKaLSMhN9U9XGkKa+eTj4L3o5PA6VXAunoAkI1qWN irdJO6uNeD49mhybg7OUIuYd8oDTySLUzvGNyErcnh/UR1l6uDk4zPtdDgayEYjD7B ++AaJH7p3JbSL/QSsHX3uXngtMt7SG8okvtgjte5s9fDdc8j9d2UgA6BXHnD8cm0Ho RbvsO2EbDBgHyxiFTecTotNoxEFgPz1IknwflQW56eoO155sMbGfXhSEn3s7c86yF5 s+NDhvsZsG5nw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d75-0KAz; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Heiner Kallweit Subject: [PATCH 13/20] spi: fsl-espi: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:12 +0200 Message-ID: <20260409120419.388546-14-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Make sure to deregister the controller before disabling runtime PM (which can leave the controller disabled) to allow SPI device drivers to do I/O during deregistration. Fixes: e9abb4db8d10 ("spi: fsl-espi: add runtime PM") Cc: stable@vger.kernel.org # 4.3 Cc: Heiner Kallweit Signed-off-by: Johan Hovold --- drivers/spi/spi-fsl-espi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 56270f8fdc17..45b9974ae911 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -718,7 +718,7 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem, pm_runtime_enable(dev); pm_runtime_get_sync(dev); - ret = devm_spi_register_controller(dev, host); + ret = spi_register_controller(host); if (ret < 0) goto err_pm; @@ -782,7 +782,15 @@ static int of_fsl_espi_probe(struct platform_device *ofdev) static void of_fsl_espi_remove(struct platform_device *dev) { + struct spi_controller *host = platform_get_drvdata(dev); + + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_disable(&dev->dev); + + spi_controller_put(host); } #ifdef CONFIG_PM_SLEEP -- 2.52.0