diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-14 10:39:44 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 10:40:15 +0100 |
| commit | fdc19212371684782577e14810a1e97c5eedf8cd (patch) | |
| tree | 0708879a8878594b6725af4537124b6d0703e9d8 | |
| parent | 16960d9cddde379785f4108c55e56ef87b56da7b (diff) | |
| download | alsa-driver-build-unstable-fdc19212371684782577e14810a1e97c5eedf8cd.tar.gz | |
Refresh usb/card.patch again for missing reset_resume entry
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | alsa/usb/card.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/alsa/usb/card.patch b/alsa/usb/card.patch index a37c93dea..7c10cae40 100644 --- a/alsa/usb/card.patch +++ b/alsa/usb/card.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/usb/card.c 2014-02-09 14:35:45.872517538 +1300 -+++ card.c 2014-02-09 16:45:45.116673978 +1300 +--- ../alsa-kernel/usb/card.c 2014-02-14 10:29:56.477068117 +0100 ++++ card.c 2014-02-14 10:39:06.138048150 +0100 @@ -1,3 +1,4 @@ +#include "card.inc" /* @@ -32,7 +32,7 @@ } } -@@ -375,8 +380,13 @@ +@@ -377,8 +382,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); -@@ -479,8 +489,12 @@ +@@ -481,8 +491,12 @@ alts = &intf->altsetting[0]; ifnum = get_iface_desc(alts)->bInterfaceNumber; @@ -59,7 +59,7 @@ if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum) goto __err_val; -@@ -618,6 +632,7 @@ +@@ -620,6 +634,7 @@ } } @@ -67,7 +67,7 @@ /* * new 2.5 USB kernel API */ -@@ -738,6 +753,7 @@ +@@ -740,6 +755,7 @@ #define usb_audio_resume NULL #define usb_audio_reset_resume NULL #endif /* CONFIG_PM */ @@ -75,7 +75,7 @@ static struct usb_device_id usb_audio_ids [] = { #include "quirks-table.h" -@@ -753,14 +769,25 @@ +@@ -755,14 +771,26 @@ */ static struct usb_driver usb_audio_driver = { @@ -88,7 +88,7 @@ +#ifndef OLD_USB .suspend = usb_audio_suspend, .resume = usb_audio_resume, -- .reset_resume = usb_audio_reset_resume, + .reset_resume = usb_audio_reset_resume, +#endif +#ifdef OLD_USB + .driver_list = LIST_HEAD_INIT(usb_audio_driver.driver_list), |