aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAge
* Merge branch 'origin'Mauro Carvalho Chehab2006-01-31
|\
| * Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2006-01-31
| |\
| | * [SERIAL] 8250 Documentation fixTimothy Charles McGrath2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the documentation error for 'SERIAL_8250' in drivers/serial/Kconfig Signed-off-by: Timothy Charles McGrath <tmHikaru@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [SERIAL] Make uart_port flags a bitwise typeRussell King2006-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same reasoning as commit 747c8a55946ed037bf7d62454c3c599c02af2262 but this time we're making uart_port flags a bitwise type - not all of these flags correspond with the old ASYNC_ flags, so there is the possibility for bugs if the wrong ASYNC_* constants are used. Always use UPF_* constants for uart_port->flags. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [SERIAL] Make port->ops constantRussell King2006-01-21
| | | | | | | | | | | | | | | | | | No one should write to the port->ops structure, so make it constant. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [SERIAL] Remove UPF_AUTOPROBE and UPF_BOOT_ONLYMCARussell King2006-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functionality UPF_BOOT_ONLYMCA provided has been replaced by the 8250_mca module, which only registers MCA ports if MCA is present. UPF_AUTOPROBE has no functional effect - in fact, it's never tested. Only ibmasm set the flag. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [SERIAL] Don't use ASYNC_ constants with the uart_port structureRussell King2006-01-21
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [SERIAL] 8250 serial console fixesAlan Cox2006-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch resolves most of the problems with an SMP serial console race with output via the tty path. At the end of the serial console print we force enable the tx int in case we clobbered the tx interrupt status racing between the console and tty output. That way the extra tx interrupt causes the transmit path to restart not hang. It also makes the serial console printk use the FIFO. This is neccessary because some remote management devices fake serial console with FIFO and are confused into sending one packet per character over ethernet when we stall rather than filling the FIFO. In order to preserve existing reliability semantics the function waits for the serial queue to completely empty before returning. Both of these problems were identified by a Red Hat partner. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-01-31
| |\ \
| | * | [ARM] 3266/1: S3C2400 - adds macro S3C24XXLucas Correia Villa Real2006-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Lucas Correia Villa Real This patch defines S3C2400 memory map and adds a S3C24XX macro for common resources between S3C2400, S3C2410 and S3C2440 cpus. Signed-off-by: Lucas Correia Villa Real <lucasvr@gobolinux.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] amba-clcd: Allow RGB555 and RGB565 with 16bppRussell King2006-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some folk want to use RGB555 rather tahn RGB565 with amba-clcd. Allow amba-clcd to accept either pixel format. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] Convert request_irq+set_irq_type to request_irq with SA_TRIGGERRussell King2006-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to have request_irq followed by set_irq_type. Just use request_irq with the appropriate SA_TRIGGER flags. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [PATCH] fix deadlock in drivers/pci/msi.cIngo Molnar2006-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lock validator caught another one: drivers/pci/msi.c is accessing &irq_desc[i].lock with interrupts enabled (!). The fix is to disable interrupts properly. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-blockLinus Torvalds2006-01-31
| |\ \ \
| | * | | [LIBATA] Blacklist certain Maxtor firmware revisions for FUA supportJens Axboe2006-01-30
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | It looks like they are either discarding or corrupting data when the FUA command is used, bad. Signed-off-by: Jens Axboe <axboe@suse.de>
| * | | Merge branch 'upstream-fixes' of ↵Linus Torvalds2006-01-31
| |\ \ \ | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| | * | | [PATCH] Clarify help text of SKGE/SK98LIN/SKY2Daniel Drake2006-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some users have commented that it is unclear which driver they should be using for their Marvell/SysKonnect network adapter, and which ones are/aren't interchangable. This patch attempts to reduce the confusion. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | Merge branch 'upstream-fixes' of ↵Jeff Garzik2006-01-31
| | |\ \ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| | | * | | [PATCH] PCMCIA=m, HOSTAP_CS=y is not a legal configurationAdrian Bunk2006-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_PCMCIA=m, CONFIG_HOSTAP_CS=y doesn't compile. Reported by "Gabriel C." <crazy@pimpmylinux.org>. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | | * | | [PATCH] ipw2200: Fix a variable referenced after kfree() bugZhu Yi2006-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | | * | | [PATCH] ipw2200: Fix sw_reset doesn't clear the static essid problemZhu Yi2006-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | | * | | [PATCH] ipw2200: Fix "iwspy ethx off" causes kernel panicZhu Yi2006-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hong Liu <hong.liu@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | | * | | [PATCH] ipw2100: Fix setting txpower failed problemZhu Yi2006-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ipw2100 driver misunderstood the parameter of txpower. Tx Power off means turn off the radio, but the driver interpret it as "can't set txpower". So when getting the txpower, it sets disabled=1 to the iwconifg tool in managed mode. And the tool will display "Tx Power off" when disabled=1. Now, in managed mode, iwconfig will not show "TX Power" if the radio is not switched off. It will only display "Tx Power off" only if the radio is killed. Signed-off-by: Hong Liu <hong.liu@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | | * | | [PATCH] ipw2100: Fix a gcc compile warningZhu Yi2006-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/net/wireless/ipw2100.c:2236: warning: `ipw2100_match_buf' defined but not used Cc: Yi Zhu <yi.zhu@intel.com> Cc: James Ketrenos <jketreno@linux.intel.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | | Merge branch 'upstream-fixes' of ↵Jeff Garzik2006-01-28
| | |\| | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| | | * | | [PATCH] orinoco_cs: tweak Vcc debugging messagesValdis.Kletnieks@vt.edu2006-01-27
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current orinoco_cs.c can issue the exact same error message for 2 different tests that can fail. Alter them so we can tell which one of the two failed. Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] mv643xx_eth: Whitespace cleanupDale Farnsworth2006-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | [PATCH] mv643xx_eth: Update dev->last_rx on packet receivePaolo Galtieri2006-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dev->last_rx on packet receive This fix corrects errors seen during configuration of the bonding driver. Signed-off-by: Paolo Galtieri <pgaltieri@mvista.com> Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | [PATCH] mv643xx_eth: Fix spinlock recursion bugDale Farnsworth2006-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch eliminates a spinlock recursion bug introduced recently. Since eth_port_send() is always called with the lock held, we simply remove the locking inside the function itself. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | [PATCH] s2io: scatter-gather fixAnanda Raju2006-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a problem with fragmented skb in s2io driver version 2.0.9.4 available in 2.6.16-rc1 kernel. The adapter will fail to transmit if any scatter-gather skb arrives. This patch provides fix for the above described problem. Signed-off-by: Ananda Raju <ananda.raju@neterion.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | [PATCH] b44: fix laptop carrier detectStephen Hemminger2006-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On my laptop, the b44 device is created and the carrier state defaults to ON when created by alloc_etherdev. This means tools like NetworkManager see the carrier as On and try and bring the device up. The correct thing to do is mark the carrier as Off when device is created. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | [PATCH] acenic: fix checking of read_eeprom_byte() return valuesEric Sesterhenn2006-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tmp in ace_init is u32 thus rendering read_eeprom_byte() return values checks useless. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | [PATCH] bonding: fix ->get_settings error checkingEric Sesterhenn2006-01-26
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since get_settings() returns a signed int and it gets checked for < 0 to catch an error, res should be a signed int too. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * / / [SUNGEM]: Make PM of PHYs more reliable (#2)Benjamin Herrenschmidt2006-01-23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On my latest laptop, I've had occasional PHY dead on wakeup from sleep... the PHY would be totally unresponsive even to toggling the hard reset line until the machine is powered down... Looking closely at the code, I found some possible issues in the way we setup the MDIO lines during suspend along with slight divergences from what Darwin does when resetting it that may explain the problem. That patch change these and the problem appear to be gone for me at least... I also fixed an mdelay -> msleep while I was at it to the pmac feature code that is called when toggling the PHY reset line since sungem doesn't call it in an atomic context anymore. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>b Signed-off-by: David S. Miller <davem@davemloft.net>
* | | V4L/DVB (3442): Allow tristate build for cx88-vp3054-i2cMichael Krufky2006-01-26
| | | | | | | | | | | | | | | | | | | | | - allow tristate build for cx88-vp3054-i2c Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3439a): media video stradis memory fixJiri Slaby2006-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memset clears once set structure, there is actually no need for memset, because configure function do it for us. Next, vfree(NULL) is legal, so avoid useless labels. Thanks Dave Jones for reporting this. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3434): changed comment in tuner-core.cMarkus Rechberger2006-01-23
| | | | | | | | | | | | | | | | | | | | | - changed comment in tuner-core.c Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3433): Fix printk type warningRandy Dunlap2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix printk type warning: drivers/media/dvb/b2c2/flexcop-pci.c:164: warning: format '%08x' expects type 'unsigned int', but argument 4 has type 'dma_addr_t' Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3431): fixed spelling error, exectuted --> executed.Michael Krufky2006-01-23
| | | | | | | | | | | | | | | | | | | | | - fixed spelling error, exectuted --> executed. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3429): Missing break statement on tuner-coreMarkus Rechberger2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | - default_tuner_init was called twice due to a missing break statement. Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Acked-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3428): drivers/media/dvb/ possible cleanupsAdrian Bunk2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make needlessly global code static - #if 0 the following unused global functions: - b2c2/flexcop-dma.c: flexcop_dma_control_packet_irq() - b2c2/flexcop-dma.c: flexcop_dma_config_packet_count() Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3418): Cause tda9887 to use I2C_DRIVERID_TDA9887Mike Isely2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | - The tda9887 has an I2C id reserved for it, but it hasn't been using it. Probably an oversight. Fixed with this patch. Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3417): make VP-3054 Secondary I2C Bus Support a Kconfig option.Michael Krufky2006-01-23
| | | | | | | | | | | | | | | | | | | | | - make VP-3054 Secondary I2C Bus Support a Kconfig option. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3416): Recognise Hauppauge card #34519Ian Pickworth2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | - Recognise Hauppauge card #34519 Signed-off-by: Ian Pickworth <ian@pickworth.me.uk> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3414): rename dvb_pll_tbmv30111in to dvb_pll_samsung_tbmvMichael Krufky2006-01-23
| | | | | | | | | | | | | | | | | | | | | - rename dvb_pll_tbmv30111in to dvb_pll_samsung_tbmv Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3413): Kill nxt2002 in favor of the nxt200x moduleMichael Krufky2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Kill nxt2002 module in favor of nxt200x. - Repair broken nxt2002 support in the nxt200x module. - Make the flexcop driver use nxt200x instead of the nxt2002 module for the Air2PC 2nd generation PCI card. - Remove the nxt2002 module from cvs and kernel build. Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3409): Mark Typhoon cards as Lifeview OEM'sPeter Missel2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | - Mark Typhoon cards as OEM of Lifeview. Signed-off-by: Peter Missel <peter.missel@onlinehome.de> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3405): Fixes tvp5150a/am1 detection.Mauro Carvalho Chehab2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tvp5150 type were determined by a secondary register instead of using ROM code. - tvp5150am1 have ROM=4.0, while tvp5150a have ROM=3.33 (decimal). All other ROM versions are reported as unknown tvp5150. - Except for reporting, current code doesn't enable any special feature for tvp5150am1 or tvp5150a. Code should work for both models (but were tested only for tvp5150am1). Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | VIDEO_CX88_ALSA must select SND_PCMAdrian Bunk2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | - VIDEO_CX88_ALSA must select SND_PCM Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | V4L/DVB (3403): Add probe check for the tda9840.Hans Verkuil2006-01-23
| | | | | | | | | | | | | | | | | | | | | | | | - Add probe check for the tda9840 to prevent misdetection of a Micronas dpl3518a as a tda9840. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>