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 A0DC247CC64; Tue, 16 Jun 2026 17:52:31 +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=1781632353; cv=none; b=i7FIUsc06+VVdRQRtoUk0giGSkAB75jZpbq5FUKiuAlHLVq140k1RHVUONPQPl67WkpzFz1YQoIdqI5N8anlrUPzKhcT5WN9hEiwMb309qUTWAI8u43uZJpLQRU2ATDJ4c5Wg8/3eann0XktbxA5sVcF1EVMDcRhtrcoO61NM1g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781632353; c=relaxed/simple; bh=BZVlcst+hdNYNVP5ZkSuJhq1rvvWx2qO2EXRZiDArjc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eTEl9iHxI25YvNoy1hEiqJmlcZdKhtN9p2k7HqIfMtS6uZ5M2+887ySnWXYQlrxHW59oDpytUq87qaKiksvsk1vDdjPbOKR1PwALrfCLTPl25GWfAvsEVXwxoJVObnYJHaWIZeDXmtEF8jB/gPcpj02aaM67PPlrJbN5ZFmd26U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jzy5dz6D; 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="jzy5dz6D" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7EE81F000E9; Tue, 16 Jun 2026 17:52:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781632350; bh=dr1D5AHIXrYgtMoLnMiF5C01LqxvYY+WtsCtKfr3ugg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jzy5dz6Dln7/QVgTzk9M6SBbtRK72AOxUA6wX1g1aiZYyf6kv14MZbh76Yt0vcMja aCynyoRimDRaaQzNZX70eXhsFSS8sWCtJlKweuegtNJAHnUiRd3rmKKfVX67LCPfa2 hzv5kX1usThRIFNrMlwPbF+0yNGIT8IIZOR7r2vo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Maxime Ripard , Johan Hovold , Mark Brown , Sasha Levin Subject: [PATCH 6.1 394/522] spi: sun6i: fix controller deregistration Date: Tue, 16 Jun 2026 20:29:01 +0530 Message-ID: <20260616145144.312334441@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold [ Upstream commit d874a1c33aee0d88fb4ba2f8aeadaa9f1965209a ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: 3558fe900e8a ("spi: sunxi: Add Allwinner A31 SPI controller driver") Cc: stable@vger.kernel.org # 3.15 Cc: Maxime Ripard Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-20-johan@kernel.org Signed-off-by: Mark Brown [ renamed spi_controller APIs to spi_master equivalents and kept int return type for sun6i_spi_remove ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-sun6i.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- a/drivers/spi/spi-sun6i.c +++ b/drivers/spi/spi-sun6i.c @@ -688,7 +688,7 @@ static int sun6i_spi_probe(struct platfo pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev); - ret = devm_spi_register_master(&pdev->dev, master); + ret = spi_register_master(master); if (ret) { dev_err(&pdev->dev, "cannot register SPI master\n"); goto err_pm_disable; @@ -714,12 +714,19 @@ static int sun6i_spi_remove(struct platf { struct spi_master *master = platform_get_drvdata(pdev); + spi_master_get(master); + + spi_unregister_master(master); + pm_runtime_force_suspend(&pdev->dev); if (master->dma_tx) dma_release_channel(master->dma_tx); if (master->dma_rx) dma_release_channel(master->dma_rx); + + spi_master_put(master); + return 0; }