Merge remote-tracking branch 'stable/build' into build

15 files changed, 56 insertions, 56 deletions

diff --git a/alsa/acore/info.patch b/alsa/acore/info.patch
index 2cb0f2f52..d983bf3c2 100644
--- a/alsa/acore/info.patch
+++ b/alsa/acore/info.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/info.c	2014-02-14 08:10:32.317887679 +0100
-+++ info.c	2014-02-14 10:32:00.169618030 +0100
+--- ../alsa-kernel/core/info.c	2013-05-13 10:01:02.042914933 +0200
++++ info.c	2013-05-13 10:18:58.422914805 +0200
 @@ -1,3 +1,7 @@
 +#define __NO_VERSION__
 +#include "adriver.h"
@@ -54,7 +54,7 @@
  static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
  {
  	struct snd_info_private_data *data;
-@@ -490,9 +521,28 @@
+@@ -485,9 +516,28 @@
  	return -ENOTTY;
  }
  
@@ -83,7 +83,7 @@
  	struct snd_info_private_data *data;
  	struct snd_info_entry *entry;
  
-@@ -518,7 +568,11 @@
+@@ -513,7 +563,11 @@
  	.read =			snd_info_entry_read,
  	.write =		snd_info_entry_write,
  	.poll =			snd_info_entry_poll,
@@ -95,7 +95,7 @@
  	.mmap =			snd_info_entry_mmap,
  	.open =			snd_info_entry_open,
  	.release =		snd_info_entry_release,
-@@ -578,7 +632,11 @@
+@@ -573,7 +627,11 @@
  #ifdef CONFIG_SND_OSSEMUL
  		snd_info_free_entry(snd_oss_root);
  #endif
@@ -107,7 +107,7 @@
  	}
  	return 0;
  }
-@@ -640,7 +698,11 @@
+@@ -635,7 +693,11 @@
  {
  	mutex_lock(&info_mutex);
  	if (card->proc_root_link) {
@@ -119,7 +119,7 @@
  		card->proc_root_link = NULL;
  	}
  	if (strcmp(card->id, card->proc_root->name))
-@@ -659,7 +721,11 @@
+@@ -654,7 +716,11 @@
  	if (!card)
  		return;
  	mutex_lock(&info_mutex);
@@ -131,7 +131,7 @@
  	card->proc_root_link = NULL;
  	if (card->proc_root)
  		snd_info_disconnect(card->proc_root);
-@@ -847,7 +913,11 @@
+@@ -842,7 +908,11 @@
  	list_del_init(&entry->list);
  	root = entry->parent == NULL ? snd_proc_root : entry->parent->p;
  	snd_BUG_ON(!root);
@@ -143,7 +143,7 @@
  	entry->p = NULL;
  }
  
-@@ -948,6 +1018,17 @@
+@@ -943,6 +1013,17 @@
  		return -ENXIO;
  	root = entry->parent == NULL ? snd_proc_root : entry->parent->p;
  	mutex_lock(&info_mutex);
@@ -161,7 +161,7 @@
  	if (S_ISDIR(entry->mode)) {
  		p = proc_mkdir_mode(entry->name, entry->mode, root);
  		if (!p) {
-@@ -963,6 +1044,7 @@
+@@ -958,6 +1039,7 @@
  		}
  		proc_set_size(p, entry->size);
  	}
@@ -169,7 +169,7 @@
  	entry->p = p;
  	if (entry->parent)
  		list_add_tail(&entry->list, &entry->parent->children);
