Merge branch 'topic/oss' into for-linus

[pandora-kernel.git] / sound / core / oss / io.c

diff --git a/sound/core/oss/io.c b/sound/core/oss/io.c
index f874f6c..6faa1d7 100644 (file)
--- a/sound/core/oss/io.c
+++ b/sound/core/oss/io.c
@@ -39,14 +39,17 @@ static snd_pcm_sframes_t io_playback_transfer(struct snd_pcm_plugin *plugin,
                                    struct snd_pcm_plugin_channel *dst_channels,
                                    snd_pcm_uframes_t frames)
 {
-       snd_assert(plugin != NULL, return -ENXIO);
-       snd_assert(src_channels != NULL, return -ENXIO);
+       if (snd_BUG_ON(!plugin))
+               return -ENXIO;
+       if (snd_BUG_ON(!src_channels))
+               return -ENXIO;
        if (plugin->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED) {
                return pcm_write(plugin->plug, src_channels->area.addr, frames);
        } else {
                int channel, channels = plugin->dst_format.channels;
                void **bufs = (void**)plugin->extra_data;
-               snd_assert(bufs != NULL, return -ENXIO);
+               if (snd_BUG_ON(!bufs))
+                       return -ENXIO;
                for (channel = 0; channel < channels; channel++) {
                        if (src_channels[channel].enabled)
                                bufs[channel] = src_channels[channel].area.addr;
@@ -62,14 +65,17 @@ static snd_pcm_sframes_t io_capture_transfer(struct snd_pcm_plugin *plugin,
                                   struct snd_pcm_plugin_channel *dst_channels,
                                   snd_pcm_uframes_t frames)
 {
-       snd_assert(plugin != NULL, return -ENXIO);
-       snd_assert(dst_channels != NULL, return -ENXIO);
+       if (snd_BUG_ON(!plugin))
+               return -ENXIO;
+       if (snd_BUG_ON(!dst_channels))
+               return -ENXIO;
        if (plugin->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED) {
                return pcm_read(plugin->plug, dst_channels->area.addr, frames);
        } else {
                int channel, channels = plugin->dst_format.channels;
                void **bufs = (void**)plugin->extra_data;
-               snd_assert(bufs != NULL, return -ENXIO);
+               if (snd_BUG_ON(!bufs))
+                       return -ENXIO;
                for (channel = 0; channel < channels; channel++) {
                        if (dst_channels[channel].enabled)
                                bufs[channel] = dst_channels[channel].area.addr;
@@ -107,9 +113,11 @@ int snd_pcm_plugin_build_io(struct snd_pcm_substream *plug,
        struct snd_pcm_plugin_format format;
        struct snd_pcm_plugin *plugin;
 
-       snd_assert(r_plugin != NULL, return -ENXIO);
+       if (snd_BUG_ON(!r_plugin))
+               return -ENXIO;
        *r_plugin = NULL;
-       snd_assert(plug != NULL && params != NULL, return -ENXIO);
+       if (snd_BUG_ON(!plug || !params))
+               return -ENXIO;
        format.format = params_format(params);
        format.rate = params_rate(params);
        format.channels = params_channels(params);