diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-09 19:32:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-09 19:32:12 +0200 |
| commit | 824f63b6be4c3de13da6b3c88c4c9f5db696e8c8 (patch) | |
| tree | 05e64442d4ae42a57f5790ae132ef9d4e107ae1a | |
| parent | 6b2970c46a49e96e1aabb70033dcb5cc818491f2 (diff) | |
| download | alsa-driver-build-unstable-824f63b6be4c3de13da6b3c88c4c9f5db696e8c8.tar.gz | |
Refresh info.patch for BKL removal changes
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | acore/info.patch | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/acore/info.patch b/acore/info.patch index b0a58d4ce..eba6f6083 100644 --- a/acore/info.patch +++ b/acore/info.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/core/info.c 2009-07-06 14:32:55.000000000 +0200 -+++ info.c 2009-07-06 14:39:42.000000000 +0200 +--- ../alsa-kernel/core/info.c 2010-04-09 17:37:52.473468020 +0200 ++++ info.c 2010-04-09 19:27:27.688965183 +0200 @@ -1,3 +1,4 @@ +#include "info.inc" /* @@ -39,27 +39,7 @@ static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig) { struct snd_info_private_data *data; -@@ -167,7 +169,9 @@ - - data = file->private_data; - entry = data->entry; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3) - lock_kernel(); -+#endif - switch (entry->content) { - case SNDRV_INFO_CONTENT_TEXT: - switch (orig) { -@@ -196,7 +200,9 @@ - } - ret = -ENXIO; - out: -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3) - unlock_kernel(); -+#endif - return ret; - } - -@@ -481,9 +487,26 @@ +@@ -481,9 +483,26 @@ return -ENOTTY; } @@ -86,7 +66,7 @@ struct snd_info_private_data *data; struct snd_info_entry *entry; -@@ -504,22 +527,35 @@ +@@ -504,22 +523,35 @@ static const struct file_operations snd_info_entry_operations = { @@ -123,7 +103,7 @@ if (p == NULL) return -ENOMEM; snd_proc_root = p; -@@ -907,6 +943,7 @@ +@@ -907,6 +939,7 @@ EXPORT_SYMBOL(snd_card_proc_new); @@ -131,7 +111,7 @@ /** * snd_info_free_entry - release the info entry * @entry: the info entry -@@ -946,13 +983,21 @@ +@@ -946,13 +979,21 @@ return -ENXIO; root = entry->parent == NULL ? snd_proc_root : entry->parent->p; mutex_lock(&info_mutex); @@ -155,7 +135,7 @@ p->size = entry->size; p->data = entry; entry->p = p; -@@ -972,9 +1017,19 @@ +@@ -972,9 +1013,19 @@ static void snd_info_version_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) { |