Merge remote branch 'alsa/master'

3 files changed, 36 insertions, 13 deletions

diff --git a/configure.in b/configure.in
index fa85eb4d8..18ccefee9 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl Copyright (c) by Jaroslav Kysela <perex@perex.cz>
 AC_PREREQ(2.59)
 AC_INIT(acore/sound.patch)
 AC_PREFIX_DEFAULT(/usr)
-CONFIG_SND_VERSION="1.0.22.1"
+CONFIG_SND_VERSION="1.0.23"
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -1566,6 +1566,7 @@ CHECK_KERNEL_HEADER(linux/bitrev.h)
 CHECK_KERNEL_HEADER(linux/hrtimer.h)
 CHECK_KERNEL_HEADER(linux/gcd.h, [#include \"gcd_compat.h\"
 ])
+CHECK_KERNEL_HEADER(linux/gfp.h)
 
 dnl Check for dump_stack
 if test "$kversion.$kpatchlevel" = "2.6"; then
diff --git a/include/adriver.h b/include/adriver.h
index cd0542804..3b8f54605 100644
--- a/include/adriver.h
+++ b/include/adriver.h
@@ -1994,6 +1994,13 @@ blocking_notifier_chain_unregister(struct blocking_notifier_head *nh,
 #endif /* BLOCKING_INIT_NOTIFIER_HEAD */
 #endif /* <2.6.17 */
 
+/* pgprot_noncached - 2.4 has different defines */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
+#ifndef pgprot_noncached
+#define pgprot_noncached(x) (x)
+#endif
+#endif
+
 /* no_llseek() */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
 #define no_llseek	NULL
diff --git a/usb/card.patch b/usb/card.patch
index 14ee3f6ab..9cfa3a4f9 100644
--- a/usb/card.patch
+++ b/usb/card.patch
@@ -1,11 +1,11 @@
---- ../alsa-kernel/usb/card.c	2010-03-10 09:22:24.488022926 +0100
-+++ card.c	2010-03-10 09:58:02.287522401 +0100
+--- ../alsa-kernel/usb/card.c	2010-04-16 10:37:42.000000000 +0200
++++ card.c	2010-04-16 10:29:29.000000000 +0200
 @@ -1,3 +1,4 @@
 +#include "card.inc"
  /*
   *   (Tentative) USB Audio Driver for ALSA
   *
-@@ -78,7 +79,12 @@
+@@ -79,7 +80,12 @@
  static int vid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 };
  static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 };
  static int nrpacks = 8;		/* max. number of packets per urb */
@@ -19,7 +19,7 @@
  static int device_setup[SNDRV_CARDS]; /* device parameter for this card */
  static int ignore_ctl_error;
  
-@@ -237,7 +243,11 @@
+@@ -238,13 +244,18 @@
  	case UAC_VERSION_2: {
  		struct uac_clock_source_descriptor *cs;
  		struct usb_interface_assoc_descriptor *assoc =
@@ -31,7 +31,22 @@
  
  		if (!assoc) {
  			snd_printk(KERN_ERR "Audio class v2 interfaces need an interface association\n");
-@@ -340,8 +350,13 @@
+ 			return -EINVAL;
+ 		}
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)
+ 		/* FIXME: for now, we expect there is at least one clock source
+ 		 * descriptor and we always take the first one.
+ 		 * We should properly support devices with multiple clock sources,
+@@ -266,6 +277,7 @@
+ 			if (intf != ctrlif)
+ 				snd_usb_create_stream(chip, ctrlif, intf);
+ 		}
++#endif
+ 
+ 		break;
+ 	}
+@@ -341,8 +353,13 @@
  	chip->nrpacks = nrpacks;
  	chip->async_unlink = async_unlink;
  
@@ -45,7 +60,7 @@
  	INIT_LIST_HEAD(&chip->pcm_list);
  	INIT_LIST_HEAD(&chip->midi_list);
  	INIT_LIST_HEAD(&chip->mixer_list);
-@@ -427,8 +442,12 @@
+@@ -428,8 +445,12 @@
  
  	alts = &intf->altsetting[0];
  	ifnum = get_iface_desc(alts)->bInterfaceNumber;
@@ -58,7 +73,7 @@
  	if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum)
  		goto __err_val;
  
-@@ -546,6 +565,7 @@
+@@ -547,6 +568,7 @@
  	}
  }
  
@@ -66,15 +81,15 @@
  /*
   * new 2.5 USB kernel API
   */
-@@ -606,6 +626,7 @@
- 	return 0;
- }
+@@ -610,6 +632,7 @@
+ #define usb_audio_suspend	NULL
+ #define usb_audio_resume	NULL
  #endif		/* CONFIG_PM */
 +#endif	/* OLD_USB */
  
  static struct usb_device_id usb_audio_ids [] = {
  #include "quirks-table.h"
-@@ -622,11 +643,19 @@
+@@ -626,11 +649,19 @@
   */
  
  static struct usb_driver usb_audio_driver = {
@@ -94,7 +109,7 @@
  	.id_table =	usb_audio_ids,
  };
  
-@@ -646,3 +675,5 @@
+@@ -650,3 +681,5 @@
  
  module_init(snd_usb_audio_init);
  module_exit(snd_usb_audio_cleanup);