summaryrefslogtreecommitdiffstats
path: root/sound/oss
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of ↵Linus Torvalds2009-12-092-3/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits) tree-wide: fix misspelling of "definition" in comments reiserfs: fix misspelling of "journaled" doc: Fix a typo in slub.txt. inotify: remove superfluous return code check hdlc: spelling fix in find_pvc() comment doc: fix regulator docs cut-and-pasteism mtd: Fix comment in Kconfig doc: Fix IRQ chip docs tree-wide: fix assorted typos all over the place drivers/ata/libata-sff.c: comment spelling fixes fix typos/grammos in Documentation/edac.txt sysctl: add missing comments fs/debugfs/inode.c: fix comment typos sgivwfb: Make use of ARRAY_SIZE. sky2: fix sky2_link_down copy/paste comment error tree-wide: fix typos "couter" -> "counter" tree-wide: fix typos "offest" -> "offset" fix kerneldoc for set_irq_msi() spidev: fix double "of of" in comment comment typo fix: sybsystem -> subsystem ...
| * Merge branch 'for-next' into for-linusJiri Kosina2009-12-072-3/+1
| |\ | | | | | | | | | | | | | | | Conflicts: kernel/irq/chip.c
| | * tree-wide: fix assorted typos all over the placeAndré Goddard Rosa2009-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That is "success", "unknown", "through", "performance", "[re|un]mapping" , "access", "default", "reasonable", "[con]currently", "temperature" , "channel", "[un]used", "application", "example","hierarchy", "therefore" , "[over|under]flow", "contiguous", "threshold", "enough" and others. Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| | * Kconfig: Remove useless and sometimes wrong commentsMichael Roth2009-11-091-2/+0
| | | | | | | | | | | | | | | | | | | | | Additionally, some excessive newlines removed. Signed-off-by: Michael Roth <mroth@nessie.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | | Merge branch 'topic/misc' into for-linusTakashi Iwai2009-12-043-3/+3
|\ \ \
| * | | sound: OSS: keep index within bounds of midi_devs[]Roel Kluin2009-11-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the {orig,midi}_dev equals num_midis, that's one too large already. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | Merge branch 'fix/misc' into topic/miscTakashi Iwai2009-11-143-4/+6
| |\ \ \
| * | | | sound: OSS: fix error return in dma_ioctl()Roel Kluin2009-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The returned error should stay negative Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | | Merge branch 'topic/pcm-dma-fix' into topic/core-changeTakashi Iwai2009-12-011-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'hostprogs-wmissing-prototypes' of ↵Linus Torvalds2009-11-171-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc * 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc: Makefile: Add -Wmising-prototypes to HOSTCFLAGS oss: Mark loadhex static in hex2hex.c dtc: Mark various internal functions static dtc: Set "noinput" in the lexer to avoid an unused function drm: radeon: Mark several functions static in mkregtable arch/sparc/boot/*.c: Mark various internal functions static arch/powerpc/boot/addRamDisk.c: Mark several internal functions static arch/alpha/boot/tools/objstrip.c: Mark "usage" static Documentation/vm/page-types.c: Declare checked_open static genksyms: Mark is_reserved_word static kconfig: Mark various internal functions static kconfig: Make zconf.y work with current bison
| | * | | oss: Mark loadhex static in hex2hex.cJosh Triplett2009-11-151-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | Nothing outside of hex2hex.c references loadhex. Signed-off-by: Josh Triplett <josh@joshtriplett.org>
* | | | Merge branch 'topic/beep-rename' into topic/core-changeTakashi Iwai2009-12-014-1496/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'fix/misc' into topic/miscTakashi Iwai2009-11-012-6/+0
| |\ \ | | |/
| * | sound: remove OSS Ensoniq SoundScape driverKrzysztof Helt2009-10-303-1493/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OSS driver for Ensoniq SoundScape cards is broken after conversion to mutexes and a new ALSA snd-sscape driver handles all devices handled by the OSS one. The ALSA driver was tested with these cards: Spea V7 MediaFX Ensoniq Soundscape Elite Ensoniq Soundscape VIVO (this card is not handled by the OSS driver) Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: Cleanup redundant tests on unsignedRoel Kluin2009-10-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables are unsigned so the test `>= 0' is always true, the `< 0' test always fails. In these cases the other part of the test catches wrapped values. In dac_audio_write() there does not occur a test for wrapped values, but the test appears redundant. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | sound: Replace old style lock initializerThomas Gleixner2009-11-071-1/+3
| | | | | | | | | | | | | | | | | | | | | SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | sound: Use KERN_WARNING instead of KERN_WARN, which does not existRandy Dunlap2009-11-052-3/+3
| |/ |/| | | | | | | | | Reported-by: Andrew Lyon <andrew.lyon@gmail.com> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | trivial: remove unnecessary semicolonsJoe Perches2009-09-211-3/+0
| | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | trivial: Remove commented out usage of dead MODULE_PARM() in swarm_cs4297aRobert P. J. Day2009-09-211-3/+0
|/ | | | | | | Get rid of that commented usage of the now defunct MODULE_PARM macro. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* sound: vwsnd: Fix setting of cfgval and ctlval in li_setup_dma()Roel Kluin2009-08-261-3/+3
| | | | | | | | Since !LI_CCFG_* evaluates to 0, this did not change anything to cfgval and ctlval. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* sound: fix OSS MIDI output data lossClemens Ladisch2009-08-101-3/+4
| | | | | | | | | | | In the 2.1.6 kernel, the output loop in midi_poll() was changed to enable interrupts during the outputc() call. Unfortunately, the check whether the device has accepted the current byte ("ok") was moved behind the code that removes the byte from the output queue, so one byte would be lost every time the hardware FIFO is full. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* sound: mpu401.c: Buffer overflowRoel Kluin2009-07-291-1/+1
| | | | | | | | mpu_synth_info[m].name is a char[30], and the minimum length of the data written by sprintf is 31 bytes including terminating null. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* sound: aedsp16: Buffer overflowRoel Kluin2009-07-291-4/+5
| | | | | | | | DSPVersion is declared as char[3], but the sprintf writes at least 4 bytes including terminating null. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* sound: OSS: mpu401, fix deadlockJiri Slaby2009-06-291-13/+3
| | | | | | | | mpu401_chk_version is called with a spin lock already held. Don't take it again. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* sound: Use PCI_VDEVICEJoe Perches2009-06-251-1/+1
| | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* time: move PIT_TICK_RATE to linux/timex.hArnd Bergmann2009-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PIT_TICK_RATE is currently defined in four architectures, but in three different places. While linux/timex.h is not the perfect place for it, it is still a reasonable replacement for those drivers that traditionally use asm/timex.h to get CLOCK_TICK_RATE and expect it to be the PIT frequency. Note that for Alpha, the actual value changed from 1193182UL to 1193180UL. This is unlikely to make a difference, and probably can only improve accuracy. There was a discussion on the correct value of CLOCK_TICK_RATE a few years ago, after which every existing instance was getting changed to 1193182. According to the specification, it should be 1193181.818181... Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Len Brown <lenb@kernel.org> Cc: john stultz <johnstul@us.ibm.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* trivial: unnecessary (void*) cast removal in sound/oss/msnd.cChris Sanford2009-06-121-1/+1
| | | | | | | This is a trivial patch that removes an unnecessary void pointer cast. Signed-off-by: Chris Sanford <crsanford@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* sound: oss: sh_dac_audio timer fixes.Magnus Damm2009-05-152-54/+33
| | | | | | | | | | | This patch modifies sh_dac_audio in the following ways: - use high resolution timer instead of TMU1 - fix cpu/dac.h include - add future rewrite comment Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* trivial: Fix misspelling of firmwareNick Andrew2009-03-301-1/+1
| | | | | | | Fix misspelling of firmware. Signed-off-by: Nick Andrew <nick@nick-andrew.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* Merge branch 'for-linus' of ↵Linus Torvalds2009-03-261-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: irq_node.handler() should return irqreturn_t m68k: section mismatch fixes: Atari SCSI m68k: section mismatch fixes: DMAsound for Atari MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository m68k: mac - Add SWIM floppy support m68k: mac - Add a new entry in mac_model to identify the floppy controller type. m68k: Add install target
| * m68k: section mismatch fixes: DMAsound for AtariMichael Schmitz2009-03-261-2/+2
| | | | | | | | | | | | | | add __initdata to driver presets struct Signed-off-By: Michael Schmitz <schmitz@debian.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* | Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6Linus Torvalds2009-03-265-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | * 'bkl-removal' of git://git.lwn.net/linux-2.6: Rationalize fasync return values Move FASYNC bit handling to f_op->fasync() Use f_lock to protect f_flags Rename struct file->f_ep_lock
| * | Use f_lock to protect f_flagsJonathan Corbet2009-03-165-0/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | Traditionally, changes to struct file->f_flags have been done under BKL protection, or with no protection at all. This patch causes all f_flags changes after file open/creation time to be done under protection of f_lock. This allows the removal of some BKL usage and fixes a number of longstanding (if microscopic) races. Reviewed-by: Christoph Hellwig <hch@lst.de> Cc: Al Viro <viro@ZenIV.linux.org.uk> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
* | Merge branch 'topic/oss-fix' into for-linusTakashi Iwai2009-03-245-14/+11
|\ \ | |/ |/|
| * sound/oss: fix sparse warning: symbol shadows an earlier oneHannes Eder2009-02-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | Impact: Move variable to a more inner scope. Fix this sparse warning: sound/oss/sequencer.c:235:29: warning: symbol 'err' shadows an earlier one sound/oss/sequencer.c:215:13: originally declared here Signed-off-by: Hannes Eder <hannes@hanneseder.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * sound/oss: fix sparse warnings: different signednessHannes Eder2009-02-261-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Impact: Change signature of 'set_volume_stereo' and 'set_volume_mono'. Fix this sparse warnings: sound/oss/pss.c:545:42: warning: incorrect type in argument 2 (different signedness) sound/oss/pss.c:546:42: warning: incorrect type in argument 3 (different signedness) sound/oss/pss.c:554:59: warning: incorrect type in argument 2 (different signedness) sound/oss/pss.c:560:59: warning: incorrect type in argument 2 (different signedness) sound/oss/pss.c:566:59: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Hannes Eder <hannes@hanneseder.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * sound: OSS: missing parentheses in pas2_card.cRoel Kluin2009-02-181-3/+1
| | | | | | | | | | | | | | Add missing parentheses in pas2_card.c. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * sound: OSS: ad1848 - Fix another typoTakashi Iwai2009-02-171-1/+1
| | | | | | | | | | | | | | Fix another typo of || and &&. Reported-by: Jörg-Volker Peetz <jvpeetz@web.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * sound: OSS: &&/|| typo in ad1848.cRoel Kluin2009-02-161-1/+1
| | | | | | | | | | | | | | &&/|| typo Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * sound: OSS: dmabuf: too many loopsRoel Kluin2009-02-111-1/+1
| | | | | | | | | | | | | | loop adev->dmap_out->nbufs times Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | m68k: atari - Rename "mfp" to "st_mfp"Geert Uytterhoeven2009-02-221-8/+8
|/ | | | | | | | | | | | | | | | | | | | http://kisskb.ellerman.id.au/kisskb/buildresult/72115/: | net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile' | net/mac80211/ieee80211_i.h:350: error: syntax error before '}' token | net/mac80211/ieee80211_i.h:455: error: field 'sta' has incomplete type | distcc[19430] ERROR: compile net/mac80211/main.c on sprygo/32 failed This is caused by | # define mfp ((*(volatile struct MFP*)MFP_BAS)) in arch/m68k/include/asm/atarihw.h, which conflicts with the new "mfp" enum in net/mac80211/ieee80211_i.h. Rename "mfp" to "st_mfp", as it's a way too generic name for a global #define. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* m68k: dmasound - Kill warn_unused_result warningsGeert Uytterhoeven2009-01-122-8/+13
| | | | | | | warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
* trivial: fix an -> a typos in documentation and commentsFrederik Schwarzer2009-01-061-1/+1
| | | | | | | | | | | It is always "an" if there is a vowel _spoken_ (not written). So it is: "an hour" (spoken vowel) but "a uniform" (spoken 'j') Signed-off-by: Frederik Schwarzer <schwarzerf@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* [ARM] netwinder: clean up GPIO namingRussell King2008-12-131-5/+3
| | | | | | | Netwinder was using gpio_xxx names which could clash with the GPIO layer. Add a 'nw_' prefix to ensure that these remain separate. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* oss: fix O_NONBLOCK in dmasound_coreAl Viro2008-11-012-3/+3
| | | | | | | | | | | | We broke O_NONBLOCK handling in OSS dmasound_core in 2.3.11-pre3 - the original code copied f_flags to open_mode and then checked for O_NONBLOCK in there, but that got changed to copying f_mode and O_NONBLOCK has not reached that field in any kernel version. Since we do not care for any other bits, the fix is obvious... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2008-10-271-1/+1
|\ | | | | | | | | | | | | | | | | | | 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: ASoC: Blackfin: update SPORT0 port selector (v2) ALSA: hda - Restore default pin configs for realtek codecs sound: use a common working email address pci: use pci_ioremap_bar() in sound/
| *-----. Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and ↵Takashi Iwai2008-10-272-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 'topic/pci-ioremap-bar' into for-linus
| | | | * | sound: use a common working email addressAlan Cox2008-10-271-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | | [PATCH] introduce fmode_t, do annotationsAl Viro2008-10-218-27/+19
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
* | | | sh: Migrate common board headers to mach-common/.Paul Mundt2008-10-201-1/+1
|/ / / | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
OpenPOWER on IntegriCloud