diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-10 15:44:59 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-10 15:44:59 +0100 |
| commit | 14e99ddb45763392108c048127b3d1f7a2b465df (patch) | |
| tree | 5bbd84451a1781298fbf96644ecf6ba6acacdc5c /sound | |
| parent | 340cedd5fabcc7ef6d561231aa682781aa14bb17 (diff) | |
| parent | 9196508ba2d5fc1ed5f7f1d929fec27d191f533d (diff) | |
Merge branch 'topic/misc' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/oss/mixer_oss.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c index 4690b8b5681f..e570649184e2 100644 --- a/sound/core/oss/mixer_oss.c +++ b/sound/core/oss/mixer_oss.c @@ -692,6 +692,9 @@ static int snd_mixer_oss_put_volume1(struct snd_mixer_oss_file *fmixer, snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PVOLUME], left, right); if (slot->present & SNDRV_MIXER_OSS_PRESENT_CVOLUME) snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CVOLUME], left, right); + } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_CVOLUME) { + snd_mixer_oss_put_volume1_vol(fmixer, pslot, + slot->numid[SNDRV_MIXER_OSS_ITEM_CVOLUME], left, right); } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GVOLUME) { snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GVOLUME], left, right); } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GLOBAL) { |