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 C33A23BD63B; 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=bIqD2618eRjGKG7COrgmQuWI8dctfknK96Qa345DiuqNXYj+LoY44CJljE+sewQfH0o6AfqdZ15JYddfYIGIMvN9f/4sJ6Au3LOjslGofBmhkLFYXtnIacOOnO/JhD8r99AEuizp7TTd9kQ/zARylbJPk1wXmx0kufmPSMbZALY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736326; c=relaxed/simple; bh=WBPrRuAmAQ/zlEaKZ9bjdjO4z8ffnisBNAnRXlbfIHU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aoEQztVKCrhiOuCAxzqs6P3oKRO0n7q2O6SI+nUhGze/fES9EHmTMoQMUXqYxQzDJL4ASjhpZEg2cU7vtaD7mPWlPpYLHcrOY+WyjKHR3Uu7JqtxGoDd6A65QZUMp56dPkUOIasSzrnrZzPMh9DaxPR3q0C3pJuudIjq0g8zHCM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=s0E497hQ; 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="s0E497hQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65E5EC2BCC6; 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=WBPrRuAmAQ/zlEaKZ9bjdjO4z8ffnisBNAnRXlbfIHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s0E497hQZSoWwZQ6DZXGcAHpCcTaGxeP1vqkNgziLgr5xNax4jY2zKZIIdnuYgkhm 0y7AbLeNziHy5YvDRIJyELjr9lTm8tXsIt7XkNsFoNhCTB0Zhr2Mp91+BeQu716SyC RLh6TnQ7DiBu8ipA4H7SL8mVdTdxp7Wl52U9WSyDFitISArQ6jFISWdWR4i7ERhzSR S17QP+aXLcMoxH7SER1p0whmcb+1GcOuIYHOBOoTFcE4yxb1JAhtTodCF2LhrY3slG Ty+HBhvruXOp7Lv0LatjDiu2Vat6C6iNkOzZhMEhN4lKomrf5vBov9A3uHsIufG2OD GO32R3cYWmGNA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d7D-0Tgw; 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, Neil Armstrong Subject: [PATCH 17/20] spi: meson-spicc: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:16 +0200 Message-ID: <20260409120419.388546-18-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 it to allow SPI device drivers to do I/O during deregistration. Fixes: 454fa271bc4e ("spi: Add Meson SPICC driver") Cc: stable@vger.kernel.org # 4.13 Cc: Neil Armstrong Signed-off-by: Johan Hovold --- drivers/spi/spi-meson-spicc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c index 57768da3205d..b80f9f457b66 100644 --- a/drivers/spi/spi-meson-spicc.c +++ b/drivers/spi/spi-meson-spicc.c @@ -1081,7 +1081,7 @@ static int meson_spicc_probe(struct platform_device *pdev) } } - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) { dev_err(&pdev->dev, "spi registration failed\n"); goto out_host; @@ -1099,8 +1099,14 @@ static void meson_spicc_remove(struct platform_device *pdev) { struct meson_spicc_device *spicc = platform_get_drvdata(pdev); + spi_controller_get(spicc->host); + + spi_unregister_controller(spicc->host); + /* Disable SPI */ writel(0, spicc->base + SPICC_CONREG); + + spi_controller_put(spicc->host); } static const struct meson_spicc_data meson_spicc_gx_data = { -- 2.52.0