浏览代码

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>
Jarkko Nikula 10 年之前
父节点
当前提交
48421adfe7
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/spi/spi-pxa2xx.c

+ 2 - 1
drivers/spi/spi-pxa2xx.c

@@ -1492,7 +1492,8 @@ static int pxa2xx_spi_resume(struct device *dev)
 		clk_prepare_enable(ssp->clk);
 		clk_prepare_enable(ssp->clk);
 
 
 	/* Restore LPSS private register bits */
 	/* 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 */
 	/* Start the queue running */
 	status = spi_master_resume(drv_data->master);
 	status = spi_master_resume(drv_data->master);