1 files changed, 25 insertions, 13 deletions

diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index bec94138205e..6751daa3bb50 100644
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -62,7 +62,8 @@ static int snd_pcm_plugin_alloc(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t
         if ((width = snd_pcm_format_physical_width(format->format)) < 0)
                 return width;
         size = frames * format->channels * width;
-        snd_assert((size % 8) == 0, return -ENXIO);
+        if (snd_BUG_ON(size % 8))
+                return -ENXIO;
         size /= 8;
         if (plugin->buf_frames < frames) {
                 vfree(plugin->buf);
@@ -84,7 +85,8 @@ static int snd_pcm_plugin_alloc(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t
                         c->area.step = format->channels * width;
                 }
         } else if (plugin->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
-                snd_assert((size % format->channels) == 0,);
+                if (snd_BUG_ON(size % format->channels))
+                        return -EINVAL;
                 size /= format->channels;
                 for (channel = 0; channel < format->channels; channel++, c++) {
                         c->frames = frames;
@@ -102,13 +104,15 @@ static int snd_pcm_plugin_alloc(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t
 int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)
 {
         int err;
-        snd_assert(snd_pcm_plug_first(plug) != NULL, return -ENXIO);
+        if (snd_BUG_ON(!snd_pcm_plug_first(plug)))
+                return -ENXIO;
         if (snd_pcm_plug_stream(plug) == SNDRV_PCM_STREAM_PLAYBACK) {
                 struct snd_pcm_plugin *plugin = snd_pcm_plug_first(plug);
                 while (plugin->next) {
                         if (plugin->dst_frames)
                                 frames = plugin->dst_frames(plugin, frames);
-                        snd_assert(frames > 0, return -ENXIO);
+                        if (snd_BUG_ON(frames <= 0))
+                                return -ENXIO;
                         plugin = plugin->next;
                         err = snd_pcm_plugin_alloc(plugin, frames);
                         if (err < 0)
@@ -119,7 +123,8 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)
                 while (plugin->prev) {
                         if (plugin->src_frames)
                                 frames = plugin->src_frames(plugin, frames);
-                        snd_assert(frames > 0, return -ENXIO);
+                        if (snd_BUG_ON(frames <= 0))
+                                return -ENXIO;
                         plugin = plugin->prev;
                         err = snd_pcm_plugin_alloc(plugin, frames);
                         if (err < 0)
@@ -148,8 +153,10 @@ int snd_pcm_plugin_build(struct snd_pcm_substream *plug,
         struct snd_pcm_plugin *plugin;
         unsigned int channels;
         
-        snd_assert(plug != NULL, return -ENXIO);
-        snd_assert(src_format != NULL && dst_format != NULL, return -ENXIO);
+        if (snd_BUG_ON(!plug))
+                return -ENXIO;
+        if (snd_BUG_ON(!src_format || !dst_format))
+                return -ENXIO;
         plugin = kzalloc(sizeof(*plugin) + extra, GFP_KERNEL);
         if (plugin == NULL)
                 return -ENOMEM;
@@ -159,10 +166,10 @@ int snd_pcm_plugin_build(struct snd_pcm_substream *plug,
         plugin->access = SNDRV_PCM_ACCESS_RW_INTERLEAVED;
         plugin->src_format = *src_format;
         plugin->src_width = snd_pcm_format_physical_width(src_format->format);
-        snd_assert(plugin->src_width > 0, );
+        snd_BUG_ON(plugin->src_width <= 0);
         plugin->dst_format = *dst_format;
         plugin->dst_width = snd_pcm_format_physical_width(dst_format->format);
-        snd_assert(plugin->dst_width > 0, );
+        snd_BUG_ON(plugin->dst_width <= 0);
         if (plugin->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 channels = src_format->channels;
         else
@@ -194,7 +201,8 @@ snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_p
         struct snd_pcm_plugin *plugin, *plugin_prev, *plugin_next;
         int stream = snd_pcm_plug_stream(plug);
 
-        snd_assert(plug != NULL, return -ENXIO);
+        if (snd_BUG_ON(!plug))
+                return -ENXIO;
         if (drv_frames == 0)
                 return 0;
         if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
@@ -224,7 +232,8 @@ snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *plug, snd_pc
         snd_pcm_sframes_t frames;
         int stream = snd_pcm_plug_stream(plug);
         
-        snd_assert(plug != NULL, return -ENXIO);
+        if (snd_BUG_ON(!plug))
+                return -ENXIO;
         if (clt_frames == 0)
                 return 0;
         frames = clt_frames;
@@ -540,7 +549,8 @@ snd_pcm_sframes_t snd_pcm_plug_client_channels_buf(struct snd_pcm_substream *plu
         int width, nchannels, channel;
         int stream = snd_pcm_plug_stream(plug);
 
-        snd_assert(buf != NULL, return -ENXIO);
+        if (snd_BUG_ON(!buf))
+                return -ENXIO;
         if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 plugin = snd_pcm_plug_first(plug);
                 format = &plugin->src_format;
@@ -553,7 +563,9 @@ snd_pcm_sframes_t snd_pcm_plug_client_channels_buf(struct snd_pcm_substream *plu
         if ((width = snd_pcm_format_physical_width(format->format)) < 0)
                 return width;
         nchannels = format->channels;
-        snd_assert(plugin->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED || format->channels <= 1, return -ENXIO);
+        if (snd_BUG_ON(plugin->access != SNDRV_PCM_ACCESS_RW_INTERLEAVED &&
+                       format->channels > 1))
+                return -ENXIO;
         for (channel = 0; channel < nchannels; channel++, v++) {
                 v->frames = count;
                 v->enabled = 1;