aboutsummaryrefslogtreecommitdiffstats
path: root/sound/sound_core.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-03-09 11:33:48 -0500
committerTakashi Iwai <tiwai@suse.de>2011-03-09 14:10:37 -0500
commit848669da3a92fa6ab815e0517af3294afb3ea928 (patch)
treeac00a24c870f08e069397c94d506ae263c0bd1c1 /sound/sound_core.c
parenta2800300f28bd1814f3ba8cfd93ecb0b00c2dfe3 (diff)
sound: Use sound_register_*() for additional OSS minor devices
Since OSS driver creates the device entries for /dev/audio* and /dev/dspW* by itself without coping with sound_core, it leads to conflicts with others and let sysfs spewing warnings. This patch rewrites the registration part of OSS driver to use the standard method also for additional minor devices. Reported-by: Steven Rostedt <rostedt@goodmis.org> (with ktest.pl) Tested-by: Steven Rostedt <rostedt@goodmis.org> (with ktest.pl) Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/sound_core.c')
-rw-r--r--sound/sound_core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 5580aced873..6ce277860fd 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -384,6 +384,9 @@ int register_sound_special_device(const struct file_operations *fops, int unit,
384 case 4: 384 case 4:
385 name = "audio"; 385 name = "audio";
386 break; 386 break;
387 case 5:
388 name = "dspW";
389 break;
387 case 8: 390 case 8:
388 name = "sequencer2"; 391 name = "sequencer2";
389 if (unit >= SOUND_STEP) 392 if (unit >= SOUND_STEP)