Merge remote-tracking branch 'spi/fix/hspi' into spi-linus
This commit is contained in:
commit
78e9fa521e
1 changed files with 2 additions and 2 deletions
|
@ -296,6 +296,8 @@ static int hspi_probe(struct platform_device *pdev)
|
|||
goto error1;
|
||||
}
|
||||
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
|
||||
master->num_chipselect = 1;
|
||||
master->bus_num = pdev->id;
|
||||
master->setup = hspi_setup;
|
||||
|
@ -309,8 +311,6 @@ static int hspi_probe(struct platform_device *pdev)
|
|||
goto error1;
|
||||
}
|
||||
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
|
||||
error1:
|
||||
|
|
Loading…
Add table
Reference in a new issue