diff options
Diffstat (limited to 'drivers/spi/spi-qup.c')
| -rw-r--r-- | drivers/spi/spi-qup.c | 7 | 
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index c338ef1136f6..1bfa889b8427 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -982,8 +982,10 @@ static int spi_qup_suspend(struct device *device)  	if (ret)  		return ret; -	clk_disable_unprepare(controller->cclk); -	clk_disable_unprepare(controller->iclk); +	if (!pm_runtime_suspended(device)) { +		clk_disable_unprepare(controller->cclk); +		clk_disable_unprepare(controller->iclk); +	}  	return 0;  } @@ -1030,7 +1032,6 @@ static int spi_qup_remove(struct platform_device *pdev)  	pm_runtime_put_noidle(&pdev->dev);  	pm_runtime_disable(&pdev->dev); -	spi_master_put(master);  	return 0;  }  | 
