Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync up with Linus #51

Merged
merged 55 commits into from
Mar 19, 2015
Merged

Sync up with Linus #51

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
001eabf
crypto: arm/aes update NEON AES module to latest OpenSSL version
Feb 26, 2015
486b908
HID: wacom: do not send pen events before touch is up/forced out
Pinglinux Feb 20, 2015
e0d41fd
HID: wacom: rely on actual touch down count to decide touch_down
Pinglinux Feb 20, 2015
ce9594c
ASoC: ak4671: Fix control-less DAPM routes
larsclausen Feb 27, 2015
8e6a75c
ASoC: da732x: Fix control-less DAPM routes
larsclausen Feb 27, 2015
cdd3d2a
ASoC: sn95031: Fix control-less DAPM routes
larsclausen Feb 27, 2015
90aff15
fsl_ssi: fix of_property_read_u32_array return value check
maciejsszmigiero Mar 4, 2015
6c8ca30
ASoC: fsl_ssi: Don't try to round-up for PM divisor calculation
Mar 5, 2015
7b8f10d
clocksource: efm32: Fix a NULL pointer dereference
yongbae Mar 3, 2015
1096be0
clockevents: sun5i: Fix setup_irq init sequence
yongbae Mar 3, 2015
9ab2b7f
Merge branch 'clockevents/4.0-rc2' of http://git.linaro.org/people/da…
Mar 5, 2015
3995614
perf annotate: Fix fallback to unparsed disassembler line
acmel Mar 5, 2015
e678fef
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/lin…
Mar 5, 2015
e893286
x86/vdso: Fix the build on GCC5
Mar 5, 2015
c7d910b
ASoC: sgtl5000: remove useless register write clearing CHRGPUMP_POWERUP
Feb 27, 2015
a4ee556
ASoC: rt286: Change the DMI mapping for Dino
Mar 6, 2015
3fe0607
ASoC: Intel: remove conflicts when load/unload multiple firmware images
hanlui Feb 25, 2015
34e81ab
ASoC: Fix component lists locking
larsclausen Mar 7, 2015
394838c
x86/asm/entry/32: Fix user_mode() misuses
amluto Mar 10, 2015
2bf4c1d
ASoC: adav80x: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
08641d9
ASoC: ak4641: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
e8371aa
ASoC: cs4271: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
d223b0e
ASoC: es8238: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
d7f58db
ASoC: pcm1681: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
4c523ef
ASoC: tas5086: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
00a14c2
ASoC: wm2000: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
bd14016
ASoC: wm8731: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
24cc883
ASoC: wm8903: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
eaddf6f
ASoC: wm8904: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
07892b1
ASoC: wm8955: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
b4a18c8
ASoC: wm8960: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
4b0b669
ASoC: wm9712: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
87a8b28
ASoC: wm9713: Fix wrong value references for boolean kctl
tiwai Mar 10, 2015
a415457
HID: add ALWAYS_POLL quirk for a Logitech 0xc007
Mar 10, 2015
7486341
x86/platform, acpi: Bypass legacy PIC and PIT in ACPI hardware reduce…
Mar 11, 2015
c8a470c
x86/apic/numachip: Fix sibling map with NumaChip
dblueman Mar 12, 2015
d415a7f
perf: Fix context leak in put_event()
clyu Feb 26, 2015
ccfe8c3
crypto: aesni - fix memory usage in GCM decryption
smuellerDD Mar 12, 2015
a7c80eb
x86/fpu: Avoid math_state_restore() without used_math() in __restore_…
oleg-nesterov Mar 13, 2015
f4c3686
x86/fpu: Drop_fpu() should not assume that tsk equals current
oleg-nesterov Mar 13, 2015
9b02864
HID: tivo: enable all buttons on the TiVo Slide Pro remote
Mar 13, 2015
69797da
Revert "x86/mm/ASLR: Propagate base load address calculation"
suryasaimadhu Mar 16, 2015
016e81f
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
broonie Mar 16, 2015
af6b7a8
Merge remote-tracking branches 'asoc/fix/ak4671', 'asoc/fix/control',…
broonie Mar 16, 2015
33484c6
Merge remote-tracking branches 'asoc/fix/sgtl5000' and 'asoc/fix/sn95…
broonie Mar 16, 2015
cc26173
ALSA: hda - Treat stereo-to-mono mix properly
tiwai Mar 16, 2015
8cb2c2d
livepatch: Fix subtle race with coming and going modules
pmladek Mar 12, 2015
3fc6c5a
Merge tag 'asoc-fix-v4.0-rc4' of git://git.kernel.org/pub/scm/linux/k…
tiwai Mar 17, 2015
e2c7d88
HID: wacom: check for wacom->shared before following the pointer
bentiss Mar 5, 2015
13326e5
Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' …
torvalds Mar 17, 2015
c586165
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Mar 17, 2015
e63c733
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Mar 18, 2015
da11508
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Mar 18, 2015
ec3fbff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
torvalds Mar 18, 2015
7b09ac7
Merge tag 'sound-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kerne…
torvalds Mar 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sound/soc/codecs/adav80x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ static int adav80x_put_deemph(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
unsigned int deemph = ucontrol->value.enumerated.item[0];
unsigned int deemph = ucontrol->value.integer.value[0];

if (deemph > 1)
return -EINVAL;
Expand All @@ -333,7 +333,7 @@ static int adav80x_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = adav80x->deemph;
ucontrol->value.integer.value[0] = adav80x->deemph;
return 0;
};

Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/ak4641.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static int ak4641_put_deemph(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);
int deemph = ucontrol->value.enumerated.item[0];
int deemph = ucontrol->value.integer.value[0];

