Skip to content

Commit 9f320df

Browse files
committed
ALSA: hda/ca0132: Fix missing error handling in ca0132_alt_select_out()
There are a couple of cases where the error is ignored or the error code isn't propagated in ca0132_alt_select_out(). Fix those. Fixes: def3f0a ("ALSA: hda/ca0132 - Add quirk output selection structures.") Link: https://patch.msgid.link/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent cac5f2a commit 9f320df

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

sound/hda/codecs/ca0132.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4802,7 +4802,8 @@ static int ca0132_alt_select_out(struct hda_codec *codec)
48024802
if (err < 0)
48034803
goto exit;
48044804

4805-
if (ca0132_alt_select_out_quirk_set(codec) < 0)
4805+
err = ca0132_alt_select_out_quirk_set(codec);
4806+
if (err < 0)
48064807
goto exit;
48074808

48084809
switch (spec->cur_out_type) {
@@ -4892,6 +4893,8 @@ static int ca0132_alt_select_out(struct hda_codec *codec)
48924893
spec->bass_redirection_val);
48934894
else
48944895
err = ca0132_alt_surround_set_bass_redirection(codec, 0);
4896+
if (err < 0)
4897+
goto exit;
48954898

48964899
/* Unmute DSP now that we're done with output selection. */
48974900
err = dspio_set_uint_param(codec, 0x96,

0 commit comments

Comments
 (0)