diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-11 15:18:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-11 15:18:50 +0100 |
| commit | 76ca341d26be85dd9a37ecad91f2eff959ffd27e (patch) | |
| tree | 7bd1872831daf7c4932fe440a8b717d3017227a2 | |
| parent | b3eda928d2ffe8d96b2939d2e0157f6be85ed2ce (diff) | |
| download | alsa-driver-build-unstable-76ca341d26be85dd9a37ecad91f2eff959ffd27e.tar.gz | |
Fix builds of usb-audio with older kernels for autopm stuff
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | usb/card.patch | 10 | ||||
| -rw-r--r-- | usb/usbcompat.h | 11 |
2 files changed, 18 insertions, 3 deletions
diff --git a/usb/card.patch b/usb/card.patch index 0954d025e..d48cfc5c0 100644 --- a/usb/card.patch +++ b/usb/card.patch @@ -1,5 +1,5 @@ --- ../alsa-kernel/usb/card.c 2011-03-11 15:00:47.607195676 +0100 -+++ card.c 2011-03-11 15:00:52.323378280 +0100 ++++ card.c 2011-03-11 15:17:53.470906409 +0100 @@ -1,3 +1,4 @@ +#include "card.inc" /* @@ -88,7 +88,7 @@ static struct usb_device_id usb_audio_ids [] = { #include "quirks-table.h" -@@ -683,11 +706,19 @@ +@@ -683,13 +706,23 @@ */ static struct usb_driver usb_audio_driver = { @@ -106,9 +106,13 @@ + .driver_list = LIST_HEAD_INIT(usb_audio_driver.driver_list), +#endif .id_table = usb_audio_ids, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) .supports_autosuspend = 1, ++#endif }; -@@ -708,3 +739,5 @@ + + static int __init snd_usb_audio_init(void) +@@ -708,3 +741,5 @@ module_init(snd_usb_audio_init); module_exit(snd_usb_audio_cleanup); diff --git a/usb/usbcompat.h b/usb/usbcompat.h index 212720456..62c1d924a 100644 --- a/usb/usbcompat.h +++ b/usb/usbcompat.h @@ -96,4 +96,15 @@ static inline int usb_endpoint_xfer_control( #endif /* < 2.6.21 */ #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) +#define PM_EVENT_AUTO 0 +static inline int usb_autopm_get_interface(struct usb_interface *intf) +{ + return 0; +} +static inline void usb_autopm_put_interface(struct usb_interface *intf) +{ +} +#endif /* < 2.6.20 */ + #endif /* __ALSA_USBCOMPAT_H */ |