From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Date: Wed, 28 Jan 2015 08:09:42 +0000 (+0200)
Subject: spi: pxa2xx: Fix unconditional call of lpss_ssp_setup in pxa2xx_spi_resume
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=48421adfe7e9bb0f972ed22eaf0cba215dcc35bb;p=linux-beck.git

spi: pxa2xx: Fix unconditional call of lpss_ssp_setup in pxa2xx_spi_resume

Commit 7566bcc76b15 ("spi: pxa2xx: Move is_lpss_ssp() tests to caller") did
not check LPSS before calling lpss_ssp_setup() in pxa2xx_spi_resume().

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index b00db8bb3c71..bbf3c93f12bd 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1492,7 +1492,8 @@ static int pxa2xx_spi_resume(struct device *dev)
 		clk_prepare_enable(ssp->clk);
 
 	/* Restore LPSS private register bits */
-	lpss_ssp_setup(drv_data);
+	if (is_lpss_ssp(drv_data))
+		lpss_ssp_setup(drv_data);
 
 	/* Start the queue running */
 	status = spi_master_resume(drv_data->master);