Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / sound / core / oss / pcm_plugin.c

diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index 6bb31009f0b4996949981c129b0cc94b29b1b7ce..6430410c6c04703af940b04f377b15fdb304572a 100644 (file)
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -663,10 +663,7 @@ static int snd_pcm_plug_playback_channels_mask(snd_pcm_plug_t *plug,
                bitset_t *dstmask = bs;
                int err;
                bitset_one(dstmask, schannels);
-               if (plugin == NULL) {
-                       bitset_and(client_vmask, dstmask, schannels);
-                       return 0;
-               }
+
                while (1) {
                        err = plugin->src_channels_mask(plugin, dstmask, &srcmask);
                        if (err < 0)