diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2015-01-28 03:09:42 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-28 06:24:47 -0500 |
commit | 48421adfe7e9bb0f972ed22eaf0cba215dcc35bb (patch) | |
tree | 7f6cc11859be8051459750d89af1bb9111774c04 /drivers/spi | |
parent | c039dd275e88989478abe5f28e4e15648c28ce33 (diff) |
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>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) | |||
1492 | clk_prepare_enable(ssp->clk); | 1492 | clk_prepare_enable(ssp->clk); |
1493 | 1493 | ||
1494 | /* Restore LPSS private register bits */ | 1494 | /* Restore LPSS private register bits */ |
1495 | lpss_ssp_setup(drv_data); | 1495 | if (is_lpss_ssp(drv_data)) |
1496 | lpss_ssp_setup(drv_data); | ||
1496 | 1497 | ||
1497 | /* Start the queue running */ | 1498 | /* Start the queue running */ |
1498 | status = spi_master_resume(drv_data->master); | 1499 | status = spi_master_resume(drv_data->master); |