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

4 files changed, 36 insertions, 34 deletions

diff --git a/alsa/acore/Makefile b/alsa/acore/Makefile
index 5a2d1fbd7..519bb8d08 100644
--- a/alsa/acore/Makefile
+++ b/alsa/acore/Makefile
@@ -21,6 +21,8 @@ snd-hpet-objs := hpetimer.o
 obj-$(CONFIG_SND_HPET) += snd-hpet.o
 obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/
 
+EXTRA_CFLAGS += -I$(SND_TOPDIR)/alsa-kernel/core
+
 include $(SND_TOPDIR)/Rules.make
 
 info.c: info.patch $(SND_TOPDIR)/alsa-kernel/core/info.c
diff --git a/alsa/include/sound/pcm.patch b/alsa/include/sound/pcm.patch
index 0ca4b0d83..acefa50de 100644
--- a/alsa/include/sound/pcm.patch
+++ b/alsa/include/sound/pcm.patch
@@ -1,6 +1,6 @@
---- ../../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 @@
+--- ../../alsa-kernel/include/pcm.h	2014-11-05 11:37:45.762841230 +0100
++++ pcm.h	2014-11-05 15:43:22.943766205 +0100
+@@ -283,10 +283,18 @@
  	snd_pcm_uframes_t avail_max;
  	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */
  	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */
@@ -19,7 +19,7 @@
  
  	/* -- HW params -- */
  	snd_pcm_access_t access;	/* access mode */
-@@ -296,6 +304,9 @@
+@@ -297,6 +305,9 @@
  	snd_pcm_uframes_t period_size;	/* period size */
  	unsigned int periods;		/* periods */
  	snd_pcm_uframes_t buffer_size;	/* buffer size */
@@ -29,7 +29,7 @@
  	snd_pcm_uframes_t min_align;	/* Min alignment for the format */
  	size_t byte_align;
  	unsigned int frame_bits;
-@@ -303,11 +314,17 @@
+@@ -304,11 +315,17 @@
  	unsigned int info;
  	unsigned int rate_num;
  	unsigned int rate_den;
@@ -47,7 +47,7 @@
  	snd_pcm_uframes_t start_threshold;
  	snd_pcm_uframes_t stop_threshold;
  	snd_pcm_uframes_t silence_threshold; /* Silence filling happens when
-@@ -325,9 +342,22 @@
+@@ -326,9 +343,22 @@
  	struct snd_pcm_mmap_control *control;
  
  	/* -- locking / scheduling -- */
@@ -70,7 +70,7 @@
  	struct fasync_struct *fasync;
  
  	/* -- private section -- */
-@@ -344,8 +374,9 @@
+@@ -345,8 +375,9 @@
  
  	/* -- timer -- */
  	unsigned int timer_resolution;	/* timer resolution */
@@ -81,7 +81,7 @@
  	/* -- DMA -- */           
  	unsigned char *dma_area;	/* DMA area */
  	dma_addr_t dma_addr;		/* physical bus address (not accessible from main CPU) */
-@@ -358,9 +389,37 @@
+@@ -359,9 +390,37 @@
  	struct snd_pcm_oss_runtime oss;
  #endif
  
@@ -119,7 +119,7 @@
  };
  
  struct snd_pcm_group {		/* keep linked substreams */
-@@ -378,7 +437,15 @@
+@@ -380,7 +439,15 @@
  	int number;
  	char name[32];			/* substream name */
  	int stream;			/* stream (direction) */
@@ -135,7 +135,7 @@
  	size_t buffer_bytes_max;	/* limit ring buffer size */
  	struct snd_dma_buffer dma_buffer;
  	size_t dma_max;
-@@ -389,6 +456,9 @@
+@@ -391,6 +458,9 @@
          /* -- timer section -- */
  	struct snd_timer *timer;		/* timer */
  	unsigned timer_running: 1;	/* time is running */
@@ -145,7 +145,7 @@
  	/* -- next substream -- */
  	struct snd_pcm_substream *next;
  	/* -- linked substreams -- */
-@@ -401,7 +471,9 @@
+@@ -403,7 +473,9 @@
  	atomic_t mmap_count;
  	unsigned int f_flags;
  	void (*pcm_release)(struct snd_pcm_substream *);
@@ -155,8 +155,8 @@
  #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
  	/* -- OSS things -- */
  	struct snd_pcm_oss_substream oss;
-@@ -417,6 +489,13 @@
- #endif
+@@ -422,6 +494,13 @@
+ #endif /* CONFIG_SND_VERBOSE_PROCFS */
  	/* misc flags */
  	unsigned int hw_opened: 1;
 +
@@ -169,7 +169,7 @@
  };
  
  #define SUBSTREAM_BUSY(substream) ((substream)->ref_count > 0)
-@@ -500,7 +579,11 @@
+@@ -504,7 +583,11 @@
  int snd_pcm_status(struct snd_pcm_substream *substream,
  		   struct snd_pcm_status *status);
  int snd_pcm_start(struct snd_pcm_substream *substream);
