diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:26 +0100 |
| commit | 043b35f281f5f141e7a928d27492133ef33b8119 (patch) | |
| tree | 30a9598866d6b8d44ee6b3fe88506881f23e0203 /sound/soc/codecs/wcd9335.c | |
| parent | 0dceaf7c798de953c74073cc77be40b7be49abbc (diff) | |
| parent | 87a6fe80d56be85bda093c4dd8a3e6535bda7e4a (diff) | |
| download | linux-043b35f281f5f141e7a928d27492133ef33b8119.tar.bz2 | |
Merge branch 'asoc-5.3' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wcd9335.c')
| -rw-r--r-- | sound/soc/codecs/wcd9335.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index a04a7cedd99d..1bbbe421b999 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -86,11 +86,6 @@ #define WCD9335_DEC_PWR_LVL_HP 0x04 #define WCD9335_DEC_PWR_LVL_DF 0x00 -#define TX_HPF_CUT_OFF_FREQ_MASK 0x60 -#define CF_MIN_3DB_4HZ 0x0 -#define CF_MIN_3DB_75HZ 0x1 -#define CF_MIN_3DB_150HZ 0x2 - #define WCD9335_SLIM_RX_CH(p) \ {.port = p + WCD9335_RX_START, .shift = p,} @@ -2734,7 +2729,7 @@ static int wcd9335_codec_enable_dec(struct snd_soc_dapm_widget *w, char *dec; u8 hpf_coff_freq; - widget_name = kstrndup(w->name, 15, GFP_KERNEL); + widget_name = kmemdup_nul(w->name, 15, GFP_KERNEL); if (!widget_name) return -ENOMEM; |