summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge by hand (whitespace conflicts in libata.h)James Bottomley2005-11-10335-10090/+31203
|\ | | | | | | Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2005-11-0912-18/+338
| |\
| | * [PATCH] ide-floppy: software eject not working with LS-120 driveOndrej Zary2005-11-101-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem (eject not working on ATAPI LS-120 drive) is caused by idefloppy_ioctl() function which *first* tries generic_ide_ioctl() and *only* if it fails with -EINVAL, proceeds with the specific ioctls. The generic eject command fails with something other than -EINVAL and the specific one is never executed. This patch fixes it by first going through the internal ioctls and only trying generic_ide_ioctl() if none of them matches. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| | * [PATCH] siimage: enable interrupts on Adaptec SA-1210 cardJohn W. Linville2005-11-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The siimage driver proports to support the Adaptec SA-1210 SATA controller. However, at least some of those cards boot-up with their interrupts disabled internally. The siimage driver currently ignores that fact, so that driver does not actually work with those cards. This patch enables those interrupts on cards that need it. [ This is implemented based on similar code in the libata-based sata_sil driver. ] Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| | * [PATCH] ide: CS5535 driverJaya Kumar2005-11-093-0/+315
| | | | | | | | | | | | Signed-off-by: Jaya Kumar <jayakumar.ide@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| | * [PATCH] ide: AMD Geode GX/LX supportJordan Crouse2005-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | From: "Jordan Crouse" <jordan.crouse@amd.com> The core IDE engine on the CS5536 is the same as the other AMD southbridges, so unlike the CS5535, we can simply add the appropriate PCI headers to the existing amd74xx code. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| | * [PATCH] ide: ide-scsi fails to call idescsi_check_condition for things like ↵Willem Riede2005-11-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Medium not present" This patch started life as a response to fedora specific ide subsystem changes that made error handling of my ATAPI tape drive fail; the specifics are in https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=160868 The insertion of the statement rq->errors = err; near the end of ide_end_drive_cmd() in drivers/ide/ide-io.c means that rq->errors does not contain what it needs to in idescsi_end_request() in drivers/scsi/ide-scsi.c anymore. Recent mainline kernels now also have this change. The patch below makes ide-scsi whole. Signed-off-by: Willem Riede <wrlk@riede.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| | * [PATCH] ide: possible cleanupsAdrian Bunk2005-11-093-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains the following possible cleanups: - pci/cy82c693.c: make a needlessly global function static - remove the following unneeded EXPORT_SYMBOL's: - ide-taskfile.c: do_rw_taskfile - ide-iops.c: default_hwif_iops - ide-iops.c: default_hwif_transport - ide-iops.c: wait_for_ready Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| | * [PATCH] ide: incorrect device link for ide-csHannes Reinecke2005-11-092-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devices driven by ide-cs will appear under /sys/devices instead of the appropriate PCMCIA device. To fix this I had to extend the hw_regs_t structure with a 'struct device' field, which allows us to set the parent link for the appropriate hwif. Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@suse.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| * | Fix AGP compile on non-x86 architecturesLinus Torvalds2005-11-092-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AGP shouldn't use "global_flush_tlb()" to flush the AGP mappings, that i spurely an x86'ism. The proper AGP mapping flusher that should be used is "flush_agp_mappings()", which on x86 obviously happens to do a global TLB flush. This makes AGP (or at least the config _I_ happen to use) compile again on ppc64. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6Linus Torvalds2005-11-093-27/+20
| |\ \
| | * | [PATCH] i2c-viapro: Some adjustmentsJean Delvare2005-11-071-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The big i2c-viapro SMBus driver update which went into 2.6.14-git1 introduced a few minor issues. Nothing critical, but I would like a few adjustments to be merged in to fix the following problems: * VIA should not be spelled Via. * Frodo Looijaard and Philip Edelbrock did not write the i2c-viapro driver. * When debugging is disabled, half of messages would be logged. * Drop an unneeded masking. * Some port reads can be avoided now that the transaction size is passed as a parameter to vt596_transaction(). * SMBus Receive Byte transactions are used for probing too (for EEPROMs), so hide errors on these too. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * | [PATCH] hwmon: Fix two w83627hf bugsYuan Mu2005-11-071-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix in4 reads for W83627THF and W83637HF chips. * Use the correct register for alarm flags. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * | [PATCH] i2c: ds1337 BCD conversion fixJames Chapman2005-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix BCD value errors when month=9, moving the increment inside the BIN2BCD macro. Fix similar code for the weekday value, just for consistency. This bug was reported by Michael Burian <dynmail1@gassner-waagen.at>. Signed-off-by: James Chapman <jchapman@katalix.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | | [SPARC] sbus rtc: implement ->compat_ioctlChristoph Hellwig2005-11-091-0/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC]: Fix locking thinkos in display7seg and cpwatchdog drivers.David S. Miller2005-11-092-2/+2
| | |/ | |/| | | | | | | | | | | | | Noticed by Eric Brower. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgartLinus Torvalds2005-11-094-12/+30
| |\ \
| | * | [PATCH] i460-agp warning fixesAndrew Morton2005-11-081-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/char/agp/i460-agp.c: In function `i460_fetch_size': drivers/char/agp/i460-agp.c:115: warning: size_t format, long unsigned int arg (arg 2) drivers/char/agp/i460-agp.c:115: warning: size_t format, long unsigned int arg (arg 3) drivers/char/agp/i460-agp.c: In function `i460_mask_memory': drivers/char/agp/i460-agp.c:542: warning: integer constant is too large for "long" type Note that the i460_mask_memory() change is a guess. But a good one, I suspect. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
| | * | [PATCH] AGP performance fixesAlan Hourihane2005-11-084-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AGP allocation/deallocation is suffering major performance issues due to the nature of global_flush_tlb() being called on every change_page_attr() call. For small allocations this isn't really seen, but when you start allocating 50000 pages of AGP space, for say, texture memory, then things can take seconds to complete. In some cases the situation is doubled or even quadrupled in the time due to SMP, or a deallocation, then a new reallocation. I've had a case of upto 20 seconds wait time to deallocate and reallocate AGP space. This patch fixes the problem by making it the caller's responsibility to call global_flush_tlb(), and so removes it from every instance of mapping a page into AGP space until the time that all change_page_attr() changes are done. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | | Merge branch 'upstream-linus' of ↵Linus Torvalds2005-11-0917-40/+30
| |\ \ \ | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| | * | | [PATCH] libata: if condition fix for ata_dev_identify()Albert Lee2005-11-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - if condition fix for ata_dev_identify() - ata_pio_poll() minor cleanup. Changes: - Use (dev->class == ATA_DEV_ATA) for ata_dev_identify() since "qc->tf.command" has been overwritten by the device status - Use HSM_ST_TMOUT directly in ata_pio_poll() Signed-off-by: Albert Lee <albertcc@tw.ibm.com> ============ Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | [PATCH] libata kernel-doc fixesRandy Dunlap2005-11-092-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix all reported kernel-doc errors in libata. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | Merge branch 'master'Jeff Garzik2005-11-09542-20031/+26266
| | |\ \ \
| | * | | | [libata] eliminate use of drivers/scsi/scsi.h compatibility header/definesJeff Garzik2005-11-0717-32/+22
| | | | | |
| * | | | | Merge branch 'upstream-linus' of ↵Linus Torvalds2005-11-0924-3276/+7801
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| | * | | | | [PATCH] IOC: And don't mark the things as broken Cowboy.Ralf Baechle2005-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And don't mark the things as broken Cowboy. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | | | [PATCH] dgrs: fix warnings when CONFIG_ISA and CONFIG_PCI are not enabledAshutosh Naik2005-11-091-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes compiler warnings when CONFIG_ISA and CONFIG_PCI are not enabled in the dgrc network driver. Signed-off-by: Ashutosh Naik <ashutosh.naik@gmail.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | | | [PATCH] cris v10 eth: use ethtool_opsChristoph Hellwig2005-11-091-78/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | | | [PATCH] b44: increase version numberFrancois Romieu2005-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | | | [PATCH] b44: race on device closingFrancois Romieu2005-11-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usual fix: - b44_interrupt() does not schedule NAPI polling when the device is going down; - b44_close() waits for any scheduled NAPI polling before it starts to release the private structures of the device. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | | | [PATCH] b44: replace B44_FLAG_INIT_COMPLETE with netif_running()Francois Romieu2005-11-092-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | | | [wireless ipw2100] kill unused-var warnings for debug-disabled codeJeff Garzik2005-11-091-0/+4
| | | | | | |
| | * | | | | Merge rsync://bughost.org/repos/ipw-delta/Jeff Garzik2005-11-094-2895/+7307
| | |\ \ \ \ \
| | | * | | | | Update version ipw2200 stamp to 1.0.8James Ketrenos2005-11-071-1/+1
| | | | | | | |
| | | * | | | | Updated firmware version stamp to 2.4 from 2.3 so it will use the latest ↵James Ketrenos2005-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | firmware. You can obtain the firmware at http://ipw2200.sf.net/firmware.php Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Fixed parameter reordering in firmware log routine.James Ketrenos2005-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Fixed problem with not being able to send broadcast packets.Hong Liu2005-11-071-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Added channel support for ipw2200 cards identified as 'ZZR'James Ketrenos2005-11-071-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Removed warning about TKIP not being configured if countermeasures areJames Ketrenos2005-11-072-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured. Countermeasures default to being turned off when wpa_supplicant runs, regardless of if TKIP is being used. They are only turned on if a TKIP is running. The warning we were printing is therefore not needed. Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Fixes missed beacon logic in relation to on-network AP roaming.Ben Cahill2005-11-072-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Removed legacy WIRELESS_EXT checks from ipw2200.cJames Ketrenos2005-11-071-507/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Fix 'Driver using old /proc/net/wireless support, please fix driver !' message.Benoit Boissinot2005-11-072-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wireless extensions moved the get_wireless_stats handler from being in net_device into wireless_handler. Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org> Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Pulled out a stray KERNEL_VERSION check around the suspend handler.James Ketrenos2005-11-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Updated driver version stamps for ipw2100 (1.1.3) and ipw2200 (1.0.7)James Ketrenos2005-11-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Fixes WEP firmware error condition.Hong Liu2005-11-071-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is caused by the patch in bug455 -- Channel change flood generates fatal error. The patch set the DISASSOCIATING status bit after sending the command. The process was scheduled out when waiting for the command to be sent to the card. The disassociated notification clears the DISASSOCIATING bit in the tasklet before the process set the bit. Move the bit setting code before sending the command now. Signed-off-by: Hong Liu <hong.liu@intel.com> Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | [Fix bug# 771] Too many (8) bytes recieved when using AES/hwcryptoZhu Yi2005-11-071-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Fixes problem with WEP not working (association succeeds, but no Tx/Rx)Hong Liu2005-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Removed PF_SYNCTHREAD legacy.James Ketrenos2005-11-071-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PF_SYNCTHREAD check was introduced to try and remain compatible with SWSUSP2. This check is no longer needed with newer versions. Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Fixed problem with get_cmd_string not existing if CONFIG_IPW_DEBUG disabled.James Ketrenos2005-11-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | | * | | | | Card with WEP enabled and using shared-key auth will have firmwareHong Liu2005-11-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error when it tries to auth to a WPA ap. The patch filters out WPA networks if the card is not wpa enabled when selecting network to associate to. Signed-off-by: Hong Liu <hong.liu@intel.com>
OpenPOWER on IntegriCloud