Merge remote-tracking branch 'spi/fix/hspi' into spi-linus
This commit is contained in:
@ -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)
|
|||||||
goto error1;
|
goto error1;
|
||||||
}
|
}
|
||||||
|
|
||||||
pm_runtime_enable(&pdev->dev);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
error1:
|
error1:
|
||||||
|
Reference in New Issue
Block a user