if (deemph > 1)
return -EINVAL;
Expand All @@ -92,7 +92,7 @@ static int ak4641_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = ak4641->deemph;
ucontrol->value.integer.value[0] = ak4641->deemph;
return 0;
};

Expand Down
44 changes: 22 additions & 22 deletions sound/soc/codecs/ak4671.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,25 +343,25 @@ static const struct snd_soc_dapm_widget ak4671_dapm_widgets[] = {
};

static const struct snd_soc_dapm_route ak4671_intercon[] = {
{"DAC Left", "NULL", "PMPLL"},
{"DAC Right", "NULL", "PMPLL"},
{"ADC Left", "NULL", "PMPLL"},
{"ADC Right", "NULL", "PMPLL"},
{"DAC Left", NULL, "PMPLL"},
{"DAC Right", NULL, "PMPLL"},
{"ADC Left", NULL, "PMPLL"},
{"ADC Right", NULL, "PMPLL"},

/* Outputs */
{"LOUT1", "NULL", "LOUT1 Mixer"},
{"ROUT1", "NULL", "ROUT1 Mixer"},
{"LOUT2", "NULL", "LOUT2 Mix Amp"},
{"ROUT2", "NULL", "ROUT2 Mix Amp"},
{"LOUT3", "NULL", "LOUT3 Mixer"},
{"ROUT3", "NULL", "ROUT3 Mixer"},
{"LOUT1", NULL, "LOUT1 Mixer"},
{"ROUT1", NULL, "ROUT1 Mixer"},
{"LOUT2", NULL, "LOUT2 Mix Amp"},
{"ROUT2", NULL, "ROUT2 Mix Amp"},
{"LOUT3", NULL, "LOUT3 Mixer"},
{"ROUT3", NULL, "ROUT3 Mixer"},

{"LOUT1 Mixer", "DACL", "DAC Left"},
{"ROUT1 Mixer", "DACR", "DAC Right"},
{"LOUT2 Mixer", "DACHL", "DAC Left"},
{"ROUT2 Mixer", "DACHR", "DAC Right"},
{"LOUT2 Mix Amp", "NULL", "LOUT2 Mixer"},
{"ROUT2 Mix Amp", "NULL", "ROUT2 Mixer"},
{"LOUT2 Mix Amp", NULL, "LOUT2 Mixer"},
{"ROUT2 Mix Amp", NULL, "ROUT2 Mixer"},
{"LOUT3 Mixer", "DACSL", "DAC Left"},
{"ROUT3 Mixer", "DACSR", "DAC Right"},

Expand All @@ -381,18 +381,18 @@ static const struct snd_soc_dapm_route ak4671_intercon[] = {
{"LIN2", NULL, "Mic Bias"},
{"RIN2", NULL, "Mic Bias"},

{"ADC Left", "NULL", "LIN MUX"},
{"ADC Right", "NULL", "RIN MUX"},
{"ADC Left", NULL, "LIN MUX"},
{"ADC Right", NULL, "RIN MUX"},

/* Analog Loops */
{"LIN1 Mixing Circuit", "NULL", "LIN1"},
{"RIN1 Mixing Circuit", "NULL", "RIN1"},
{"LIN2 Mixing Circuit", "NULL", "LIN2"},
{"RIN2 Mixing Circuit", "NULL", "RIN2"},
{"LIN3 Mixing Circuit", "NULL", "LIN3"},
{"RIN3 Mixing Circuit", "NULL", "RIN3"},
{"LIN4 Mixing Circuit", "NULL", "LIN4"},
{"RIN4 Mixing Circuit", "NULL", "RIN4"},
{"LIN1 Mixing Circuit", NULL, "LIN1"},
{"RIN1 Mixing Circuit", NULL, "RIN1"},
{"LIN2 Mixing Circuit", NULL, "LIN2"},
{"RIN2 Mixing Circuit", NULL, "RIN2"},
{"LIN3 Mixing Circuit", NULL, "LIN3"},
{"RIN3 Mixing Circuit", NULL, "RIN3"},
{"LIN4 Mixing Circuit", NULL, "LIN4"},
{"RIN4 Mixing Circuit", NULL, "RIN4"},

{"LOUT1 Mixer", "LINL1", "LIN1 Mixing Circuit"},
{"ROUT1 Mixer", "RINR1", "RIN1 Mixing Circuit"},
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/cs4271.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ static int cs4271_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = cs4271->deemph;
ucontrol->value.integer.value[0] = cs4271->deemph;
return 0;
}

Expand All @@ -296,7 +296,7 @@ static int cs4271_put_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);

