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
This commit is contained in:
commit
649cf0ff4b
1 changed files with 7 additions and 5 deletions
|
@ -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;
|
||||
|
|
Reference in a new issue