diff options
| author | Hisashi Nakamura <hisashi.nakamura.ak@renesas.com> | 2014-12-15 23:01:11 +0900 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-01-15 22:41:19 +0000 |
| commit | fb5dece09c3acbe2022feb16815c63f9e9045b95 (patch) | |
| tree | 73e00884d00a78079d0c5a961c9466016af3caa7 /drivers/spi | |
| parent | 780a61e9af6d5634897feabd0f1cb3fecea41590 (diff) | |
| download | linux-stable-fb5dece09c3acbe2022feb16815c63f9e9045b95.tar.gz linux-stable-fb5dece09c3acbe2022feb16815c63f9e9045b95.tar.bz2 linux-stable-fb5dece09c3acbe2022feb16815c63f9e9045b95.zip | |
spi: sh-msiof: Add runtime PM lock in initializing
commit 015760563ec77bf17cec712fa94afdf53b285287 upstream.
SH-MSIOF driver is enabled autosuspend API of spi framework.
But autosuspend framework doesn't work during initializing.
So runtime PM lock is added in SH-MSIOF driver initializing.
Fixes: e2a0ba547ba31c (spi: sh-msiof: Convert to spi core auto_runtime_pm framework)
Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-sh-msiof.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 45b09142afe2..7f0f2ebf3cdc 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -421,6 +421,8 @@ static int sh_msiof_spi_setup(struct spi_device *spi) struct device_node *np = spi->master->dev.of_node; struct sh_msiof_spi_priv *p = spi_master_get_devdata(spi->master); + pm_runtime_get_sync(&p->pdev->dev); + if (!np) { /* * Use spi->controller_data for CS (same strategy as spi_gpio), @@ -439,6 +441,9 @@ static int sh_msiof_spi_setup(struct spi_device *spi) if (spi->cs_gpio >= 0) gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH)); + + pm_runtime_put_sync(&p->pdev->dev); + return 0; } |