-@@ -980,9 +1062,20 @@
+@@ -975,9 +1057,20 @@
  
  static void snd_info_version_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
  {
diff --git a/alsa/acore/init.patch b/alsa/acore/init.patch
index d73e460ce..0854e7b50 100644
--- a/alsa/acore/init.patch
+++ b/alsa/acore/init.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/init.c	2014-02-14 10:29:56.461067921 +0100
-+++ init.c	2014-02-14 10:35:47.863521502 +0100
+--- ../alsa-kernel/core/init.c	2014-02-27 09:34:52.310696809 +0100
++++ init.c	2014-02-27 09:38:24.408003336 +0100
 @@ -1,3 +1,5 @@
 +#define __NO_VERSION__
 +#include "adriver.h"
diff --git a/alsa/acore/memalloc.patch b/alsa/acore/memalloc.patch
index 2837bf0e9..f7544aece 100644
--- a/alsa/acore/memalloc.patch
+++ b/alsa/acore/memalloc.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/memalloc.c	2014-02-14 08:10:32.318887692 +0100
-+++ memalloc.c	2014-02-14 10:46:42.307855817 +0100
+--- ../alsa-kernel/core/memalloc.c	2014-02-24 17:09:07.843751910 +0100
++++ memalloc.c	2014-02-27 09:40:11.922680686 +0100
 @@ -1,3 +1,4 @@
 +#include "memalloc.inc"
  /*
diff --git a/alsa/acore/pcm.patch b/alsa/acore/pcm.patch
index 262a3b8a4..84058ee3c 100644
--- a/alsa/acore/pcm.patch
+++ b/alsa/acore/pcm.patch
@@ -1,11 +1,11 @@
---- ../alsa-kernel/core/pcm.c	2014-02-14 08:10:32.319887704 +0100
-+++ pcm.c	2014-02-14 10:32:00.189618285 +0100
+--- ../alsa-kernel/core/pcm.c	2009-11-10 18:21:52.000000000 +0100
++++ pcm.c	2009-12-15 22:17:50.000000000 +0100
 @@ -1,3 +1,4 @@
 +#include "adriver.h"
  /*
   *  Digital Audio (PCM) abstract layer
   *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
-@@ -998,8 +999,12 @@
+@@ -928,8 +929,12 @@
  	substream->pstr->substream_opened--;
  }
  
@@ -18,7 +18,7 @@
  {
  	struct snd_pcm *pcm;
  	const char *str;
-@@ -1010,7 +1015,11 @@
+@@ -940,7 +945,11 @@
  		[SNDRV_PCM_CLASS_DIGITIZER] = "digitizer",
  	};
  
@@ -30,7 +30,7 @@
  	    pcm->dev_class > SNDRV_PCM_CLASS_LAST)
  		str = "none";
  	else
-@@ -1018,7 +1027,11 @@
+@@ -948,7 +957,11 @@
          return snprintf(buf, PAGE_SIZE, "%s\n", str);
  }
  
@@ -42,7 +42,7 @@
  	__ATTR(pcm_class, S_IRUGO, show_pcm_class, NULL);
  
  static int snd_pcm_dev_register(struct snd_device *device)
-@@ -1070,7 +1083,7 @@
+@@ -1000,7 +1013,7 @@
  			return err;
  		}
  		snd_add_device_sysfs_file(devtype, pcm->card, pcm->device,
diff --git a/alsa/acore/pcm_native.patch b/alsa/acore/pcm_native.patch
index a10ad9e05..c33722b50 100644
--- a/alsa/acore/pcm_native.patch
+++ b/alsa/acore/pcm_native.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/pcm_native.c	2014-02-14 08:10:32.320887717 +0100
-+++ pcm_native.c	2014-02-14 10:32:00.211618565 +0100
+--- ../alsa-kernel/core/pcm_native.c	2014-02-24 17:09:07.845751938 +0100
++++ pcm_native.c	2014-02-27 09:40:11.787678579 +0100
 @@ -1,3 +1,7 @@
 +#define __NO_VERSION__
 +#include "adriver.h"
diff --git a/alsa/acore/sound.patch b/alsa/acore/sound.patch
index 4d1adcb64..c4dafe86b 100644
--- a/alsa/acore/sound.patch
+++ b/alsa/acore/sound.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/core/sound.c	2014-02-14 08:10:32.325887782 +0100
-+++ sound.c	2014-02-14 10:46:42.306855804 +0100
+--- ../alsa-kernel/core/sound.c	2014-02-27 09:34:52.310696809 +0100
++++ sound.c	2014-02-27 09:40:11.888680156 +0100
 @@ -1,3 +1,4 @@
 +#include "adriver.h"
  /*
diff --git a/alsa/drivers/pcsp/pcsp.patch b/alsa/drivers/pcsp/pcsp.patch
index 91626ca2c..c4ba65376 100644
--- a/alsa/drivers/pcsp/pcsp.patch
+++ b/alsa/drivers/pcsp/pcsp.patch
@@ -1,5 +1,5 @@
---- ../../alsa-kernel/drivers/pcsp/pcsp.c	2014-02-14 10:29:56.461067921 +0100
-+++ pcsp.c	2014-02-14 10:46:42.548858883 +0100
+--- ../../alsa-kernel/drivers/pcsp/pcsp.c	2014-02-24 17:09:07.852752039 +0100
++++ pcsp.c	2014-02-27 09:40:12.222685368 +0100
 @@ -1,3 +1,4 @@
 +#include "adriver.h"
  /*
diff --git a/alsa/include/sound/core.patch b/alsa/include/sound/core.patch
index e27ac292f..e186a057f 100644
--- a/alsa/include/sound/core.patch
+++ b/alsa/include/sound/core.patch
@@ -1,6 +1,6 @@
---- ../../alsa-kernel/include/core.h	2014-02-14 10:29:56.461067921 +0100
-+++ core.h	2014-02-14 10:30:41.512621336 +0100
-@@ -108,8 +108,16 @@
+--- ../../alsa-kernel/include/core.h	2014-02-27 09:26:54.802204556 +0100
++++ core.h	2014-02-27 09:28:32.882772147 +0100
+@@ -100,8 +100,16 @@
  	char shortname[32];		/* short name of this soundcard */
  	char longname[80];		/* name of this soundcard */
  	char mixername[80];		/* mixer name */
@@ -17,7 +17,7 @@
  	struct module *module;		/* top-level module */
  
  	void *private_data;		/* private data for soundcard */
-@@ -129,7 +137,15 @@
+@@ -121,7 +129,15 @@
  	struct snd_info_entry *proc_id;	/* the card id */
  	struct proc_dir_entry *proc_root_link;	/* number link to real id */
  
@@ -33,7 +33,7 @@
  	struct snd_shutdown_f_ops *s_f_ops; /* file operations in the shutdown
  								state */
  	spinlock_t files_lock;		/* lock the files for this card */
-@@ -149,6 +165,17 @@
+@@ -141,6 +157,17 @@
  	struct snd_mixer_oss *mixer_oss;
  	int mixer_oss_change_count;
  #endif
@@ -51,7 +51,7 @@
  };
  
  #define dev_to_snd_card(p)	container_of(p, struct snd_card, card_dev)
