Commit 9f9115d8 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai

sound: oxygen: fix NULL pointer dereference when loading snd-oxygen

Check that model->control_filter is set before trying to call it.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 06651906
...@@ -936,11 +936,13 @@ static int add_controls(struct oxygen *chip, ...@@ -936,11 +936,13 @@ static int add_controls(struct oxygen *chip,
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
template = controls[i]; template = controls[i];
err = chip->model->control_filter(&template); if (chip->model->control_filter) {
if (err < 0) err = chip->model->control_filter(&template);
return err; if (err < 0)
if (err == 1) return err;
continue; if (err == 1)
continue;
}
if (!strcmp(template.name, "Master Playback Volume") && if (!strcmp(template.name, "Master Playback Volume") &&
chip->model->dac_tlv) { chip->model->dac_tlv) {
template.tlv.p = chip->model->dac_tlv; template.tlv.p = chip->model->dac_tlv;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment