diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-02-16 14:18:54 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-02-16 14:18:54 +0100 |
| commit | 5661706efa200252d0e9fea02421b0a5857808c3 (patch) | |
| tree | b6943001feff0af67c206a850be9c536fe3990b4 /sound/soc/codecs/es8326.c | |
| parent | 5791c7699ff1b8be24e1e3b2c08b180598d3ba28 (diff) | |
| parent | 5beb5627a2481aade9aa630b7ebb7f99442321b6 (diff) | |
Merge branch 'topic/apple-gmux' into for-next
Pull vga_switcheroo fix for Macs
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs/es8326.c')
| -rw-r--r--[-rwxr-xr-x] | sound/soc/codecs/es8326.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/es8326.c b/sound/soc/codecs/es8326.c index 9ddf6a35e91c..28a0565c2a95 100755..100644 --- a/sound/soc/codecs/es8326.c +++ b/sound/soc/codecs/es8326.c @@ -729,14 +729,16 @@ static int es8326_probe(struct snd_soc_component *component) } dev_dbg(component->dev, "jack-pol %x", es8326->jack_pol); - ret = device_property_read_u8(component->dev, "everest,interrupt-src", &es8326->jack_pol); + ret = device_property_read_u8(component->dev, "everest,interrupt-src", + &es8326->interrupt_src); if (ret != 0) { dev_dbg(component->dev, "interrupt-src return %d", ret); es8326->interrupt_src = ES8326_HP_DET_SRC_PIN9; } dev_dbg(component->dev, "interrupt-src %x", es8326->interrupt_src); - ret = device_property_read_u8(component->dev, "everest,interrupt-clk", &es8326->jack_pol); + ret = device_property_read_u8(component->dev, "everest,interrupt-clk", + &es8326->interrupt_clk); if (ret != 0) { dev_dbg(component->dev, "interrupt-clk return %d", ret); es8326->interrupt_clk = 0x45; |