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

Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ak4104', 'asoc/topic/arizona', 'asoc/topic/atmel' and 'asoc/topic/codec-component' into asoc-next

Browse Source
This commit is contained in:
Mark Brown
2016-09-29 12:44:07 -07:00
parent 81af726167 52abe54138 c14c59f2e9 8c7788f34e 032ca4a76f 8180bd56bd
commit 7c90fc73bf
172 changed files with 1495 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/soc-core.c
View File

@@ -3332,19 +3332,6 @@ int snd_soc_register_codec(struct device *dev,
if (ret)
goto err_free;
if (codec_drv->controls) {
codec->component.controls = codec_drv->controls;
codec->component.num_controls = codec_drv->num_controls;
}
if (codec_drv->dapm_widgets) {
codec->component.dapm_widgets = codec_drv->dapm_widgets;
codec->component.num_dapm_widgets = codec_drv->num_dapm_widgets;
}
if (codec_drv->dapm_routes) {
codec->component.dapm_routes = codec_drv->dapm_routes;
codec->component.num_dapm_routes = codec_drv->num_dapm_routes;
}
if (codec_drv->probe)
codec->component.probe = snd_soc_codec_drv_probe;
if (codec_drv->remove)