aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-09-01/spare/repo/netdev-2.6 branch 'ieee80211'Jeff Garzik
2005-09-01/spare/repo/netdev-2.6 branch 'master'Jeff Garzik
2005-08-31[PATCH] hostap: Fix null pointer dereference in prism2_pccard_card_present()Jouni Malinen
local->hw_priv was initialized only after the interrupt handler was registered. This could trigger a NULL pointer dereference in prism2_pccard_card_present() that assumed that local->hw_priv is always set (and it should have been). Fix this by setting local->hw_priv before registering the interrupt handler. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-08-30Merge refs/heads/upstream from ↵Linus Torvalds
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
2005-08-30[PATCH] ppc32 8xx: fix warnings in m8xx_setup.cMarcelo Tosatti
The following patch fixes two warnings in arch/ppc/syslib/m8xx_setup.c Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-30[PATCH] x86: pci_assign_unassigned_resources() updateIvan Kokshaysky
I had some time to think about PCI assign issues in 2.6.13-rc series. The major problem here is that we call pci_assign_unassigned_resources() way too early - at subsys_initcall level. Therefore we give no chances to ACPI and PnP routines (called at fs_initcall level) to reserve their respective resources properly, as the comments in drivers/pnp/system.c and drivers/acpi/motherboard.c suggest: /** * Reserve motherboard resources after PCI claim BARs, * but before PCI assign resources for uninitialized PCI devices */ So I moved the pci_assign_unassigned_resources() call to pcibios_assign_resources() (fs_initcall), which should hopefully fix a lot of problems and make PCIBIOS_MIN_IO tweaks unnecessary. Other changes: - remove resource assignment code from pcibios_assign_resources(), since it duplicates pci_assign_unassigned_resources() functionality and actually does nothing in 2.6.13; - modify ROM assignment code as per Ben's suggestion: try to use firmware settings by default (if PCI_ASSIGN_ROMS is not set); - set CARDBUS_IO_SIZE back to 4K as it's a wonderful stress test for various setups. Confirmed by Tero Roponen <teanropo@cc.jyu.fi> (who had problems with the 4kB CardBus IO size previously). Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-30Merge HEAD from /spare/repo/linux-2.6/.git Jeff Garzik
2005-08-30Merge refs/heads/for-linus from ↵Linus Torvalds
master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
2005-08-30Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa Linus Torvalds
2005-08-30Merge refs/heads/drm-latest from ↵Linus Torvalds
master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
2005-08-30[ALSA] usb-audio: throttle MIDI URB resubmits on USB errorsClemens Ladisch
USB generic driver When a USB error occurs that might indicate that the device has been unplugged, don't resubmit the URB immediately to prevent flooding the log with error messages before khubd has us disconnect()ed. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30[PATCH] Assign device pointer to OSS devicesTakashi Iwai
Add register_sound_special_device() function to allow assignment of device pointer to a specific OSS device for HAL. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] version 1.0.10rc1Jaroslav Kysela
2005-08-30[ALSA] Add identification for Live 5.1 [SB0220]Lee Revell
EMU10K1/EMU10K2 driver Add identification for Live 5.1 [SB0220] Signed-off-by: Lee Revell <rlrevell@joe-job.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] emu10k1 - Add missing ac97 support on SBLive! Player 5.1Takashi Iwai
EMU10K1/EMU10K2 driver Added the missing ac97 support on SBLive! Player 5.1. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] intel8x0 - Add quirk for FSC 4010Takashi Iwai
Intel8x0 driver Added ac97_quirk for FSC 4010. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] pcm - Fix zero-division in 32bit compat layerTakashi Iwai
PCM Midlevel Fixed zero-division bug in PCM 32bit compat layer. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] intel8x0 - add AC97_TUNE_MUTE_LED quirk for HP nx8220 laptop 103c:0934Daniel Horchner
Intel8x0 driver Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] usb-audio: fix Emagic MIDI protocol handlingClemens Ladisch
USB generic driver Emagic devices pad their packets not with 0xff bytes but with a 0xff byte followed by garbage, so we have to stop at the first such byte. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30[ALSA] Fix missing spin_unlockTakashi Iwai
au88x0 driver,Common EMU synth Fixed missing spin_unlock. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] include/sound/gus.h: 'extern inline' -> 'static inline'Adrian Bunk
GUS Library 'extern inline' doesn't make much sense. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] hda-intel - Fix ULI M5461 supportTakashi Iwai
HDA Intel driver Fix and clean up for the support of ULI M5461 - set CORB/RIRB sizes explicitly - add workarounds for ULI on ia32 - max number of streams depends on the chip type now - increase the size of BDL Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] hda-codec - Add beep support for UniwillTakashi Iwai
HDA Codec driver Added the missing beep support for Uniwill laptop (ALSA bug#1358). Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] vxpocket - Register device pointerTakashi Iwai
Digigram VX Pocket driver Add snd_card_set_dev() to register the device pointer. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] vxpocket - Fix wrong index assignmentTakashi Iwai
Digigram VX Pocket driver Fixed the wrong index number assignment. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] vxpocket - Add missing event callbackTakashi Iwai
Digigram VX Pocket driver Added the missing event callback. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] Fix compilation without CONFIG_PROC_FSTakashi Iwai
Memalloc module Fix an error when built without CONFIG_PROC_FS. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] hda-codec - Code clean upTakashi Iwai
HDA Codec driver Use struct instead of array to improve the readability of hda_codec.c. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] hda-intel - correct a bug in detection of rate supportedNicolas Graziano
HDA Codec driver The insertion of the rate 9600 make a shift in detection of supported rate, put this rate at the end of the list. Signed-off-by: Nicolas Graziano <nicolas.graziano@wanadoo.fr> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] HP nx6110 quirksSergey Vlasov
Intel8x0 driver,AC97 Codec The HP nx6110 laptop needs to have Headphone Jack Sense enabled so that the internal speakers will be turned off when headphones are plugged in. Also ac97_quirk=hp_only is needed to make a single Master volume in the mixer instead of separate volumes for internal speakers and headphones, which just confuses the user. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] ac97_bus - revert last change and do it only in the ALSA treeJaroslav Kysela
AC97 Codec Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] ac97_bus - replace <linux/module.h> with <sound/driver.h> for consistencyJaroslav Kysela
AC97 Codec Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] via82xx - Add DXS entry for MSI 7142Takashi Iwai
VIA82xx driver Added the DXS entry for MSI 7142 (K8MM-V). Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] PCM resume cleanupsJaroslav Kysela
Digigram VX core,CS4231 driver,ATIIXP driver,VIA82xx driver VIA82xx-modem driver,au88x0 driver,CS46xx driver,Trident driver This patch disables SNDRV_PCM_INFO_RESUME flag for drivers which does not support the full resume. Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] ac97 - make ac97 codec device name uniqueBjorge Dijkstra
AC97 Codec The patch fixes the bus_id conflict error when registering two codecs of the same type (ALSA bug#1334). Signed-off-by: Bjorge Dijkstra <bjorge@gmx.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] hdspm - Fix module parameter descriptionTakashi Iwai
RME9652 driver Fix the module parameter description after proofreading. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] nm256 - Fix PM and irq handlingTakashi Iwai
NM256 driver - Fixed the PCM resume - restoring the rate setting - Fixed the handling of buggy irqs - Dynamically acquire/release irq handler to make the driver more robust to unknown irq storms (as OSS driver does). Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] intel8x0 - Fix PMTakashi Iwai
Intel8x0 driver Fixed the PCM resume of intel8x0. Restores the requested register setting. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] ALSA timer - fixed compilationJaroslav Kysela
Timer Midlevel Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] Timer API - SNDRV_TIMER_EVENT_RESUME - val is resolution in nsJaroslav Kysela
ALSA Core Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] Timer API - added SUSPEND/RESUME eventsJaroslav Kysela
PCM Midlevel,Timer Midlevel,ALSA Core - added SNDRV_TIMER_EVENT_SUSPEND / RESUME events - changed timer events from PAUSE / CONTINUE in PCM midlevel to SUSPEND / RESUME Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] hda-intel: Suspend/resume fixes for PCM devicesJaroslav Kysela
HDA Intel driver - removed SNDRV_PCM_INFO_RESUME (the driver cannot do PCM resume at the time) - fixed chip->pcm_devs initialization Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] hda-patch-realtek - added pci subdevice ID for Acer TravelMate 8100 ↵Jaroslav Kysela
(3 stack model + digital out) HDA Codec driver Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] via82xx - Fix SPDIF sample ratesTakashi Iwai
VIA82xx driver Fixed the sample rates set in the fourth DXS channel with Non-VRA mode. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] Fix PCM 32bit compat layerTakashi Iwai
PCM Midlevel Fixed the handling of boundary in PCM 32bit compat layer. Positions in hwsync are bound in the 32bit boundary size. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] opl3sa2 - use different name for PnP BIOS driverJaroslav Kysela
OPL3SA2 driver - use different name (opl3sa2-pnpbios) for PnP BIOS driver - don't print warning when manual config of resources fails (PnP BIOS) Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] ac97: make patch_wolfson_wm97??_specific() functions staticClemens Ladisch
AC97 Codec Make the patch_wolfson_wm97??_specific() functions static again. This patch was accidentally reverted in rev. 1.92. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30[ALSA] usb-audio: use vmalloc for the PCM bufferClemens Ladisch
USB generic driver With the double buffering, we no longer need contiguous memory for the PCM buffer, so we can use vmalloc() instead of the preallocation functions, and increase the maximum size to 256 KB. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30[ALSA] usb-audio: use usb_buffer_alloc/freeClemens Ladisch
USB generic driver Use the USB buffer allocation functions to avoid repeated DMA mappings of our buffers, which are re-used quite a lot. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30[ALSA] usb-audio: properly lock hwptr_done accessesClemens Ladisch
USB generic driver Take the substream lock when reading hwptr_done to avoid a race condition with the updates in the URB callbacks. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>