aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-01-18 14:16:24 +0100
committerTakashi Iwai <tiwai@suse.de>2010-01-18 14:18:55 +0100
commit808c569f3609b37642d1e08373e3de829b99d0f8 (patch)
tree11c857dc1e74bcfd13efc02207fe61b1d46469d3 /sound
parentc181a13a41ef32c9037393f4b42b780e1a36eb91 (diff)
downloadlinux-2.6.34-ux500-808c569f3609b37642d1e08373e3de829b99d0f8.tar.gz
ALSA: Remove warning message for invalid OSS minor ranges
When a card instance with a higher card number is registered, warning messages are spewed eventually with stack traces due to the invalid minor number for OSS device registration. For example, thinkpad-acpi registers the card number 29 as default, and you'll see always these messages. This is rather confusing (and worries users), thus better to return simply the error code. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/sound_oss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index 7fe12264ff8..0c164e5e432 100644
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -93,7 +93,7 @@ static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)
default:
return -EINVAL;
}
- if (snd_BUG_ON(minor < 0 || minor >= SNDRV_OSS_MINORS))
+ if (minor < 0 || minor >= SNDRV_OSS_MINORS)
return -EINVAL;
return minor;
}