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 E9DDB3AC0D4; Fri, 10 Apr 2026 08:18:56 +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=1775809137; cv=none; b=ruMKRAfmi6PoK4eSSpO3GNjuFXwvbngipb9RfE5vtTrXu36vJ1PIz2HqfGeRA7kh6f8gOsl67FzXu0yqgQdfiAiQdpFiIGoomdnLy1LCkq8f3gwZkoUR6RgI+SBDDvgd4oTpkxsqsHDrqOspflEf17/sYm2ScG2o80gyX4EoUFw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775809137; c=relaxed/simple; bh=myVQNTSRrfMEDMsyrLlgY1ej6c3ouUnZhQiGPsvtHZM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jqCS5uCzBXAYLQpBZCddyaJBEgEO5yBD2lBD3EacmgL0Cn6YAqjyyrQ8yes6E1w8ANoukxuE0qT0GpqzptaDh2LwYvITA+B39xJTfcskOwsganbDjjhn7UmKiT5HUlmAZ57vRckG8zldGHZyIAugDRbIbtNrRR2oADdrrOaunL4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WKIAyxSv; 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="WKIAyxSv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F79CC2BCB0; Fri, 10 Apr 2026 08:18:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775809136; bh=myVQNTSRrfMEDMsyrLlgY1ej6c3ouUnZhQiGPsvtHZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WKIAyxSv5w+8fgD+6Juh3XTOrSOeHolzeA+APACpvVSjYHKFdl7yWmjzZPtsXMRs6 c1sOSA6RoYqH4MCIcfmB5OtQIrVPrEUo5FYiF36ue/k74rpkhfAkNYEPRdKC5pISnf x6XWkEJdPPnAKMcANpQjQrzjLPw0/t1UlHxEuuJH+1iRuI6ffpQFwnXqiyZewHOnG9 3FI2Y3NxfexwGxnnZhO/XdNgVxdsLTTbgz+6E408odJVr+AAU0vgLXvB46dYGCaqxA /APFRRWL5r/78oD6Pj33DQnijQp/7D/4nbb2c0czWWMYv6tlvt9q00+95qzjUOCYSh y4PsJ9XWCeVhA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wB74n-000000026uQ-3dJW; Fri, 10 Apr 2026 10:18:53 +0200 From: Johan Hovold To: Mark Brown Cc: Matthias Brugger , AngeloGioacchino Del Regno , Frank Li , Sascha Hauer , Andrew Jeffery , Avi Fishman , Tomer Maimon , Tali Perry , Linus Walleij , Andi Shyti , Tudor Ambarus , Paul Walmsley , Samuel Holland , Orson Zhai , Baolin Wang , Jernej Skrabec , Masahisa Kojima , Jassi Brar , Laxman Dewangan , Kunihiko Hayashi , Masami Hiramatsu , Michal Simek , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 05/26] spi: omap2-mcspi: fix controller deregistration Date: Fri, 10 Apr 2026 10:17:35 +0200 Message-ID: <20260410081757.503099-6-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260410081757.503099-1-johan@kernel.org> References: <20260410081757.503099-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 releasing underlying resources like DMA during driver unbind. Fixes: ccdc7bf92573 ("SPI: omap2_mcspi driver") Cc: stable@vger.kernel.org # 2.6.23 Signed-off-by: Johan Hovold --- drivers/spi/spi-omap2-mcspi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index a3468e47e77d..56b30ff58771 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -1592,7 +1592,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev) if (status < 0) goto disable_pm; - status = devm_spi_register_controller(&pdev->dev, ctlr); + status = spi_register_controller(ctlr); if (status < 0) goto disable_pm; @@ -1613,11 +1613,17 @@ static void omap2_mcspi_remove(struct platform_device *pdev) struct spi_controller *ctlr = platform_get_drvdata(pdev); struct omap2_mcspi *mcspi = spi_controller_get_devdata(ctlr); + spi_controller_get(ctlr); + + spi_unregister_controller(ctlr); + omap2_mcspi_release_dma(ctlr); pm_runtime_dont_use_autosuspend(mcspi->dev); pm_runtime_put_sync(mcspi->dev); pm_runtime_disable(&pdev->dev); + + spi_controller_put(ctlr); } /* work with hotplug and coldplug */ -- 2.52.0