|
@@ -386,7 +386,8 @@ static int soc_widget_read(struct snd_soc_dapm_widget *w, int reg,
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
-static int soc_widget_write(struct snd_soc_dapm_widget *w, int reg, int val)
|
|
|
+static int soc_widget_write(struct snd_soc_dapm_widget *w, int reg,
|
|
|
+ unsigned int val)
|
|
|
{
|
|
|
if (w->codec)
|
|
|
return snd_soc_write(w->codec, reg, val);
|
|
@@ -506,7 +507,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
|
|
|
case snd_soc_dapm_switch:
|
|
|
case snd_soc_dapm_mixer:
|
|
|
case snd_soc_dapm_mixer_named_ctl: {
|
|
|
- int val;
|
|
|
+ unsigned int val;
|
|
|
struct soc_mixer_control *mc = (struct soc_mixer_control *)
|
|
|
w->kcontrol_news[i].private_value;
|
|
|
int reg = mc->reg;
|
|
@@ -530,7 +531,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
|
|
|
case snd_soc_dapm_mux: {
|
|
|
struct soc_enum *e = (struct soc_enum *)
|
|
|
w->kcontrol_news[i].private_value;
|
|
|
- int val, item;
|
|
|
+ unsigned int val, item;
|
|
|
|
|
|
soc_widget_read(w, e->reg, &val);
|
|
|
item = (val >> e->shift_l) & e->mask;
|
|
@@ -559,7 +560,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
|
|
|
case snd_soc_dapm_value_mux: {
|
|
|
struct soc_enum *e = (struct soc_enum *)
|
|
|
w->kcontrol_news[i].private_value;
|
|
|
- int val, item;
|
|
|
+ unsigned int val, item;
|
|
|
|
|
|
soc_widget_read(w, e->reg, &val);
|
|
|
val = (val >> e->shift_l) & e->mask;
|