tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 649cf0ff 626a16c1

+7 -5
unified split
+7 -5
sound/pci/oxygen/oxygen_mixer.c
··· 936 937 for (i = 0; i < count; ++i) { 938 template = controls[i]; 939 - err = chip->model->control_filter(&template); 940 - if (err < 0) 941 - return err; 942 - if (err == 1) 943 - continue; 944 if (!strcmp(template.name, "Master Playback Volume") && 945 chip->model->dac_tlv) { 946 template.tlv.p = chip->model->dac_tlv;
··· 936 937 for (i = 0; i < count; ++i) { 938 template = controls[i]; 939 + if (chip->model->control_filter) { 940 + err = chip->model->control_filter(&template); 941 + if (err < 0) 942 + return err; 943 + if (err == 1) 944 + continue; 945 + } 946 if (!strcmp(template.name, "Master Playback Volume") && 947 chip->model->dac_tlv) { 948 template.tlv.p = chip->model->dac_tlv;