OSDN Git Service
Andi Kleen [Fri, 29 Jul 2005 04:15:22 +0000 (21:15 -0700)]
[PATCH] x86_64: Always ack IPIs even on errors
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alexander Nyberg [Fri, 29 Jul 2005 04:15:20 +0000 (21:15 -0700)]
[PATCH] x86_64: cpu hotplug changes kills nmi watchdog
When the x86_64 cpu hotplug changes went in it added a check in
default_do_nmi() which kills NMI delivery on any CPU but the BSP.
The NMI watchdog is brought up quite some time before the online bit is set
in num_online_cpus so this won't work very well. The nmi watchdogs on cpus
that are not BSP will never be reprogrammed and no NMIs.
Why was this check added? How does an offlined cpu receive an NMI?
Signed-off-by: Alexander Nyberg <alexn@telia.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Cc: <ashok.raj@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Thu, 28 Jul 2005 22:44:44 +0000 (15:44 -0700)]
Linux 2.6.13-rc4
Joachim Nilsson [Thu, 28 Jul 2005 22:18:03 +0000 (00:18 +0200)]
[PATCH] fix gconfig crash
I ran glade-2 on the glade file, fixed two missing stock icons and
cleaned up the C code that inserts the single/split/full modes. The
rest of the patch is minor cleanups only. I refrained from using all
the included xpm icons in images.c (like qconf.cc does) in favour of
using the stock Gtk+ icons instead. Oh, yes there was a "back" bug
in split mode that I also removed, oh well...
It has been tested with success by several people, including
Jesper Juhl, Randy Dunlap and myself.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Thu, 28 Jul 2005 17:34:47 +0000 (10:34 -0700)]
Revert broken "statement with no effect" warning fix
It may shut up gcc, but it also incorrectly changes the semantics of the
smp_call_function() helpers.
You can fix the warning other ways if you are interested (create another
inline function that takes no arguments and returns zero), but
preferably gcc just shouldn't complain about unused return values from
statement expressions in the first place.
Linus Torvalds [Thu, 28 Jul 2005 15:41:58 +0000 (08:41 -0700)]
Merge /pub/scm/linux/kernel/git/perex/alsa
Steven Rostedt [Thu, 28 Jul 2005 12:45:06 +0000 (08:45 -0400)]
[PATCH] speed up on find_first_bit for i386 (let compiler do the work)
Avoid using "rep scas", just let the compiler select a sequence of
regular instructions.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Richard Henderson [Thu, 28 Jul 2005 08:07:41 +0000 (01:07 -0700)]
[PATCH] alpha: fix "statement with no effect" warnings
Apparently gcc 4.0 complains about "({ 0; });", which leads to -Werror
breakage in one of the alpha oprofile modules.
One might could argue that this is a gcc bug, in that statement-expressions
should be considered to be function-like rather than statement-like for the
purposes of this warning. But it's just as easy to use an inline function
in the first place, side-stepping the issue.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bjorn Helgaas [Thu, 28 Jul 2005 08:07:39 +0000 (01:07 -0700)]
[PATCH] PCDP: if PCDP contains parity information, use it
If the PCDP supplies parity, use it (only none/even/odd supported), and
don't append parity/stop bit arguments unless baud is present.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Tony Luck [Thu, 28 Jul 2005 08:07:38 +0000 (01:07 -0700)]
[PATCH] e1000: no need for reboot notifier
sys_reboot() now calls device_suspend(), so it is no longer necessary for
the e1000 driver to register a reboot notifier [in fact doing so results in
e1000_suspend() getting called twice].
(akpm: we need to fast-track this. It's causing ia64 to oops on shutdown)
Signed-off-by: Tony Luck <tony.luck@intel.com>
Cc: <cramerj@intel.com>
Cc: <john.ronciak@intel.com>
Cc: <ganesh.venkatesan@intel.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
James Morris [Thu, 28 Jul 2005 08:07:37 +0000 (01:07 -0700)]
[PATCH] SELinux: default labeling of MLS field
Implement kernel labeling of the MLS (multilevel security) field of
security contexts for files which have no existing MLS field. This is to
enable upgrades of a system from non-MLS to MLS without performing a full
filesystem relabel including all of the mountpoints, which would be quite
painful for users.
With this patch, with MLS enabled, if a file has no MLS field, the kernel
internally adds an MLS field to the in-core inode (but not to the on-disk
file). This MLS field added is the default for the superblock, allowing
per-mountpoint control over the values via fixed policy or mount options.
This patch has been tested by enabling MLS without relabeling its
filesystem, and seems to be working correctly.
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ian Campbell [Thu, 28 Jul 2005 08:07:34 +0000 (01:07 -0700)]
[PATCH] cs89x0: collect tx_bytes statistics
Signed-off-by: Ian Campbell <icampbell@arcom.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Giancarlo Formicuccia [Thu, 28 Jul 2005 08:07:33 +0000 (01:07 -0700)]
[PATCH] Fix incorrect Asus k7m irq router detection
This patch:
http://marc.theaimsgroup.com/?l=bk-commits-head&m=
111955644929114&w=2
uncovered a k7m bios bug, where the VT82C686A router is reported as
being "586-compatible". The two chips have different pirq mapping, so
this leads to "irq routing conflict" on many pci devices.
The suggested fix was discussed with Aleksey Gorelov, who helped me
to identify the problem as a probable bios bug.
Signed-off-by: Giancarlo Formicuccia <giancarlo.formicuccia@gmail.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Mike Miller [Thu, 28 Jul 2005 08:07:31 +0000 (01:07 -0700)]
[PATCH] cciss per disk queue
This patch adds per disk queue functionality to cciss. Sometime back I
submitted a patch but it looks like only part of what I needed. In the 2.6
kernel if we have more than one logical volume the driver will Oops during
rmmod. It seems all of the queues actually point back to the same queue.
So after deleting the first volume you hit a null pointer on the second
one.
This has been tested in our labs. There is no difference in performance,
it just fixes the Oops.
Signed-off-by: Mike Miller <mike.miller@hp.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Daniel Ritz [Thu, 28 Jul 2005 08:07:30 +0000 (01:07 -0700)]
[PATCH] pcmcia: disable read prefetch/write burst on old O2Micro bridges
Older O2Micro bridges have problems with both read prefetch and write burst
depending on the combination of the chipset, bridge, cardbus card. safest is
to disable read prefetch and write burst on those old bridges.
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Daniel Ritz [Thu, 28 Jul 2005 08:07:28 +0000 (01:07 -0700)]
[PATCH] yenta: free_irq() on suspend.
Resume doesn't seem to work without.
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dominik Brodowski [Thu, 28 Jul 2005 08:07:27 +0000 (01:07 -0700)]
[PATCH] pcmcia: fix sharing IRQs and request_irq without IRQ_HANDLE_PRESENT
Debugging and description from: Noah Misch <noah@cs.caltech.edu>
When a driver calls pcmcia_request_irq with IRQ_HANDLE_PRESENT unset, it looks
for an open IRQ by request_irq()ing with a dummy handler and NULL dev_info.
free_irq uses dev_info as a key for identifying the handler to free among
those sharing an IRQ, so request_irq returns -EINVAL if dev_info is NULL and
the IRQ may be shared. That unknown error code is the -EINVAL.
It looks like only pcnet_cs and axnet_cs are affected. Most other drivers let
pcmcia_request_irq install their interrupt handlers. sym53c500_cs requests
its IRQ manually, but it cannot share an IRQ.
The appended patch changes pcmcia_request_irq to pass an arbitrary, unique,
non-NULL dev_info with the dummy handler.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dominik Brodowski [Thu, 28 Jul 2005 08:07:26 +0000 (01:07 -0700)]
[PATCH] pcmcia: update documentation
Update the PCMCIA documentation to reflect some more, though older, changes.
Parts extracted from an e-mail from Randy Dunlap with his consent.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Komuro [Thu, 28 Jul 2005 08:07:24 +0000 (01:07 -0700)]
[PATCH] pcmcia: fix many device IDs
If the product-id-string contains the '+' , '&' ,'_', it was not converted
properly from the /etc/pcmcia/config(pcmcia-cs config file).
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dominik Brodowski [Thu, 28 Jul 2005 08:07:23 +0000 (01:07 -0700)]
[PATCH] pcmcia: avoid duble iounmap of one address
Avoid double iounmap of one address, and disable cis_virt if set_mem_map
failed.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Dominik Brodowski [Thu, 28 Jul 2005 08:07:22 +0000 (01:07 -0700)]
[PATCH] pcmcia: update au1000 to work with recent changes
Get the au1000 PCMCIA socket drivers to work.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jar [Thu, 28 Jul 2005 08:07:21 +0000 (01:07 -0700)]
[PATCH] pcmcia: remove duplicates in orinoco_cs
Remove duplicates from the device id table.
Signed-off-by: Jarkko Raja <jar@pcuf.fi>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Pavel Roskin [Thu, 28 Jul 2005 08:07:20 +0000 (01:07 -0700)]
[PATCH] pcmcia: fix comment
There are two problems with the message about missing callback functions: it's
not written in correct English and it lacks newline at the end.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Pavel Roskin [Thu, 28 Jul 2005 08:07:19 +0000 (01:07 -0700)]
[PATCH] pcmcia: ide-cs id_table update
SanDisk ConnectPlus has two functions. Function 0 is prism2 card, currently
only supported by HostAP (not in the kernel). Function 1 is 128M flash,
supported by ide-cs. This patch adds an entry for function 1 to ide-cs.c.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrew Morton [Thu, 28 Jul 2005 08:07:18 +0000 (01:07 -0700)]
[PATCH] bio_clone fix
Fix bug introduced in 2.6.11-rc2: when we clone a BIO we need to copy over the
current index into it as well.
It corrupts data with some MD setups.
See http://bugzilla.kernel.org/show_bug.cgi?id=4946
Huuuuuuuuge thanks to Matthew Stapleton <matthew4196@gmail.com> for doggedly
chasing this one down.
Acked-by: Jens Axboe <axboe@suse.de>
Cc: <linux-raid@vger.kernel.org>
Cc: <dm-devel@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jaroslav Kysela [Thu, 28 Jul 2005 13:50:42 +0000 (15:50 +0200)]
[ALSA] version 1.0.9b
Takashi Iwai [Thu, 28 Jul 2005 13:22:55 +0000 (15:22 +0200)]
[ALSA] wavefront - declare initialization data as static
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Takashi Iwai [Wed, 27 Jul 2005 15:30:14 +0000 (17:30 +0200)]
[ALSA] via82xx - Fix dxs_support of twinhead laptop
VIA82xx driver
Changed the dxs_support value of twinhead laptop to DXS_SRC.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Sergey Ulanov [Wed, 27 Jul 2005 15:28:58 +0000 (17:28 +0200)]
[ALSA] Jack Sense support for AD1980 and AD1888
AC97 Codec
Attached patch adds 'Jack Sense' controls for AD1980 and AD1888 chips.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai [Wed, 27 Jul 2005 15:26:59 +0000 (17:26 +0200)]
[ALSA] vx-driver - Fix the calculation of frequency parameter
Digigram VX core
Fixed the calculation of frequency parameter of vx boards.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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>
Andrew Vasquez [Thu, 28 Jul 2005 05:10:59 +0000 (22:10 -0700)]
[PATCH] More qla2xxx configuration fixes
This adds the appropriate FW_LOADER pre-requisite and a separate entry
for ISP24xx support.
Thanks to Adrian Bunk and Jesper Juhl for their efforts in fixing this
quirk.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hal Rosenstock [Thu, 28 Jul 2005 03:38:56 +0000 (20:38 -0700)]
[IB/ucm]: Clean up userspace CM
Only print debug messages when debug_level is set.
Eliminate NULL checks prior to calling kfree.
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Libor Michalek <libor@topspin.com>
Roland Dreier [Thu, 28 Jul 2005 02:12:56 +0000 (19:12 -0700)]
Merge /scratch/Ksrc/linux-git/
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>