-@@ -310,7 +337,11 @@
+@@ -301,7 +328,11 @@
  int snd_card_file_remove(struct snd_card *card, struct file *file);
  #define snd_card_unref(card)	put_device(&(card)->card_dev)
  
@@ -63,7 +63,7 @@
  
  /* device.c */
  
-@@ -438,13 +469,21 @@
+@@ -428,13 +459,21 @@
  
  /* for easier backward-porting */
  #if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
diff --git a/alsa/include/sound/pcm.patch b/alsa/include/sound/pcm.patch
index 9809fd119..0ca4b0d83 100644
--- a/alsa/include/sound/pcm.patch
+++ b/alsa/include/sound/pcm.patch
@@ -1,5 +1,5 @@
---- ../../alsa-kernel/include/pcm.h	2014-02-14 08:10:32.314887640 +0100
-+++ pcm.h	2014-02-14 10:46:42.233854876 +0100
+--- ../../alsa-kernel/include/pcm.h	2014-02-24 17:09:07.801751307 +0100
++++ pcm.h	2014-02-27 09:40:11.649676426 +0100
 @@ -282,10 +282,18 @@
  	snd_pcm_uframes_t avail_max;
  	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */
diff --git a/alsa/pci/hda/hda_beep.patch b/alsa/pci/hda/hda_beep.patch
index 82f20084f..c70390cf4 100644
--- a/alsa/pci/hda/hda_beep.patch
+++ b/alsa/pci/hda/hda_beep.patch
@@ -1,12 +1,12 @@
---- ../../alsa-kernel/pci/hda/hda_beep.c	2013-12-19 17:11:11.245210883 +0100
-+++ hda_beep.c	2014-02-14 10:46:43.090865780 +0100
+--- ../../alsa-kernel/pci/hda/hda_beep.c	2014-02-27 09:34:52.311696824 +0100
++++ hda_beep.c	2014-02-27 09:39:39.726178305 +0100
 @@ -1,3 +1,5 @@
 +#define __NO_VERSION__
 +#include "adriver.h"
  /*
   * Digital Beep Input Interface for HD-audio codec
   *
-@@ -104,7 +106,11 @@
+@@ -103,7 +105,11 @@
  static int snd_hda_beep_event(struct input_dev *dev, unsigned int type,
  				unsigned int code, int hz)
  {
@@ -18,7 +18,7 @@
  
  	switch (code) {
  	case SND_BELL:
-@@ -128,7 +134,9 @@
+@@ -127,7 +133,9 @@
  
  static void turn_off_beep(struct hda_beep *beep)
  {
@@ -28,7 +28,7 @@
  	if (beep->playing) {
  		/* turn off beep */
  		snd_hda_codec_write(beep->codec, beep->nid, 0,
-@@ -141,6 +149,9 @@
+@@ -140,6 +148,9 @@
  static void snd_hda_do_detach(struct hda_beep *beep)
  {
  	input_unregister_device(beep->dev);
@@ -38,7 +38,7 @@
  	beep->dev = NULL;
  	turn_off_beep(beep);
  }
-@@ -151,7 +162,11 @@
+@@ -150,7 +161,11 @@
  	struct hda_codec *codec = beep->codec;
  	int err;
  
@@ -50,16 +50,16 @@
  	if (!input_dev)
  		return -ENOMEM;
  
-@@ -167,15 +182,26 @@
+@@ -166,15 +181,26 @@
  	input_dev->evbit[0] = BIT_MASK(EV_SND);
  	input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
  	input_dev->event = snd_hda_beep_event;
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
- 	input_dev->dev.parent = &codec->bus->pci->dev;
+ 	input_dev->dev.parent = codec->bus->card->dev;
  	input_set_drvdata(input_dev, beep);
 +#else
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15)
-+	input_dev->cdev.dev = &codec->bus->pci->dev;
++	input_dev->cdev.dev = codec->bus->card>dev;
 +#endif
 +	input_dev->private = beep;
 +#endif /* 2.6.22 */ 
