diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-11 17:39:51 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-11 17:40:54 +0200 |
| commit | 25cd95408092b15a2bd0d2e765b4865956d3863d (patch) | |
| tree | e2fbb04aead08e950f443f56d9dbfda0ec0385f7 | |
| parent | 4e4b9f77628ce12c56984dae1882572e975e774b (diff) | |
| download | alsa-driver-build-unstable-25cd95408092b15a2bd0d2e765b4865956d3863d.tar.gz | |
Refresh misc.patch
For the upstream change in snd_pci_quirk_lookup() (commit e5b50ada).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | alsa/acore/misc.patch | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/alsa/acore/misc.patch b/alsa/acore/misc.patch index 30110f8a1..f51667a35 100644 --- a/alsa/acore/misc.patch +++ b/alsa/acore/misc.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/core/misc.c 2012-08-03 13:00:50.000000000 +0200 -+++ misc.c 2012-08-03 13:05:22.000000000 +0200 +--- ../alsa-kernel/core/misc.c 2014-10-09 07:31:15.604455099 +0200 ++++ misc.c 2014-10-11 17:38:34.285109989 +0200 @@ -1,3 +1,9 @@ +#define __NO_VERSION__ +#include "adriver.h" @@ -105,16 +105,20 @@ } EXPORT_SYMBOL_GPL(__snd_printk); #endif -@@ -145,9 +204,42 @@ +@@ -145,11 +204,46 @@ const struct snd_pci_quirk * snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 0) + if (!pci) + return NULL; return snd_pci_quirk_lookup_id(pci->subsystem_vendor, pci->subsystem_device, list); +#else + unsigned short subsystem_vendor, subsystem_device; ++ if (!pci) ++ return NULL; + pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor); + pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device); + return snd_pci_quirk_lookup_id(subsystem_vendor, |