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

Commit 649cf0ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  sound: oxygen: fix NULL pointer dereference when loading snd-oxygen
parents 626a16c1 9f9115d8

sound/pci/oxygen/oxygen_mixer.c

+7 −5
Original line number Diff line number Diff line
@@ -936,11 +936,13 @@ static int add_controls(struct oxygen *chip, 


	for (i = 0; i < count; ++i) {

		template = controls[i];

		if (chip->model->control_filter) {

			err = chip->model->control_filter(&template);

			if (err < 0)

				return err;

			if (err == 1)

				continue;

		}

		if (!strcmp(template.name, "Master Playback Volume") &&

		    chip->model->dac_tlv) {

			template.tlv.p = chip->model->dac_tlv;