Merge branch 'topic/bkl' into topic/core-cleanup

[pandora-kernel.git] / sound / core / info.c

diff --git a/sound/core/info.c b/sound/core/info.c
index cc4a53d..ff968be 100644 (file)
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -168,7 +168,7 @@ static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
 
        data = file->private_data;
        entry = data->entry;
-       lock_kernel();
+       mutex_lock(&entry->access);
        switch (entry->content) {
        case SNDRV_INFO_CONTENT_TEXT:
                switch (orig) {
@@ -197,7 +197,7 @@ static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
        }
        ret = -ENXIO;
 out:
-       unlock_kernel();
+       mutex_unlock(&entry->access);
        return ret;
 }