Merge branch 'fix/misc' into topic/misc

This commit is contained in:
Takashi Iwai 2010-10-11 13:45:22 +02:00
commit 4e83998f5a
594 changed files with 5027 additions and 3162 deletions

View file

@ -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;
}