diff options
| author | Mark Brown <broonie@kernel.org> | 2018-10-21 17:00:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-21 17:00:14 +0100 |
| commit | 4b51c747e4a52175e63d125db8365b38b06f0343 (patch) | |
| tree | cd03133d8efbf5a039c7cb369aa7eaa8c27d8ebe /drivers/spi/spi-fsl-espi.c | |
| parent | 92d58fd13af269552b65853d2c3a63970c4090bf (diff) | |
| parent | 0c903aafc8529f64d24d2cd6df32f2bf16aad20b (diff) | |
Merge branch 'spi-4.20' into spi-next
Diffstat (limited to 'drivers/spi/spi-fsl-espi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-espi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 1e8ff6256079..cf2118dc91f4 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -798,10 +798,8 @@ static int of_fsl_espi_suspend(struct device *dev) int ret; ret = spi_master_suspend(master); - if (ret) { - dev_warn(dev, "cannot suspend master\n"); + if (ret) return ret; - } return pm_runtime_force_suspend(dev); } |