diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-09 10:51:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-09 10:51:45 +0200 |
| commit | c8bdfacb63c85d39ff55d365f1e48cce011b219e (patch) | |
| tree | 402f659bdb919064dd7bced98c59de63994abe03 /sound/core | |
| parent | add7c0a6a4b8669ebd726f9c08ba6002900ca671 (diff) | |
| parent | a7a13d0676335a7dc9dd72264cca02606e43aaba (diff) | |
| download | linux-stable-c8bdfacb63c85d39ff55d365f1e48cce011b219e.tar.gz linux-stable-c8bdfacb63c85d39ff55d365f1e48cce011b219e.tar.bz2 linux-stable-c8bdfacb63c85d39ff55d365f1e48cce011b219e.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/rawmidi.c | 2 | ||||
| -rw-r--r-- | sound/core/seq/oss/seq_oss_init.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index eb68326c37d4..a7868ad4d530 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -829,6 +829,8 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card, if (get_user(device, (int __user *)argp)) return -EFAULT; + if (device >= SNDRV_RAWMIDI_DEVICES) /* next device is -1 */ + device = SNDRV_RAWMIDI_DEVICES - 1; mutex_lock(®ister_mutex); device = device < 0 ? 0 : device + 1; while (device < SNDRV_RAWMIDI_DEVICES) { diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c index 685712276ac9..69cd7b3c362d 100644 --- a/sound/core/seq/oss/seq_oss_init.c +++ b/sound/core/seq/oss/seq_oss_init.c @@ -281,13 +281,10 @@ snd_seq_oss_open(struct file *file, int level) return 0; _error: - snd_seq_oss_writeq_delete(dp->writeq); - snd_seq_oss_readq_delete(dp->readq); snd_seq_oss_synth_cleanup(dp); snd_seq_oss_midi_cleanup(dp); - delete_port(dp); delete_seq_queue(dp->queue); - kfree(dp); + delete_port(dp); return rc; } @@ -350,8 +347,10 @@ create_port(struct seq_oss_devinfo *dp) static int delete_port(struct seq_oss_devinfo *dp) { - if (dp->port < 0) + if (dp->port < 0) { + kfree(dp); return 0; + } debug_printk(("delete_port %i\n", dp->port)); return snd_seq_event_port_detach(dp->cseq, dp->port); |