| Message ID | 20230926130926.314751-1-d-gole@ti.com |
|---|---|
| State | Accepted |
| Commit | 86401132d7bbb550d80df0959ad9fa356ebc168d |
| Headers | show |
| Series | [V3] spi: spi-cadence-quadspi: Fix missing unwind goto warnings | expand |
On Tue, 26 Sep 2023 18:39:27 +0530, Dhruva Gole wrote: > The following smatch warnings were recently introduced: > > drivers/spi/spi-cadence-quadspi.c:1882 cqspi_probe() warn: missing > unwind goto? > > Fix these warnings by releasing dma channel and adding a goto fail probe. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: spi-cadence-quadspi: Fix missing unwind goto warnings commit: 86401132d7bbb550d80df0959ad9fa356ebc168d All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index 4828da4587c5..3d7bf62da11c 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1878,8 +1878,11 @@ static int cqspi_probe(struct platform_device *pdev) } ret = devm_pm_runtime_enable(dev); - if (ret) - return ret; + if (ret) { + if (cqspi->rx_chan) + dma_release_channel(cqspi->rx_chan); + goto probe_setup_failed; + } pm_runtime_set_autosuspend_delay(dev, CQSPI_AUTOSUSPEND_TIMEOUT); pm_runtime_use_autosuspend(dev);
The following smatch warnings were recently introduced: drivers/spi/spi-cadence-quadspi.c:1882 cqspi_probe() warn: missing unwind goto? Fix these warnings by releasing dma channel and adding a goto fail probe. Fixes: 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/all/5e21c351-cd08-443e-8509-aecf242a4da9@kadam.mountain/ Signed-off-by: Dhruva Gole <d-gole@ti.com> --- *NOTE:* Please base on top of origin: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git branch: for-next Link to v2: https://lore.kernel.org/r/20230919074658.41666-1-d-gole@ti.com Link to V1: https://lore.kernel.org/all/20230915123103.2493640-1-d-gole@ti.com/ Changelog in v3: * Rebased and removed mixing of links from commit message Changelog in v2: * added dma_release_channel * added a fixes tag. drivers/spi/spi-cadence-quadspi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) base-commit: b643e6268c8f466ebb08a594b8ec8a1e2fd275a2