Skip to content

Commit

Permalink
bus: ti-sysc: Fix unbalanced pm_runtime_enable by adding remove
Browse files Browse the repository at this point in the history
Looks like we're missing remove() that's needed if a driver instance
rebound. Otherwise we will get "Unbalanced pm_runtime_enable!".

Signed-off-by: Tony Lindgren <[email protected]>
  • Loading branch information
tmlind committed Oct 13, 2017
1 parent a4a5d49 commit 684be5a
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions drivers/bus/ti-sysc.c
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,30 @@ static int sysc_probe(struct platform_device *pdev)
return error;
}

static int sysc_remove(struct platform_device *pdev)
{
struct sysc *ddata = platform_get_drvdata(pdev);
int error;

error = pm_runtime_get_sync(ddata->dev);
if (error < 0) {
pm_runtime_put_noidle(ddata->dev);
pm_runtime_disable(ddata->dev);
goto unprepare;
}

of_platform_depopulate(&pdev->dev);

pm_runtime_dont_use_autosuspend(&pdev->dev);
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);

unprepare:
sysc_unprepare(ddata);

return 0;
}

static const struct of_device_id sysc_match[] = {
{ .compatible = "ti,sysc-omap2" },
{ .compatible = "ti,sysc-omap4" },
Expand All @@ -546,6 +570,7 @@ MODULE_DEVICE_TABLE(of, sysc_match);

static struct platform_driver sysc_driver = {
.probe = sysc_probe,
.remove = sysc_remove,
.driver = {
.name = "ti-sysc",
.of_match_table = sysc_match,
Expand Down

0 comments on commit 684be5a

Please sign in to comment.