diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-11 22:49:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-11 22:49:04 +0200 |
| commit | 1d5f6b6c053f1349063a4639e4e4df5a8cfe8cf0 (patch) | |
| tree | 4096db0f98f3193775727fcd4bb6d513d8008335 | |
| parent | aaf8537d942cb5d7979ca3b15d899cd84357e9c3 (diff) | |
| download | alsa-driver-build-unstable-1d5f6b6c053f1349063a4639e4e4df5a8cfe8cf0.tar.gz | |
Refresh usb/mixer.patch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | usb/mixer.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usb/mixer.patch b/usb/mixer.patch index b3322cbf2..d5ce0d88d 100644 --- a/usb/mixer.patch +++ b/usb/mixer.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/usb/mixer.c 2010-03-12 12:21:47.911524364 +0100 -+++ mixer.c 2010-03-12 12:26:11.336022654 +0100 +--- ../alsa-kernel/usb/mixer.c 2010-05-11 22:44:30.924953053 +0200 ++++ mixer.c 2010-05-11 22:48:39.545200268 +0200 @@ -1,3 +1,5 @@ +#include "mixer.inc" + @@ -21,19 +21,19 @@ /* * manual mapping of mixer names * if the mixer topology is too complicated and the parsed names are -@@ -1967,7 +1977,11 @@ +@@ -2013,7 +2023,11 @@ } } +#if !defined(OLD_USB) && !defined(CONFIG_SND_NEW_IRQ_HANDLER) -+static void snd_usb_mixer_status_complete(struct urb *urb, struct pt_regs *regs) ++static void snd_usb_mixer_interrupt(struct urb *urb, struct pt_regs *regs) +#else - static void snd_usb_mixer_status_complete(struct urb *urb) + static void snd_usb_mixer_interrupt(struct urb *urb) +#endif { struct usb_mixer_interface *mixer = urb->context; - -@@ -2011,7 +2025,11 @@ + int len = urb->actual_length; +@@ -2083,7 +2097,11 @@ return 0; epnum = usb_endpoint_num(ep); |