Merge tag 'v2.6.33' for its firewire changes since last branch point

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index 7fe12264ff80..0c164e5e4322 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;
 }