designware platdrv and runtime pm?

[Wolfram Sang]

Hi guys,

while handling the merge conflict for the designware-platdrv, I noticed
an asymmetry in the runtime PM handling. Currently, code looks like
this:

        if (dev->pm_runtime_disabled) {
                pm_runtime_forbid(&pdev->dev);
        } else {
                pm_runtime_set_autosuspend_delay(&pdev->dev, 1000);
                pm_runtime_use_autosuspend(&pdev->dev);
                pm_runtime_set_active(&pdev->dev);
                pm_runtime_enable(&pdev->dev);
        }

        r = i2c_dw_probe(dev);
        if (r) {
                pm_runtime_disable(&pdev->dev);
                return r;
        }

But shouldn't the above error path (and the remove path) also take
dev->pm_runtime_disabled into account and act accordingly?

Thanks,

   Wolfram

signature.asc
Description: Digital signature