Merge branch 'topic/oss' into for-linus

[pandora-kernel.git] / sound / core / oss / mixer_oss.c

diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index e570649..7724238 100644 (file)
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -703,19 +703,27 @@ static int snd_mixer_oss_put_volume1(struct snd_mixer_oss_file *fmixer,
        if (left || right) {
                if (slot->present & SNDRV_MIXER_OSS_PRESENT_PSWITCH)
                        snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PSWITCH], left, right, 0);
+               if (slot->present & SNDRV_MIXER_OSS_PRESENT_CSWITCH)
+                       snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CSWITCH], left, right, 0);
                if (slot->present & SNDRV_MIXER_OSS_PRESENT_GSWITCH)
                        snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GSWITCH], left, right, 0);
                if (slot->present & SNDRV_MIXER_OSS_PRESENT_PROUTE)
                        snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PROUTE], left, right, 1);
+               if (slot->present & SNDRV_MIXER_OSS_PRESENT_CROUTE)
+                       snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CROUTE], left, right, 1);
                if (slot->present & SNDRV_MIXER_OSS_PRESENT_GROUTE)
                        snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GROUTE], left, right, 1);
        } else {
                if (slot->present & SNDRV_MIXER_OSS_PRESENT_PSWITCH) {
                        snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PSWITCH], left, right, 0);
+               } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_CSWITCH) {
+                       snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CSWITCH], left, right, 0);
                } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GSWITCH) {
                        snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GSWITCH], left, right, 0);
                } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_PROUTE) {
                        snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PROUTE], left, right, 1);
+               } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_CROUTE) {
+                       snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CROUTE], left, right, 1);
                } else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GROUTE) {
                        snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GROUTE], left, right, 1);
                }
@@ -1146,7 +1154,8 @@ static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,
                                     struct snd_info_buffer *buffer)
 {
        struct snd_mixer_oss *mixer = entry->private_data;
-       char line[128], str[32], idxstr[16], *cptr;
+       char line[128], str[32], idxstr[16];
+       const char *cptr;
        int ch, idx;
        struct snd_mixer_oss_assign_table *tbl;
        struct slot *slot;