Merge branch 'for-linus' into for-next

[mirror_ubuntu-zesty-kernel.git] / sound / core / oss / linear.c

diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c
index 13b3f6f49fae3c8624b8d47e44b24268be211b3c..2045697f449d3f5ebe347572dc2dfba66b64568a 100644 (file)
--- 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