Messages in this thread Patch in this message |  | | Date | Mon, 16 Jun 2008 18:50:02 +0200 | From | Takashi Iwai <> | Subject | [GIT PULL] ALSA fix for 2.6.26-rc6 |
| |
Hi Linus,
please pull ALSA fix for 2.6.26-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
Thanks!
Takashi
===
Clemens Ladisch (1): sound: oxygen: fix NULL pointer dereference when loading snd-oxygen
sound/pci/oxygen/oxygen_mixer.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index cc0cdda..6facac5 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -936,11 +936,13 @@ static int add_controls(struct oxygen *chip, for (i = 0; i < count; ++i) { template = controls[i]; - err = chip->model->control_filter(&template); - if (err < 0) - return err; - if (err == 1) - continue; + 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;
|  |