diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-12 19:52:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 19:52:41 +0100 |
| commit | e375d27cb1c81d466dee9ffb992ae0b09b1ea8d7 (patch) | |
| tree | c7ccdfb604ca3a48dfcac3749b912a4ca1e5181b | |
| parent | 2be4fd30129198b9d5a4a77abfc15fcb72c8562c (diff) | |
| parent | 16960d9cddde379785f4108c55e56ef87b56da7b (diff) | |
| download | alsa-driver-build-unstable-e375d27cb1c81d466dee9ffb992ae0b09b1ea8d7.tar.gz | |
Merge remote-tracking branch 'stable/build' into build
| -rw-r--r-- | alsa/usb/card.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/alsa/usb/card.patch b/alsa/usb/card.patch index 679bf1529..a37c93dea 100644 --- a/alsa/usb/card.patch +++ b/alsa/usb/card.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/usb/card.c 2013-10-09 14:00:50.128683771 +0200 -+++ card.c 2013-10-15 15:45:31.779430219 +0200 +--- ../alsa-kernel/usb/card.c 2014-02-09 14:35:45.872517538 +1300 ++++ card.c 2014-02-09 16:45:45.116673978 +1300 @@ -1,3 +1,4 @@ +#include "card.inc" /* @@ -67,15 +67,15 @@ /* * new 2.5 USB kernel API */ -@@ -727,6 +742,7 @@ - #define usb_audio_suspend NULL +@@ -738,6 +753,7 @@ #define usb_audio_resume NULL + #define usb_audio_reset_resume NULL #endif /* CONFIG_PM */ +#endif /* OLD_USB */ static struct usb_device_id usb_audio_ids [] = { #include "quirks-table.h" -@@ -742,13 +758,25 @@ +@@ -753,14 +769,25 @@ */ static struct usb_driver usb_audio_driver = { @@ -88,6 +88,7 @@ +#ifndef OLD_USB .suspend = usb_audio_suspend, .resume = usb_audio_resume, +- .reset_resume = usb_audio_reset_resume, +#endif +#ifdef OLD_USB + .driver_list = LIST_HEAD_INIT(usb_audio_driver.driver_list), |