diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-16 10:23:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-16 10:23:21 -0700 |
| commit | 649cf0ff4b998e3082c6d9d8673eaab71f3de656 (patch) | |
| tree | d003559e5f27ca4038f406f61af707166c135965 | |
| parent | 626a16c16e13e4afaba382bfc0354a3555f5231c (diff) | |
| parent | 9f9115d880ca550922434aee05ca18796c58eb99 (diff) | |
| download | linux-649cf0ff4b998e3082c6d9d8673eaab71f3de656.tar.gz linux-649cf0ff4b998e3082c6d9d8673eaab71f3de656.tar.bz2 linux-649cf0ff4b998e3082c6d9d8673eaab71f3de656.zip | |
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
| -rw-r--r-- | 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 cc0cddadd589..6facac5aed90 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; |