Refresh acore/info.patch

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 21 insertions, 21 deletions

diff --git a/alsa/acore/info.patch b/alsa/acore/info.patch
index 8ff855000..03b279103 100644
--- a/alsa/acore/info.patch
+++ b/alsa/acore/info.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/info.c	2015-04-27 12:25:57.296617927 +0200
-+++ info.c	2015-04-27 17:47:07.408725107 +0200
+--- ../alsa-kernel/core/info.c	2015-05-18 11:26:57.088632828 +0200
++++ info.c	2015-05-19 13:16:49.230323229 +0200
 @@ -1,3 +1,7 @@
 +#define __NO_VERSION__
 +#include "adriver.h"
@@ -8,7 +8,7 @@
  /*
   *  Information interface for ALSA driver
   *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
-@@ -114,6 +118,25 @@ static bool valid_pos(loff_t pos, size_t
+@@ -114,6 +118,25 @@
  	return true;
  }
  
@@ -34,7 +34,7 @@
  /*
   * file ops for binary proc files
   */
-@@ -232,9 +255,28 @@ static long snd_info_entry_ioctl(struct
+@@ -232,9 +255,28 @@
  				   file, cmd, arg);
  }
  
@@ -63,7 +63,7 @@
  	struct snd_info_private_data *data;
  	struct snd_info_entry *entry;
  
-@@ -304,7 +346,11 @@ static const struct file_operations snd_
+@@ -304,7 +346,11 @@
  	.read =			snd_info_entry_read,
  	.write =		snd_info_entry_write,
  	.poll =			snd_info_entry_poll,
@@ -75,7 +75,7 @@
  	.mmap =			snd_info_entry_mmap,
  	.open =			snd_info_entry_open,
  	.release =		snd_info_entry_release,
-@@ -339,12 +385,21 @@ static ssize_t snd_info_text_entry_write
+@@ -339,12 +385,21 @@
  		}
  	}
  	if (next > buf->len) {
@@ -97,9 +97,9 @@
  		buf->buffer = nbuf;
  		buf->len = PAGE_ALIGN(next);
  	}
-@@ -457,6 +512,12 @@ static struct snd_info_entry *create_sub
- 
- static struct snd_info_entry *snd_info_create_entry(const char *name);
+@@ -458,6 +513,12 @@
+ static struct snd_info_entry *
+ snd_info_create_entry(const char *name, struct snd_info_entry *parent);
  
 +#if defined(CONFIG_SND_DEBUG_MEMORY) && defined(CONFIG_PROC_FS)
 +extern int snd_memory_info_init(void);
@@ -109,8 +109,8 @@
 +
  int __init snd_info_init(void)
  {
- 	snd_proc_root = snd_info_create_entry("asound");
-@@ -480,6 +541,7 @@ int __init snd_info_init(void)
+ 	snd_proc_root = snd_info_create_entry("asound", NULL);
+@@ -481,6 +542,7 @@
  	    snd_minor_info_init() < 0 ||
  	    snd_minor_info_oss_init() < 0 ||
  	    snd_card_info_init() < 0 ||
@@ -118,7 +118,7 @@
  	    snd_info_minor_register() < 0)
  		goto error;
  	return 0;
-@@ -543,7 +605,11 @@ void snd_info_card_id_change(struct snd_
+@@ -573,7 +635,11 @@
  {
  	mutex_lock(&info_mutex);
  	if (card->proc_root_link) {
@@ -130,7 +130,7 @@
  		card->proc_root_link = NULL;
  	}
  	if (strcmp(card->id, card->proc_root->name))
-@@ -562,7 +628,11 @@ void snd_info_card_disconnect(struct snd
+@@ -592,7 +658,11 @@
  	if (!card)
  		return;
  	mutex_lock(&info_mutex);
@@ -142,10 +142,10 @@
  	card->proc_root_link = NULL;
  	if (card->proc_root)
  		snd_info_disconnect(card->proc_root);
-@@ -745,7 +815,20 @@ static void snd_info_disconnect(struct s
- 	list_for_each_entry_safe(p, n, &entry->children, list)
+@@ -776,7 +846,20 @@
+ 		return;
+ 	list_for_each_entry(p, &entry->children, list)
  		snd_info_disconnect(p);
- 	list_del_init(&entry->list);
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
 +	{
 +		struct proc_dir_entry *root;
@@ -163,7 +163,7 @@
  	entry->p = NULL;
  }
  
-@@ -795,6 +878,23 @@ int snd_info_register(struct snd_info_en
+@@ -827,6 +910,23 @@
  		return -ENXIO;
  	root = entry->parent == NULL ? snd_proc_root->p : entry->parent->p;
  	mutex_lock(&info_mutex);
@@ -187,15 +187,15 @@
  	if (S_ISDIR(entry->mode)) {
  		p = proc_mkdir_mode(entry->name, entry->mode, root);
  		if (!p) {
-@@ -815,6 +915,7 @@ int snd_info_register(struct snd_info_en
+@@ -847,6 +947,7 @@
  		}
  		proc_set_size(p, entry->size);
  	}
 +#endif
  	entry->p = p;
- 	if (entry->parent)
- 		list_add_tail(&entry->list, &entry->parent->children);
-@@ -830,9 +931,20 @@ EXPORT_SYMBOL(snd_info_register);
+ 	mutex_unlock(&info_mutex);
+ 	return 0;
+@@ -860,9 +961,20 @@
  
  static void snd_info_version_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
  {