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 AAD963FF1CD; Fri, 15 May 2026 15:52:28 +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=1778860348; cv=none; b=geUxqFyBubuGnmwI2FA9QRptNQ9GZDHmQX9snOVsPJKN6kA6k+1KuT5ZZ5cBbIwtoRXg7TmwY3qMb/kLQ9SFoLYiN78MnxxB/V6R2pzxw8sLmSW6uses5oxPlBOa015A7B3RfaxnxZXEC88Dw36LMpC7iHzljF4AdUTXM1o3DRI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778860348; c=relaxed/simple; bh=GWDK8zEE0o7mhwKI3hZyPB5Uct7c57IcQFGY4wLHZf0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ftGFz5iaE16CjnBlStjQ297qONVsVhkO5TF4O81EaoWGYQN3JAwdJCoNWhWokMFljQh3PvZsRrwYZd6bvUsQuXstGTD3imcxrvn/mpQrj1j5YaqnczHG+QwIX4qA0wPXc2DRVstKhU/RcGgEZYtCkRTvueo1Oigoe1dKWKpMa+I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1zS4/CMs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1zS4/CMs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41DF9C2BCB0; Fri, 15 May 2026 15:52:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778860348; bh=GWDK8zEE0o7mhwKI3hZyPB5Uct7c57IcQFGY4wLHZf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1zS4/CMsc6fDqlNYv/vKhkHnmLPNHz7iiWhrNVPCnVRl3IR9trg7DwSYjmeMfWXQx jBAdtfhiTKdipk+3MH78YlQjV92uLpbt0dWe1VrtHtVB8BzCxDoz+8/bR9544R8j6W MAozQhVCdiOqXFnruKI21Ci0Qd8HaFyz+XkSckIw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jingoo Han , Johan Hovold , Mark Brown Subject: [PATCH 6.12 053/144] spi: rspi: fix controller deregistration Date: Fri, 15 May 2026 17:47:59 +0200 Message-ID: <20260515154654.775334103@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154653.469907118@linuxfoundation.org> References: <20260515154653.469907118@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold commit 9944fa6726afb1e6eb7e2212764e7da0c97f2dcc upstream. Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: 9e03d05eee4c ("spi: rcar: Use devm_spi_register_master()") Cc: stable@vger.kernel.org # 3.14 Cc: Jingoo Han Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-11-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-rspi.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -1171,8 +1171,14 @@ static void rspi_remove(struct platform_ { struct rspi_data *rspi = platform_get_drvdata(pdev); + spi_controller_get(rspi->ctlr); + + spi_unregister_controller(rspi->ctlr); + rspi_release_dma(rspi->ctlr); pm_runtime_disable(&pdev->dev); + + spi_controller_put(rspi->ctlr); } static const struct spi_ops rspi_ops = { @@ -1377,9 +1383,9 @@ static int rspi_probe(struct platform_de if (ret < 0) dev_warn(&pdev->dev, "DMA not available, using PIO\n"); - ret = devm_spi_register_controller(&pdev->dev, ctlr); + ret = spi_register_controller(ctlr); if (ret < 0) { - dev_err(&pdev->dev, "devm_spi_register_controller error.\n"); + dev_err(&pdev->dev, "failed to register controller\n"); goto error3; }