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 4ED9039E9A0 for ; Wed, 13 May 2026 17:45:05 +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=1778694305; cv=none; b=QEkP/7f+Ya0DFoMnoj1TYn++mgAZsUjhlvyP/1ovsBEJGIIsN4APnBe5WnzuI6N7dgRJo9erV/WTN/Bd4M7VoYpH9MrtcSDrLBD4PdzhV4KNltr3osR0kTQODvVrdivlON3lG7ht/K2LSsmde1CpLWGXFKsEmCsxbp1L16U1cuo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778694305; c=relaxed/simple; bh=HUU4w4jDqyduSamGz8uwpN3XQS8xvZexHMMloR4So1I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wk/W4j8fRdtZ6L+lAGjXGeedH9XkWZOOMKSkNXrAQXgIYKU6i31Lih5RbpL4eNnZpxbc0QvrAxtZ4b/2nmvQqQL5n8LFwBrL/ZYsSCs4GvCEGURM0f867as1EvRk+zkc1JKiTqp31upxzy2pZujCqgpAxIzXwph2xl4RfBe+pHM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ElZmdlTU; 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="ElZmdlTU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9646EC2BCC6; Wed, 13 May 2026 17:45:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778694305; bh=HUU4w4jDqyduSamGz8uwpN3XQS8xvZexHMMloR4So1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ElZmdlTUPWq/wxoNwHKPNGnTqKo5gGFi6wAk14xavj36+o5K/TfcRTomObzApZbKd ZSO0zFyAymLZ+aV92VTHuAxBuOwoQDPkHueTPTsHgBN9H3aNDU2Cbi4FKlSTBmEhTv SqmFRCnuKnConXP87uWmPrzsHFnBYTf2SS+nkDxauYxzFAJJqlRCOFGQqUI7sGNgCf lA7WRG8NiKkOSFjPZ9w01e0I6VO09LgXqUkW6wdZRtEpAHsO0NeUNH7NqFXIQtgwqm r8OK2N5lC+C0na7WXGxLg6ymqHSfg+0kJrEb8VuVnrxktf6dwnIfnOVenFWrPI3YwK O16CDnAlQlubw== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Maxime Ripard , Mark Brown , Sasha Levin Subject: [PATCH 6.1.y 3/3] spi: sun4i: fix controller deregistration Date: Wed, 13 May 2026 13:45:01 -0400 Message-ID: <20260513174501.3896424-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260513174501.3896424-1-sashal@kernel.org> References: <2026051252-unproven-faculty-80e7@gregkh> <20260513174501.3896424-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 42108a2f03e0fdeabe9d02d085bdb058baa1189f ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: b5f6517948cc ("spi: sunxi: Add Allwinner A10 SPI controller driver") Cc: stable@vger.kernel.org # 3.15 Cc: Maxime Ripard Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-19-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-sun4i.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c index b1afd5e100451..ccbebf9dafa0e 100644 --- a/drivers/spi/spi-sun4i.c +++ b/drivers/spi/spi-sun4i.c @@ -503,7 +503,7 @@ static int sun4i_spi_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); pm_runtime_idle(&pdev->dev); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) { dev_err(&pdev->dev, "cannot register SPI host\n"); goto err_pm_disable; @@ -521,7 +521,15 @@ static int sun4i_spi_probe(struct platform_device *pdev) static void sun4i_spi_remove(struct platform_device *pdev) { + struct spi_controller *host = platform_get_drvdata(pdev); + + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_force_suspend(&pdev->dev); + + spi_controller_put(host); } static const struct of_device_id sun4i_spi_match[] = { -- 2.53.0