diff --git a/alsa/pci/echoaudio/echoaudio.patch b/alsa/pci/echoaudio/echoaudio.patch
index d90eca8b1..268961dd7 100644
--- a/alsa/pci/echoaudio/echoaudio.patch
+++ b/alsa/pci/echoaudio/echoaudio.patch
@@ -1,6 +1,6 @@
---- ../../alsa-kernel/pci/echoaudio/echoaudio.c	2010-01-29 23:17:31.000000000 +0100
-+++ echoaudio.c	2010-01-29 23:28:45.000000000 +0100
-@@ -1943,6 +1943,7 @@ static __devinit int snd_echo_create(str
+--- ../../alsa-kernel/pci/echoaudio/echoaudio.c	2014-11-05 15:38:31.147011646 +0100
++++ echoaudio.c	2014-11-05 15:43:23.744779248 +0100
+@@ -1906,6 +1906,7 @@
  	struct echoaudio *chip;
  	int err;
  	size_t sz;
@@ -8,7 +8,7 @@
  	static struct snd_device_ops ops = {
  		.dev_free = snd_echo_dev_free,
  	};
-@@ -2014,7 +2015,12 @@ static __devinit int snd_echo_create(str
+@@ -1977,7 +1978,12 @@
  	chip->comm_page_phys = chip->commpage_dma_buf.addr;
  	chip->comm_page = (struct comm_page *)chip->commpage_dma_buf.area;
  
@@ -22,15 +22,15 @@
  	if (err >= 0)
  		err = set_mixer_defaults(chip);
  	if (err < 0) {
-@@ -2245,6 +2251,7 @@ static int snd_echo_resume(struct pci_de
+@@ -2204,6 +2210,7 @@
  	struct comm_page *commpage, *commpage_bak;
  	u32 pipe_alloc_mask;
  	int err;
 +	u16 subsystem_device;
  
- 	DE_INIT(("resume start\n"));
  	pci_restore_state(pci);
-@@ -2252,7 +2259,12 @@ static int snd_echo_resume(struct pci_de
+ 	commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);
+@@ -2212,7 +2219,12 @@
  	commpage = chip->comm_page;
  	memcpy(commpage_bak, commpage, sizeof(struct comm_page));
  
@@ -43,4 +43,4 @@
 +	err = init_hw(chip, chip->pci->device, subsystem_device);
  	if (err < 0) {
  		kfree(commpage_bak);
- 		DE_INIT(("resume init_hw err=%d\n", err));
+ 		dev_err(dev, "resume init_hw err=%d\n", err);
diff --git a/alsa/usb/card.patch b/alsa/usb/card.patch
index 816739b27..56264465e 100644
--- a/alsa/usb/card.patch
+++ b/alsa/usb/card.patch
@@ -1,11 +1,11 @@
---- ../alsa-kernel/usb/card.c	2014-02-28 11:55:49.058259824 +0100
-+++ card.c	2014-02-28 12:02:57.056335503 +0100
+--- ../alsa-kernel/usb/card.c	2014-11-05 15:38:31.150011695 +0100
++++ card.c	2014-11-05 15:43:24.356789213 +0100
 @@ -1,3 +1,4 @@
 +#include "card.inc"
  /*
   *   (Tentative) USB Audio Driver for ALSA
   *
-@@ -261,6 +262,7 @@
+@@ -259,6 +260,7 @@
  	}
  
  	case UAC_VERSION_2: {
@@ -13,7 +13,7 @@
  		struct usb_interface_assoc_descriptor *assoc =
  			usb_ifnum_to_if(dev, ctrlif)->intf_assoc;
  
-@@ -280,8 +282,10 @@
+@@ -278,8 +280,10 @@
  		}
  
  		if (!assoc) {
@@ -24,7 +24,7 @@
  		}
  
  		for (i = 0; i < assoc->bInterfaceCount; i++) {
-@@ -292,6 +296,7 @@
+@@ -290,6 +294,7 @@
  		}
  
  		break;
@@ -32,7 +32,7 @@
  	}
  	}
  
-@@ -380,8 +385,13 @@
+@@ -373,8 +378,13 @@
  	chip->autoclock = autoclock;
  	chip->probing = 1;
  
@@ -46,7 +46,7 @@
  	INIT_LIST_HEAD(&chip->pcm_list);
  	INIT_LIST_HEAD(&chip->ep_list);
  	INIT_LIST_HEAD(&chip->midi_list);
-@@ -484,8 +494,12 @@
+@@ -477,8 +487,12 @@
  
  	alts = &intf->altsetting[0];
  	ifnum = get_iface_desc(alts)->bInterfaceNumber;
@@ -57,16 +57,16 @@
 +	id = USB_ID(dev->descriptor.idVendor, dev->descriptor.idProduct);
 +#endif
  	if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum)
- 		goto __err_val;
+ 		return -ENXIO;
  
-@@ -623,6 +637,7 @@
- 	}
+@@ -576,6 +590,7 @@
+ 	return err;
  }
  
 +#ifndef OLD_USB
  /*
-  * new 2.5 USB kernel API
-  */
+  * we need to take care of counter, since disconnection can be called also
+  * many times as well as usb_audio_probe().
 @@ -743,6 +758,7 @@
  #define usb_audio_resume	NULL
  #define usb_audio_reset_resume	NULL