|
@@ -213,17 +213,17 @@ static int mtk8250_probe(struct platform_device *pdev)
|
|
|
|
|
|
platform_set_drvdata(pdev, data);
|
|
|
|
|
|
- pm_runtime_enable(&pdev->dev);
|
|
|
- if (!pm_runtime_enabled(&pdev->dev)) {
|
|
|
- err = mtk8250_runtime_resume(&pdev->dev);
|
|
|
- if (err)
|
|
|
- return err;
|
|
|
- }
|
|
|
+ err = mtk8250_runtime_resume(&pdev->dev);
|
|
|
+ if (err)
|
|
|
+ return err;
|
|
|
|
|
|
data->line = serial8250_register_8250_port(&uart);
|
|
|
if (data->line < 0)
|
|
|
return data->line;
|
|
|
|
|
|
+ pm_runtime_set_active(&pdev->dev);
|
|
|
+ pm_runtime_enable(&pdev->dev);
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -234,13 +234,11 @@ static int mtk8250_remove(struct platform_device *pdev)
|
|
|
pm_runtime_get_sync(&pdev->dev);
|
|
|
|
|
|
serial8250_unregister_port(data->line);
|
|
|
+ mtk8250_runtime_suspend(&pdev->dev);
|
|
|
|
|
|
pm_runtime_disable(&pdev->dev);
|
|
|
pm_runtime_put_noidle(&pdev->dev);
|
|
|
|
|
|
- if (!pm_runtime_status_suspended(&pdev->dev))
|
|
|
- mtk8250_runtime_suspend(&pdev->dev);
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|