diff --git a/alsa/pci/hda/hda_intel.patch b/alsa/pci/hda/hda_intel.patch
index 0cea292ff..50c18e5fa 100644
--- a/alsa/pci/hda/hda_intel.patch
+++ b/alsa/pci/hda/hda_intel.patch
@@ -1,5 +1,5 @@
---- ../../alsa-kernel/pci/hda/hda_intel.c	2014-02-14 10:29:56.470068031 +0100
-+++ hda_intel.c	2014-02-14 10:51:14.000311502 +0100
+--- ../../alsa-kernel/pci/hda/hda_intel.c	2014-02-27 09:34:52.313696856 +0100
++++ hda_intel.c	2014-02-27 09:40:13.092698944 +0100
 @@ -1,3 +1,4 @@
 +#include "hda_intel_hack.c"
  /*
diff --git a/alsa/pci/via82xx.patch b/alsa/pci/via82xx.patch
index 3d8d470f3..1922b753c 100644
--- a/alsa/pci/via82xx.patch
+++ b/alsa/pci/via82xx.patch
@@ -1,5 +1,5 @@
---- ../alsa-kernel/pci/via82xx.c	2014-02-14 10:29:56.475068093 +0100
-+++ via82xx.c	2014-02-14 10:46:42.779861823 +0100
+--- ../alsa-kernel/pci/via82xx.c	2014-02-26 18:32:52.831625273 +0100
++++ via82xx.c	2014-02-27 09:40:12.593691157 +0100
 @@ -1,3 +1,4 @@
 +#include "adriver.h"
  /*
diff --git a/alsa/usb/usx2y/usbusx2y.patch b/alsa/usb/usx2y/usbusx2y.patch
index 69e47fdaa..a37d02e33 100644
--- a/alsa/usb/usx2y/usbusx2y.patch
+++ b/alsa/usb/usx2y/usbusx2y.patch
@@ -1,5 +1,5 @@
---- ../../alsa-kernel/usb/usx2y/usbusx2y.c	2014-02-14 08:10:32.368888338 +0100
-+++ usbusx2y.c	2014-02-14 10:51:14.716320606 +0100
+--- ../../alsa-kernel/usb/usx2y/usbusx2y.c	2014-02-24 17:09:07.901752742 +0100
++++ usbusx2y.c	2014-02-27 09:40:13.941712192 +0100
 @@ -1,3 +1,5 @@
 +#include "usbusx2y.inc"
 +
diff --git a/alsa/usb/usx2y/usx2yhwdeppcm.patch b/alsa/usb/usx2y/usx2yhwdeppcm.patch
index 1fe50b647..ba5a969bd 100644
--- a/alsa/usb/usx2y/usx2yhwdeppcm.patch
+++ b/alsa/usb/usx2y/usx2yhwdeppcm.patch
@@ -1,11 +1,11 @@
---- ../../alsa-kernel/usb/usx2y/usx2yhwdeppcm.c	2013-10-02 17:57:10.236598197 +0200
-+++ usx2yhwdeppcm.c	2014-02-14 10:46:43.917876302 +0100
+--- ../../alsa-kernel/usb/usx2y/usx2yhwdeppcm.c	2013-04-29 11:45:04.825944327 +0200
++++ usx2yhwdeppcm.c	2013-04-29 18:04:28.975941611 +0200
 @@ -1,3 +1,4 @@
 +#include "usx2yhwdeppcm.inc"
  /*
   *   This program is free software; you can redistribute it and/or modify
   *   it under the terms of the GNU General Public License as published by
-@@ -438,6 +439,9 @@
+@@ -443,6 +444,9 @@
  					if (0 == u)
  						atomic_set(&subs->state, state_STARTING3);
  					urb->dev = usX2Y->dev;
diff --git a/alsa/utils/alsa-info.sh b/alsa/utils/alsa-info.sh
index 2280af50f..859d7bca6 100755
--- a/alsa/utils/alsa-info.sh
+++ b/alsa/utils/alsa-info.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION=0.4.62
+SCRIPT_VERSION=0.4.63
 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
 
 #################################################################################
@@ -246,7 +246,7 @@ withdmesg() {
 	echo "!!ALSA/HDA dmesg" >> $FILE
 	echo "!!--------------" >> $FILE
 	echo "" >> $FILE
-	dmesg | grep -C1 -E 'ALSA|HDA|HDMI|sound|hda.codec|hda.intel' >> $FILE
+	dmesg | grep -C1 -E 'ALSA|HDA|HDMI|snd[_-]|sound|hda.codec|hda.intel' >> $FILE
 	echo "" >> $FILE
 	echo "" >> $FILE
 }