aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/oss
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-03-24 12:01:15 +0100
committerJaroslav Kysela <perex@suse.cz>2005-05-29 09:00:11 +0200
commit94f19c9a6da1fd3a5958f1a0b44aa340f2596a5b (patch)
tree25934824d74c8534a53283eb3a5a90e9e2408b03 /sound/core/oss
parentAutomatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/hch/xfs-2.6 (diff)
downloadlinux-dev-94f19c9a6da1fd3a5958f1a0b44aa340f2596a5b.tar.xz
linux-dev-94f19c9a6da1fd3a5958f1a0b44aa340f2596a5b.zip
[ALSA] kill dead code
ALSA<-OSS emulation The Coverity checker found this obviously dead code. I'm not sure which of the if (plugin == NULL) is correct - this patch removes the one that couldn't be true. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/oss')
-rw-r--r--sound/core/oss/pcm_plugin.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index 6bb31009f0b4..6430410c6c04 100644
--- 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)