diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-29 08:37:26 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-29 08:37:26 -0400 |
| commit | 449f1ca6253cb8d7bbe84666ac7d2696308d16c8 (patch) | |
| tree | ee0ad0fa000d9f2e48a7ab23874208c1ceb77c41 | |
| parent | b787f68c36d49bb1d9236f403813641efa74a031 (diff) | |
| parent | a2d97723cb3a7741af81868427b36bba274b681b (diff) | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
| -rw-r--r-- | include/sound/soc-dapm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 0bc83647d3fa..1065095c6973 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -287,7 +287,7 @@ struct device; | |||
| 287 | .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\ | 287 | .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\ |
| 288 | .tlv.p = (tlv_array), \ | 288 | .tlv.p = (tlv_array), \ |
| 289 | .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ | 289 | .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ |
| 290 | .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) } | 290 | .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) } |
| 291 | #define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \ | 291 | #define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \ |
| 292 | SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array) | 292 | SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array) |
| 293 | #define SOC_DAPM_ENUM(xname, xenum) \ | 293 | #define SOC_DAPM_ENUM(xname, xenum) \ |