From: Greg Kroah-Hartman Date: Mon, 17 Jul 2006 15:43:19 +0000 (-0700) Subject: alsa patches checked in X-Git-Tag: v2.6.17.7~2^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=208d28e700cdfbdbe77e47dafc94f2cb5401473e;p=thirdparty%2Fkernel%2Fstable-queue.git alsa patches checked in --- diff --git a/queue-2.6.17/alsa-au88x0-fix-64bit-address-of-mpu401-mmio-port.patch b/queue-2.6.17/alsa-au88x0-fix-64bit-address-of-mpu401-mmio-port.patch new file mode 100644 index 00000000000..12bc1aed177 --- /dev/null +++ b/queue-2.6.17/alsa-au88x0-fix-64bit-address-of-mpu401-mmio-port.patch @@ -0,0 +1,44 @@ +From stable-bounces@linux.kernel.org Thu Jul 13 11:10:55 2006 +Date: Thu, 13 Jul 2006 20:10:13 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Cc: +Subject: ALSA: au88x0 - Fix 64bit address of MPU401 MMIO port + +From: Takashi Iwai + +[PATCH] ALSA: au88x0 - Fix 64bit address of MPU401 MMIO port + +Fix 64bit address of MPU401 MMIO port on au88x0 chip. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/au88x0/au88x0_mpu401.c | 2 +- + sound/pci/rme9652/hdsp.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- linux-2.6.17.6.orig/sound/pci/au88x0/au88x0_mpu401.c ++++ linux-2.6.17.6/sound/pci/au88x0/au88x0_mpu401.c +@@ -47,7 +47,7 @@ static int __devinit snd_vortex_midi(vor + struct snd_rawmidi *rmidi; + int temp, mode; + struct snd_mpu401 *mpu; +- int port; ++ unsigned long port; + + #ifdef VORTEX_MPU401_LEGACY + /* EnableHardCodedMPU401Port() */ +--- linux-2.6.17.6.orig/sound/pci/rme9652/hdsp.c ++++ linux-2.6.17.6/sound/pci/rme9652/hdsp.c +@@ -389,7 +389,7 @@ MODULE_SUPPORTED_DEVICE("{{RME Hammerfal + + /* use hotplug firmeare loader? */ + #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) +-#ifndef HDSP_USE_HWDEP_LOADER ++#if !defined(HDSP_USE_HWDEP_LOADER) && !defined(CONFIG_SND_HDSP) + #define HDSP_FW_LOADER + #endif + #endif diff --git a/queue-2.6.17/alsa-fix-a-deadlock-in-snd-rtctimer.patch b/queue-2.6.17/alsa-fix-a-deadlock-in-snd-rtctimer.patch new file mode 100644 index 00000000000..bf3d29f335a --- /dev/null +++ b/queue-2.6.17/alsa-fix-a-deadlock-in-snd-rtctimer.patch @@ -0,0 +1,45 @@ +From stable-bounces@linux.kernel.org Thu Jul 13 11:09:05 2006 +Date: Thu, 13 Jul 2006 20:08:01 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Cc: +Subject: ALSA: Fix a deadlock in snd-rtctimer + +From: Takashi Iwai + +[PATCH] ALSA: Fix a deadlock in snd-rtctimer + +Fix an occasional deadlock occuring with snd-rtctimer driver, +added irqsave to the lock in tasklet (ALSA bug#952). + +Signed-off-by: Takashi Iwai +Signed-off-by: Jaroslav Kysela +Signed-off-by: Greg Kroah-Hartman + +--- + sound/core/timer.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- linux-2.6.17.6.orig/sound/core/timer.c ++++ linux-2.6.17.6/sound/core/timer.c +@@ -628,8 +628,9 @@ static void snd_timer_tasklet(unsigned l + struct snd_timer_instance *ti; + struct list_head *p; + unsigned long resolution, ticks; ++ unsigned long flags; + +- spin_lock(&timer->lock); ++ spin_lock_irqsave(&timer->lock, flags); + /* now process all callbacks */ + while (!list_empty(&timer->sack_list_head)) { + p = timer->sack_list_head.next; /* get first item */ +@@ -649,7 +650,7 @@ static void snd_timer_tasklet(unsigned l + spin_lock(&timer->lock); + ti->flags &= ~SNDRV_TIMER_IFLG_CALLBACK; + } +- spin_unlock(&timer->lock); ++ spin_unlock_irqrestore(&timer->lock, flags); + } + + /* diff --git a/queue-2.6.17/alsa-fix-missing-array-terminators-in-ad1988-codec-support.patch b/queue-2.6.17/alsa-fix-missing-array-terminators-in-ad1988-codec-support.patch new file mode 100644 index 00000000000..f39c5b0ee14 --- /dev/null +++ b/queue-2.6.17/alsa-fix-missing-array-terminators-in-ad1988-codec-support.patch @@ -0,0 +1,56 @@ +From stable-bounces@linux.kernel.org Thu Jul 13 11:16:41 2006 +Date: Thu, 13 Jul 2006 20:15:44 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Cc: +Subject: ALSA: Fix missing array terminators in AD1988 codec support + +From: Takashi Iwai + +[PATCH] ALSA: Fix missing array terminators in AD1988 codec support + +Fixed the missing array terminators in AD1988 codec support code. + +Signed-off-by: Takashi Iwai +Signed-off-by: Jaroslav Kysela +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_analog.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- linux-2.6.17.6.orig/sound/pci/hda/patch_analog.c ++++ linux-2.6.17.6/sound/pci/hda/patch_analog.c +@@ -1582,6 +1582,7 @@ static struct snd_kcontrol_new ad1988_6s + HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME("Side Playback Volume", 0x0a, 0x0, HDA_OUTPUT), ++ { } /* end */ + }; + + static struct snd_kcontrol_new ad1988_6stack_mixers1_rev2[] = { +@@ -1590,6 +1591,7 @@ static struct snd_kcontrol_new ad1988_6s + HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0a, 2, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME("Side Playback Volume", 0x06, 0x0, HDA_OUTPUT), ++ { } /* end */ + }; + + static struct snd_kcontrol_new ad1988_6stack_mixers2[] = { +@@ -1628,6 +1630,7 @@ static struct snd_kcontrol_new ad1988_3s + HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT), ++ { } /* end */ + }; + + static struct snd_kcontrol_new ad1988_3stack_mixers1_rev2[] = { +@@ -1635,6 +1638,7 @@ static struct snd_kcontrol_new ad1988_3s + HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x06, 1, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x06, 2, 0x0, HDA_OUTPUT), ++ { } /* end */ + }; + + static struct snd_kcontrol_new ad1988_3stack_mixers2[] = { diff --git a/queue-2.6.17/alsa-fix-model-for-hp-dc7600.patch b/queue-2.6.17/alsa-fix-model-for-hp-dc7600.patch new file mode 100644 index 00000000000..80064306393 --- /dev/null +++ b/queue-2.6.17/alsa-fix-model-for-hp-dc7600.patch @@ -0,0 +1,34 @@ +From stable-bounces@linux.kernel.org Thu Jul 13 12:15:26 2006 +Date: Thu, 13 Jul 2006 20:27:55 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Cc: +Subject: ALSA: Fix model for HP dc7600 + +From: Takashi Iwai + +[PATCH] ALSA: Fix model for HP dc7600 + +Changed the assigned model for HP dc7600 with ALC260 codec +to match better with the actual I/O assignment. +Patch taken from ALSA bug#2157. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.17.6.orig/sound/pci/hda/patch_realtek.c ++++ linux-2.6.17.6/sound/pci/hda/patch_realtek.c +@@ -3827,7 +3827,7 @@ static struct hda_board_config alc260_cf + { .modelname = "hp", .config = ALC260_HP }, + { .pci_subvendor = 0x103c, .pci_subdevice = 0x3010, .config = ALC260_HP }, + { .pci_subvendor = 0x103c, .pci_subdevice = 0x3011, .config = ALC260_HP }, +- { .pci_subvendor = 0x103c, .pci_subdevice = 0x3012, .config = ALC260_HP }, ++ { .pci_subvendor = 0x103c, .pci_subdevice = 0x3012, .config = ALC260_HP_3013 }, + { .pci_subvendor = 0x103c, .pci_subdevice = 0x3013, .config = ALC260_HP_3013 }, + { .pci_subvendor = 0x103c, .pci_subdevice = 0x3014, .config = ALC260_HP }, + { .pci_subvendor = 0x103c, .pci_subdevice = 0x3015, .config = ALC260_HP }, diff --git a/queue-2.6.17/alsa-fix-mute-switch-on-vaio-laptops-with-stac7661.patch b/queue-2.6.17/alsa-fix-mute-switch-on-vaio-laptops-with-stac7661.patch new file mode 100644 index 00000000000..8f66c5c0a46 --- /dev/null +++ b/queue-2.6.17/alsa-fix-mute-switch-on-vaio-laptops-with-stac7661.patch @@ -0,0 +1,42 @@ +From stable-bounces@linux.kernel.org Thu Jul 13 11:18:42 2006 +Date: Thu, 13 Jul 2006 20:17:52 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Cc: +Subject: ALSA: Fix mute switch on VAIO laptops with STAC7661 + +From: Takashi Iwai + +[PATCH] ALSA: Fix mute switch on VAIO laptops with STAC7661 + +Fixed the master mute switch on VAIO laptops with STAC7661 +codec chip. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_sigmatel.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- linux-2.6.17.6.orig/sound/pci/hda/patch_sigmatel.c ++++ linux-2.6.17.6/sound/pci/hda/patch_sigmatel.c +@@ -1262,13 +1262,13 @@ static int vaio_master_sw_put(struct snd + int change; + + change = snd_hda_codec_amp_update(codec, 0x02, 0, HDA_OUTPUT, 0, +- 0x80, valp[0] & 0x80); ++ 0x80, (valp[0] ? 0 : 0x80)); + change |= snd_hda_codec_amp_update(codec, 0x02, 1, HDA_OUTPUT, 0, +- 0x80, valp[1] & 0x80); ++ 0x80, (valp[1] ? 0 : 0x80)); + snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0, +- 0x80, valp[0] & 0x80); ++ 0x80, (valp[0] ? 0 : 0x80)); + snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0, +- 0x80, valp[1] & 0x80); ++ 0x80, (valp[1] ? 0 : 0x80)); + return change; + } + diff --git a/queue-2.6.17/alsa-fix-the-snd_fm801_tea575x-dependencies.patch b/queue-2.6.17/alsa-fix-the-snd_fm801_tea575x-dependencies.patch new file mode 100644 index 00000000000..26a144b8249 --- /dev/null +++ b/queue-2.6.17/alsa-fix-the-snd_fm801_tea575x-dependencies.patch @@ -0,0 +1,74 @@ +From stable-bounces@linux.kernel.org Thu Jul 13 11:09:38 2006 +Date: Thu, 13 Jul 2006 20:09:02 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Cc: +Subject: ALSA: fix the SND_FM801_TEA575X dependencies + +From: Takashi Iwai + +[PATCH] ALSA: fix the SND_FM801_TEA575X dependencies + +CONFIG_SND_FM801=y, CONFIG_SND_FM801_TEA575X=m resulted in the following +compile error: +<-- snip --> +... + LD vmlinux +sound/built-in.o: In function 'snd_fm801_free': +fm801.c:(.text+0x3c15b): undefined reference to 'snd_tea575x_exit' +sound/built-in.o: In function 'snd_card_fm801_probe': +fm801.c:(.text+0x3cfde): undefined reference to 'snd_tea575x_init' +make: *** [vmlinux] Error 1 +<-- snip --> +This patch fixes kernel Bugzilla #6458. + +Signed-off-by: Adrian Bunk +Signed-off-by: Takashi Iwai +Signed-off-by: Jaroslav Kysela +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/Kconfig | 14 ++++++++------ + sound/pci/fm801.c | 2 +- + 2 files changed, 9 insertions(+), 7 deletions(-) + +--- linux-2.6.17.6.orig/sound/pci/Kconfig ++++ linux-2.6.17.6/sound/pci/Kconfig +@@ -318,17 +318,19 @@ config SND_FM801 + To compile this driver as a module, choose M here: the module + will be called snd-fm801. + +-config SND_FM801_TEA575X +- tristate "ForteMedia FM801 + TEA5757 tuner" ++config SND_FM801_TEA575X_BOOL ++ bool "ForteMedia FM801 + TEA5757 tuner" + depends on SND_FM801 +- select VIDEO_DEV + help + Say Y here to include support for soundcards based on the ForteMedia + FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media +- Forte SF256-PCS-02). ++ Forte SF256-PCS-02) into the snd-fm801 driver. + +- To compile this driver as a module, choose M here: the module +- will be called snd-fm801-tea575x. ++config SND_FM801_TEA575X ++ tristate ++ depends on SND_FM801_TEA575X_BOOL ++ default SND_FM801 ++ select VIDEO_DEV + + config SND_HDA_INTEL + tristate "Intel HD Audio" +--- linux-2.6.17.6.orig/sound/pci/fm801.c ++++ linux-2.6.17.6/sound/pci/fm801.c +@@ -35,7 +35,7 @@ + + #include + +-#if (defined(CONFIG_SND_FM801_TEA575X) || defined(CONFIG_SND_FM801_TEA575X_MODULE)) && (defined(CONFIG_VIDEO_DEV) || defined(CONFIG_VIDEO_DEV_MODULE)) ++#ifdef CONFIG_SND_FM801_TEA575X_BOOL + #include + #define TEA575X_RADIO 1 + #endif diff --git a/queue-2.6.17/alsa-fix-undefined-references-in-isa-miro-sound-driver.patch b/queue-2.6.17/alsa-fix-undefined-references-in-isa-miro-sound-driver.patch new file mode 100644 index 00000000000..3f2deafd792 --- /dev/null +++ b/queue-2.6.17/alsa-fix-undefined-references-in-isa-miro-sound-driver.patch @@ -0,0 +1,37 @@ +From stable-bounces@linux.kernel.org Thu Jul 13 11:14:17 2006 +Date: Thu, 13 Jul 2006 20:13:30 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Cc: +Subject: ALSA: Fix undefined (missing) references in ISA MIRO sound driver + +From: Takashi Iwai + +[PATCH] ALSA: Fix undefined (missing) references in ISA MIRO sound driver + +WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_create +WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_pcm +WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_timer +WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_mixer +WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/fs/reiser4/reiser4.ko needs unknown symbol generic_file_read + +Signed-off-by: Randy Dunlap +Signed-off-by: Takashi Iwai +Signed-off-by: Jaroslav Kysela +Signed-off-by: Greg Kroah-Hartman + +--- + sound/isa/cs423x/Makefile | 1 + + 1 file changed, 1 insertion(+) + +--- linux-2.6.17.6.orig/sound/isa/cs423x/Makefile ++++ linux-2.6.17.6/sound/isa/cs423x/Makefile +@@ -11,6 +11,7 @@ snd-cs4236-objs := cs4236.o + + # Toplevel Module Dependency + obj-$(CONFIG_SND_AZT2320) += snd-cs4231-lib.o ++obj-$(CONFIG_SND_MIRO) += snd-cs4231-lib.o + obj-$(CONFIG_SND_OPL3SA2) += snd-cs4231-lib.o + obj-$(CONFIG_SND_CS4231) += snd-cs4231.o snd-cs4231-lib.o + obj-$(CONFIG_SND_CS4232) += snd-cs4232.o snd-cs4231-lib.o diff --git a/queue-2.6.17/alsa-fix-workaround-for-ad1988a-rev2-codec.patch b/queue-2.6.17/alsa-fix-workaround-for-ad1988a-rev2-codec.patch new file mode 100644 index 00000000000..f40402fc442 --- /dev/null +++ b/queue-2.6.17/alsa-fix-workaround-for-ad1988a-rev2-codec.patch @@ -0,0 +1,87 @@ +From stable-bounces@linux.kernel.org Thu Jul 13 11:17:14 2006 +Date: Thu, 13 Jul 2006 20:16:41 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Cc: +Subject: ALSA: Fix workaround for AD1988A rev2 codec + +From: Takashi Iwai + +[PATCH] ALSA: Fix workaround for AD1988A rev2 codec + +Fix the workaround for AD1988A rev2 codec not to apply to AD1988B codec +chips. + +Signed-off-by: Takashi Iwai +Signed-off-by: Jaroslav Kysela +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_analog.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +--- linux-2.6.17.6.orig/sound/pci/hda/patch_analog.c ++++ linux-2.6.17.6/sound/pci/hda/patch_analog.c +@@ -1488,6 +1488,9 @@ enum { + /* reivision id to check workarounds */ + #define AD1988A_REV2 0x100200 + ++#define is_rev2(codec) \ ++ ((codec)->vendor_id == 0x11d41988 && \ ++ (codec)->revision_id == AD1988A_REV2) + + /* + * mixers +@@ -2138,7 +2141,7 @@ static inline hda_nid_t ad1988_idx_to_da + /* A B C D E F G H */ + 0x04, 0x05, 0x0a, 0x04, 0x06, 0x05, 0x0a, 0x06 + }; +- if (codec->revision_id == AD1988A_REV2) ++ if (is_rev2(codec)) + return idx_to_dac_rev2[idx]; + else + return idx_to_dac[idx]; +@@ -2507,7 +2510,7 @@ static int patch_ad1988(struct hda_codec + mutex_init(&spec->amp_mutex); + codec->spec = spec; + +- if (codec->revision_id == AD1988A_REV2) ++ if (is_rev2(codec)) + snd_printk(KERN_INFO "patch_analog: AD1988A rev.2 is detected, enable workarounds\n"); + + board_config = snd_hda_check_board_config(codec, ad1988_cfg_tbl); +@@ -2533,13 +2536,13 @@ static int patch_ad1988(struct hda_codec + case AD1988_6STACK_DIG: + spec->multiout.max_channels = 8; + spec->multiout.num_dacs = 4; +- if (codec->revision_id == AD1988A_REV2) ++ if (is_rev2(codec)) + spec->multiout.dac_nids = ad1988_6stack_dac_nids_rev2; + else + spec->multiout.dac_nids = ad1988_6stack_dac_nids; + spec->input_mux = &ad1988_6stack_capture_source; + spec->num_mixers = 2; +- if (codec->revision_id == AD1988A_REV2) ++ if (is_rev2(codec)) + spec->mixers[0] = ad1988_6stack_mixers1_rev2; + else + spec->mixers[0] = ad1988_6stack_mixers1; +@@ -2555,7 +2558,7 @@ static int patch_ad1988(struct hda_codec + case AD1988_3STACK_DIG: + spec->multiout.max_channels = 6; + spec->multiout.num_dacs = 3; +- if (codec->revision_id == AD1988A_REV2) ++ if (is_rev2(codec)) + spec->multiout.dac_nids = ad1988_3stack_dac_nids_rev2; + else + spec->multiout.dac_nids = ad1988_3stack_dac_nids; +@@ -2563,7 +2566,7 @@ static int patch_ad1988(struct hda_codec + spec->channel_mode = ad1988_3stack_modes; + spec->num_channel_mode = ARRAY_SIZE(ad1988_3stack_modes); + spec->num_mixers = 2; +- if (codec->revision_id == AD1988A_REV2) ++ if (is_rev2(codec)) + spec->mixers[0] = ad1988_3stack_mixers1_rev2; + else + spec->mixers[0] = ad1988_3stack_mixers1; diff --git a/queue-2.6.17/alsa-hda-intel-fix-race-in-remove.patch b/queue-2.6.17/alsa-hda-intel-fix-race-in-remove.patch new file mode 100644 index 00000000000..58fb357edac --- /dev/null +++ b/queue-2.6.17/alsa-hda-intel-fix-race-in-remove.patch @@ -0,0 +1,38 @@ +From stable-bounces@linux.kernel.org Thu Jul 13 11:07:37 2006 +Date: Thu, 13 Jul 2006 20:06:54 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Cc: +Subject: ALSA: hda-intel - Fix race in remove + +From: Takashi Iwai + +[PATCH] ALSA: hda-intel - Fix race in remove + +Call iounmap after free_irq to avoid invalid accesses in the +shared irq. The patch is taken from + https://bugzilla.novell.com/show_bug.cgi?id=167869 + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/hda_intel.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- linux-2.6.17.6.orig/sound/pci/hda/hda_intel.c ++++ linux-2.6.17.6/sound/pci/hda/hda_intel.c +@@ -1393,10 +1393,10 @@ static int azx_free(struct azx *chip) + msleep(1); + } + +- if (chip->remap_addr) +- iounmap(chip->remap_addr); + if (chip->irq >= 0) + free_irq(chip->irq, (void*)chip); ++ if (chip->remap_addr) ++ iounmap(chip->remap_addr); + + if (chip->bdl.area) + snd_dma_free_pages(&chip->bdl); diff --git a/queue-2.6.17/alsa-rme-hdsp-fixed-proc-interface.patch b/queue-2.6.17/alsa-rme-hdsp-fixed-proc-interface.patch new file mode 100644 index 00000000000..01d5d5b0ce7 --- /dev/null +++ b/queue-2.6.17/alsa-rme-hdsp-fixed-proc-interface.patch @@ -0,0 +1,34 @@ +From stable-bounces@linux.kernel.org Thu Jul 13 11:13:21 2006 +Date: Thu, 13 Jul 2006 20:12:41 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Cc: +Subject: ALSA: RME HDSP - fixed proc interface (missing {}) + +From: Remy Bruno + +[PATCH] ALSA: RME HDSP - fixed proc interface (missing {}) + +From: Remy Bruno +Signed-off-by: Jaroslav Kysela +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/rme9652/hdsp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- linux-2.6.17.6.orig/sound/pci/rme9652/hdsp.c ++++ linux-2.6.17.6/sound/pci/rme9652/hdsp.c +@@ -3169,9 +3169,10 @@ snd_hdsp_proc_read(struct snd_info_entry + char *clock_source; + int x; + +- if (hdsp_check_for_iobox (hdsp)) ++ if (hdsp_check_for_iobox (hdsp)) { + snd_iprintf(buffer, "No I/O box connected.\nPlease connect one and upload firmware.\n"); + return; ++ } + + if (hdsp_check_for_firmware(hdsp, 0)) { + if (hdsp->state & HDSP_FirmwareCached) { diff --git a/queue-2.6.17/alsa-suppress-irq-handler-mismatch-messages-in-alsa-isa-drivers.patch b/queue-2.6.17/alsa-suppress-irq-handler-mismatch-messages-in-alsa-isa-drivers.patch new file mode 100644 index 00000000000..95807a66246 --- /dev/null +++ b/queue-2.6.17/alsa-suppress-irq-handler-mismatch-messages-in-alsa-isa-drivers.patch @@ -0,0 +1,34 @@ +From stable-bounces@linux.kernel.org Fri Jul 14 07:41:12 2006 +Date: Fri, 14 Jul 2006 16:40:35 +0200 +Message-ID: +From: Takashi Iwai +To: stable@kernel.org +Subject: ALSA: Suppress irq handler mismatch messages in ALSA ISA drivers + +From: Takashi Iwai + +[PATCH] Suppress irq handler mismatch messages in ALSA ISA drivers + +Suppress 'irq handler mismatch' messages at auto-probing of irqs +in ALSA ISA drivers. + +Signed-off-by: Takashi Iwai +Signed-off-by: Jaroslav Kysela +Signed-off-by: Greg Kroah-Hartman + +--- + include/sound/initval.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- linux-2.6.17.6.orig/include/sound/initval.h ++++ linux-2.6.17.6/include/sound/initval.h +@@ -62,7 +62,8 @@ static int snd_legacy_find_free_irq(int + { + while (*irq_table != -1) { + if (!request_irq(*irq_table, snd_legacy_empty_irq_handler, +- SA_INTERRUPT, "ALSA Test IRQ", (void *) irq_table)) { ++ SA_INTERRUPT | SA_PROBEIRQ, "ALSA Test IRQ", ++ (void *) irq_table)) { + free_irq(*irq_table, (void *) irq_table); + return *irq_table; + } diff --git a/queue-2.6.17/series b/queue-2.6.17/series index 7a88606c9fd..4f627c9cdee 100644 --- a/queue-2.6.17/series +++ b/queue-2.6.17/series @@ -29,3 +29,14 @@ pdflush-handle-resume-wakeups.patch ieee80211-tkip-requires-crc32.patch fix-ipv4-decnet-routing-rule-dumping.patch add-missing-ufo-initialisations.patch +alsa-suppress-irq-handler-mismatch-messages-in-alsa-isa-drivers.patch +alsa-rme-hdsp-fixed-proc-interface.patch +alsa-hda-intel-fix-race-in-remove.patch +alsa-fix-workaround-for-ad1988a-rev2-codec.patch +alsa-fix-undefined-references-in-isa-miro-sound-driver.patch +alsa-fix-the-snd_fm801_tea575x-dependencies.patch +alsa-fix-mute-switch-on-vaio-laptops-with-stac7661.patch +alsa-fix-model-for-hp-dc7600.patch +alsa-fix-missing-array-terminators-in-ad1988-codec-support.patch +alsa-fix-a-deadlock-in-snd-rtctimer.patch +alsa-au88x0-fix-64bit-address-of-mpu401-mmio-port.patch