diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-19 16:39:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-19 16:39:46 +1100 |
| commit | 793746d7e5f76a1456111b9e9085129ab9f66cdd (patch) | |
| tree | e267899ca319f2219a4fd8f43b8b70f5e4410735 | |
| parent | e29d507a97c25366f9f763f2e60855148d58d4aa (diff) | |
| parent | 015760563ec77bf17cec712fa94afdf53b285287 (diff) | |
Merge remote-tracking branch 'spi/for-next'
| -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 239be7cbe5a..96a5fc0878d 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -480,6 +480,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), @@ -498,6 +500,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; } |