OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'char-misc-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[uclinux-h8/linux.git]
/
sound
/
soc
/
codecs
/
sgtl5000.c
diff --git
a/sound/soc/codecs/sgtl5000.c
b/sound/soc/codecs/sgtl5000.c
index
bfda25e
..
f540f82
100644
(file)
--- a/
sound/soc/codecs/sgtl5000.c
+++ b/
sound/soc/codecs/sgtl5000.c
@@
-1376,8
+1376,8
@@
static int sgtl5000_probe(struct snd_soc_codec *codec)
sgtl5000->micbias_resistor << SGTL5000_BIAS_R_SHIFT);
snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL,
sgtl5000->micbias_resistor << SGTL5000_BIAS_R_SHIFT);
snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL,
- SGTL5000_BIAS_
R
_MASK,
- sgtl5000->micbias_voltage << SGTL5000_BIAS_
R
_SHIFT);
+ SGTL5000_BIAS_
VOLT
_MASK,
+ sgtl5000->micbias_voltage << SGTL5000_BIAS_
VOLT
_SHIFT);
/*
* disable DAP
* TODO:
/*
* disable DAP
* TODO:
@@
-1549,7
+1549,7
@@
static int sgtl5000_i2c_probe(struct i2c_client *client,
else {
sgtl5000->micbias_voltage = 0;
dev_err(&client->dev,
else {
sgtl5000->micbias_voltage = 0;
dev_err(&client->dev,
- "Unsuitable MicBias
resistor
\n");
+ "Unsuitable MicBias
voltage
\n");
}
} else {
sgtl5000->micbias_voltage = 0;
}
} else {
sgtl5000->micbias_voltage = 0;