Revert "ASoC: fsl_micfil: Fix error handler with pm_runtime_enable"
This reverts commit ce6c7befc2
.
It breaks the Android KABI and will be brought back at a later time when
it is safe to do so.
Bug: 161946584
Change-Id: I38380dd554132e8495672b216e6312011827c932
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
parent
e2b436192b
commit
f1fdb6e6a9
@ -712,7 +712,7 @@ static int fsl_micfil_probe(struct platform_device *pdev)
|
|||||||
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
|
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(&pdev->dev, "failed to pcm register\n");
|
dev_err(&pdev->dev, "failed to pcm register\n");
|
||||||
goto err_pm_disable;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
fsl_micfil_dai.capture.formats = micfil->soc->formats;
|
fsl_micfil_dai.capture.formats = micfil->soc->formats;
|
||||||
@ -722,20 +722,9 @@ static int fsl_micfil_probe(struct platform_device *pdev)
|
|||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(&pdev->dev, "failed to register component %s\n",
|
dev_err(&pdev->dev, "failed to register component %s\n",
|
||||||
fsl_micfil_component.name);
|
fsl_micfil_component.name);
|
||||||
goto err_pm_disable;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
err_pm_disable:
|
|
||||||
pm_runtime_disable(&pdev->dev);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void fsl_micfil_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
pm_runtime_disable(&pdev->dev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __maybe_unused fsl_micfil_runtime_suspend(struct device *dev)
|
static int __maybe_unused fsl_micfil_runtime_suspend(struct device *dev)
|
||||||
@ -796,7 +785,6 @@ static const struct dev_pm_ops fsl_micfil_pm_ops = {
|
|||||||
|
|
||||||
static struct platform_driver fsl_micfil_driver = {
|
static struct platform_driver fsl_micfil_driver = {
|
||||||
.probe = fsl_micfil_probe,
|
.probe = fsl_micfil_probe,
|
||||||
.remove_new = fsl_micfil_remove,
|
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "fsl-micfil-dai",
|
.name = "fsl-micfil-dai",
|
||||||
.pm = &fsl_micfil_pm_ops,
|
.pm = &fsl_micfil_pm_ops,
|
||||||
|
Loading…
Reference in New Issue
Block a user