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 4283B3AD507; Fri, 10 Apr 2026 08:18:57 +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=ePbJ3VfV17imVY6Gi0PZxIeXs4/tjhuUSUwg0DsoCtsYmK+Q/3C22vAYy9EqVueVEuhmzgNYcZNfj9pv/pRlDI0RMQEKCWs0DcfCZOGvMQsv3zzzGi341WU3GzK/GfTIYHp0wPgSU8ft2zhnyX5r7ZQq/k8t9Ag/XCx62E4GEZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775809137; c=relaxed/simple; bh=Fn5B119nUyTCP5N8nKKW4q40wJHmjGjR/V6mYnoy5hI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C8blPst736HrMoPjbTL0vOPoRrhOmWXaOD1iSfqGa9m3GYRMWdRNDxCaJ+cKIf42RB6xFk3gx+UkgO6WV8QPahe+ao87FhTPU5Oyaxkyu/OmHXzgFwMTLD4rbrgoyQCjD881Vq3QE1OPfUK7V4CY8m0stEiL6U3lhH3FjAj3IeQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=V8hSSorq; 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="V8hSSorq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B20ACC4AF18; 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=Fn5B119nUyTCP5N8nKKW4q40wJHmjGjR/V6mYnoy5hI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V8hSSorqTVlmQPN8+xobHECuBw5MxRqJInC7ZrrQIQvYkAa88zAQmsTjgwr78JE17 CWBsytjo9gQW2RMG24oLzKZuVNPLVJdnxxKR1qZboV6pfmUd+e9lnm1xt83vO/kVXK 2d1RMeKMqQ0dzOhs3Thw7OpT/YRHddtwr4++amcK11ZGH9dlSY4UBTipaizrwEaQb4 lhYuc/Z1gywVVseoJYN0sOceEeIcsHbMbwsx5GlrJApcLe+KNPun09Sx6ABaflEFH0 eqGaLRdj79U+lbF/6UWB6mATd9EiXFwNdNN13pgdpSSb+5ZkEnzKKeMnuVWZrxEgP2 OIaZjnFn5AP4A== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wB74o-000000026us-02R6; Fri, 10 Apr 2026 10:18:54 +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, Maxime Ripard Subject: [PATCH 19/26] spi: sun6i: fix controller deregistration Date: Fri, 10 Apr 2026 10:17:49 +0200 Message-ID: <20260410081757.503099-20-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 disabling underlying resources like clocks during driver unbind. Fixes: 3558fe900e8a ("spi: sunxi: Add Allwinner A31 SPI controller driver") Cc: stable@vger.kernel.org # 3.15 Cc: Maxime Ripard Signed-off-by: Johan Hovold --- drivers/spi/spi-sun6i.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c index 240e46f84f7b..5ac73d324d06 100644 --- a/drivers/spi/spi-sun6i.c +++ b/drivers/spi/spi-sun6i.c @@ -742,7 +742,7 @@ static int sun6i_spi_probe(struct platform_device *pdev) pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&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; @@ -768,12 +768,18 @@ static void sun6i_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); 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 sun6i_spi_cfg sun6i_a31_spi_cfg = { -- 2.52.0