summaryrefslogtreecommitdiffstats
path: root/sound/oss
Commit message (Collapse)AuthorAgeFilesLines
* Merge 'upstream' branch of ↵Linus Torvalds2005-06-271-2/+3
|\ | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
| * [PATCH] sound/oss/via82cxxx_audio: Use the DMA_32BIT_MASK constantTobias Klauser2005-06-271-2/+3
| | | | | | | | | | | | | | | | | | Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Domen Puncer <domen@coderock.org>
* | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manuallyLinus Torvalds2005-06-277-92/+211
|\ \ | |/ |/| | | Some manual fixups required due to clashes with the PF_FREEZE cleanups.
| * Input: ES1371 (OSS) - do not carry around gameport code if gameportDmitry Torokhov2005-06-011-32/+63
| | | | | | | | | | | | core support is disabled. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ES1370 (OSS) - do not carry around gameport code if gameportDmitry Torokhov2005-06-011-30/+58
| | | | | | | | | | | | core support is disabled. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: make sure that joystick support in CMPCI driver can only beDmitry Torokhov2005-06-011-1/+1
| | | | | | | | | | | | | | selected if either gameport is built-in or _both_ gameport and cmpci are built as modules. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: mad16 (OSS) - do not carry around gameport code if gameport coreDmitry Torokhov2005-06-011-7/+23
| | | | | | | | | | | | support is disabled. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: sonicvibes (OSS) - do not carry around gameport code if gameportDmitry Torokhov2005-06-011-5/+20
| | | | | | | | | | | | core support is disabled. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: trident (OSS) - do not carry around gameport code if gameportDmitry Torokhov2005-06-011-12/+25
| | | | | | | | | | | | core support is disabled, some formatting changes. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ESS Solo (OSS) - do not carry around gameport code if gameportDmitry Torokhov2005-06-011-5/+21
| | | | | | | | | | | | core support is disabled. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | [PATCH] sound/oss/cmpci: Use the DMA_32BIT_MASK constantTobias Klauser2005-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] sound/oss/es1370: Use the DMA_32BIT_MASK constantTobias Klauser2005-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] sound/oss/es1371: Use the DMA_32BIT_MASK constantTobias Klauser2005-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] sound/oss/esssolo1: Use the DMA_32BIT_MASK constantTobias Klauser2005-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] change the SOUND_PRIME handlingAdrian Bunk2005-06-251-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SOUND_PRIME (for OSS) is a tristate. This doesn't make much sense if most users are checking for SOUND_PRIME!=0. This patch changes the semantics of SOUND_PRIME to being a limit for all OSS modules, IOW: SOUND_PRIME=m does now say that all OSS drivers can only be modular. As a side effect, since SOUND_PRIME already depends on SOUND, there's no longer a reason for drivers depending on SOUND_PRIME to additionally depend on SOUND. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] sound/oss/sscape.c: remove dead codeAdrian Bunk2005-06-251-7/+1
| | | | | | | | | | | | | | | | | | | | | | The Coverity checker found that sscape_sb_enable never get's assigned any value different from 0, and therefore some code paths are impossible. This patch removes this variable and the dead code paths. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] sound/oss/rme96xx.c: remove kernel 2.2 #if'sAdrian Bunk2005-06-251-4/+0
| | | | | | | | | | | | | | | | This patch removes #if's for kernel 2.2 . Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] nm256 oss build failureDave Jones2005-06-252-5/+3
| | | | | | | | | | | | | | | | static declaration follows non static Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] sound/oss/: cleanupsAdrian Bunk2005-06-256-13/+11
| | | | | | | | | | | | | | | | | | This patch contains cleanups including the following: - make needlessly global code static Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] remove redundant NULL checks before kfree() in sound/ and avoid ↵Jesper Juhl2005-06-258-28/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | casting pointers about to be kfree()'ed Checking a pointer for NULL before calling kfree() on it is redundant, kfree() deals with NULL pointers just fine. This patch removes such checks from sound/ This patch also makes another, but closely related, change. It avoids casting pointers about to be kfree()'ed. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] rme96xx: fix PageReserved rangeHugh Dickins2005-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | rme96xx busmaster_malloc miscalculates and fails to set PageReserved on any page of char *buf; but busmaster_free does it right, so do the same (I don't have the card, just noticed this while sifting for rmap BUGs). Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] class: convert sound/* to use the new class api instead of class_simplegregkh@suse.de2005-06-201-10/+9
|/ | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Input:Adrian Bunk2005-05-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | This patch adds dummy gameport_register_port, gameport_unregister_port and gameport_set_phys functions to gameport.h for the case when a driver can't use gameport. This fixes the compilation of some OSS drivers with GAMEPORT=n without the need to #if inside every single driver. This patch also removes the non-working and now obsolete SOUND_GAMEPORT. This patch is also an alternative solution for ALSA drivers with similar problems (but #if's inside the drivers might have the advantage of saving some more bytes of gameport is not available). The only user-visible change is that for GAMEPORT=m the affected OSS drivers are now allowed to be built statically (but they won't have gameport support). Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* [PATCH] Add CXT48 to modem black list in ac97Herbert Xu2005-05-051-0/+1
| | | | | | | | | The following patch works around the misdetection of the CXT48 codec as a modem by the OSS ac97 driver. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] sound/oss/sonicvibes.c: fix an array overflowAdrian Bunk2005-05-011-1/+1
| | | | | | | | This patch fixes an array overflow found by the Coverity checker. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] msnd_pinnacle GFP fixAl Viro2005-04-241-1/+1
| | | | | | | | Dumb typo - __get_free_page() takes gfp mask (in this case - GFP_KERNEL), not the page size... Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] let SOUND_AD1889 depend on PCIAdrian Bunk2005-04-161-1/+1
| | | | | | | | | | | | | | Compiling SOUND_AD1889 with PCI=n results in the following compile error: sound/built-in.o(.text+0x24f0c): In function `ad1889_remove': : undefined reference to `pci_release_region' This patch adds the missing dependency on PCI. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] opl3sa2: MODULE_PARM_DESCMagnus Damm2005-04-161-1/+1
| | | | | | | | opl3sa2: Fix "irq"-parameter name typo for parameter description. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] fix u32 vs. pm_message_t in rest of the treePavel Machek2005-04-161-1/+1
| | | | | | | | | This fixes u32 vs. pm_message_t confusion in remaining places. Fortunately there's few of them. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Linux-2.6.12-rc2v2.6.12-rc2Linus Torvalds2005-04-16210-0/+172711
Initial git repository build. I'm not bothering with the full history, even though we have it. We can create a separate "historical" git archive of that later if we want to, and in the meantime it's about 3.2GB when imported into git - space that would just make the early git days unnecessarily complicated, when we don't have a lot of good infrastructure for it. Let it rip!
OpenPOWER on IntegriCloud