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 3942B30DD1D; Fri, 15 May 2026 16:20:15 +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=1778862015; cv=none; b=qCWdvthC6ZirC3ewC1RaO1xyves8wbeuj7l7mnXno9a01U4AU+13soa1tILZrPlOtkbz89GU0wH24XPGvEuSqpQVv9XyheZmDOrCOVRlvd/QBM4u1AVrqzdrzsxfXi3/FaVRnGSxT9iLwbVgEt6zf/U6/EaVjwMBmpLSNY+RcMg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778862015; c=relaxed/simple; bh=BPoeQQcL0kq2dQY8eT5RxdQ66V7cphsQTYu3r/i1Jtc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gNfadbeefwCAh+iehLkSLy47C2Oail8gYHVLYDnPjL9ILOwpTpqFmD0UR8nvfurDUB7oFe/iQfDrIflm9vqbI0HJEV6T/8tPTzcUEauTCRZ/3RIZlybYO/swBtlzXVFiEw32sSOufcrZyZ1pEaL4VMNlPVhnhiebM16dotWmQKE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xiaYzVgN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xiaYzVgN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3F4BC2BCB0; Fri, 15 May 2026 16:20:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778862015; bh=BPoeQQcL0kq2dQY8eT5RxdQ66V7cphsQTYu3r/i1Jtc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xiaYzVgNq+Fsy2Wp/kpyHW2L/eJEancjjasBKUxhrB1u46Yy2xtEVriRw22AMLy2L PiQs2uIUMZtVyICLSKEkuh262U919e1M2D5nrla6YRnin7rVbePHH3DWDH82he+7JD q/ee6qKf31dBRdY3e+ZTntnfSz5aLVtbfGV+SamI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Steven King , Johan Hovold , Mark Brown Subject: [PATCH 6.18 076/188] spi: coldfire-qspi: fix controller deregistration Date: Fri, 15 May 2026 17:48:13 +0200 Message-ID: <20260515154658.967906825@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154657.309489048@linuxfoundation.org> References: <20260515154657.309489048@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold commit e7c510e192ff2a1264d999575eea39a506424264 upstream. Make sure to deregister the controller before disabling underlying resources like clocks (via runtime pm) during driver unbind. Fixes: 34b8c6617366 ("spi: Add Freescale/Motorola Coldfire QSPI driver") Cc: stable@vger.kernel.org # 2.6.34 Cc: Steven King Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-11-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-coldfire-qspi.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/drivers/spi/spi-coldfire-qspi.c +++ b/drivers/spi/spi-coldfire-qspi.c @@ -410,9 +410,9 @@ static int mcfqspi_probe(struct platform platform_set_drvdata(pdev, host); pm_runtime_enable(&pdev->dev); - status = devm_spi_register_controller(&pdev->dev, host); + status = spi_register_controller(host); if (status) { - dev_dbg(&pdev->dev, "devm_spi_register_controller failed\n"); + dev_dbg(&pdev->dev, "failed to register controller\n"); goto fail1; } @@ -436,11 +436,17 @@ static void mcfqspi_remove(struct platfo struct spi_controller *host = platform_get_drvdata(pdev); struct mcfqspi *mcfqspi = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_disable(&pdev->dev); /* disable the hardware (set the baud rate to 0) */ mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR); mcfqspi_cs_teardown(mcfqspi); + + spi_controller_put(host); } #ifdef CONFIG_PM_SLEEP