diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:20 +0100 |
| commit | c55b869ac49587290f24cb5c8a4e7023c90dfb3f (patch) | |
| tree | 423aca2e0dfe91056c68d16df7153e01e17e9f22 /drivers/spi | |
| parent | 4c4b8da17d59f35b0aafe855269852ce01f11fba (diff) | |
| parent | 7b8f7eef1afcb834d701f369dbd2e18b03fd7647 (diff) | |
| download | blackbird-op-linux-c55b869ac49587290f24cb5c8a4e7023c90dfb3f.tar.gz blackbird-op-linux-c55b869ac49587290f24cb5c8a4e7023c90dfb3f.zip | |
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-s3c64xx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index a80376dc3a10..ae07c3afe956 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -1121,6 +1121,7 @@ static int s3c64xx_spi_setup(struct spi_device *spi) return 0; setup_exit: + pm_runtime_put(&sdd->pdev->dev); /* setup() returns with device de-selected */ disable_cs(sdd, spi); @@ -1428,6 +1429,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN, sdd->regs + S3C64XX_SPI_INT_EN); + pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev); if (spi_register_master(master)) { |
