diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-05-16 05:18:48 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-05-16 05:18:48 (GMT) |
| commit | 478e858b2fd4d0cbeef039befb7ef25b9c9bdc37 (patch) | |
| tree | 0914191dcd444982150c8bbb76d387b314ab1ea3 /sound/soc/codecs/da7213.c | |
| parent | b1b9fbd0507aac4ddce14f513d52332f50be89dc (diff) | |
| parent | 407a0e18ecfbd7f58f49c307a657b63e6f32544d (diff) | |
| download | linux-478e858b2fd4d0cbeef039befb7ef25b9c9bdc37.tar.xz | |
Merge tag 'asoc-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.10
A few small driver-specific fixes, none of them especially crippling.
Diffstat (limited to 'sound/soc/codecs/da7213.c')
| -rw-r--r-- | sound/soc/codecs/da7213.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 41230ad..4a6f1da 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -1488,17 +1488,17 @@ static int da7213_probe(struct snd_soc_codec *codec) DA7213_DMIC_DATA_SEL_SHIFT); break; } - switch (pdata->dmic_data_sel) { + switch (pdata->dmic_samplephase) { case DA7213_DMIC_SAMPLE_ON_CLKEDGE: case DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE: - dmic_cfg |= (pdata->dmic_data_sel << + dmic_cfg |= (pdata->dmic_samplephase << DA7213_DMIC_SAMPLEPHASE_SHIFT); break; } - switch (pdata->dmic_data_sel) { + switch (pdata->dmic_clk_rate) { case DA7213_DMIC_CLK_3_0MHZ: case DA7213_DMIC_CLK_1_5MHZ: - dmic_cfg |= (pdata->dmic_data_sel << + dmic_cfg |= (pdata->dmic_clk_rate << DA7213_DMIC_CLK_RATE_SHIFT); break; } |