diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
tree | e72d346172a30bbee165d7f585784724906da416 /sound/oss | |
parent | dd1d3a49db4ae5c6afffadaff526b96c7993c7dd (diff) | |
parent | d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 (diff) |
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) | |||
392 | case SND_DEV_DSP: | 392 | case SND_DEV_DSP: |
393 | case SND_DEV_DSP16: | 393 | case SND_DEV_DSP16: |
394 | case SND_DEV_AUDIO: | 394 | case SND_DEV_AUDIO: |
395 | return audio_ioctl(dev, file, cmd, p); | 395 | ret = audio_ioctl(dev, file, cmd, p); |
396 | break; | 396 | break; |
397 | 397 | ||
398 | case SND_DEV_MIDIN: | 398 | case SND_DEV_MIDIN: |
399 | return MIDIbuf_ioctl(dev, file, cmd, p); | 399 | ret = MIDIbuf_ioctl(dev, file, cmd, p); |
400 | break; | 400 | break; |
401 | 401 | ||
402 | } | 402 | } |