Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[~andy/linux] / sound / sound_core.c

diff --git a/sound/sound_core.c b/sound/sound_core.c
index cb61317df509690fd597cb0385647af63d5a0e06..c03bbaefdbc36c623e3f5b76cea86f6ad59e46cc 100644 (file)
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -165,6 +165,7 @@ static const struct file_operations soundcore_fops =
        /* We must have an owner or the module locking fails */
        .owner  = THIS_MODULE,
        .open   = soundcore_open,
+       .llseek = noop_llseek,
 };
 
 /*