xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next

Browse Source
This commit is contained in:
Mark Brown
2014-05-22 00:23:45 +01:00
parent b79e16cb4a ccffbd27af
commit 497c11a946
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/pcm512x.c
View File

@@ -517,6 +517,7 @@ void pcm512x_remove(struct device *dev)
} }
EXPORT_SYMBOL_GPL(pcm512x_remove); EXPORT_SYMBOL_GPL(pcm512x_remove);
#ifdef CONFIG_PM_RUNTIME
static int pcm512x_suspend(struct device *dev) static int pcm512x_suspend(struct device *dev)
{ {
struct pcm512x_priv *pcm512x = dev_get_drvdata(dev); struct pcm512x_priv *pcm512x = dev_get_drvdata(dev);
@@ -578,6 +579,7 @@ static int pcm512x_resume(struct device *dev)
return 0; return 0;
} }
#endif
const struct dev_pm_ops pcm512x_pm_ops = { const struct dev_pm_ops pcm512x_pm_ops = {
SET_RUNTIME_PM_OPS(pcm512x_suspend, pcm512x_resume, NULL) SET_RUNTIME_PM_OPS(pcm512x_suspend, pcm512x_resume, NULL)