diff --git a/[refs] b/[refs] index 496a03c0eaf5..7b60a15eab3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d05468b72a32ec45aefb48caa00bd99350b9cf86 +refs/heads/master: 5b5cd553e3ac49e6a9bac148f07ab94d3d96dae5 diff --git a/trunk/sound/core/info.c b/trunk/sound/core/info.c index d749a0d394a7..fe836618fa25 100644 --- a/trunk/sound/core/info.c +++ b/trunk/sound/core/info.c @@ -167,7 +167,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) { @@ -196,7 +196,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; }