Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
sound
/
soc
/
codecs
/
cx20442.c
diff --git
a/kernel/sound/soc/codecs/cx20442.c
b/kernel/sound/soc/codecs/cx20442.c
index
0f334bc
..
d6f4abb
100644
(file)
--- a/
kernel/sound/soc/codecs/cx20442.c
+++ b/
kernel/sound/soc/codecs/cx20442.c
@@
-333,7
+333,7
@@
static int cx20442_set_bias_level(struct snd_soc_codec *codec,
switch (level) {
case SND_SOC_BIAS_PREPARE:
switch (level) {
case SND_SOC_BIAS_PREPARE:
- if (
codec->dapm.bias_level
!= SND_SOC_BIAS_STANDBY)
+ if (
snd_soc_codec_get_bias_level(codec)
!= SND_SOC_BIAS_STANDBY)
break;
if (IS_ERR(cx20442->por))
err = PTR_ERR(cx20442->por);
break;
if (IS_ERR(cx20442->por))
err = PTR_ERR(cx20442->por);
@@
-341,7
+341,7
@@
static int cx20442_set_bias_level(struct snd_soc_codec *codec,
err = regulator_enable(cx20442->por);
break;
case SND_SOC_BIAS_STANDBY:
err = regulator_enable(cx20442->por);
break;
case SND_SOC_BIAS_STANDBY:
- if (
codec->dapm.bias_level
!= SND_SOC_BIAS_PREPARE)
+ if (
snd_soc_codec_get_bias_level(codec)
!= SND_SOC_BIAS_PREPARE)
break;
if (IS_ERR(cx20442->por))
err = PTR_ERR(cx20442->por);
break;
if (IS_ERR(cx20442->por))
err = PTR_ERR(cx20442->por);
@@
-351,8
+351,6
@@
static int cx20442_set_bias_level(struct snd_soc_codec *codec,
default:
break;
}
default:
break;
}
- if (!err)
- codec->dapm.bias_level = level;
return err;
}
return err;
}