diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-11 13:45:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 13:45:22 +0200 |
| commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
| tree | e72d346172a30bbee165d7f585784724906da416 /sound/oss | |
| parent | ALSA: oxygen - Add a SSID for CMI8787-HG2PCI (diff) | |
| parent | OSS: soundcard: locking bug in sound_ioctl() (diff) | |
| download | linux-4e83998f5af010a928495988c586ea2926624db9.tar.xz linux-4e83998f5af010a928495988c586ea2926624db9.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/soundcard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index 938ed94f904f..a5ab61ed0a97 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c @@ -392,11 +392,11 @@ static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case SND_DEV_DSP: case SND_DEV_DSP16: case SND_DEV_AUDIO: - return audio_ioctl(dev, file, cmd, p); + ret = audio_ioctl(dev, file, cmd, p); break; case SND_DEV_MIDIN: - return MIDIbuf_ioctl(dev, file, cmd, p); + ret = MIDIbuf_ioctl(dev, file, cmd, p); break; } |