projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4593f2d
a6b0961
)
Merge branch 'for-linus' into for-next
author
Takashi Iwai
<tiwai@suse.de>
Mon, 19 Nov 2018 11:19:21 +0000
(12:19 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 19 Nov 2018 11:19:48 +0000
(12:19 +0100)
Backporting for further works on ca0132 codec driver
Signed-off-by: Takashi Iwai <tiwai@suse.de>
1
2
sound/pci/hda/patch_ca0132.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/pci/hda/patch_ca0132.c
index
9c0b94b
,
0a56763
..
c40cb63
---
1
/
sound/pci/hda/patch_ca0132.c
---
2
/
sound/pci/hda/patch_ca0132.c
+++ b/
sound/pci/hda/patch_ca0132.c
@@@
-8526,13
-8489,11
+8527,13
@@@
static void ca0132_config(struct hda_co
break;
case QUIRK_AE5:
codec_dbg(codec, "%s: QUIRK_AE5 applied.\n", __func__);
- snd_hda_apply_pincfgs(codec,
r3di
_pincfgs);
+ snd_hda_apply_pincfgs(codec,
ae5
_pincfgs);
break;
+ default:
+ break;
}
- switch (
spec->quirk
) {
+ switch (
ca0132_quirk(spec)
) {
case QUIRK_ALIENWARE:
spec->num_outputs = 2;
spec->out_pins[0] = 0x0b; /* speaker out */