Commit 71e63e74 authored by Ulf Hansson's avatar Ulf Hansson Committed by Russell King
Browse files

ARM: 7149/1: spi/pl022: Enable clock in probe 



Make sure we enable the clock before leaving probe.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent abf015f0

drivers/spi/spi-pl022.c

+8 −0
Original line number Diff line number Diff line
@@ -2184,6 +2184,12 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) 
		goto  err_clk_prep;

	}



	status = clk_enable(pl022->clk);

	if (status) {

		dev_err(&adev->dev, "could not enable SSP/SPI bus clock\n");

		goto err_no_clk_en;

	}



	/* Disable SSP */

	writew((readw(SSP_CR1(pl022->virtbase)) & (~SSP_CR1_MASK_SSE)),

	       SSP_CR1(pl022->virtbase));
@@ -2237,6 +2243,8 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) 


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

 err_no_irq:

	clk_disable(pl022->clk);

 err_no_clk_en:

	clk_unprepare(pl022->clk);

 err_clk_prep:

	clk_put(pl022->clk);