mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
This commit is contained in:
commit
c55b869ac4
1 changed files with 2 additions and 0 deletions
|
@ -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)) {
|
||||
|
|
Loading…
Reference in a new issue