Merge remote-tracking branch 'asoc/fix/max98095' into asoc-linus
This commit is contained in:
Коммит
267666ea3b
|
@ -1863,7 +1863,7 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol,
|
||||||
struct max98095_pdata *pdata = max98095->pdata;
|
struct max98095_pdata *pdata = max98095->pdata;
|
||||||
int channel = max98095_get_eq_channel(kcontrol->id.name);
|
int channel = max98095_get_eq_channel(kcontrol->id.name);
|
||||||
struct max98095_cdata *cdata;
|
struct max98095_cdata *cdata;
|
||||||
int sel = ucontrol->value.integer.value[0];
|
unsigned int sel = ucontrol->value.integer.value[0];
|
||||||
struct max98095_eq_cfg *coef_set;
|
struct max98095_eq_cfg *coef_set;
|
||||||
int fs, best, best_val, i;
|
int fs, best, best_val, i;
|
||||||
int regmask, regsave;
|
int regmask, regsave;
|
||||||
|
@ -2016,7 +2016,7 @@ static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol,
|
||||||
struct max98095_pdata *pdata = max98095->pdata;
|
struct max98095_pdata *pdata = max98095->pdata;
|
||||||
int channel = max98095_get_bq_channel(codec, kcontrol->id.name);
|
int channel = max98095_get_bq_channel(codec, kcontrol->id.name);
|
||||||
struct max98095_cdata *cdata;
|
struct max98095_cdata *cdata;
|
||||||
int sel = ucontrol->value.integer.value[0];
|
unsigned int sel = ucontrol->value.integer.value[0];
|
||||||
struct max98095_biquad_cfg *coef_set;
|
struct max98095_biquad_cfg *coef_set;
|
||||||
int fs, best, best_val, i;
|
int fs, best, best_val, i;
|
||||||
int regmask, regsave;
|
int regmask, regsave;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче