From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 6322734FF79; Tue, 16 Jun 2026 18:32:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781634724; cv=none; b=bAUTkmT5CEUT4bEXwjNYH7g5UZsvR5zz0Z0veU8f1bnL2zYz63P+mKL2CLVl6f374H6szStHQP3yV2LCyWVZdFdf4lXsfNBuLdx1i50R7xHTJF0bl82zd/oD59aeaA+YMlD39whOX4x5sY0RdlzOvDpPj/v0eN2iOouyOnw/jCU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781634724; c=relaxed/simple; bh=yFo5KAUKXWG64Edlh6P38aPjBanHXYYasblKj7gJKoI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JH1MXPSNkv7M8Cd9BtnkNJPFQeP5+xFPid/MQRTgyUPpiuHJPuNVrCd8+CJVNo2J5WXAIqYU2M1JkdvSKBJHY3bWnbfGOlrm6cJyrP0qR73Q1ZA2XZ2rJXgfoHe5r2EvX9ezlyypat8ZEKNhHDafafSvC9AJXX26pNgHiNvp8Bg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wXaA/Sbt; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wXaA/Sbt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A0EA1F000E9; Tue, 16 Jun 2026 18:32:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781634723; bh=dlRd1bPFXzqVyZQoHcjFHa8HXWv8M7GnzCUck6FXoqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wXaA/SbtV/1yaTAkvjHoh4EoRww8fTfjcmqYa5/dIgF7yIDRjLcjhVYZw3yso8IDF F+njBlE23tmhzfx9ua7GvhNzF2nTYQhUY/0EnSIeRG0qkDq1Z0AvSc7BdJ9duO0qOi f3I1XWnXBH0G/RlKt/tBcfgNDiHKZBixKC2jwBk0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Keiji Hayashibara , Johan Hovold , Mark Brown , Sasha Levin Subject: [PATCH 5.15 319/411] spi: uniphier: fix controller deregistration Date: Tue, 16 Jun 2026 20:29:17 +0530 Message-ID: <20260616145118.112633784@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145100.376842714@linuxfoundation.org> References: <20260616145100.376842714@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ 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 [ renamed spi_*_controller/host APIs to spi_*_master/master aliases and kept the pre-existing clk_disable_unprepare() after unregister ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-uniphier.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/drivers/spi/spi-uniphier.c +++ b/drivers/spi/spi-uniphier.c @@ -751,7 +751,7 @@ static int uniphier_spi_probe(struct pla master->max_dma_len = min(dma_tx_burst, dma_rx_burst); - ret = devm_spi_register_master(&pdev->dev, master); + ret = spi_register_master(master); if (ret) goto out_release_dma; @@ -780,6 +780,10 @@ static int uniphier_spi_remove(struct pl struct spi_master *master = platform_get_drvdata(pdev); struct uniphier_spi_priv *priv = spi_master_get_devdata(master); + spi_master_get(master); + + spi_unregister_master(master); + if (master->dma_tx) dma_release_channel(master->dma_tx); if (master->dma_rx) @@ -787,6 +791,8 @@ static int uniphier_spi_remove(struct pl clk_disable_unprepare(priv->clk); + spi_master_put(master); + return 0; }