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 29EF747F2E5 for ; Fri, 15 May 2026 12:15:32 +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=1778847333; cv=none; b=bwlweEsSo6VZRyMY41GnyYuKa0qDRnY2D88wD9TDOpsJXC1ptvOp/SiylRcnDvcAkZloebFFdddoUfHGL8jsOBYeAqkG0Kjv6q8VLVIm2i6jUU3klpKNK+AMkc9MNn2mQNiaPLSIf7i6ucPbXi05J1BA0jm/6s5lXimujrG92N0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778847333; c=relaxed/simple; bh=U/0vKkm8ojQXIsp3AEDb0qA59xW7mYTF51Zng5h7xSQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zok3e2y4Ak55FqrvkJmIIhUZSCvnczS0tbsNRzRx5C1oKKlFJq/uqjGC6CHeAyonb3afWRsGmoYN8W5mgSUH/Thm49QKG5olZRzjIfNIoeZ3iHuiSUMb+YBFy1Dqa2a1eaiJf0AS3tsiVOxLzIqSvByZ5zCVF80a58fxpV3chHs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RVOMHEDv; 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="RVOMHEDv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F37AEC2BCB8; Fri, 15 May 2026 12:15:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778847332; bh=U/0vKkm8ojQXIsp3AEDb0qA59xW7mYTF51Zng5h7xSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RVOMHEDvI+4W0V7pGXvV0osef6vDKDafc6tIG1oz3ouDjLHsCqDPci2VMjUe3MBiB A4+jXfv7UmaS2qAiI1WSG66WC62naVWp1S1BCODdwmRxxurqDWra3fnZWEbqi3PFI3 ILzgMGcXRTnrt3q+AR5LAoGfxxMJbZLr/w1A5re3//ZFOsKtBVyGTiDTe1qgl5mAXD Un2aJFb9FFfC6/f0RLqbM+zlTbBoXm1iA3bN8oOTZk0Pgc635YByd24uksABuVvvjD IR3YAePvp4XHamWjEsqwlpvgDiGKybnnbSxR1QsCgzko5TmYAj4eztoTvSiDDQGOg9 S3n72lG+1jilg== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Masayuki Ohtake , Mark Brown , Sasha Levin Subject: [PATCH 5.15.y 2/2] spi: topcliff-pch: fix controller deregistration Date: Fri, 15 May 2026 08:15:25 -0400 Message-ID: <20260515121525.3130058-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515121525.3130058-1-sashal@kernel.org> References: <2026051240-sleep-zen-7409@gregkh> <20260515121525.3130058-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 5d6f477d6fc0767c57c5e1e6f55a1662820eef87 ] Make sure to deregister the controller before disabling and releasing underlying resources like interrupts and DMA during driver unbind. Fixes: e8b17b5b3f30 ("spi/topcliff: Add topcliff platform controller hub (PCH) spi bus driver") Cc: stable@vger.kernel.org # 2.6.37 Cc: Masayuki Ohtake Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260414134319.978196-8-johan@kernel.org Signed-off-by: Mark Brown [ renamed spi_controller_*(data->host) calls to spi_master_*(data->master) ] Signed-off-by: Sasha Levin --- drivers/spi/spi-topcliff-pch.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index 9641de3fef177..fa60828808d84 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c @@ -1427,6 +1427,10 @@ static void pch_spi_pd_remove(struct platform_device *plat_dev) dev_dbg(&plat_dev->dev, "%s:[ch%d] irq=%d\n", __func__, plat_dev->id, board_dat->pdev->irq); + spi_master_get(data->master); + + spi_unregister_master(data->master); + if (use_dma) pch_free_dma_buf(board_dat, data); @@ -1454,7 +1458,8 @@ static void pch_spi_pd_remove(struct platform_device *plat_dev) } pci_iounmap(board_dat->pdev, data->io_remap_addr); - spi_unregister_master(data->master); + + spi_master_put(data->master); } #ifdef CONFIG_PM static int pch_spi_pd_suspend(struct platform_device *pd_dev, -- 2.53.0