aboutsummaryrefslogtreecommitdiff
path: root/sound/core/oss/linear.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-27 08:02:59 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-27 08:02:59 +0200
commitd1227e3fe0c63a258db855f4f1536b0b34cd8725 (patch)
treed1fba37609a1b357eeb1051d0a6709385dd3bf90 /sound/core/oss/linear.c
parent9477c58e3308f54a108a5d1eb9621830b329b0ca (diff)
parent78fa2c4d2465d014e67d3e12d948425856587251 (diff)
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/core/oss/linear.c')
-rw-r--r--sound/core/oss/linear.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c
index 13b3f6f49fa..2045697f449 100644
--- a/sound/core/oss/linear.c
+++ b/sound/core/oss/linear.c
@@ -90,11 +90,8 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,
struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames)
{
- struct linear_priv *data;
-
if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))
return -ENXIO;
- data = (struct linear_priv *)plugin->extra_data;
if (frames == 0)
return 0;
#ifdef CONFIG_SND_DEBUG