From 35972ae47e26fffcec7cf77c32deeceaa549d902 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Thu, 24 Mar 2005 12:01:15 +0100
Subject: [PATCH] --- yaml --- r: 1469 b: refs/heads/master c:
 94f19c9a6da1fd3a5958f1a0b44aa340f2596a5b h: refs/heads/master i:   1467:
 f938494cd0e71d094e8e236788c362fd5b796ac6 v: v3

---
 [refs]                            | 2 +-
 trunk/sound/core/oss/pcm_plugin.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 628cb9dec434..0e55c29d32f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 254feb882a7c6e4e51416dff6a97d847fbbba551
+refs/heads/master: 94f19c9a6da1fd3a5958f1a0b44aa340f2596a5b
diff --git a/trunk/sound/core/oss/pcm_plugin.c b/trunk/sound/core/oss/pcm_plugin.c
index 6bb31009f0b4..6430410c6c04 100644
--- a/trunk/sound/core/oss/pcm_plugin.c
+++ b/trunk/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)