diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-19 03:37:31 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-19 03:37:31 -0400 |
| commit | d819c49da624e3ee09b2844603d58265039eecdd (patch) | |
| tree | 09a503b98769767d81337ec8e5c14c60874a4e77 /sound/pci/oxygen/oxygen_mixer.c | |
| parent | f18f982abf183e91f435990d337164c7a43d1e6d (diff) | |
| parent | 9bedbcb207ed9a571b239231d99c8fd4a34ae24d (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'sound/pci/oxygen/oxygen_mixer.c')
| -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, | |||
| 936 | 936 | ||
| 937 | for (i = 0; i < count; ++i) { | 937 | for (i = 0; i < count; ++i) { |
| 938 | template = controls[i]; | 938 | template = controls[i]; |
| 939 | err = chip->model->control_filter(&template); | 939 | if (chip->model->control_filter) { |
| 940 | if (err < 0) | 940 | err = chip->model->control_filter(&template); |
| 941 | return err; | 941 | if (err < 0) |
| 942 | if (err == 1) | 942 | return err; |
| 943 | continue; | 943 | if (err == 1) |
| 944 | continue; | ||
| 945 | } | ||
| 944 | if (!strcmp(template.name, "Master Playback Volume") && | 946 | if (!strcmp(template.name, "Master Playback Volume") && |
| 945 | chip->model->dac_tlv) { | 947 | chip->model->dac_tlv) { |
| 946 | template.tlv.p = chip->model->dac_tlv; | 948 | template.tlv.p = chip->model->dac_tlv; |