Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
提交 c55b869a 编写于 作者: M Mark Brown
浏览文件
操作

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

上级 4c4b8da1 7b8f7eef
显示空白变更内容
内联 并排
Showing with 2 addition and 0 deletion
drivers/spi/spi-s3c64xx.c
浏览文件 @ c55b869a
...@@ -1121,6 +1121,7 @@ static int s3c64xx_spi_setup(struct spi_device *spi) ...@@ -1121,6 +1121,7 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
return 0; return 0;
setup_exit: setup_exit:
pm_runtime_put(&sdd->pdev->dev);
/* setup() returns with device de-selected */ /* setup() returns with device de-selected */
disable_cs(sdd, spi); disable_cs(sdd, spi);
...@@ -1428,6 +1429,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) ...@@ -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, 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_set_active(&pdev->dev);
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
if (spi_register_master(master)) { if (spi_register_master(master)) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或