diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-11 15:02:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-11 15:02:32 +0100 |
| commit | b3eda928d2ffe8d96b2939d2e0157f6be85ed2ce (patch) | |
| tree | abdb6e003d42c4a55cb51de3a40b995f001b252f | |
| parent | 168f7a54b1287c6c402ce18498c6bce2b75b3e0b (diff) | |
| download | alsa-driver-build-unstable-b3eda928d2ffe8d96b2939d2e0157f6be85ed2ce.tar.gz | |
Refreshed usb/card.patch
for autosuspend support
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | usb/card.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/usb/card.patch b/usb/card.patch index 65f6747ee..0954d025e 100644 --- a/usb/card.patch +++ b/usb/card.patch @@ -1,11 +1,11 @@ ---- ../alsa-kernel/usb/card.c 2011-01-24 13:13:16.000000000 +0100 -+++ card.c 2011-01-24 17:25:21.000000000 +0100 +--- ../alsa-kernel/usb/card.c 2011-03-11 15:00:47.607195676 +0100 ++++ card.c 2011-03-11 15:00:52.323378280 +0100 @@ -1,3 +1,4 @@ +#include "card.inc" /* * (Tentative) USB Audio Driver for ALSA * -@@ -79,7 +80,12 @@ +@@ -80,7 +81,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; -@@ -242,19 +248,25 @@ +@@ -243,19 +249,25 @@ case UAC_VERSION_2: { struct usb_interface_assoc_descriptor *assoc = @@ -45,9 +45,9 @@ break; } -@@ -330,8 +342,13 @@ - chip->nrpacks = nrpacks; +@@ -333,8 +345,13 @@ chip->async_unlink = async_unlink; + chip->probing = 1; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) chip->usb_id = USB_ID(le16_to_cpu(dev->descriptor.idVendor), @@ -59,7 +59,7 @@ INIT_LIST_HEAD(&chip->pcm_list); INIT_LIST_HEAD(&chip->midi_list); INIT_LIST_HEAD(&chip->mixer_list); -@@ -428,8 +445,12 @@ +@@ -431,8 +448,12 @@ alts = &intf->altsetting[0]; ifnum = get_iface_desc(alts)->bInterfaceNumber; @@ -72,7 +72,7 @@ if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum) goto __err_val; -@@ -555,6 +576,7 @@ +@@ -564,6 +585,7 @@ } } @@ -80,7 +80,7 @@ /* * new 2.5 USB kernel API */ -@@ -618,6 +640,7 @@ +@@ -667,6 +689,7 @@ #define usb_audio_suspend NULL #define usb_audio_resume NULL #endif /* CONFIG_PM */ @@ -88,7 +88,7 @@ static struct usb_device_id usb_audio_ids [] = { #include "quirks-table.h" -@@ -634,11 +657,19 @@ +@@ -683,11 +706,19 @@ */ static struct usb_driver usb_audio_driver = { @@ -106,9 +106,9 @@ + .driver_list = LIST_HEAD_INIT(usb_audio_driver.driver_list), +#endif .id_table = usb_audio_ids, + .supports_autosuspend = 1, }; - -@@ -658,3 +689,5 @@ +@@ -708,3 +739,5 @@ module_init(snd_usb_audio_init); module_exit(snd_usb_audio_cleanup); |