Nicolas Graziano [Wed, 27 Jul 2005 15:25:08 +0000 (17:25 +0200)]
[ALSA] hda driver, correct bug in model 'auto'
HDA Codec driver
- Correct some index variable inversion in patch_cmedia.c
Signed-off-by: Nicolas Graziano <nicolas.graziano@wanadoo.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Victor Fusco [Tue, 26 Jul 2005 11:42:31 +0000 (13:42 +0200)]
[ALSA] sound/core Fix the sparse warning 'implicit cast to nocast type'
Memalloc module,ALSA Core,Instrument layer
Fix the sparse warning 'implicit cast to nocast type'
File/Subsystem:sound/core
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Mon, 25 Jul 2005 14:19:10 +0000 (16:19 +0200)]
[ALSA] usb-audio - change quirk type handling
USB generic driver
Make the quirk type an enum instead of a #defined integer, and use a
table for the quirk constructor functions instead of a big switch
statement.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Clemens Ladisch [Mon, 25 Jul 2005 14:17:29 +0000 (16:17 +0200)]
[ALSA] usb-audio - add support for Miditech USB MIDI keyboards
USB generic driver
Add support for Miditech Midistart and MidiStudio keyboards (another
case of devices using the standard protocol but having no descriptors).
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Clemens Ladisch [Thu, 21 Jul 2005 06:01:22 +0000 (08:01 +0200)]
[ALSA] seq-midi - silently ignore non-MIDI events
ALSA sequencer
When non-MIDI sequencer events are sent to a RawMIDI port, silently
ignore them instead of returning a confusing error code which may upset
the sequencer and abort the current write() to /dev/snd/seq.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Clemens Ladisch [Mon, 11 Jul 2005 13:37:19 +0000 (15:37 +0200)]
[ALSA] ac97 - remove unused variable
AC97 Codec
remove a variable made obsolete by the last change
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
James Courtier-Dutton [Sun, 10 Jul 2005 10:04:29 +0000 (12:04 +0200)]
[ALSA] ac97: Fix volume control bit size detection for STAC9704.
AC97 Codec
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
James Courtier-Dutton [Sun, 10 Jul 2005 09:50:36 +0000 (11:50 +0200)]
[ALSA] emu10k1: Add EMU 1212m card entry and document it as not supported yet.
EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Nishanth Aravamudan [Sat, 9 Jul 2005 08:54:37 +0000 (10:54 +0200)]
[ALSA] Fix-up sleeping in sound/usb
USB generic driver,USB USX2Y
Description: Fix-up sleeping in sound/usb. Replace big_mdelay() with
msleep() to guarantee the task delays as expected. This also involved
replacing/removing custom sleep functions.
Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Nishanth Aravamudan [Sat, 9 Jul 2005 08:53:24 +0000 (10:53 +0200)]
[ALSA] Fix-up sleeping in sound/ppc
PPC AWACS driver,PPC PMAC driver,PPC Tumbler driver
Description: Fix-up sleeping in sound/ppc. Replace big_mdelay() with
msleep() to guarantee the task delays as expected. This also involved
replacing/removing custom sleep functions.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Nishanth Aravamudan [Sat, 9 Jul 2005 08:13:22 +0000 (10:13 +0200)]
[ALSA] sound/pci: fix-up sleeping paths
ENS1370/1+ driver,ES1968 driver,Intel8x0 driver,VIA82xx driver
VIA82xx-modem driver,AC97 Codec,ALI5451 driver,CS46xx driver
MIXART driver,RME HDSP driver,Trident driver,YMFPCI driver
Description: Fix-up sleeping in sound/pci. These changes fall under the
following two categories:
1) Replace schedule_timeout() with msleep() to guarantee the
task delays as expected. This also involved replacing/removing
custom sleep functions.
2) Do not assume jiffies will only increment by one if you
request a 1 jiffy sleep, i.e. use time_after/time_before in
while loops.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Jaroslav Kysela [Sat, 9 Jul 2005 08:07:55 +0000 (10:07 +0200)]
[ALSA] ens1371 - added extra delay for ac97 codec initialization
ENS1370/1+ driver
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Henrik Kretzschmar [Fri, 8 Jul 2005 11:53:42 +0000 (13:53 +0200)]
[ALSA] typo-fix and snd_assert()-expression-split
ALSA Core
This patch corrects a typo in the kerneldocs of snd_info_get_str().
It also splits the expressions of snd_assert() in snd_info_unregister()
into one-expression-per-call for better debugging.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Henrik Kretzschmar [Fri, 8 Jul 2005 07:29:18 +0000 (09:29 +0200)]
[ALSA] fix compiler warning
GUS Library
This patch fixes a compiler warning if sequencer is disabled.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
James Courtier-Dutton [Wed, 6 Jul 2005 20:36:18 +0000 (22:36 +0200)]
[ALSA] snd-emu10k1: Fixes recognition of Audigy ES.
EMU10K1/EMU10K2 driver
Fixes ALSA bug #1237.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
James Courtier-Dutton [Wed, 6 Jul 2005 20:21:51 +0000 (22:21 +0200)]
[ALSA] emu10k1: Add module option uint subsystem.
EMU10K1/EMU10K2 driver
It allows the user to force the snd-emu10k1 module to think the user
has a particular sound card. Useful if their particular sound card
is not yet recognised.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Jaroslav Kysela [Tue, 5 Jul 2005 08:27:09 +0000 (10:27 +0200)]
[ALSA] via82xx - changed MSI K7T266 Pro2 - 4005:4710 in white list (SRC enable)
VIA82xx driver
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Mon, 4 Jul 2005 16:12:39 +0000 (18:12 +0200)]
[ALSA] hdsp - Add 'Sample Clock Source Locking' control
RME HDSP driver
Added 'Sample Clock Source Locking' control. If this switch is on,
the clock source can't be changed via PCM hw_params API (as sample rate).
This will fix the problem of OSS-emulation, for example.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Matt [Mon, 4 Jul 2005 15:51:39 +0000 (17:51 +0200)]
[ALSA] hda: add sigmatel hp detect support
HDA Codec driver
Adds support for detecting hp insertion/removal and enable/disable of
lineouts based on unsolicited events.
Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Matt [Mon, 4 Jul 2005 15:49:55 +0000 (17:49 +0200)]
[ALSA] hda: enable unsolicited responses
HDA Intel driver
Patch enables unsolicited responses on the HDA controller. Without
the UREN bit set, the controller will not place unsolicited responses
in a RIRB.
Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Clemens Ladisch [Mon, 4 Jul 2005 07:21:45 +0000 (09:21 +0200)]
[ALSA] usb-audio - use bDeviceSubClass to detect MOTU FastLane
USB generic driver
MOTU builds other USB MIDI interfaces with the same product ID as the
FastLane, so we have to check the bDeviceSubClass field to differentiate
between them.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Clemens Ladisch [Mon, 4 Jul 2005 07:20:42 +0000 (09:20 +0200)]
[ALSA] usb-audio - rename QUIRK_MIDI_MOTU to QUIRK_MIDI_RAW
USB generic driver
Rename the protocol used by the MOTU FastLane to 'raw' because it might
be useful with other devices, and there are other MOTU interfaces that
do not use this protocol.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Clemens Ladisch [Mon, 4 Jul 2005 07:18:46 +0000 (09:18 +0200)]
[ALSA] usb-audio - enable high speed transfers with Audiy 2 NX
USB generic driver
This patch enables the boot commands to activate high speed mode (and
associated sample formats like 8 channels with 24 bits at 96 kHz) on the
SB Audigy 2 NX.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
James Courtier-Dutton [Sun, 3 Jul 2005 10:54:29 +0000 (12:54 +0200)]
[ALSA] emu10k1: Added tested status comments.
EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
James Courtier-Dutton [Sun, 3 Jul 2005 10:32:40 +0000 (12:32 +0200)]
[ALSA] emu10k1: Sort by card id.
EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
James Courtier-Dutton [Sat, 2 Jul 2005 16:03:37 +0000 (18:03 +0200)]
[ALSA] snd-emu10k1: Tidy mixer controls.
EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
James Courtier-Dutton [Sat, 2 Jul 2005 14:33:34 +0000 (16:33 +0200)]
[ALSA] snd-emu10k1: Card capabilities tidy up.
EMU10K1/EMU10K2 driver
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Jaroslav Kysela [Sat, 2 Jul 2005 13:20:57 +0000 (15:20 +0200)]
[ALSA] via82xx - added MSI K7T266 Pro2 - 4005:4710 to white list (DXS enable)
VIA82xx driver
Reporter: Marko Kohtala <marko.kohtala@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Clemens Ladisch [Fri, 1 Jul 2005 14:19:39 +0000 (16:19 +0200)]
[ALSA] usb-audio: add support for an unknown Yamaha USB MIDI device
USB generic driver
Add a quirk for the Yamaha USB MIDI device with USB ID 0x103d.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Takashi Iwai [Thu, 30 Jun 2005 16:54:04 +0000 (18:54 +0200)]
[ALSA] Add ARM PXA2xx AC97 driver
Documentation,ARM,/arm/Makefile,ARM PXA2XX driver
Added ARM PXA2xx AC97 driver by Nicolas Pitre
(moved from alsa-driver tree).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 30 Jun 2005 16:26:20 +0000 (18:26 +0200)]
[ALSA] Add DBRI driver on Sparcs
Documentation,SPARC,/sparc/Makefile
Add the DBRI driver on Sparcs by Martin Habets <mhabets@users.sourceforge.net>
(moved from alsa-driver tree).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 30 Jun 2005 16:13:54 +0000 (18:13 +0200)]
[ALSA] Add help texts to Kconfig
SPARC
Added simple help texts to Kconfig of Sparc sound drivers.
(Better texts are appreciated :)
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 30 Jun 2005 11:47:58 +0000 (13:47 +0200)]
[ALSA] maestro3 - Clean up
Maestro3 driver
- Clean up maestro3 code
- Use msleep()
- Don't enable hw-vol irq when not defined
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 30 Jun 2005 11:47:06 +0000 (13:47 +0200)]
[ALSA] Fix resume of intel8x0
Intel8x0 driver,AC97 Codec
Fix resume of intel8x0 driver. The ac97 codec didn't restore some registers
properly, and the restore of ICH4 SPDIF and SDIN settings was missing.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 30 Jun 2005 11:45:20 +0000 (13:45 +0200)]
[ALSA] cmipci - Add Mic Boost capture switch
CMIPCI driver
Added 'Mic Boost Capture Switch' and 'Phone' switches.
The existing playback switch is renamed as 'Mic Boost Playback Switch'.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 30 Jun 2005 11:42:39 +0000 (13:42 +0200)]
[ALSA] vxpocket - Remove unused code
Digigram VX Pocket driver
Removed unused files (dropped by the last change).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 30 Jun 2005 11:40:51 +0000 (13:40 +0200)]
[ALSA] Fix and clean-up of vxpocket driver
Documentation,PCMCIA Kconfig,Digigram VX Pocket driver
- Fixed Oops with request_firmware()
- Detect the card type in runtime (vxpoocket v2 or 440)
- snd-vxp440 driver is merged to snd-vxpocket
- Clean up the code
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 30 Jun 2005 08:54:33 +0000 (10:54 +0200)]
[ALSA] Use kstrdup
HDA Codec driver
Use the new kstrdup() function instead of in-house one.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Thu, 30 Jun 2005 07:55:31 +0000 (09:55 +0200)]
[ALSA] Fix dependency of GUS driver
ALSA sequencer
Add the missing snd-seq-midi-emul to SND_GUS_SYNTH list.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Henrik Kretzschmar [Wed, 29 Jun 2005 17:31:06 +0000 (19:31 +0200)]
[ALSA] cleanup and typo-correction
ALSA Core
This patch changes, adds and remove some comments, which will
make now more sense and fit on a 80-char line. It also changes
the order of snd_power_wait() to make the file more readable.
It removes the device.c comment in front of _snd_minor,
cause snd_minor has nothing to do with device.c.
The both typos in the kernel-docs were corrected too.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Henrik Kretzschmar [Wed, 29 Jun 2005 17:30:42 +0000 (19:30 +0200)]
[ALSA] Fix two typos and changes on snd_assert()
ALSA Core
Both typos were in the kerneldocs.
I splitted the snd_assert() calls in one-expression-per-call for better
debugging.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Tue, 28 Jun 2005 12:16:21 +0000 (14:16 +0200)]
[ALSA] hda-codec - Add entry for Acer APFV
HDA Codec driver
Added the model entry for Acer APFV.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Mon, 27 Jun 2005 13:32:43 +0000 (15:32 +0200)]
[ALSA] hda-codec - Add 6stack model for ALC880
Documentation,HDA Codec driver
- Added a new '6stack' model for ALC880.
- Fixed the typo in 6stack-digout model name.
- Added description for missing models in ALSA-Configuration.txt.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Harald Welte [Mon, 27 Jun 2005 13:10:56 +0000 (15:10 +0200)]
[ALSA] Add new pci device id (SB400) to atiixp-modem
ATIIXP-modem driver
I didn't actually test whether the modem works, but at least the driver
loads and initializes fine. Please consider inclusion.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Mon, 27 Jun 2005 13:07:33 +0000 (15:07 +0200)]
[ALSA] trident - Shut up compile warnings
Trident driver
Shut up compile warnings about uninitialized variables.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Matt [Mon, 27 Jun 2005 13:06:52 +0000 (15:06 +0200)]
[ALSA] hda-codec - SigmaTel HDA resume support
HDA Codec driver
Adds resume support to the SigmaTel HDA patch. Please apply.
Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Matt [Mon, 27 Jun 2005 12:59:41 +0000 (14:59 +0200)]
[ALSA] hda-codec - SigmaTel HDA multichannel support
HDA Codec driver
Adds 6/8 channel support to the SigmaTel HDA patch. Please apply.
Signed-off-by: Matt <matt@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Clemens Ladisch [Mon, 27 Jun 2005 06:18:27 +0000 (08:18 +0200)]
[ALSA] usb-audio - fix capture of non-48k sample rates on Audigy 2 NX
USB generic driver
On the SB Audigy 2 NX, capturing with sample rates that are not a
multiple of 48 kHz does not seem to work, so disable it.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Clemens Ladisch [Mon, 27 Jun 2005 06:17:30 +0000 (08:17 +0200)]
[ALSA] usb-audio - high speed audio support
USB generic driver
Add support for endpoints with bInterval > 1, and decoding of the
wMaxPacketSize field of high-speed endpoints.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Takashi Iwai [Tue, 21 Jun 2005 12:49:19 +0000 (14:49 +0200)]
[ALSA] hda-codec - Fix oops with ALC880
HDA Codec driver
- Fixed oops with ALC880 auto-config mode
- Fixed a wrong config table entry for ALC880
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Jaroslav Kysela [Mon, 20 Jun 2005 08:42:44 +0000 (10:42 +0200)]
[ALSA] ak4114: removed duplicate wake_up()
AK4114 receiver
- wake_up(&runtime->sleep) is already called in snd_pcm_post_stop()
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Richard Henderson [Thu, 28 Jul 2005 00:10:52 +0000 (17:10 -0700)]
[PATCH] new alpha syscalls
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Thu, 28 Jul 2005 00:09:10 +0000 (17:09 -0700)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Thu, 28 Jul 2005 00:08:21 +0000 (17:08 -0700)]
Fix up qla2xxx configuration bogosity
If we haven't configured the qla24xx driver, then the Makefile shouldn't
do it for us.
This also means that we can avoid the unnecessary selection of FC_ATTRS.
Debugged by James Bottomley
Andrew Morton [Wed, 27 Jul 2005 17:41:23 +0000 (10:41 -0700)]
[PATCH] Avoid device suspend on reboot
My fairly ordinary x86 test box gets stuck during reboot on the
wait_for_completion() in ide_do_drive_cmd():
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Wed, 27 Jul 2005 23:42:22 +0000 (16:42 -0700)]
Merge head 'for-linus' of /linux/kernel/git/shaggy/jfs-2.6
Linus Torvalds [Wed, 27 Jul 2005 23:37:59 +0000 (16:37 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 27 Jul 2005 23:37:03 +0000 (16:37 -0700)]
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Wed, 27 Jul 2005 23:36:08 +0000 (16:36 -0700)]
Merge kernel.org:/home/rmk/linux-2.6-arm-smp
Marcelo Tosatti [Wed, 27 Jul 2005 07:55:54 +0000 (04:55 -0300)]
[PATCH] ppc32: 8xx remove BROKEN Kconfig entry
8xx is not BROKEN anymore.
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Anton Wöllert [Wed, 27 Jul 2005 07:45:17 +0000 (04:45 -0300)]
[PATCH] ppc32: 8xx avoid icbi misbehaviour in __flush_dcache_icache_phys
On 8xx, in the case where a pagefault happens for a process who's not
the owner of the vma in question (ptrace for instance), the flush
operation is performed via the physical address.
Unfortunately, that results in a strange, unexplainable "icbi"
instruction fault, most likely due to a CPU bug (see oops below).
Avoid that by flushing the page via its kernel virtual address.
Oops: kernel access of bad area, sig: 11 [#2]
NIP:
C000543C LR:
C000B060 SP:
C0F35DF0 REGS:
c0f35d40 TRAP: 0300 Not tainted
MSR:
00009022 EE: 1 PR: 0 FP: 0 ME: 1 IR/DR: 10
DAR:
00000010, DSISR:
C2000000
TASK =
c0ea8430[761] 'gdbserver' THREAD:
c0f34000
Last syscall: 26
GPR00:
00009022 C0F35DF0 C0EA8430 00F59000 00000100 FFFFFFFF 00F58000
00000001
GPR08:
C021DAEF C0270000 00009032 C0270000 22044024 10025428 01000800
00000001
GPR16:
007FFF3F 00000001 00000000 7FBC6AC0 00F61022 00000001 C0839300
C01E0000
GPR24:
00CD0889 C082F568 3000AC18 C02A7A00 C0EA15C8 00F588A9 C02ACB00
C02ACB00
NIP [
c000543c] __flush_dcache_icache_phys+0x38/0x54
LR [
c000b060] flush_dcache_icache_page+0x20/0x30
Call trace:
[
c000b154] update_mmu_cache+0x7c/0xa4
[
c005ae98] do_wp_page+0x460/0x5ec
[
c005c8a0] handle_mm_fault+0x7cc/0x91c
[
c005ccec] get_user_pages+0x2fc/0x65c
[
c0027104] access_process_vm+0x9c/0x1d4
[
c00076e0] sys_ptrace+0x240/0x4a4
[
c0002bd0] ret_from_syscall+0x0/0x44
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jesper Juhl [Wed, 27 Jul 2005 18:46:10 +0000 (11:46 -0700)]
[PATCH] Update CREDITS entry and listings in source files for Jesper Juhl
a) update entry in CREDITS for Jesper Juhl
b) remove email address from source files so it's only listed in credits.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jesper Juhl [Wed, 27 Jul 2005 18:46:09 +0000 (11:46 -0700)]
[PATCH] clean up inline static vs static inline
`gcc -W' likes to complain if the static keyword is not at the beginning of
the declaration. This patch fixes all remaining occurrences of "inline
static" up with "static inline" in the entire kernel tree (140 occurrences in
47 files).
While making this change I came across a few lines with trailing whitespace
that I also fixed up, I have also added or removed a blank line or two here
and there, but there are no functional changes in the patch.
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>
Michal Januszewski [Wed, 27 Jul 2005 18:46:08 +0000 (11:46 -0700)]
[PATCH] fbdev: update info->cmap when setting cmap from user-/kernelspace.
The fb_info struct, as defined in include/linux/fb.h, contains an element
that is supposed to hold the current color map:
struct fb_cmap cmap; /* Current cmap */
This cmap is currently never updated when either fb_set_cmap() or
fb_set_user_cmap() are called. As a result, info->cmap contains the
default cmap that was set by a device driver/fbcon and a userspace
application using the FBIOGETCMAP ioctl will not always get the *currently*
used color map.
The patch fixes this by making sure the cmap is copied to info->cmap after
it is set correctly. It moves most of the code that is responsible for
setting the cmap to fb_set_cmap() and out of fb_set_user_cmap() to avoid
code-duplication.
Signed-off-by: Michal Januszewski <spock@gentoo.org>
Cc: <linux-fbdev-devel@lists.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michal Januszewski [Wed, 27 Jul 2005 18:46:06 +0000 (11:46 -0700)]
[PATCH] fbcon: don't repaint the cursor when it is disabled.
Currently even when the cursor is disabled (`setterm -cursor off`), it is
still repainted as a black rectangle the size of a single char. This can
be seen, for example, by chvt'ing to a free tty, disabling the cursor and
doing `dd if=3D/dev/urandom of=3D/dev/fb0`.
The patch changes this behaviour by avoiding painting anything when the
cursor is disabled.
Signed-off-by: Michal Januszewski <spock@gentoo.org>
Cc: <linux-fbdev-devel@lists.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jon Smirl [Wed, 27 Jul 2005 18:46:05 +0000 (11:46 -0700)]
[PATCH] fbdev: colormap fixes
Color maps have up to 256 entries. 4096/256 allows for 16 characters per
line. The format for a cmap entry is "%02x%c%4x%4x%4x\n" %02x entry %c
transp %4x red %4x blue %4x green
You can read the color_map with cat fb0/color_map.
Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jon Smirl [Wed, 27 Jul 2005 18:46:05 +0000 (11:46 -0700)]
[PATCH] radeonfb: clean up EDID sysfs attribute
radeonfb does not clean up EDID sysfs attribute
Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jon Smirl [Wed, 27 Jul 2005 18:46:04 +0000 (11:46 -0700)]
[PATCH] fbmem: use unregister_chrdev() on unload
fbdev is missing unregister_chrdev() on unload.
Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jon Smirl [Wed, 27 Jul 2005 18:46:03 +0000 (11:46 -0700)]
[PATCH] fbmon: horizontal frequency rounding fix
Fix rounding error when mode frequency is very close to monitor limit
Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Acked-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Marcelo Tosatti [Wed, 27 Jul 2005 18:46:01 +0000 (11:46 -0700)]
[PATCH] cpm_uart: use DPRAM for early console
m8xx_cpm_hostalloc() can't rely on using the coherent DMA allocator early
on boot because the VM is not fully up yet. Change it to use the on-board
DPRAM instead.
The current code relies on the "bootmem_page" allocated by
m8xx_cpm_reset(), which must be killed.
This is done in v2.4 but has never been forward ported to v2.6.
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Cc: Pantelis Antoniou <panto@intracom.gr>
Cc: Kumar Gala <kumar.gala@freescale.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Krufky [Wed, 27 Jul 2005 18:46:00 +0000 (11:46 -0700)]
[PATCH] dvb: rename lgdt3302 frontend module to lgdt330x
Rename lgdt3302 to lgdt330x, to make way for the addition of lgdt3303
support in future revisions.
I am changing the name of this module now so that hopefully the name will
be changed before the release of 2.6.13 ... It wouldn't make sense to
release 2.6.13 with the name lgdt3302 in it, which will only be renamed to
lgdt330x in later versions.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Hunold [Wed, 27 Jul 2005 18:46:00 +0000 (11:46 -0700)]
[PATCH] v4l: fix tuning with MXB driver
I noticed that some past changes to the gerneric Video4Linux tuner module
for analog tuners broke my "Multimedia eXtension Board" driver.
The tuner driver was made aware of Video4Linux2 tuning ioctls, but my
driver was not ported and still uses the Video4Linux1 ioctls. This does
not work anymore as intendend, the tuning is currently broken.
The attached patch fixes non-working tuning in MXB driver introduced by
some recent generic tuner changes by replacing Video4Linux1 tuner ioctls
with proper Video4Linux2 tuner ioctls.
- fix non-working tuning in MXB driver introduced by some recent generic
tuner changes by replacing Video4Linux1 tuner ioctls with proper
Video4Linux2 tuner ioctls
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Cc: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Krufky [Wed, 27 Jul 2005 18:45:59 +0000 (11:45 -0700)]
[PATCH] v4l: hybrid dvb: rename CFLAGS from CONFIG_DVB_xxxx back to original HAVE_xxxx
The #define CONFIG_DVB_* are actually CFLAGS set by Makefile. CONFIG_*
namespace is reserved for Kconfig. This renames them back to HAVE_*
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Krufky [Wed, 27 Jul 2005 18:45:58 +0000 (11:45 -0700)]
[PATCH] v4l: hybrid dvb: move #defines to Makefile
This patch moves #define from cx88-dvb.c and saa7134-dvb.c into Makefile as
CFLAGS, allowing code compatability with video4linux cvs.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Krufky [Wed, 27 Jul 2005 18:45:57 +0000 (11:45 -0700)]
[PATCH] v4l: hybrid dvb: fix warnings with -Wundef
This patch adds a missing #ifdef to saa7134-dvb.c (thanks to Mauro Carvalho
Chehab) and changes #if to #ifdef in both files.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Krufky [Wed, 27 Jul 2005 18:45:56 +0000 (11:45 -0700)]
[PATCH] dvb/v4l: cx88 cleanup
Remove unneeded comment.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Krufky [Wed, 27 Jul 2005 18:45:56 +0000 (11:45 -0700)]
[PATCH] lgdt3302: warning fix
warning: `i2c_readbytes' defined but not used
This code will either be re-enabled or deleted in a future patch.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Krufky [Wed, 27 Jul 2005 18:45:55 +0000 (11:45 -0700)]
[PATCH] dvb/4vl: RF input selection fir
Select the RF input connector based upon the type of demodulation selected.
ANT RF connector is selected for 8-VSB and CABLE RF connector is selected
for QAM64/QAM256. This only affects the cards that use the Microtune 4042
tuner.
Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Krufky [Wed, 27 Jul 2005 18:45:54 +0000 (11:45 -0700)]
[PATCH] dvb/v4l: lgdt3302: isolate tuner
Remove the dvb_pll_desc from the frontend and replace with a
pll_set-callback to isolate the tuner programming from the frontend.
Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Krufky [Wed, 27 Jul 2005 18:45:53 +0000 (11:45 -0700)]
[PATCH] v4l: fix regression modprobe bttv freezes the computer
Remove redundant bttv_reset_audio() which caused the computer to freeze
with some bt8xx based DVB cards when loading the bttv driver.
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Adrian Bunk [Wed, 27 Jul 2005 18:45:52 +0000 (11:45 -0700)]
[PATCH] VIDEO_SAA7134 must depend on SOUND
VIDEO_SAA7134=y and SOUND=n results in the following compile error:
LD .tmp_vmlinux1
drivers/built-in.o(.text+0x4fafcb): In function `saa7134_initdev':
: undefined reference to `unregister_sound_dsp'
drivers/built-in.o(.text+0x4fb141): In function `saa7134_initdev':
: undefined reference to `register_sound_dsp'
drivers/built-in.o(.text+0x4fb17c): In function `saa7134_initdev':
: undefined reference to `register_sound_mixer'
drivers/built-in.o(.text+0x4fb339): In function `saa7134_finidev':
: undefined reference to `unregister_sound_mixer'
drivers/built-in.o(.text+0x4fb341): In function `saa7134_finidev':
: undefined reference to `unregister_sound_dsp'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Adrian Bunk [Wed, 27 Jul 2005 18:45:51 +0000 (11:45 -0700)]
[PATCH] drivers/media/video/tveeprom.c: possible cleanups
This patch contains the following possible cleanups:
- make two needlessly global structs static
- #if 0 the EXPORT_SYMBOL'ed but unused function tveeprom_dump
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Gregory B Frost [Wed, 27 Jul 2005 18:45:48 +0000 (11:45 -0700)]
[PATCH] DVICO Fusion DVB-T1 Tuner (LG-Z201) fix
It is a small modification to the table that defines the way that the
LG-Z201 tuner is controlled for the DVICO Fusion DVB-T1 tuner card.
I believe that a mistake was made when the dvb tuner code was reorganised
(to use a generic table for the tuner information instead of inline code)
and as a result, the DVICO card doesn't tune properly.
The modification I have made to the table makes it behave like it did with
the old inline tuner code that worked. The patch is on top of the 2.6.12
kernel.
Signed-off-by: Gregory B Frost <frosts1@hotkey.net.au>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:47 +0000 (11:45 -0700)]
[PATCH] IB: Add core locking documentation to Infiniband
Add core locking documentation to Infiniband
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:46 +0000 (11:45 -0700)]
[PATCH] IB: Eliminate sparse warnings in SA client
Eliminate sparse warnings in SA client
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:45 +0000 (11:45 -0700)]
[PATCH] IB: Hook up userspace CM to the make system
Hook up userspace CM to the make system
Signed-off-by: Libor Michalek <libor@topspin.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Tom Duffy [Wed, 27 Jul 2005 18:45:45 +0000 (11:45 -0700)]
[PATCH] Add kernel portion of user CM implementation (fix)
Include the patch openib-general changing class_simple to class.
Signed-off-by: Tom Duffy <tduffy@sun.com>
Cc: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:44 +0000 (11:45 -0700)]
[PATCH] IB: Add kernel portion of user CM implementation
Add kernel portion of user CM implementation
Signed-off-by: Libor Michalek <libor@topspin.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:43 +0000 (11:45 -0700)]
[PATCH] IB: Add the header file for user space CM
Add the header file for user space CM. This file defines the ABI used by the
CM for kernel/user communication.
Signed-off-by: Libor Michalek <libor@topspin.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:42 +0000 (11:45 -0700)]
[PATCH] IB: Implementation for RMPP support in user MAD
Implementation for RMPP support in user MAD
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:41 +0000 (11:45 -0700)]
[PATCH] IB: User MAD ABI changes to support RMPP
User MAD ABI changes to support RMPP
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:40 +0000 (11:45 -0700)]
[PATCH] IB: Add the kernel CM implementation
Add the kernel CM implementation
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:39 +0000 (11:45 -0700)]
[PATCH] IB: Add the header file for kernel CM (Communications Manager)
Add the header file for kernel CM (Communications Manager)
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:38 +0000 (11:45 -0700)]
[PATCH] IB: Add Service Record support to SA client
Add Service Record support to SA client
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:37 +0000 (11:45 -0700)]
[PATCH] IB: Add RMPP implementation
Add RMPP implementation.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:36 +0000 (11:45 -0700)]
[PATCH] IB: Introduce RMPP APIs
Introduce RMPP APIs
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:35 +0000 (11:45 -0700)]
[PATCH] IB: A couple of IB core bug fixes
Replace be32_to_cpup with be32_to_cpu and fix bug referencing pointer rather
than value in ib_create_ah_from_wc().
Signed-off-by: Tom Duffy <tduffy@sun.com>
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:34 +0000 (11:45 -0700)]
[PATCH] IB: Add ib_create_ah_from_wc to IB verbs
Added new call: ib_create_ah_from_wc. Call will allocate an address handle
given work completion information, including any received GRH.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:33 +0000 (11:45 -0700)]
[PATCH] IB: Fix a couple of MAD code paths
Fixed locking to handle error posting MAD send work requests. Fixed handling
canceling a MAD with an active work request.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Wed, 27 Jul 2005 18:45:32 +0000 (11:45 -0700)]
[PATCH] IB: Optimize canceling a MAD
Optimize canceling a MAD.
- Eliminate searching timeout list in cancel case.
- Remove duplicate calls to queue work item.
- Eliminate resending a MAD before MAD is completed.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>