cs4271->deemph = ucontrol->value.enumerated.item[0];
cs4271->deemph = ucontrol->value.integer.value[0];
return cs4271_set_deemph(codec);
}

Expand Down
8 changes: 4 additions & 4 deletions sound/soc/codecs/da732x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,11 +876,11 @@ static const struct snd_soc_dapm_widget da732x_dapm_widgets[] = {

static const struct snd_soc_dapm_route da732x_dapm_routes[] = {
/* Inputs */
{"AUX1L PGA", "NULL", "AUX1L"},
{"AUX1R PGA", "NULL", "AUX1R"},
{"AUX1L PGA", NULL, "AUX1L"},
{"AUX1R PGA", NULL, "AUX1R"},
{"MIC1 PGA", NULL, "MIC1"},
{"MIC2 PGA", "NULL", "MIC2"},
{"MIC3 PGA", "NULL", "MIC3"},
{"MIC2 PGA", NULL, "MIC2"},
{"MIC3 PGA", NULL, "MIC3"},

/* Capture Path */
{"ADC1 Left MUX", "MIC1", "MIC1 PGA"},
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/es8328.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ static int es8328_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = es8328->deemph;
ucontrol->value.integer.value[0] = es8328->deemph;
return 0;
}

Expand All @@ -129,7 +129,7 @@ static int es8328_put_deemph(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec);
int deemph = ucontrol->value.enumerated.item[0];
int deemph = ucontrol->value.integer.value[0];
int ret;

if (deemph > 1)
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/pcm1681.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = priv->deemph;
ucontrol->value.integer.value[0] = priv->deemph;

return 0;
}
Expand All @@ -129,7 +129,7 @@ static int pcm1681_put_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec);

priv->deemph = ucontrol->value.enumerated.item[0];
priv->deemph = ucontrol->value.integer.value[0];

return pcm1681_set_deemph(codec);
}
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/rt286.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,7 @@ static struct dmi_system_id dmi_dell_dino[] = {
.ident = "Dell Dino",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_BOARD_NAME, "0144P8")
DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9343")
}
},
{ }
Expand Down
8 changes: 1 addition & 7 deletions sound/soc/codecs/sgtl5000.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,13 +1151,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
/* Enable VDDC charge pump */
ana_pwr |= SGTL5000_VDDC_CHRGPMP_POWERUP;
} else if (vddio >= 3100 && vdda >= 3100) {
/*
* if vddio and vddd > 3.1v,
* charge pump should be clean before set ana_pwr
*/
snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
SGTL5000_VDDC_CHRGPMP_POWERUP, 0);

ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP;
/* VDDC use VDDIO rail */
lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD;
lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO <<
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/sn95031.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,8 @@ static const struct snd_soc_dapm_route sn95031_audio_map[] = {
/* speaker map */
{ "IHFOUTL", NULL, "Speaker Rail"},
{ "IHFOUTR", NULL, "Speaker Rail"},
{ "IHFOUTL", "NULL", "Speaker Left Playback"},
{ "IHFOUTR", "NULL", "Speaker Right Playback"},
{ "IHFOUTL", NULL, "Speaker Left Playback"},
{ "IHFOUTR", NULL, "Speaker Right Playback"},
{ "Speaker Left Playback", NULL, "Speaker Left Filter"},
{ "Speaker Right Playback", NULL, "Speaker Right Filter"},
{ "Speaker Left Filter", NULL, "IHFDAC Left"},
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/tas5086.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ static int tas5086_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = priv->deemph;
ucontrol->value.integer.value[0] = priv->deemph;

return 0;
}
Expand All @@ -292,7 +292,7 @@ static int tas5086_put_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);

