summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)AuthorFilesLines
2005-09-14Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp Linus Torvalds1-0/+2
2005-09-14Merge master.kernel.org:/home/rmk/linux-2.6-serial Linus Torvalds7-8/+8
2005-09-14Merge master.kernel.org:/home/rmk/linux-2.6-i2c Linus Torvalds1-4/+8
2005-09-14[I2C] Add a functionality method, and remove algorithm idsRussell King1-4/+8
This allows i2c-pxa to finally build. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-09-14[ARM] 2907/1: GCC 4 serial driver compile fixesVincent Sanders7-8/+8
Patch from Vincent Sanders When building the ARM platforms several serial drivers fail to compile with GCC 4.01 due to extern/static ambiguity. Signed-off-by: Vincent Sanders <vince@arm.linux.org.uk> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-09-14[PATCH] hvc_console: start kernel thread before registering ttyAnton Blanchard1-3/+3
Its possible that we can write to the hvc_console tty as soon it is registered. Recently this started happening due to (what looks like) a change to the hotplug code. Unfortunately at this stage we have not started the khvcd kernel thread and oops. The solution is to start the kernel thread before registering the tty. Signed-off-by: Anton Blanchard <anton@samba.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-14[PATCH] nv_i2c oops fixAntonino A. Daplas1-4/+7
The call to fb_firmware_edid may return NULL but this is not checked before trying to memcpy using this pointer. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-14[PATCH] i4l: Sedlbauer speed star II V 3.1 exist with various subversionsKarsten Keil1-1/+1
the 4th id field should be not used Signed-off-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-14Fix yenta error message when unable to find a bus assignmentLinus Torvalds1-2/+2
And mention 'pci=assign-busses' as a possible fix. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-14[PATCH] yenta oops fixIvan Kokshaysky1-1/+12
In some cases, especially on modern laptops with a lot of PCI and cardbus bridges, we're unable to assign correct secondary/subordinate bus numbers to all cardbus bridges due to BIOS limitations unless we are using "pci=assign-busses" boot option. So some cardbus controllers may not have attached subordinate pci_bus structure, and yenta driver must cope with it - just ignore such cardbus bridges. For example, see https://bugzilla.novell.com/show_bug.cgi?id=113778 Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-14[PATCH] pci: only call pci_restore_bars at bootJohn W. Linville1-4/+12
Certain (SGI?) ia64 boxes object to having their PCI BARs restored unless absolutely necessary. This patch restricts calling pci_restore_bars from pci_set_power_state unless the current state is PCI_UNKNOWN, the actual (i.e. physical) state of the device is PCI_D3hot, and the device indicates that it will lose its configuration when transitioning to PCI_D0. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-14Merge branch 'upstream-fixes' of ↵Linus Torvalds11-84/+94
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
2005-09-14[PATCH] s390: ctc driver fixesFrank Pavlic1-19/+22
Jeff, sorry if I have flooded your inbox, I had some problems with the mail server here yesterday, but it seems to be fixed ... Ok patch 3-4 have no dependencies on patch 2 since only qeth driver is affected.Thus I have made a new patch 2 for ctc driver. Thank you . [patch 2/4] s390: ctc driver fixes From: Peter Tiedemann <ptiedem@de.ibm.com> - race condition fixed - minor cleanup Signed-off-by: Peter Tiedemann <ptiedem@de.ibm.com> Signed-off-by: Frank Pavlic <pavlic@de.ibm.com> diffstat: ctcmain.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[PATCH] skge: gmac register access errors in dual portStephen Hemminger3-46/+56
Merge of four previous patches and the Kconfig fix * Remove debug printk's * whitespace cleanup and version number change * clear interrupts, reset phy, and reset hardware on shutdown * ignore 64bit counter overflow interrupts * fix a couple of places where second port could clobber state of first port. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[PATCH] ixgb: correct rx_dropped countingJohn W. Linville1-2/+0
Do not count frames dropped by the hardware as part of rx_dropped. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[PATCH] e100: correct rx_dropped and add rx_missed_errorsJohn W. Linville1-3/+1
Do not count non-error frames dropped by the hardware as part of rx_dropped. Instead, count those frames dropped as rx_missed_errors. Also, do not count other error frames as part of rx_dropped. Finally, do not count oversized frames in rx_dropped (since they are counted as part of rx_length_errors). Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[PATCH] e1000: correct rx_dropped countingJohn W. Linville1-1/+0
Do not count frames dropped by the hardware as part of rx_dropped. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[PATCH] airo : fix channel number in scanmatthieu castet1-1/+4
this patch display the correct channel number with iwlist scan Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[PATCH] sata_sis: uninitialized variableUwe Koziolek1-1/+1
There is an uninitialized variable issue in sata_sis.c Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[PATCH] sata_sis: Fix typo in sata port2 initialisationArnaud Patard1-1/+1
This patch fixes a nasty typo I introduced in my previous patch (commit f2c853bca542f5ac0b036377637192a74f2091c2). The right offset of the second port in pure sata mode is 64 and not 0x64. Thanks to Martin Schuster for pointing this to me Signed-off-by: Arnaud Patard <apatard@mandriva.com> --- Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[PATCH] Correct xircom_cb use of CONFIG_NET_POLL_CONTROLLERKeith Owens1-1/+1
xircom_cb.c does #if CONFIG_NET_POLL_CONTROLLER instead of #ifdef, resulting in drivers/net/tulip/xircom_cb.c:120:5: warning: "CONFIG_NET_POLL_CONTROLLER" is not defined. Signed-off-by: Keith Owens <kaos@sgi.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[PATCH] s2io warning fixesAndrew Morton1-4/+5
drivers/net/s2io.c: In function `init_shared_mem': drivers/net/s2io.c:431: warning: cast from pointer to integer of different size drivers/net/s2io.c: In function `free_shared_mem': drivers/net/s2io.c:662: warning: cast from pointer to integer of different size Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[PATCH] sk98lin: remove PCI id info for cards for conflicting devicesStephen Hemminger1-7/+5
Fix PCI device id issues with sk98lin driver. 1. DLINK 530-T card has no Vital Product Data (VPD) area so the sk98lin driver won't work. (skge does however) 2. Remove commented out Yukon2 stuff 3. Restrict Linksys card to revisions that don't conflict with r8169 version. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14[ARM SMP] Add timer/watchdog defines for MPCoreRussell King1-0/+2
The timer/watchdog register definitions were missing from the mpcore watchdog patch. Add them. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-09-13Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 David S. Miller2-3/+21
2005-09-13Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog Linus Torvalds9-43/+2244
2005-09-13[PATCH] drivers/video: Replace custom macro with isdigit()Tobias Klauser1-1/+2
Replace the custom CHAR_IS_NUM() macro with isdigit() from <linux/ctype.h> Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Acked-by: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] matroxfb adjustmentsJan Beulich1-5/+8
Some adjustments to the matroxfb code, for one part preventing the display to be disabled for longer than necessary, and for the other part to make information about the frame buffer position available so that a kernel debugger might obtain that before the initial mode change. Finally, some return code corrections to fit the generic fb code. Signed-off-by: Jan Beulich <jbeulich@novell.com> Acked-by: Petr Vandrovec <vandrove@vc.cvut.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] fbcon: constify font dataJan Beulich13-34/+33
const-ify the font control structures and data, to make somewhat better guarantees that these are not modified anywhere in the kernel. Specifically for a kernel debugger to share this information from the normal kernel code, such a guarantee seems rather desirable. Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: "Antonino A. Daplas" <adaplas@hotpop.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] minor fbcon_scroll adjustmentJan Beulich1-0/+2
An adjustment to the SM_DOWN case of fbcon_scroll to match the behavior of SM_UP. Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: "Antonino A. Daplas" <adaplas@hotpop.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] v4l: fixup on cx88_dvb for Dvico HDTV5 GoldMauro Carvalho Chehab1-3/+4
- Bug fix for DViCO FusionHDTV5 Gold to avoid noise after frontend init. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] SharpSL: Add an input keyboard driver for Zaurus cxx00 seriesRichard Purdie3-0/+490
Add a input driver for the keyboard found on the Zaurus Cxx00 series (Spitz, Akita, Borzoi). Its based on corgikbd but there are enough subtle differences to justify a separate driver. Signed-Off-by: Richard Purdie <rpurdie@rpsys.net> Cc: Vojtech Pavlik <vojtech@suse.cz> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] SharpSL: Abstract model specifics from Corgi Backlight driverRichard Purdie1-14/+11
Separate out the Sharp Zaurus c7x0 series specific code from the Corgi backlight driver. Abstract model/machine specific functions to corgi_lcd.c via sharpsl.h This enables the driver to be used by the Zaurus cxx00 series. Signed-Off-by: Richard Purdie <rpurdie@rpsys.net> Cc: Vojtech Pavlik <vojtech@suse.cz> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] SharpSL: Abstract c7x0 specifics from Corgi Touchscreen driverRichard Purdie2-31/+45
Separate out the Sharp Zaurus c7x0 series specific code from the Corgi Touchscreen driver. Use the new functions in corgi_lcd.c via sharpsl.h for hsync handling and pass the IRQ as a platform device resource. Move a function prototype into the w100fb header file where it belongs. This enables the driver to be used by the Zaurus cxx00 series. Signed-Off-by: Richard Purdie <rpurdie@rpsys.net> Cc: Vojtech Pavlik <vojtech@suse.cz> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] pktcdvd: BUG_ON cleanupsPeter Osterlund1-6/+3
Remove some redundant BUG_ON() statements in pktcdvd and move one run-time check to compile-time. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] pktcdvd: use kcalloc and kzallocPeter Osterlund1-6/+3
Use kcalloc and kzalloc in pktcdvd. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] pktcdvd: more accurate I/O accountingPeter Osterlund1-7/+7
In the /proc statistics, only count writes that upper layers have requested. Don't count additional writes created inside the packet driver to satisfy the requirement to only write full packets. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] pktcdvd: documentation updatePeter Osterlund1-18/+30
Update the "theory of operation" description. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] pktcdvd: fix bogus BUG_ONPeter Osterlund1-1/+4
In the packet writing driver, if the drive reports a packet size larger than the driver can handle, bail out safely instead of triggering a BUG_ON. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] cciss: SCSI tape info for /procMike Miller1-3/+24
Add SCSI host and device info not elsewhere available to /proc/scsi/cciss/* Namely, connect cciss device instance with scsi host number, and give scsi host number, bus, target, lun, devicetype, and 8-byte cciss LUNID for each tapedrive/medium changer attached to a controller For instance: # cat /proc/scsi/cciss/2 cciss0: SCSI host: 2 c2b0t0l0 01 0x0000000000000001 Signed-off-by: Stephen M. Cameron <steve.cameron@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] cciss: One Button Disaster Recovery supportMike Miller1-12/+29
This patch adds support for "One Button Disaster Recovery" devices to the cciss driver. (OBDR devices are tape drives which can pretend to be cd-rom devices temporarily. Once booted the device can be reverted to a tape drive and data recovery operations can be automatically begun.) This is an enhancement request by a vendor/partner working on One Button Disaster Recovery. Signed-off-by: Stephen M. Cameron <steve.cameron@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] cciss: fix for DMA brokenessMike Miller1-2/+6
The CCISS driver seems to loose track of DMA mappings created by it's fill_cmd() routine. Neither callers of this routine are extracting the DMA address created in order to do the unmap. Instead, they simply try to unmap 0x0. It's easy to see this problem on an x86_64 system when using the "swiotlb=force" boot option. In this case, the driver is leaking resources of the swiotlb and not causing a sync of the bounce buffer. Signed-off-by: Alex Williamson <alex.williamson@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] cciss: bug fix in cciss_remove_oneMike Miller1-2/+3
This patch fixes a bug in cciss_remove_one. A set of braces was missing for the if statement causing an Oops on driver unload. Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] cciss: direct lookup for command completionsMike Miller4-7/+73
This patch changes the way we complete commands. In the old method when we got a completion we searched our command list from the top until we find it. This method uses a tag associated with each command (not SCSI command tagging) to index us directly to the completed command. This helps performance. Signed-off-by: Don Brace <dab@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] cciss: new disk register/deregister routinesMike Miller2-190/+333
This patch removes a couple of functions dealing with configuration and replaces them with new functions. This implementation fixes some bugs associated with the ACUXE. It also allows a logical volume to be removed from the middle without deleting all volumes behind it. If a user has 5 logical volumes and decides he wants to reconfigure volume number 3, he can now do that without removing volumes 4 & 5 first. This code has been tested in our labs against all application software. Signed-off-by: Chase Maupin <chase.maupin@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] cciss: busy_initializing flagMike Miller2-0/+9
This patch adds a flag called busy_initializing. If there are multiple controllers in a server AND the HP agents are running it's possible the agents may try to poll a card that is still initializing if the driver is removed and then added again. Signed-off-by: Don Brace <dab@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] cciss: new controller pci/subsystem idsMike Miller1-9/+24
This patch adds new PCI and subsystem ID's that finally made the spec. It also include a name change for one controller. I know there's a lot of duplicat names but the fw folks wanted this for the different implementations. Even though the same ASIC is used it may be embedded on some platforms, standup card in others, and a mezzanine in other servers. Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] Remove unnecessary check_region references in commentsPeter Osterlund15-20/+16
Remove check_region references from comments and printk statements so that searching for real users of this deprecated function gets easier. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] i2c-keywest warning fixAndrew Morton1-1/+0
Unused variable. Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-13[PATCH] pcmcia: add another orinoco_cs idKomuro1-0/+1
Add new id to orinoco_cs (corega PCCB-11). Signed-off-by: <komurojun-mbn@nifty.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>