← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to sound/soc/codecs/wm8978.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/soc/codecs/wm8978.c
723
723
                            struct snd_pcm_hw_params *params,
724
724
                            struct snd_soc_dai *dai)
725
725
{
726
 
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
727
 
        struct snd_soc_codec *codec = rtd->codec;
 
726
        struct snd_soc_codec *codec = dai->codec;
728
727
        struct wm8978_priv *wm8978 = snd_soc_codec_get_drvdata(codec);
729
728
        /* Word length mask = 0x60 */
730
729
        u16 iface_ctl = snd_soc_read(codec, WM8978_AUDIO_INTERFACE) & ~0x60;