spi: pxa2xx: Fix unconditional call of lpss_ssp_setup in pxa2xx_spi_resume
authorJarkko Nikula <jarkko.nikula@linux.intel.com>
Wed, 28 Jan 2015 08:09:42 +0000 (10:09 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 28 Jan 2015 11:24:47 +0000 (11:24 +0000)
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>
drivers/spi/spi-pxa2xx.c

index b00db8bb3c7152220d96b741a4c9e89b44d66978..bbf3c93f12bd358c42ec696ae0f3d35cbe9ad2c9 100644 (file)
@@ -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);