projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
rockchip
/
rockchip_i2s.c
diff --git
a/sound/soc/rockchip/rockchip_i2s.c
b/sound/soc/rockchip/rockchip_i2s.c
index acb5be53bfb4ddbd6879437e58b7dcfe990bd201..b93610212e3df75354e34d89dcb1999930a1705a 100644
(file)
--- a/
sound/soc/rockchip/rockchip_i2s.c
+++ b/
sound/soc/rockchip/rockchip_i2s.c
@@
-483,16
+483,14
@@
static int rockchip_i2s_probe(struct platform_device *pdev)
goto err_suspend;
}
goto err_suspend;
}
- ret = snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
+ ret =
devm_
snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
dev_err(&pdev->dev, "Could not register PCM\n");
if (ret) {
dev_err(&pdev->dev, "Could not register PCM\n");
-
goto err_pcm_register
;
+
return ret
;
}
return 0;
}
return 0;
-err_pcm_register:
- snd_dmaengine_pcm_unregister(&pdev->dev);
err_suspend:
if (!pm_runtime_status_suspended(&pdev->dev))
i2s_runtime_suspend(&pdev->dev);
err_suspend:
if (!pm_runtime_status_suspended(&pdev->dev))
i2s_runtime_suspend(&pdev->dev);
@@
-512,8
+510,6
@@
static int rockchip_i2s_remove(struct platform_device *pdev)
clk_disable_unprepare(i2s->mclk);
clk_disable_unprepare(i2s->hclk);
clk_disable_unprepare(i2s->mclk);
clk_disable_unprepare(i2s->hclk);
- snd_dmaengine_pcm_unregister(&pdev->dev);
- snd_soc_unregister_component(&pdev->dev);
return 0;
}
return 0;
}