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 F3D1E3C3444; 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=1775736327; cv=none; b=ARIuEFW2LEjrBqkjbG+6vdI5ToObextA3UMzHtU2kN28d0pHYfEt5UvO+OTVrl1a0MYJc1BI+xMdr+vdBrWFz5Er5lVmCcstCLdGwBOn5TIhfjFrwdMWpWUuQfWG3F1OQ14GLnB7AYewm9jvvPD+g3dSUmjYtpOtoJ7mKbQw2Ak= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736327; c=relaxed/simple; bh=+7HUP2x3eChcguKGttuSuj2E873EeFIoS7RjFCEZxvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YIOqUsrRilo1ToRaJpD4lH1cx/Jo5uJABGObSYk/tc2mmsNoobs0eGQcmo7VV/2vuf+ga8sYPcA3tmWaoPKcd8Xuu2wHPJCLXmRZep4+CH5+v4MW5vBKDzt9cmKwbrahk+yRHOJPRBAd9KdEhLROy4tQp4XI+c5+aOWG5wSV29s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KWiGwXaC; 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="KWiGwXaC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BF8EC2BCFF; 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=+7HUP2x3eChcguKGttuSuj2E873EeFIoS7RjFCEZxvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KWiGwXaCOCUyBqKfFiionYUWWSkcgdcSEUluduv2VHpqPnrc/tWWkHMICBZc+L72O 7gccoy1pzZyV9IjrOKHXHZ626s2nQpB0Ako7z8VgZdgNu/BDcBJ/G0NeXZRht0+mjw FGwmkq7CtXYeYbkFqps2yoT+YrdCwOosUOnkbQnzlcOjuYvgGVz6bsorWRtyKnQ3g+ eR5lSSKiXV+gpsp2cXBJvfNbs6xe8jDEKOiJiVrLtKYRX3yv+ge1Co8RLIBw6+FIK8 w/4EeUFRPVc7xrWKyUWih2et+oQXG/uOV6/vvrOsihhEbkkmgkl8lXuqfMgXljfg6F R1H37WyTU+96g== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d7J-0aoc; 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, Conor Dooley Subject: [PATCH 20/20] spi: mpfs: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:19 +0200 Message-ID: <20260409120419.388546-21-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 underlying resources like interrupts during driver unbind. Fixes: 9ac8d17694b6 ("spi: add support for microchip fpga spi controllers") Cc: stable@vger.kernel.org # 6.0 Cc: Conor Dooley Signed-off-by: Johan Hovold --- drivers/spi/spi-mpfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-mpfs.c b/drivers/spi/spi-mpfs.c index 64d15a6188ac..989a379b0700 100644 --- a/drivers/spi/spi-mpfs.c +++ b/drivers/spi/spi-mpfs.c @@ -574,7 +574,7 @@ static int mpfs_spi_probe(struct platform_device *pdev) mpfs_spi_init(host, spi); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) { mpfs_spi_disable_ints(spi); mpfs_spi_disable(spi); @@ -592,6 +592,8 @@ static void mpfs_spi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct mpfs_spi *spi = spi_controller_get_devdata(host); + spi_unregister_controller(host); + mpfs_spi_disable_ints(spi); mpfs_spi_disable(spi); } -- 2.52.0