OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[uclinux-h8/linux.git]
/
sound
/
synth
/
emux
/
emux_oss.c
diff --git
a/sound/synth/emux/emux_oss.c
b/sound/synth/emux/emux_oss.c
index
82e350e
..
ac75816
100644
(file)
--- a/
sound/synth/emux/emux_oss.c
+++ b/
sound/synth/emux/emux_oss.c
@@
-69,7
+69,8
@@
snd_emux_init_seq_oss(struct snd_emux *emu)
struct snd_seq_oss_reg *arg;
struct snd_seq_device *dev;
struct snd_seq_oss_reg *arg;
struct snd_seq_device *dev;
- if (snd_seq_device_new(emu->card, 0, SNDRV_SEQ_DEV_ID_OSS,
+ /* using device#1 here for avoiding conflicts with OPL3 */
+ if (snd_seq_device_new(emu->card, 1, SNDRV_SEQ_DEV_ID_OSS,
sizeof(struct snd_seq_oss_reg), &dev) < 0)
return;
sizeof(struct snd_seq_oss_reg), &dev) < 0)
return;