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 37B733ACF14; 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=cr/j6NzV+rH3ygLe8oaDIAlSMQFNg+djd1z7/30bHw0hrsLTEIFm+HCjm4qHdbUPZRGz2dF90EqHhuzHheTz5xsQURf547riI76+YyZxnQrEFazTk7uzhwOVge2KVZ+Ns59GF6iFIQNah2McLDT7pc73iPsXuT62C9+VEop89SY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775809137; c=relaxed/simple; bh=o0vXBeK2SgguF0rsfM5b6rJ0D7VG7idXDew+BdwPXro=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S9hhq8yjCo+55CkpZ23cZPR2uol06qrPWkuQ9l8AH9t8M1dGiK9qdnCDc4d9A85lcqsakqnQR9tpvFHGEPAU5s4LlfB3EaaDEJFBVb1x6KuPhNHTNE7CKdlR0QZzdhvbaO4vPa/V3uzqrki9gkaNNstgEhzrp4wX2OU97WQPOEc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Pwf6v3Id; 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="Pwf6v3Id" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A575BC2BCB7; 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=o0vXBeK2SgguF0rsfM5b6rJ0D7VG7idXDew+BdwPXro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pwf6v3Id3kuqyR244ThJ9QoniphIr4Z27UsLc0NgaJHnx8a5LTLVXdK/DQO8v/vir psz2w4xJd9hsCtXAy7Bl5Z1q8kUqd+EZqkw+D9zfTkIYGhQEbWqB8hVJGjG0eHheiv SkwR18v82EGCUKsWweLMDPLqJt71EmQIGaKyjzQuCSNxXkxqT/jaqzNUEfZpFPi/mD yWAhNysds1cMPNEZU1wq28qbsHckhkLa56jw4GWfIHSBTA1Gbvy25k+dxMtPRSenfv IoanASpqQ9/jc7BZbh3u6VZybjmpg0jeYXxvQWwiVf5a2yZY9VVV4P0HHYjeDnbN1X 19QV44ED4OqiA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wB74n-000000026ug-3xxG; 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, Geert Uytterhoeven Subject: [PATCH 13/26] spi: sh-msiof: fix controller deregistration Date: Fri, 10 Apr 2026 10:17:43 +0200 Message-ID: <20260410081757.503099-14-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: 1bd6363bc0c6 ("spi: sh-msiof: Use core message handling instead of spi-bitbang") Cc: stable@vger.kernel.org # 3.15 Cc: Geert Uytterhoeven Signed-off-by: Johan Hovold --- drivers/spi/spi-sh-msiof.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 7f3e08810560..f114b6313f4f 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1289,9 +1289,9 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) if (ret < 0) dev_warn(dev, "DMA not available, using PIO\n"); - ret = devm_spi_register_controller(dev, ctlr); + ret = spi_register_controller(ctlr); if (ret < 0) { - dev_err(dev, "devm_spi_register_controller error.\n"); + dev_err(dev, "failed to register controller\n"); goto err2; } @@ -1309,8 +1309,14 @@ static void sh_msiof_spi_remove(struct platform_device *pdev) { struct sh_msiof_spi_priv *p = platform_get_drvdata(pdev); + spi_controller_get(p->ctlr); + + spi_unregister_controller(p->ctlr); + sh_msiof_release_dma(p); pm_runtime_disable(&pdev->dev); + + spi_controller_put(p->ctlr); } static const struct platform_device_id spi_driver_ids[] = { -- 2.52.0