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 38DBC1DE894 for ; Thu, 14 May 2026 04:58:37 +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=1778734717; cv=none; b=dUr+SuZLBKzzIr52I3kMl18aZ+LVPMtEPyHFAk80BF8Hr56UCjJPMqFkWhuO7JhueDSg4DhYc91IL0cOeUk8Gx7T5LchT10lhEtdbeemzHJcJyhOv0/AtqwmKPaRdw7c4uSqLZwSeOSPZ+8tUBwx7xeZrFyUL1XXbcZOVoSJ1Z4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778734717; c=relaxed/simple; bh=nL9tJiSRN8lejaX9UbzdQ8LB+8NUAcpTbhMheNZKB2w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S04rSxDZVMXyXILpu/+O6Dda0ZZM+vGfIRlkCtsA65GR5zE7DfdGtrrvERMVNFeyrSNO14nc42F2kxRriRbN3+3yfYbFAoDpqcnHJriLXuHbt8OaleyfsOBY0BHP0nJzTs/tShOfOi0//lG9SWd8xgjJylB1o352ZXY3TfwpIdg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Y7HcyGr9; 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="Y7HcyGr9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AEDEC2BCC6; Thu, 14 May 2026 04:58:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778734716; bh=nL9tJiSRN8lejaX9UbzdQ8LB+8NUAcpTbhMheNZKB2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y7HcyGr9FKY9bO1WbuxGQCUKfPJmS87vs6RUOG6BFg7LNGZpG9ftjVComB12CWMRf zrRYY5BPDoxh2qC+/MNGKq3QixIKUP40R5ww8Jc0C00TnbKWMLXSw3S0E/wKDPVWVs AJ4wIUBnGDorauBSD5dVrqWOZ4G87OyZ45CKc5HowqQZ+T+USJLDwtOoI7oFHy1A8/ lj3Q3z9TWTF9/tUQ9OIv7BvVLKGmyEoXGlWkZfcWALzlfho/AvyybbjHqh/Bgx2rkk 5FsC/TJl4B1M23yARpp592zsm05+9QwtqJZceTfR55IPlQLCAtepib+JsIRy4Xpbao i4R8mVxIaMDuA== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Keiji Hayashibara , Mark Brown , Sasha Levin Subject: [PATCH 6.18.y 2/2] spi: uniphier: fix controller deregistration Date: Thu, 14 May 2026 00:58:33 -0400 Message-ID: <20260514045833.24151-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260514045833.24151-1-sashal@kernel.org> References: <2026051213-catching-hypnotize-7dee@gregkh> <20260514045833.24151-1-sashal@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 From: Johan Hovold [ Upstream commit 0245435f777264ac45945ed2f325dd095a41d1af ] Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Note that clocks were also disabled before the recent commit fdca270f8f87 ("spi: uniphier: Simplify clock handling with devm_clk_get_enabled()"). Fixes: 5ba155a4d4cc ("spi: add SPI controller driver for UniPhier SoC") Cc: stable@vger.kernel.org # 4.19 Cc: Keiji Hayashibara Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-25-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-uniphier.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c index b517c08a13608..75b7a0d3f8657 100644 --- a/drivers/spi/spi-uniphier.c +++ b/drivers/spi/spi-uniphier.c @@ -747,7 +747,7 @@ static int uniphier_spi_probe(struct platform_device *pdev) host->max_dma_len = min(dma_tx_burst, dma_rx_burst); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) goto out_release_dma; @@ -772,10 +772,16 @@ static void uniphier_spi_remove(struct platform_device *pdev) { struct spi_controller *host = platform_get_drvdata(pdev); + spi_controller_get(host); + + spi_unregister_controller(host); + if (host->dma_tx) dma_release_channel(host->dma_tx); if (host->dma_rx) dma_release_channel(host->dma_rx); + + spi_controller_put(host); } static const struct of_device_id uniphier_spi_match[] = { -- 2.53.0