diff options
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 26812dc2b7f2..5c6419ead015 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -1197,8 +1197,8 @@ int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol, | |||
1197 | struct hda_bind_ctls *c; | 1197 | struct hda_bind_ctls *c; |
1198 | int err; | 1198 | int err; |
1199 | 1199 | ||
1200 | c = (struct hda_bind_ctls *)kcontrol->private_value; | ||
1201 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ | 1200 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ |
1201 | c = (struct hda_bind_ctls *)kcontrol->private_value; | ||
1202 | kcontrol->private_value = *c->values; | 1202 | kcontrol->private_value = *c->values; |
1203 | err = c->ops->info(kcontrol, uinfo); | 1203 | err = c->ops->info(kcontrol, uinfo); |
1204 | kcontrol->private_value = (long)c; | 1204 | kcontrol->private_value = (long)c; |
@@ -1213,8 +1213,8 @@ int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol, | |||
1213 | struct hda_bind_ctls *c; | 1213 | struct hda_bind_ctls *c; |
1214 | int err; | 1214 | int err; |
1215 | 1215 | ||
1216 | c = (struct hda_bind_ctls *)kcontrol->private_value; | ||
1217 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ | 1216 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ |
1217 | c = (struct hda_bind_ctls *)kcontrol->private_value; | ||
1218 | kcontrol->private_value = *c->values; | 1218 | kcontrol->private_value = *c->values; |
1219 | err = c->ops->get(kcontrol, ucontrol); | 1219 | err = c->ops->get(kcontrol, ucontrol); |
1220 | kcontrol->private_value = (long)c; | 1220 | kcontrol->private_value = (long)c; |
@@ -1230,8 +1230,8 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol, | |||
1230 | unsigned long *vals; | 1230 | unsigned long *vals; |
1231 | int err = 0, change = 0; | 1231 | int err = 0, change = 0; |
1232 | 1232 | ||
1233 | c = (struct hda_bind_ctls *)kcontrol->private_value; | ||
1234 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ | 1233 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ |
1234 | c = (struct hda_bind_ctls *)kcontrol->private_value; | ||
1235 | for (vals = c->values; *vals; vals++) { | 1235 | for (vals = c->values; *vals; vals++) { |
1236 | kcontrol->private_value = *vals; | 1236 | kcontrol->private_value = *vals; |
1237 | err = c->ops->put(kcontrol, ucontrol); | 1237 | err = c->ops->put(kcontrol, ucontrol); |
@@ -1251,8 +1251,8 @@ int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag, | |||
1251 | struct hda_bind_ctls *c; | 1251 | struct hda_bind_ctls *c; |
1252 | int err; | 1252 | int err; |
1253 | 1253 | ||
1254 | c = (struct hda_bind_ctls *)kcontrol->private_value; | ||
1255 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ | 1254 | mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */ |
1255 | c = (struct hda_bind_ctls *)kcontrol->private_value; | ||
1256 | kcontrol->private_value = *c->values; | 1256 | kcontrol->private_value = *c->values; |
1257 | err = c->ops->tlv(kcontrol, op_flag, size, tlv); | 1257 | err = c->ops->tlv(kcontrol, op_flag, size, tlv); |
1258 | kcontrol->private_value = (long)c; | 1258 | kcontrol->private_value = (long)c; |