Skip to content

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

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

parents 5acb8bb4 268d7643
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/spi/spi-sh-hspi.c
View file @ 78e9fa52
...@@ -296,6 +296,8 @@ static int hspi_probe(struct platform_device *pdev) ...@@ -296,6 +296,8 @@ static int hspi_probe(struct platform_device *pdev)
goto error1; goto error1;
} }
pm_runtime_enable(&pdev->dev);
master->num_chipselect = 1; master->num_chipselect = 1;
master->bus_num = pdev->id; master->bus_num = pdev->id;
master->setup = hspi_setup; master->setup = hspi_setup;
...@@ -309,8 +311,6 @@ static int hspi_probe(struct platform_device *pdev) ...@@ -309,8 +311,6 @@ static int hspi_probe(struct platform_device *pdev)
goto error1; goto error1;
} }
pm_runtime_enable(&pdev->dev);
return 0; return 0;
error1: error1:
......
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