2 files changed, 16 insertions, 3 deletions

diff --git a/sound/core/seq/oss/seq_oss_event.c b/sound/core/seq/oss/seq_oss_event.c
index 066f5f3e3f4c..c3908862bc8b 100644
--- a/sound/core/seq/oss/seq_oss_event.c
+++ b/sound/core/seq/oss/seq_oss_event.c
@@ -285,7 +285,12 @@ local_event(struct seq_oss_devinfo *dp, union evrec *q, struct snd_seq_event *ev
 static int
 note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, struct snd_seq_event *ev)
 {
-        struct seq_oss_synthinfo *info = &dp->synths[dev];
+        struct seq_oss_synthinfo *info;
+
+        if (!snd_seq_oss_synth_is_valid(dp, dev))
+                return -ENXIO;
+
+        info = &dp->synths[dev];
         switch (info->arg.event_passing) {
         case SNDRV_SEQ_OSS_PROCESS_EVENTS:
                 if (! info->ch || ch < 0 || ch >= info->nr_voices) {
@@ -340,7 +345,12 @@ note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, st
 static int
 note_off_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, struct snd_seq_event *ev)
 {
-        struct seq_oss_synthinfo *info = &dp->synths[dev];
+        struct seq_oss_synthinfo *info;
+
+        if (!snd_seq_oss_synth_is_valid(dp, dev))
+                return -ENXIO;
+
+        info = &dp->synths[dev];
         switch (info->arg.event_passing) {
         case SNDRV_SEQ_OSS_PROCESS_EVENTS:
                 if (! info->ch || ch < 0 || ch >= info->nr_voices) {
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 857586135d18..0097f3619faa 100644
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -213,7 +213,10 @@ static int slave_put(struct snd_kcontrol *kcontrol,
         }
         if (!changed)
                 return 0;
-        return slave_put_val(slave, ucontrol);
+        err = slave_put_val(slave, ucontrol);
+        if (err < 0)
+                return err;
+        return 1;
 }
 
 static int slave_tlv_cmd(struct snd_kcontrol *kcontrol,