Skip to content

L
linux
Commit ac9fdc88 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus

parents 896182ad 3e2bd64d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/spi/spi-s3c64xx.c
View file @ ac9fdc88
...@@ -1428,6 +1428,8 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) ...@@ -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, S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
sdd->regs + S3C64XX_SPI_INT_EN); sdd->regs + S3C64XX_SPI_INT_EN);
pm_runtime_enable(&pdev->dev);
if (spi_register_master(master)) { if (spi_register_master(master)) {
dev_err(&pdev->dev, "cannot register SPI master\n"); dev_err(&pdev->dev, "cannot register SPI master\n");
ret = -EBUSY; ret = -EBUSY;
...@@ -1440,8 +1442,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) ...@@ -1440,8 +1442,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
mem_res, mem_res,
sdd->rx_dma.dmach, sdd->tx_dma.dmach); sdd->rx_dma.dmach, sdd->tx_dma.dmach);
pm_runtime_enable(&pdev->dev);
return 0; return 0;
err3: err3:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7