Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e655bf2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Don't return a fatal error at PCM-creation errors 



Don't return a fatal error to the driver but continue to probe when
any error occurs at creating PCM streams for each codec.
It's often non-fatal and keeping it would help debugging.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f93d461b

sound/pci/hda/hda_codec.c

+17 −5
Original line number Diff line number Diff line
@@ -2833,9 +2833,17 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec) 
		if (!codec->patch_ops.build_pcms)

			return 0;

		err = codec->patch_ops.build_pcms(codec);

		if (err < 0)

		if (err < 0) {

			printk(KERN_ERR "hda_codec: cannot build PCMs"

			       "for #%d (error %d)\n", codec->addr, err); 

			err = snd_hda_codec_reset(codec);

			if (err < 0) {

				printk(KERN_ERR

				       "hda_codec: cannot revert codec\n");

				return err;

			}

		}

	}

	for (pcm = 0; pcm < codec->num_pcms; pcm++) {

		struct hda_pcm *cpcm = &codec->pcm_info[pcm];

		int dev;
@@ -2846,11 +2854,15 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec) 
		if (!cpcm->pcm) {

			dev = get_empty_pcm_device(codec->bus, cpcm->pcm_type);

			if (dev < 0)

				return 0;

				continue; /* no fatal error */

			cpcm->device = dev;

			err = snd_hda_attach_pcm(codec, cpcm);

			if (err < 0)

				return err;

			if (err < 0) {

				printk(KERN_ERR "hda_codec: cannot attach "

				       "PCM stream %d for codec #%d\n",

				       dev, codec->addr);

				continue; /* no fatal error */

			}

		}

	}

	return 0;