priv->deemph = ucontrol->value.enumerated.item[0];
priv->deemph = ucontrol->value.integer.value[0];

return tas5086_set_deemph(codec);
}
Expand Down
8 changes: 4 additions & 4 deletions sound/soc/codecs/wm2000.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ static int wm2000_anc_mode_get(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);

ucontrol->value.enumerated.item[0] = wm2000->anc_active;
ucontrol->value.integer.value[0] = wm2000->anc_active;

return 0;
}
Expand All @@ -620,7 +620,7 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
int anc_active = ucontrol->value.enumerated.item[0];
int anc_active = ucontrol->value.integer.value[0];
int ret;

if (anc_active > 1)
Expand All @@ -643,7 +643,7 @@ static int wm2000_speaker_get(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);

ucontrol->value.enumerated.item[0] = wm2000->spk_ena;
ucontrol->value.integer.value[0] = wm2000->spk_ena;

return 0;
}
Expand All @@ -653,7 +653,7 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
int val = ucontrol->value.enumerated.item[0];
int val = ucontrol->value.integer.value[0];
int ret;

if (val > 1)
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/wm8731.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = wm8731->deemph;
ucontrol->value.integer.value[0] = wm8731->deemph;

return 0;
}
Expand All @@ -135,7 +135,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
int deemph = ucontrol->value.enumerated.item[0];
int deemph = ucontrol->value.integer.value[0];
int ret = 0;

if (deemph > 1)
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/wm8903.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ static int wm8903_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = wm8903->deemph;
ucontrol->value.integer.value[0] = wm8903->deemph;

return 0;
}
Expand All @@ -452,7 +452,7 @@ static int wm8903_put_deemph(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
int deemph = ucontrol->value.enumerated.item[0];
int deemph = ucontrol->value.integer.value[0];
int ret = 0;

if (deemph > 1)
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/wm8904.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = wm8904->deemph;
ucontrol->value.integer.value[0] = wm8904->deemph;
return 0;
}

Expand All @@ -534,7 +534,7 @@ static int wm8904_put_deemph(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
int deemph = ucontrol->value.enumerated.item[0];
int deemph = ucontrol->value.integer.value[0];

if (deemph > 1)
return -EINVAL;
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/wm8955.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = wm8955->deemph;
ucontrol->value.integer.value[0] = wm8955->deemph;
return 0;
}

Expand All @@ -402,7 +402,7 @@ static int wm8955_put_deemph(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);
int deemph = ucontrol->value.enumerated.item[0];
int deemph = ucontrol->value.integer.value[0];

if (deemph > 1)
return -EINVAL;
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/wm8960.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = wm8960->deemph;
ucontrol->value.integer.value[0] = wm8960->deemph;
return 0;
}

Expand All @@ -193,7 +193,7 @@ static int wm8960_put_deemph(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
int deemph = ucontrol->value.enumerated.item[0];
int deemph = ucontrol->value.integer.value[0];

if (deemph > 1)
return -EINVAL;
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/codecs/wm9712.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,
struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
unsigned int val = ucontrol->value.enumerated.item[0];
unsigned int val = ucontrol->value.integer.value[0];
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
unsigned int mixer, mask, shift, old;
Expand All @@ -193,7 +193,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,

mutex_lock(&wm9712->lock);
old = wm9712->hp_mixer[mixer];
if (ucontrol->value.enumerated.item[0])
if (ucontrol->value.integer.value[0])
wm9712->hp_mixer[mixer] |= mask;
else
wm9712->hp_mixer[mixer] &= ~mask;
Expand Down Expand Up @@ -231,7 +231,7 @@ static int wm9712_hp_mixer_get(struct snd_kcontrol *kcontrol,
mixer = mc->shift >> 8;
shift = mc->shift & 0xff;

ucontrol->value.enumerated.item[0] =
ucontrol->value.integer.value[0] =
(wm9712->hp_mixer[mixer] >> shift) & 1;

return 0;
Expand Down
Loading