Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e3ea716 authored by Viresh Kumar's avatar Viresh Kumar Committed by Grant Likely
Browse files

spi/spi-pl022: Call pl022_dma_remove(pl022) only if enable_dma is true 



pl022_dma_remove() should be called only if enable_dma is true. There is no
point calling it when pl022_dma_probe() is not called, which again depends on
enable_dma.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 0379b2a3

drivers/spi/spi-pl022.c

+6 −2
Original line number Diff line number Diff line
@@ -2237,7 +2237,9 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) 
 err_start_queue:

 err_init_queue:

	destroy_queue(pl022);

	if (platform_info->enable_dma)

		pl022_dma_remove(pl022);



	free_irq(adev->irq[0], pl022);

	pm_runtime_disable(&adev->dev);

 err_no_irq:
@@ -2265,7 +2267,9 @@ pl022_remove(struct amba_device *adev) 
	if (destroy_queue(pl022) != 0)

		dev_err(&adev->dev, "queue remove failed\n");

	load_ssp_default_config(pl022);

	if (pl022->master_info->enable_dma)

		pl022_dma_remove(pl022);



	free_irq(adev->irq[0], pl022);

	clk_disable(pl022->clk);

	clk_put(pl022->clk);