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 79F0F349CF0; Tue, 16 Jun 2026 19:02:19 +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=1781636540; cv=none; b=AnroTfLZvKOnNeh/H3najCmigxyeQKhnOIFwQgvM6DB27glZ5r5JDwlrlHBnl2ia+uIhowQv+u5iDZCYE8z3QT4gF7E00BGWHuusVg92V4naB/pIGKPGz+DejwhA4qzunK9IQB8EanfRASzT0ByX23XlJ3hBC06bIPBVOjwBu6U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781636540; c=relaxed/simple; bh=I6i+v9JJMhlANJP4RIeqBJC4sDnGdjNz5Oork6C+yRQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EL7LrL8EWDnXf/YsyLEnSzVvkm/ylu6ovmWbMv2jU8fXW6mrZdqIu/NtlNNcK/GhgJd0t6vpsTuzHKp1NKEOf59Rvz7iAwZIgDCtHGx/L096qG/ZrPdkjuXJK2Td+REIpcn7xqQ1pYhEQMLXxyJC2LKxgjPKKFx8MphdeKxzbTk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rDVFb4u7; 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="rDVFb4u7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BD481F000E9; Tue, 16 Jun 2026 19:02:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781636539; bh=ZTXMPwibEkHdUYAwCXVhpXDTdhEqrkl4IOXcT4sjteg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rDVFb4u7yGdThygMyeTe2jVqWrB9gpGD9KPpBXjzJkpPFp/e8L0eC9q1H5Xm+NEtn H7oNKDGfNaHybFWk0l/gwQkHc/+QFZj4X+gr/RaZBEQXP/lBWDLhjDT2rYAG6/lMA5 /dGze0/nfug9NvGIRniZ8m3bIenyPN3TQmdMFx3U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Naga Sureshkumar Relli , Johan Hovold , Mark Brown , Sasha Levin Subject: [PATCH 5.10 259/342] spi: zynq-qspi: fix controller deregistration Date: Tue, 16 Jun 2026 20:29:15 +0530 Message-ID: <20260616145100.318267183@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145048.348037099@linuxfoundation.org> References: <20260616145048.348037099@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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold [ Upstream commit c9c012706c9fa8ca6d129a9161caf92ab625a3fd ] Make sure to deregister the controller before disabling it during driver unbind. Note that clocks were also disabled before the recent commit 1f8fd9490e31 ("spi: zynq-qspi: Simplify clock handling with devm_clk_get_enabled()"). Fixes: 67dca5e580f1 ("spi: spi-mem: Add support for Zynq QSPI controller") Cc: stable@vger.kernel.org # 5.2: 8eb2fd00f65a Cc: stable@vger.kernel.org # 5.2 Cc: Naga Sureshkumar Relli Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-27-johan@kernel.org Signed-off-by: Mark Brown [ kept int-returning remove() with manual clk_disable_unprepare() calls and routed probe error through existing clk_dis_all cascade instead of upstream's remove_ctlr label ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-zynq-qspi.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) --- a/drivers/spi/spi-zynq-qspi.c +++ b/drivers/spi/spi-zynq-qspi.c @@ -652,7 +652,7 @@ static int zynq_qspi_probe(struct platfo xqspi = spi_controller_get_devdata(ctlr); xqspi->dev = dev; - platform_set_drvdata(pdev, xqspi); + platform_set_drvdata(pdev, ctlr); xqspi->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(xqspi->regs)) { ret = PTR_ERR(xqspi->regs); @@ -722,9 +722,9 @@ static int zynq_qspi_probe(struct platfo /* QSPI controller initializations */ zynq_qspi_init_hw(xqspi, ctlr->num_chipselect); - ret = devm_spi_register_controller(&pdev->dev, ctlr); + ret = spi_register_controller(ctlr); if (ret) { - dev_err(&pdev->dev, "spi_register_master failed\n"); + dev_err(&pdev->dev, "failed to register controller\n"); goto clk_dis_all; } @@ -752,13 +752,20 @@ remove_master: */ static int zynq_qspi_remove(struct platform_device *pdev) { - struct zynq_qspi *xqspi = platform_get_drvdata(pdev); + struct spi_controller *ctlr = platform_get_drvdata(pdev); + struct zynq_qspi *xqspi = spi_controller_get_devdata(ctlr); + + spi_controller_get(ctlr); + + spi_unregister_controller(ctlr); zynq_qspi_write(xqspi, ZYNQ_QSPI_ENABLE_OFFSET, 0); clk_disable_unprepare(xqspi->refclk); clk_disable_unprepare(xqspi->pclk); + spi_controller_put(ctlr); + return 0; }