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 34CD33ACEF8; Fri, 10 Apr 2026 08:18:57 +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=1775809137; cv=none; b=XruaS7QaPjz1LZ5wgxyhoF3es5Ubxneqb04gsH7bz2nwHzZtGAzg+EaQyHtX86sxSEI88njkET8zaxwYLdIw6Fg/whgbtLBpk3cHfj+qHkjRec8bffJ+mFyCjF+Vrw9oF3Ebeir2lCccRTX2f7eGpD/coWpSZ8iSQqmrURylAog= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775809137; c=relaxed/simple; bh=im61OindJCWFbeDsc/7HU2dJM5dG83E5ASeXW+NDShI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eCj8URdfsEa22hm0vkEjn/gV2Z1hkP0HVeiCNZinQwd4VXLoRyNahwyelHKNXriuz28FWKOFGEqCe7xo9l37JmryMwhybI5sMBP5zrcNgCQgTJ1ZZm0KPhaRD2Q3T1txNye/kziGDSmxX81Nv1tZYGIFkwpRXdfd8ePFvc4iyF8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a16U7Nb+; 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="a16U7Nb+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B044C2BCF4; Fri, 10 Apr 2026 08:18:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775809136; bh=im61OindJCWFbeDsc/7HU2dJM5dG83E5ASeXW+NDShI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a16U7Nb+ZmuO1h56nHU2Us6lb+bcGCEjrnOfD/7EFFwlxbFueh+ZItslO2okTVZqz qqtT58+xUTmi8VtamED2NqoBiRVuCACwRYQQV1GGPHcIZeyUdUqO+Jk6yYomMYCWR4 S47gNLJemSvH8guEWcewnTjgnPx0TUmtnlRdr87v32W10YRok0ciUK10QVe8AgmOJ5 dwQB4NgtGIdTbpGvWRj0FS0gEQAiDRYSYrMuCpURgczvumHsTBCPUOsBX1CzAnf/30 pRp6rAPCSANU/6ajmAWiNuzeYqt13ogad1bNRyNfkCdI7gNslLC6xJOs2z4sQkkwF9 ZUOgBy7itL+EA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wB74n-000000026ua-3qH6; Fri, 10 Apr 2026 10:18:53 +0200 From: Johan Hovold To: Mark Brown Cc: Matthias Brugger , AngeloGioacchino Del Regno , Frank Li , Sascha Hauer , Andrew Jeffery , Avi Fishman , Tomer Maimon , Tali Perry , Linus Walleij , Andi Shyti , Tudor Ambarus , Paul Walmsley , Samuel Holland , Orson Zhai , Baolin Wang , Jernej Skrabec , Masahisa Kojima , Jassi Brar , Laxman Dewangan , Kunihiko Hayashi , Masami Hiramatsu , Michal Simek , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Jingoo Han Subject: [PATCH 10/26] spi: rspi: fix controller deregistration Date: Fri, 10 Apr 2026 10:17:40 +0200 Message-ID: <20260410081757.503099-11-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260410081757.503099-1-johan@kernel.org> References: <20260410081757.503099-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 releasing underlying resources like DMA during driver unbind. Fixes: 9e03d05eee4c ("spi: rcar: Use devm_spi_register_master()") Cc: stable@vger.kernel.org # 3.14 Cc: Jingoo Han Signed-off-by: Johan Hovold --- drivers/spi/spi-rspi.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index c739c1998b4c..a8180dece716 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -1171,8 +1171,14 @@ static void rspi_remove(struct platform_device *pdev) { struct rspi_data *rspi = platform_get_drvdata(pdev); + spi_controller_get(rspi->ctlr); + + spi_unregister_controller(rspi->ctlr); + rspi_release_dma(rspi->ctlr); pm_runtime_disable(&pdev->dev); + + spi_controller_put(rspi->ctlr); } static const struct spi_ops rspi_ops = { @@ -1376,9 +1382,9 @@ static int rspi_probe(struct platform_device *pdev) if (ret < 0) dev_warn(&pdev->dev, "DMA not available, using PIO\n"); - ret = devm_spi_register_controller(&pdev->dev, ctlr); + ret = spi_register_controller(ctlr); if (ret < 0) { - dev_err(&pdev->dev, "devm_spi_register_controller error.\n"); + dev_err(&pdev->dev, "failed to register controller\n"); goto error3; } -- 2.52.0