diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-04-13 05:24:34 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-04-13 05:24:34 -0400 |
commit | 067e4a5d23422c9e9a0787b7e18fa2457226d999 (patch) | |
tree | 550ab9dc96efe513b2ffeafbff6662f8caaa68ef /sound/core/info.c | |
parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
parent | 4cf19b848f92641eeb2585949a09eedec57fb53a (diff) |
Merge branch 'topic/bkl' into topic/core-cleanup
Diffstat (limited to 'sound/core/info.c')
-rw-r--r-- | sound/core/info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/info.c b/sound/core/info.c index cc4a53d4b7f8..ff968be81678 100644 --- 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) | |||
168 | 168 | ||
169 | data = file->private_data; | 169 | data = file->private_data; |
170 | entry = data->entry; | 170 | entry = data->entry; |
171 | lock_kernel(); | 171 | mutex_lock(&entry->access); |
172 | switch (entry->content) { | 172 | switch (entry->content) { |
173 | case SNDRV_INFO_CONTENT_TEXT: | 173 | case SNDRV_INFO_CONTENT_TEXT: |
174 | switch (orig) { | 174 | switch (orig) { |
@@ -197,7 +197,7 @@ static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig) | |||
197 | } | 197 | } |
198 | ret = -ENXIO; | 198 | ret = -ENXIO; |
199 | out: | 199 | out: |
200 | unlock_kernel(); | 200 | mutex_unlock(&entry->access); |
201 | return ret; | 201 | return ret; |
202 | } | 202 | } |
203 | 203 | ||