diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-04 17:08:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-04 17:08:53 +0100 |
| commit | 00e6a31984cd1adaa7cbb8bb7603e3241b26ef55 (patch) | |
| tree | 5e35118463b3fe5512d6d4e7dca57d10bab5c135 /sound/soc/codecs | |
| parent | ddfb319926462fd9670b7c1678a1f6a14a68e421 (diff) | |
| parent | f019ee5feb344ff0b22b58df4568676295aae14f (diff) | |
| download | linux-3.10-00e6a31984cd1adaa7cbb8bb7603e3241b26ef55.tar.gz linux-3.10-00e6a31984cd1adaa7cbb8bb7603e3241b26ef55.tar.bz2 linux-3.10-00e6a31984cd1adaa7cbb8bb7603e3241b26ef55.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/cq93vc.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/cx20442.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 46dbfd067f7..347a567b01e 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -153,7 +153,7 @@ static int cq93vc_resume(struct snd_soc_codec *codec) static int cq93vc_probe(struct snd_soc_codec *codec) { - struct davinci_vc *davinci_vc = codec->dev->platform_data; + struct davinci_vc *davinci_vc = snd_soc_codec_get_drvdata(codec); davinci_vc->cq93vc.codec = codec; codec->control_data = davinci_vc; diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c index 03d1e860d22..bb4bf65b9e7 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c @@ -367,9 +367,12 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec) return 0; } +static const u8 cx20442_reg = CX20442_TELOUT | CX20442_MIC; + static struct snd_soc_codec_driver cx20442_codec_dev = { .probe = cx20442_codec_probe, .remove = cx20442_codec_remove, + .reg_cache_default = &cx20442_reg, .reg_cache_size = 1, .reg_word_size = sizeof(u8), .read = cx20442_read_reg_cache, |