]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
ASoC: core: Get dev from runtime data
authorMisael Lopez Cruz <misael.lopez@ti.com>
Sun, 16 Jun 2013 05:16:07 +0000 (00:16 -0500)
committerMisael Lopez Cruz <misael.lopez@ti.com>
Tue, 10 Mar 2015 17:33:19 +0000 (12:33 -0500)
Get dev pointer for dev_err() from runtime data instead of
codec in preparation for DAI-multicodec support.

This patch is ported from p-ti-linux-3.8.y released kernel branch
tree.(Kernel Version:3.8).

Change-Id: Id4111cee535cf07c8e5f1113d631f1a3984b6085
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Signed-off-by: Charulatha Varadarajan <charu@ti.com>
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
sound/soc/soc-core.c

index 064f29adb1eccd8f9fa835aab1f7caf8df564e28..bd12c0d0d6c35fc4b1959468df7a2c7917ad4e95 100644 (file)
@@ -1304,13 +1304,13 @@ static int soc_post_component_init(struct snd_soc_card *card,
        /* add DAPM sysfs entries for this codec */
        ret = snd_soc_dapm_sys_add(rtd->dev);
        if (ret < 0)
-               dev_err(codec->dev,
+               dev_err(rtd->dev,
                        "ASoC: failed to add codec dapm sysfs entries: %d\n", ret);
 
        /* add codec sysfs entries */
        ret = device_create_file(rtd->dev, &dev_attr_codec_reg);
        if (ret < 0)
-               dev_err(codec->dev,
+               dev_err(rtd->dev,
                        "ASoC: failed to add codec sysfs files: %d\n", ret);
 
 #ifdef CONFIG_DEBUG_FS