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
/
wm8770.c
diff --git
a/kernel/sound/soc/codecs/wm8770.c
b/kernel/sound/soc/codecs/wm8770.c
index
53e977d
..
df61784
100644
(file)
--- a/
kernel/sound/soc/codecs/wm8770.c
+++ b/
kernel/sound/soc/codecs/wm8770.c
@@
-510,7
+510,7
@@
static int wm8770_set_bias_level(struct snd_soc_codec *codec,
case SND_SOC_BIAS_PREPARE:
break;
case SND_SOC_BIAS_STANDBY:
case SND_SOC_BIAS_PREPARE:
break;
case SND_SOC_BIAS_STANDBY:
- if (
codec->dapm.bias_level
== SND_SOC_BIAS_OFF) {
+ if (
snd_soc_codec_get_bias_level(codec)
== SND_SOC_BIAS_OFF) {
ret = regulator_bulk_enable(ARRAY_SIZE(wm8770->supplies),
wm8770->supplies);
if (ret) {
ret = regulator_bulk_enable(ARRAY_SIZE(wm8770->supplies),
wm8770->supplies);
if (ret) {
@@
-534,7
+534,6
@@
static int wm8770_set_bias_level(struct snd_soc_codec *codec,
break;
}
break;
}
- codec->dapm.bias_level = level;
return 0;
}
return 0;
}
@@
-704,7
+703,6
@@
static int wm8770_spi_remove(struct spi_device *spi)
static struct spi_driver wm8770_spi_driver = {
.driver = {
.name = "wm8770",
static struct spi_driver wm8770_spi_driver = {
.driver = {
.name = "wm8770",
- .owner = THIS_MODULE,
.of_match_table = wm8770_of_match,
},
.probe = wm8770_spi_probe,
.of_match_table = wm8770_of_match,
},
.probe = wm8770_spi_probe,