diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 14:51:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 14:51:59 +0100 |
| commit | ac9fdc88641cf68b1077afb0b5cd7ed87fe4a5c2 (patch) | |
| tree | 287ad9386e55490ac33fd11f8d92d277ffaaa170 /drivers/spi | |
| parent | 896182ad319542e56dcf776565f92cb35c2b4abb (diff) | |
| parent | 3e2bd64d243ff0f3dc08c49ff218fed42ee9d981 (diff) | |
| download | blackbird-op-linux-ac9fdc88641cf68b1077afb0b5cd7ed87fe4a5c2.tar.gz blackbird-op-linux-ac9fdc88641cf68b1077afb0b5cd7ed87fe4a5c2.zip | |
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-s3c64xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 512b8893893b..a80376dc3a10 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -1428,6 +1428,8 @@ 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_enable(&pdev->dev); + if (spi_register_master(master)) { dev_err(&pdev->dev, "cannot register SPI master\n"); ret = -EBUSY; @@ -1440,8 +1442,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) mem_res, sdd->rx_dma.dmach, sdd->tx_dma.dmach); - pm_runtime_enable(&pdev->dev); - return 0; err3: |
