aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers
Commit message (Collapse)AuthorAge
* Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2Ingo Molnar2009-03-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/parisc/kernel/irq.c arch/x86/include/asm/fixmap_64.h arch/x86/include/asm/setup.h kernel/irq/handle.c Semantic merge: arch/x86/include/asm/fixmap.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * Merge commit 'v2.6.29-rc5' into x86/apicIngo Molnar2009-02-15
| |\
| * | x86: allow more than 8 cpus to be used on 32-bitYinghai Lu2009-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | X86_PC is the only remaining 'sub' architecture, so we dont need it anymore. This also cleans up a few spurious references to X86_PC in the driver space - those certainly should be X86. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* | | Merge branch 'topic/misc' into for-linusTakashi Iwai2009-03-23
|\ \ \
| * | | ALSA: sound/drivers/vx: fix sparse warning: different signednessHannes Eder2009-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix this sparse warning: sound/drivers/vx/vx_uer.c:301:42: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Hannes Eder <hannes@hanneseder.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: Add missing KERN_* prefix to printk in sound/driversTakashi Iwai2009-02-05
| |/ / | | | | | | | | | Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'topic/hwdep-cleanup' into for-linusTakashi Iwai2009-03-23
|\ \ \
| * | | ALSA: Remove superfluous hwdep opsTakashi Iwai2009-02-05
| |/ / | | | | | | | | | | | | | | | Remove NOP hwdep ops in sound drivers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'topic/snd_card_new-err' into for-linusTakashi Iwai2009-03-23
|\ \ \ | |_|/ |/| |
| * | ALSA: Convert to snd_card_create() in other sound/*Takashi Iwai2009-01-12
| |/ | | | | | | | | | | | | Convert from snd_card_new() to the new snd_card_create() function in other sound subdirectories. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* / ALSA: mtpav - Fix initial value for input hwportTakashi Iwai2009-02-11
|/ | | | | | | | | | | Fix the initial value for input hwport. The old value (-1) may cause Oops when an realtime MIDI byte is received before the input port is explicitly given. Instead, now it's set to the broadcasting as default. Tested-by: Holger Dehnhardt <dehnhardt@ahdehnhardt.de> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* Merge branch 'timers-core-for-linus' of ↵Linus Torvalds2008-12-30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimers: fix warning in kernel/hrtimer.c x86: make sure we really have an hpet mapping before using it x86: enable HPET on Fujitsu u9200 linux/timex.h: cleanup for userspace posix-timers: simplify de_thread()->exit_itimers() path posix-timers: check ->it_signal instead of ->it_pid to validate the timer posix-timers: use "struct pid*" instead of "struct task_struct*" nohz: suppress needless timer reprogramming clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI nohz: no softirq pending warnings for offline cpus hrtimer: removing all ur callback modes, fix hrtimer: removing all ur callback modes, fix hotplug hrtimer: removing all ur callback modes x86: correct link to HPET timer specification rtc-cmos: export second NVRAM bank Fixed up conflicts in sound/drivers/pcsp/pcsp.c and sound/core/hrtimer.c manually.
| * hrtimer: removing all ur callback modesPeter Zijlstra2008-11-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Impact: cleanup, move all hrtimer processing into hardirq context This is an attempt at removing some of the hrtimer complexity by reducing the number of callback modes to 1. This means that all hrtimer callback functions will be ran from HARD-irq context. I went through all the 30 odd hrtimer callback functions in the kernel and saw only one that I'm not quite sure of, which is the one in net/can/bcm.c - hence I'm CC-ing the folks responsible for that code. Furthermore, the hrtimer core now calls callbacks directly with IRQs disabled in case you try to enqueue an expired timer. If this timer is a periodic timer (which should use hrtimer_forward() to advance its time) then it might be possible to end up in an inf. recursive loop due to the fact that hrtimer_forward() doesn't round up to the next timer granularity, and therefore keeps on calling the callback - obviously this needs a fix. Aside from that, this seems to compile and actually boot on my dual core test box - although I'm sure there are some bugs in, me not hitting any makes me certain :-) Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* | Merge branch 'topic/convert-tasklet' into to-pushTakashi Iwai2008-12-25
|\ \
| * | ALSA: hda - Convert from takslet_hi_schedule() to tasklet_schedule()Takashi Iwai2008-12-18
| |/ | | | | | | | | | | | | | | Replace all tasklet_hi_schedule() callers with the normal tasklet_schedule(). The former often causes troubles with RT-kernels, and has actually no merit. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'topic/pcsp-fix' into topic/miscTakashi Iwai2008-12-20
|\ \
| * | ALSA: pcsp - Fix starting the stream with HRTIMER_CB_IRQSAFE_UNLOCKTakashi Iwai2008-11-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the callback mode HRTIMER_CB_IRQSAFE_UNLOCK, the start of the stream with zero delay doesn't work. Since IRQSAFE mode is removed, we have to change the pcsp start-up code. This patch splits the callback function to two parts, the triggering of the port and the calculation of the expire time, and the update of the ALSA PCM core. The first part is called both from the trigger-start and the hrtimer callback while the latter is handled only in the hrtimer callback. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | Merge branch 'topic/misc' into topic/pcsp-fixTakashi Iwai2008-11-26
| |\ \ | | |/ | |/| | | | | | | Conflicts: sound/drivers/pcsp/pcsp_lib.c
| * | Merge branch 'for-linus' of ↵Linus Torvalds2008-11-03
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda: make a STAC_DELL_EQ option ALSA: emu10k1 - Add more invert_shared_spdif flag to Audigy models ALSA: hda - Add a quirk for another Acer Aspire (1025:0090) ALSA: remove direct access of dev->bus_id in sound/isa/* sound: struct device - replace bus_id with dev_name(), dev_set_name() ALSA: Fix PIT lockup on some chipsets when using the PC-Speaker ALSA: rawmidi - Add open check in rawmidi callbacks ALSA: hda - Add digital-mic for ALC269 auto-probe mode ALSA: hda - Disable broken mic auto-muting in Realtek codes
| * \ \ Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2Thomas Gleixner2008-10-22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: kernel/time/tick-sched.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| | * \ \ Merge commit 'linus/master' into merge-linusArjan van de Ven2008-10-17
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/x86/kvm/i8254.c
| | * | | | hrtimer: convert sound/ to the new hrtimer apisArjan van de Ven2008-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to be able to do range hrtimers we need to use accessor functions to the "expire" member of the hrtimer struct. This patch converts sound/ to these accessors. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
* | | | | | ALSA: ac97 - Remove EXPERIMENTAL from CONFIG_SND_AC97_POWER_SAVETakashi Iwai2008-11-28
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | It's mature enough now. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | | ALSA: pcsp - Use HRTIMER_CB_IRQSAFE_UNLOCKEDTakashi Iwai2008-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HRTIMER_CB_IRQSAFE was removed in the upstream. Try to use HRTIMER_CB_IRQSAFE_UNLOCKED instead. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | | Merge branch 'topic/fix/misc' into topic/miscTakashi Iwai2008-11-07
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | sound: struct device - replace bus_id with dev_name(), dev_set_name()Kay Sievers2008-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [stripped sound/isa/* changes, replaced with the next patch -- tiwai] Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | | ALSA: Fix PIT lockup on some chipsets when using the PC-SpeakerZoltan Devai2008-11-03
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Fix PIT lockup on some chipsets when using the PC-Speaker. Signed-off-by: Zoltan Devai <zdevai@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'topic/misc-next' into topic/miscTakashi Iwai2008-10-27
|\ \ \ \ | |/ / / |/| | |
| * | | ALSA: pcsp - Fix locking messes in snd-pcspTakashi Iwai2008-10-20
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snd-pcsp driver takes chip->substream_lock together with PCM substream lock. These are even mixed up with hrtimer's lock, resulting in messy lock depencies. Right now, snd-pcsp driver resolves the deadlock by using HRTIMER_CB_SOFTIRQ. However, this isn't nice for a really fast path like bit-flipping. This patch introduces a tasklet for PCM period handling so that the hrtimer callback can be handled fast. This also reduce the use of chip->substream_lock to avoid deadlocks. It's still used in pointer callback, but even this could be removed with a proper barrier. Another good solution is to introduce async trigger callback. But, this will involve with a major rewrite of the PCM core code, so I take first this easy fix. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* / | ALSA: misc typo fixesMariusz Kozlowski2008-10-19
|/ / | | | | | | | | | | | | Fixed typos in disabled codes via #if 0. Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: mtpav - Fix race in probeTakashi Iwai2008-10-10
| | | | | | | | | | | | | | | | | | | | | | Ingo reported Oops at probing mtpav driver. It's a race between the irq handler and the rawmidi instance registration. This patch fixes the order of registration to avoid the race. Signed-off-by: Takashi Iwai <tiwai@suse.de> Tested-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | ALSA: dummy driver - do not use assignment in if conditionJaroslav Kysela2008-08-15
| | | | | | | | | | | | checkpatch.pl does not like assignment in if condition Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | sound: Fix esoteric double free in the dummy sound driver.Daniel THOMPSON2008-08-15
| | | | | | | | | | | | | | | | | | | | | | | | The dummy driver uses runtime->private_free but still frees its pcm structures on error paths. This is esoteric because the error paths in question are unreachable. Thus the bug is only a problem when someone copies this code into other drivers. Signed-off-by: Daniel R Thompson <daniel.thompson@st.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | ALSA: Kill snd_assert() in other placesTakashi Iwai2008-08-13
|/ | | | | | | | Kill snd_assert() in other places, either removed or replaced with if () with snd_BUG_ON(). Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gitDavid Woodhouse2008-07-14
|\ | | | | | | | | | | Conflicts: sound/pci/Kconfig
| * Fix a const pointer usage warning in the Digigram VX soundcard driverDavid Howells2008-07-10
| | | | | | | | | | | | | | | | | | | | | | Fix a const pointer usage warning in the Digigram VX soundcard driver. A const pointer is being passed to copy_from_user() to load the firmware into. This is okay in this case because the function has allocated the firmware struct itself, but the const qualifier will be part of the firmware struct - so the patch casts the const away. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * vx: treat firmware data as constDavid Woodhouse2008-07-10
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
* | ALSA: Fix a const pointer usage warning in the Digigram VX soundcard driverDavid Howells2008-07-10
| | | | | | | | | | | | | | | | | | | | | | | | Fix a const pointer usage warning in the Digigram VX soundcard driver. A const pointer is being passed to copy_from_user() to load the firmware into. This is okay in this case because the function has allocated the firmware struct itself, but the const qualifier is part of the firmware struct - so the patch casts the const away. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | [ALSA] Fix AC97 kconfig itemsTakashi Iwai2008-05-27
| | | | | | | | | | | | | | The kconfig items related with AC97-powersave must be outside the CONFIG_SND_PCI range. And it'd be better together with CONFIG_SND_AC97. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | sound: Convert to menuconfigTakashi Iwai2008-05-27
| | | | | | | | | | | | Convert menu in sound Kconfig files to menuconfig and if. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | [ALSA] ac97 - Add virtual master control to VT1616/VT1617A codec.Daniel Jacobowitz2008-05-19
|/ | | | | | | | Enable VMASTER for VT1616 / VT1617A codec. Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* [ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item numberStas Sergeev2008-05-25
| | | | | | | This solves the problem with mixers wrongly displaying the PWM freq. Signed-off-by: Stas Sergeev <stsp@aknet.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* snd-pcsp: use HRTIMER_CB_SOFTIRQStas Sergeev2008-05-20
| | | | | | | | | | | | | Change HRTIMER_CB_IRQSAFE to HRTIMER_CB_SOFTIRQ, as suggested by Thomas Gleixner. That solves the lock dependancy reported in Bug #10701. That also allows to call hrtimer_start() directly, tasklet "stupid hack" removed. Signed-off-by: Stas Sergeev <stsp@aknet.ru> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* snd-pcsp: silent misleading warningStas Sergeev2008-05-19
| | | | | | | | | | It appears that alsa allows a sound buffer with size not evenly devided by the period size. This triggers a warning in snd-pcsp and floods the log. As a quick fix, the warning should be disabled. Signed-off-by: Stas Sergeev <stsp@aknet.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* snd-pcsp: depend on CONFIG_EXPERIMENTALStas Sergeev2008-05-19
| | | | | | | | | Considering all the feedbacks I got, depending snd-pcsp on CONFIG_EXPERIMENTAL looks like the only safe way to get out of all the troubles at one go. :) Signed-off-by: Stas Sergeev <stsp@aknet.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* snd-pcsp: put back the compatibility code for the older alsa-libsStas Sergeev2008-05-19
| | | | | | | | | The attached patch adds back the compatibility code, allowing the driver to work with older alsa-libs. The removal was premature, it breaks the real-life configs. Signed-off-by: Stas Sergeev <stsp@aknet.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* snd-pcsp: adjust help texts to frighten usersStas Sergeev2008-05-19
| | | | | | | | | | | Added the warning text to the help of snd-pcsp about the possible problem with this driver so that user can know of the problem in advance. Also, removed the obsoleted text about ancient pc-speaker patch in CONFIG_SOUND help. Signed-off-by: Stas Sergeev <stsp@aknet.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* pcspkr: fix dependanciesStas Sergeev2008-05-07
| | | | | | | | | | | | | | fix pcspkr dependancies: make the pcspkr platform drivers to depend on a platform device, and not the other way around. Signed-off-by: Stas Sergeev <stsp@aknet.ru> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Dmitry Torokhov <dtor@mail.ru> CC: Vojtech Pavlik <vojtech@suse.cz> CC: Michael Opdenacker <michael-lists@free-electrons.com> [fixed for 2.6.26-rc1 by tiwai] Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] pcsp: Fix build with CONFIG_PM=nJohann Felix Soden2008-05-05
| | | | | | | | | sound/drivers/pcsp/pcsp.c: In function 'pcsp_suspend': sound/drivers/pcsp/pcsp.c:201: error: implicit declaration of function 'snd_pcm_suspend_all' Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net> CC: Stas Sergeev <stsp@aknet.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [ALSA] pcsp - Fix more dependencyTakashi Iwai2008-04-29
| | | | | | Added the missing dependency and select for snd-pcsp driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-15 12:28:16 -0500