Skip to content

Commit

Permalink
spi: pxa2xx: Fix unconditional call of lpss_ssp_setup in pxa2xx_spi_r…
Browse files Browse the repository at this point in the history
…esume

Commit 7566bcc ("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>
  • Loading branch information
Jarkko Nikula authored and Mark Brown committed Jan 28, 2015
1 parent c039dd2 commit 48421ad
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/spi/spi-pxa2xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 48421ad

Please sign in to comment.