diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-02 11:37:29 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-02 11:37:29 +0100 |
| commit | b11797541e4948c0023b648a81d39aba3c756e10 (patch) | |
| tree | e5347ffca5334f7b9b992c416cc8b624d1a4cedc | |
| parent | 889635819213cbc2ca75d58b3269b473c48daeea (diff) | |
| download | alsa-driver-build-unstable-b11797541e4948c0023b648a81d39aba3c756e10.tar.gz | |
Refreshed usbaudio.patch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | usb/usbaudio.patch | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/usb/usbaudio.patch b/usb/usbaudio.patch index 5c4540a21..44fa82cbf 100644 --- a/usb/usbaudio.patch +++ b/usb/usbaudio.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/usb/usbaudio.c 2010-02-23 17:02:35.027536460 +0100 -+++ usbaudio.c 2010-02-23 18:02:36.063036430 +0100 +--- ../alsa-kernel/usb/usbaudio.c 2010-03-02 11:29:15.000000000 +0100 ++++ usbaudio.c 2010-03-02 11:32:39.000000000 +0100 @@ -1,3 +1,4 @@ +#include "usbaudio.inc" /* @@ -206,19 +206,7 @@ switch (fp->maxpacksize) { case 0x120: -@@ -3423,7 +3483,11 @@ - fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress; - fp->ep_attr = get_endpoint(alts, 0)->bmAttributes; - fp->datainterval = parse_datainterval(chip, alts); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) - fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize); -+#else -+ fp->maxpacksize = get_endpoint(alts, 0)->wMaxPacketSize; -+#endif - fp->rate_max = fp->rate_min = combine_triple(&alts->extra[8]); - - stream = (fp->endpoint & USB_DIR_IN) -@@ -3500,8 +3564,13 @@ +@@ -3448,8 +3508,13 @@ struct usb_host_config *config = dev->actconfig; int err; @@ -232,7 +220,7 @@ snd_printdd("sending Extigy boot sequence...\n"); /* Send message to force it to reconnect with full interface. */ err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev,0), -@@ -3513,8 +3582,13 @@ +@@ -3461,8 +3526,13 @@ if (err < 0) snd_printdd("error usb_get_descriptor: %d\n", err); err = usb_reset_configuration(dev); if (err < 0) snd_printdd("error usb_reset_configuration: %d\n", err); @@ -246,7 +234,7 @@ return -ENODEV; /* quit this anyway */ } return 0; -@@ -3522,6 +3596,8 @@ +@@ -3470,6 +3540,8 @@ static int snd_usb_audigy2nx_boot_quirk(struct usb_device *dev) { @@ -255,7 +243,7 @@ u8 buf = 1; snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), 0x2a, -@@ -3533,6 +3609,7 @@ +@@ -3481,6 +3553,7 @@ 1, 2000, NULL, 0, 1000); return -ENODEV; } @@ -263,7 +251,7 @@ return 0; } -@@ -3787,8 +3864,13 @@ +@@ -3734,8 +3807,13 @@ chip->index = idx; chip->dev = dev; chip->card = card; @@ -277,7 +265,7 @@ INIT_LIST_HEAD(&chip->pcm_list); INIT_LIST_HEAD(&chip->midi_list); INIT_LIST_HEAD(&chip->mixer_list); -@@ -3875,8 +3957,12 @@ +@@ -3822,8 +3900,12 @@ alts = &intf->altsetting[0]; ifnum = get_iface_desc(alts)->bInterfaceNumber; @@ -290,7 +278,7 @@ if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum) goto __err_val; -@@ -4021,6 +4107,7 @@ +@@ -3968,6 +4050,7 @@ } } @@ -298,7 +286,7 @@ /* * new 2.5 USB kernel API */ -@@ -4081,6 +4168,7 @@ +@@ -4028,6 +4111,7 @@ return 0; } #endif /* CONFIG_PM */ @@ -306,7 +294,7 @@ static int __init snd_usb_audio_init(void) { -@@ -4099,3 +4187,5 @@ +@@ -4046,3 +4130,5 @@ module_init(snd_usb_audio_init); module_exit(snd_usb_audio_cleanup); |