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 D5B5E3C062D; Thu, 9 Apr 2026 12:05:26 +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=1775736326; cv=none; b=gP55dV53Q3l0NwG/zQPw4JLR9TDWFYXm4a8mhKRlmSWLQPqPCdKZb2te6A3uBr78VLHrv/bwBS8PEgsFPiuCg9p3rj2cVeMP5E/rbWBT4QSvFPsdSVjkJjZf7hfujryj0Vw/ve5Jcz3ntFhOq07g4CEsnQyxGI4Qf0TVIBwiNlQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=tuNfjIQoyz+Ks6HZ8O/w3x28GoFwiQOi8TzTHCOHUPc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Av+zLbTYLnlVeRBNg9jBGORTB75EodwGCVJjWJMdGldXP3O7Kcc/FqYntYyV7YnFcX5hw1j53zjFOfAbxakcVGExH5QW9N9RftUfHNez/SYxImxmc1NW2oOVZsaW023pnELih65nLk/YAUIlK+nZ21bpY2u+j/yL5luZfFmTtG8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EbA7+h86; 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="EbA7+h86" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E511C4AF0F; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=tuNfjIQoyz+Ks6HZ8O/w3x28GoFwiQOi8TzTHCOHUPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EbA7+h86tzlRsMowMUd7a6p2un35IUTKJNtVL+xixsaAPbqf/dFOWUelCsC3GpBhr LUSG5hd1mG9MmjVUChaXZJFqRv2O/thI7wn9QQDKQ0REkr5+vwYKxprvckcMgXCZAS iX/9PBsaoSQaLU1BPGsifs6uhy2L7rAVv9vjE61cKC0k/HNzPDwTC6omxEAjD51WLK NIpz80WpDHcNSBmkIHn/5OAt+t40USwNIWfTv3fLY59Bi0wLHWNVnDY3LhJ2wrfy+7 HrM+oNi9e6pd/1qfVSaBKuLN6EfM+lYJv48KZofvlA1yjjSOa1iLTsDoGaMf8aoXHL wsM8hQ91Qe1mw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d79-0OyI; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Andrew Bresticker Subject: [PATCH 15/20] spi: img-spfi: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:14 +0200 Message-ID: <20260409120419.388546-16-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-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 and releasing underlying resources like clocks and DMA during driver unbind. Fixes: deba25800a12 ("spi: Add driver for IMG SPFI controller") Cc: stable@vger.kernel.org # 3.19 Cc: Andrew Bresticker Signed-off-by: Johan Hovold --- drivers/spi/spi-img-spfi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c index 902fb64815c9..57625a3ce2f2 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c @@ -643,7 +643,7 @@ static int img_spfi_probe(struct platform_device *pdev) pm_runtime_set_active(spfi->dev); pm_runtime_enable(spfi->dev); - ret = devm_spi_register_controller(spfi->dev, host); + ret = spi_register_controller(host); if (ret) goto disable_pm; @@ -669,6 +669,10 @@ static void img_spfi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct img_spfi *spfi = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + if (spfi->tx_ch) dma_release_channel(spfi->tx_ch); if (spfi->rx_ch) @@ -679,6 +683,8 @@ static void img_spfi_remove(struct platform_device *pdev) clk_disable_unprepare(spfi->spfi_clk); clk_disable_unprepare(spfi->sys_clk); } + + spi_controller_put(host); } #ifdef CONFIG_PM -- 2.52.0