summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2005-07-28Linux 2.6.13-rc4v2.6.13-rc4Linus Torvalds
2005-07-28[PATCH] fix gconfig crashJoachim Nilsson
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>
2005-07-28Revert broken "statement with no effect" warning fixLinus Torvalds
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.
2005-07-28Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsaLinus Torvalds
2005-07-28[PATCH] speed up on find_first_bit for i386 (let compiler do the work)Steven Rostedt
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>
2005-07-28[PATCH] alpha: fix "statement with no effect" warningsRichard Henderson
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>
2005-07-28[PATCH] PCDP: if PCDP contains parity information, use itBjorn Helgaas
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>
2005-07-28[PATCH] e1000: no need for reboot notifierTony Luck
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>
2005-07-28[PATCH] SELinux: default labeling of MLS fieldJames Morris
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>
2005-07-28[PATCH] cs89x0: collect tx_bytes statisticsIan Campbell
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>
2005-07-28[PATCH] Fix incorrect Asus k7m irq router detectionGiancarlo Formicuccia
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>
2005-07-28[PATCH] cciss per disk queueMike Miller
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>
2005-07-28[PATCH] pcmcia: disable read prefetch/write burst on old O2Micro bridgesDaniel Ritz
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>
2005-07-28[PATCH] yenta: free_irq() on suspend.Daniel Ritz
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>
2005-07-28[PATCH] pcmcia: fix sharing IRQs and request_irq without IRQ_HANDLE_PRESENTDominik Brodowski
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>
2005-07-28[PATCH] pcmcia: update documentationDominik Brodowski
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>
2005-07-28[PATCH] pcmcia: fix many device IDsKomuro
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>
2005-07-28[PATCH] pcmcia: avoid duble iounmap of one addressDominik Brodowski
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>
2005-07-28[PATCH] pcmcia: update au1000 to work with recent changesDominik Brodowski
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>
2005-07-28[PATCH] pcmcia: remove duplicates in orinoco_csJar
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>
2005-07-28[PATCH] pcmcia: fix commentPavel Roskin
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>
2005-07-28[PATCH] pcmcia: ide-cs id_table updatePavel Roskin
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>
2005-07-28[PATCH] bio_clone fixAndrew Morton
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>
2005-07-28[ALSA] version 1.0.9bJaroslav Kysela
2005-07-28[ALSA] wavefront - declare initialization data as staticTakashi Iwai
Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-07-28[ALSA] via82xx - Fix dxs_support of twinhead laptopTakashi Iwai
VIA82xx driver Changed the dxs_support value of twinhead laptop to DXS_SRC. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28[ALSA] Jack Sense support for AD1980 and AD1888Sergey Ulanov
AC97 Codec Attached patch adds 'Jack Sense' controls for AD1980 and AD1888 chips. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28[ALSA] vx-driver - Fix the calculation of frequency parameterTakashi Iwai
Digigram VX core Fixed the calculation of frequency parameter of vx boards. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-07-28[ALSA] hda driver, correct bug in model 'auto'Nicolas Graziano
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>
2005-07-28[ALSA] sound/core Fix the sparse warning 'implicit cast to nocast type'Victor Fusco
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>
2005-07-28[ALSA] usb-audio - change quirk type handlingClemens Ladisch
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>
2005-07-28[ALSA] usb-audio - add support for Miditech USB MIDI keyboardsClemens Ladisch
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>
2005-07-28[ALSA] seq-midi - silently ignore non-MIDI eventsClemens Ladisch
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>
2005-07-28[ALSA] ac97 - remove unused variableClemens Ladisch
AC97 Codec remove a variable made obsolete by the last change Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-07-28[ALSA] ac97: Fix volume control bit size detection for STAC9704.James Courtier-Dutton
AC97 Codec Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28[ALSA] emu10k1: Add EMU 1212m card entry and document it as not supported yet.James Courtier-Dutton
EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28[ALSA] Fix-up sleeping in sound/usbNishanth Aravamudan
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>
2005-07-28[ALSA] Fix-up sleeping in sound/ppcNishanth Aravamudan
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>
2005-07-28[ALSA] sound/pci: fix-up sleeping pathsNishanth Aravamudan
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>
2005-07-28[ALSA] ens1371 - added extra delay for ac97 codec initializationJaroslav Kysela
ENS1370/1+ driver Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-07-28[ALSA] typo-fix and snd_assert()-expression-splitHenrik Kretzschmar
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>
2005-07-28[ALSA] fix compiler warningHenrik Kretzschmar
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>
2005-07-28[ALSA] snd-emu10k1: Fixes recognition of Audigy ES.James Courtier-Dutton
EMU10K1/EMU10K2 driver Fixes ALSA bug #1237. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
2005-07-28[ALSA] emu10k1: Add module option uint subsystem.James Courtier-Dutton
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>
2005-07-28[ALSA] via82xx - changed MSI K7T266 Pro2 - 4005:4710 in white list (SRC enable)Jaroslav Kysela
VIA82xx driver Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-07-28[ALSA] hdsp - Add 'Sample Clock Source Locking' controlTakashi Iwai
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>
2005-07-28[ALSA] hda: add sigmatel hp detect supportMatt
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>
2005-07-28[ALSA] hda: enable unsolicited responsesMatt
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>
2005-07-28[ALSA] usb-audio - use bDeviceSubClass to detect MOTU FastLaneClemens Ladisch
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>
2005-07-28[ALSA] usb-audio - rename QUIRK_MIDI_MOTU to QUIRK_MIDI_RAWClemens Ladisch
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>