aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2007-03-09Pull bugzilla-5966 into release branchLen Brown1-1/+22
2007-03-09Pull ibm into release branchLen Brown2-2/+37
2007-03-09Pull altix into release branchLen Brown2-22/+24
2007-03-09ACPI: ec: fix race in status register accessAlexey Starikovskiy1-17/+23
Delay the read of the EC status register until after the event that caused it occurs -- otherwise it is possible to read and act on stale status that was associated with the previous event. Do this with a perpetually incrementing "event_count" to detect when a new event occurs and it is safe to read status. There is no workaround for polling mode -- it is inherently exposed to reading and acting on stale status, since it doesn't have an interrupt to tell it the event completed. http://bugzilla.kernel.org/show_bug.cgi?id=8110 Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
2007-03-09USB Elan FTDI: check for workqueue creationCyrill Gorcunov1-2/+16
Avoid NULL pointer usage if workqueue creation failed. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: fix spinlock recursion in cdc-acm.cOliver Neukum1-4/+4
this fixes the spinlock recursion issue. The older fix was incomplete. Signed-off-by: Oliver Neukum <oneukum@suse.de> Acked-by: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: fix Unaligned access in EHCI driverMax Dmitrichenko1-2/+1
I get following warnings on spar64: Kernel unaligned access at TPC[1000c9e4] ehci_hub_control+0x54c/0x68c [ehci_hcd] Despite of the comment in the patched code, the type cast used there does make unaligned access. The fix was made as it's done in ohci-hub.c. Signed-off-by: Max Dmitrichenko <dmitrmax@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: Product ID for FT232RL in ftdi_sioGard Spreemann2-0/+4
Here is a patch adding the PID for the FT232RL to ftdi_sio. The patch generates a warning during compilation because get_ftdi_divisor doesn't explicitly handle the FT232RL with this patch, so I guess you don't want to use it in its current state. It is all I could come up with with the knowledge I have of the drivers at the moment, though, and I hope you can have some use for it at least. It works fine with my DLP-TILT with an FT232RL. From: Gard Spreemann <spreeman@stud.ntnu.no> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USBNET: DM9501: Add Corega FEther USB-TXC support.YOSHIFUJI Hideaki1-0/+4
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Cc: Jeff Garzik <jeff@garzik.org> Cc: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: ipaq.c: Additional devicesAndre Spahlinger1-0/+2
Additional devices Signed-off-by: Andre Spahlinger <uenz@gmx.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: further fix for usb-serialOliver Neukum1-5/+4
this is a fix for the outstanding usb-serial issues. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: fix usb-serial device naming bugOliver Neukum1-1/+1
Am Montag, 26. Februar 2007 15:16 schrieb Craig Schlenter: > Hi Greg > > 34ef50e5b1f96c2d8c0f3d28b7d407743806256c is definitely > the source of the problem. Reverting that makes the > ftdi port show up as ttyUSB0 again for me and it > can actually be opened. This patch should fix the issue. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Craig Schlenter <craig@codefountain.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: RTS/DTR signal patch for airprime driverMartin Schiller1-0/+47
I encountered some problems with the airprime driver in use with a Novatel Merlin XU870: Closing an open Connection to e.g. /dev/ttyUSB0 doesn't reset the RTS/DTR lines of the Modem. Consequently, when I use minicom to establish a connection by "ATD*99#" the modem doesn't hang up even if i exit minicom and so I cannot reuse the modem unless I remove it and plug it in again. With the attached patch, the RTS/DTR lines are resetted on a close. The code was mainly taken from the option.c driver.
2007-03-09USB: ftdi_sio: use port_probe / port_remove thereby fixing access to the latency_timerJim Radford1-44/+35
Convert all the port specific code in attach / shutdown to use the new port_probe / port_register callbacks from device_register / device_unregister allowing adding the sysfs attributes to be added at the correct time and to the serial port device itself, instead of to the unadorned usb device, avoiding a NULL dereference. Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09usb-serial: fix shutdown / device_unregister orderJim Radford1-5/+6
Ensure that the ->port_remove() callbacks get called before the ->shutdown() callback which makeing the order symmetric with ->attach() being called before ->port_probe(). Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: add Additional PIDs in ftdi_sioThomas Schleusener2-0/+21
I've developed some devices with FTDI chips (FT232xx). FTDI was so kind to give some own PID's which I can use together with their VID. Some of the devices are already very popular here and I have customers from universities, institutes ..... I use the FTDI VID 0x0403. My PID's are: 0xff38 - IBS US485 (USB<-->RS422/485 interface) 0xff39 - IBS PIC-Programmer 0xff3a - IBS Card reader for PCMCIA SRAM-cards 0xff3b - IBS PK1 - Particel counter 0xff3c - IBS RS232 - Monitor 0xff3d - APP 70 (dust monitoring system) 0xff3e - IBS PEDO-Modem (RF modem 868.35 MHz) 0xff3f - future device The company is "IBS Ing.-Buero Schleusener". From: Thomas Schleusener <thomas@be-schl.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: add QL355P power supply ids to fdti_sioMichael Olberg2-0/+7
2007-03-09USB: New device IDs for cp2101 driverJon K Hellan1-0/+2
Here are two new device IDs for the cp2101 driver. The diff is with linus's tree as of this evending. From: Jon K Hellan <hellan@acm.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: kill dead code from hub.cOliver Neukum1-7/+0
this kills residual obsoletet code from hub.c Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: ratelimit debounce error messagesOliver Neukum1-1/+1
flaky hardware can cause a lot of debounce failed messages. To limit the performance impact, a ratelimit should be used. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: pxa2xx_udc: fix hardcoded irq numberMilan Svoboda1-1/+1
This patch changes last use of hardcoded number of irq to use platfrom_get_irq. Signed-off-by: Milan Svoboda <msvoboda@ra.rockwell.com> Acked-by: David Brownell <david-b@pacbell.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09UHCI: fix port resume problemAlan Stern1-4/+7
This patch (as863) fixes a problem encountered sometimes when resuming a port on a UHCI controller. The hardware may turn off the Resume-Detect bit before turning off the Suspend bit, leading usbcore to think that the port is still suspended and the resume has failed. The patch makes uhci_finish_suspend() wait until both bits are safely off. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: set the correct interval for interrupt URBsAlan Stern2-9/+13
This patch (as862) fixes a couple of bugs in the way usbcore handles intervals for interrupt URBs. usb_interrupt_msg (and usb_bulk_msg for backward compatibility) don't set the interval correctly for high-speed devices. proc_do_submiturb() doesn't set it correctly when a bulk URB is submitted to an interrupt endpoint. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: goku_udc: Remove crude cache coherency codeRalf Baechle1-29/+0
This is deep architecture specific magic and does should not to exist in a driver. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Cc: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB storage: Nokia 6288 unusual_devs entryAndrew Nayenko1-0/+7
This patch adds an usual_devs entry for the Nokia 6288. Originally from Andrew with a re-diff by Phil. From: Andrew Nayenko <relan@bk.ru> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB storage: Removed duplicate supertop unusual_dev entryPhil Dibowitz1-10/+0
This patch removes the duplicate supertop entries that made it into the .21 rc kernels. Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09USB: at91_udc, fix more modpost bogosity (rename driver struct)David Brownell1-3/+3
Rename the driver struct used with at91_udc to prevent yet another bogus warning from "modpost". Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09ACPI: Kconfig: hide ACPI menu when CONFIG_PM=nRobert P. J. Day1-0/+1
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Len Brown <len.brown@intel.com>
2007-03-09ACPI: video: Fix spelling and grammar mistakesJulius Volz1-19/+19
Correct some of the most obvious spelling and grammar mistakes in drivers/acpi/video.c (comments and printk output). Signed-off-by: Julius Volz <juliusrv@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
2007-03-09ACPI: make blacklist more verboseAnthony Godshall, Ampro Computers, Inc1-2/+8
IMHO, ACPI disabled due to DMI failure or blacklisted year should be noted, as is done with other ACPI blacklisting. This will help people troubleshoot when ACPI isn't working. Status quo is a mysterious "ACPI Disabled" message without explanation on BIOS that implements ACPI but not DMI. This is actually fairly common on embedded x86 boards. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com>
2007-03-09asus-laptop: make code staticAdrian Bunk1-1/+1
This patch makes some needlessly global code static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Len Brown <len.brown@intel.com>
2007-03-09[IPV6] fix ipv6_getsockopt_sticky copy_to_user leakChris Wright1-1/+1
User supplied len < 0 can cause leak of kernel memory. Use unsigned compare instead. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2007-03-09pci: fix section mismatch warningSam Ravnborg1-1/+1
drivers/pci/search.c caused following section mismatch warning (if compiled with CONFIG_HOTPLUG=n): WARNING: drivers/pci/built-in.o - Section mismatch: reference to .init.text: from .text.pci_find_bus after 'pci_find_bus' (at offset 0x24) This was due to pci_find_bus() calling a function marked __devinit. Fix was to remove the __devinit from the offending function. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09PCI: aer: fix section mismatch warningSam Ravnborg1-3/+3
Fix following section mismatch warning (when compiled with CONFIG_HOTPLUG=n): WARNING: drivers/pci/built-in.o - Section mismatch: reference to .init.text:aer_probe from .data between 'aerdrv' (at offset 0x1608) and 'aer_error_handlers' Warning was fixed by renaming aerdrv to aerdriver so we pass the whitelist. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09pcie: fix section mismatch warningSam Ravnborg1-3/+3
Fix following section mismatch warning (when compiled with CONFIG_HOTPLUG=n): WARNING: drivers/pci/built-in.o - Section mismatch: reference to .init.text:pcie_portdrv_probe from .data between 'pcie_portdrv' (at offset 0xe40) and 'pcie_portdrv_err_handler' This warning was fixed by renaming pcie_portdrv to pcie_portdriver so we pass the whitelist. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09PCI: allow multiple calls to pcim_pin_device()Tejun Heo1-7/+8
Sanity check in pcim_pin_device() was too restrictive in that it didn't allow multiple calls to the function, which is against the devres philosohpy of fire-and-forget. Track pinned status separately and allow pinning multiple times. Signed-off-by: Tejun Heo <htejun@gmail.com> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09kobject: new_device->kref wasn't putted after error in kobject_move()Dmitriy Monakhov1-0/+2
If error happen we jump to "out" label, in this case new_device not yet became the parent but it wasn't putted. Signed-off-by: Monakhov Dmitriy <dmonakhov@openvz.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09driver core: export device_renameJohannes Berg1-1/+1
In wireless we'd like to allow renaming of the phy devices we surface in sysfs. The base wireless code, however, can be built modular and thus we need device_rename exported. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09Remove devfs from MAINTAINERSJörn Engel1-3/+0
Remove last remaining trace of devfs. Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09Driver core: add device symlink back to sysfsGreg Kroah-Hartman1-8/+13
This moves the device symlink back to sysfs even if CONFIG_SYSFS_DEPRECATED is enabled as too many userspace programs (well, HAL), still rely on this link to be present. I will rework the ability for sysfs to change layouts like this in the future, but for now, this patch should fix people's network connections. Cc: Kay Sievers <kay.sievers@vrfy.org> Cc: Matt Mackall <mpm@selenic.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09Revert "driver core: refcounting fix"Greg Kroah-Hartman1-6/+0
This reverts commit 63ce18cfe685115ff8d341bae4c9204a79043cf0. It was the incorrect fix and causes a reference counting bug whenever any driver module is removed from the system. Mike Galbraith <efault@gmx.de> is looking for the real fix for his problem. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-03-09libata-acpi: allow _GTF on SATA, but disable on PATA for nowKristen Accardi1-0/+7
The ACPI specification states, and BIOS implementations depend on, _STM being called before _GTF. SATA does this, but PATA does not. So for now, simply prevent execution of _GTF on PATA devices. Longer term we should implement ACPI support for PATA devices in libata. Signed-off-by: Kristen Accardi <kristen.c.accardi@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
2007-03-09Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpcLinus Torvalds9-30/+94
* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] 85xx: Enable CONFIG_SERIAL_8250_SHARE_IRQ [POWERPC] Select u-image as default image for Linkstation [POWERPC] 83xx: Minor fixes for 834x_mds USB setup code [POWERPC] Fix warning in powermac pci.c [POWERPC] Fix warning in powermac feature.c [POWERPC] Fix warning in prom_parse.c of_irq_map_oldworld() [POWERPC] Celleb: bug fix caused by not casting pointer types [POWERPC] Add missing newline in xmon help output [POWERPC] No DEEPNAP on 970MP 1.0
2007-03-09[IPV6]: Fix for ipv6_setsockopt NULL dereferenceOlaf Kirch1-1/+1
I came across this bug in http://bugzilla.kernel.org/show_bug.cgi?id=8155 Signed-off-by: Olaf Kirch <olaf.kirch@oracle.com> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2007-03-09[DCCP]: Initialise write_xmit_timer also on passive socketsGerrit Renker3-16/+26
The TX CCID needs the write_xmit_timer for delaying packet sends. Previously this timer was only activated on active (connecting) sockets. This patch initialises the write_xmit_timer in sync with the other timers, i.e. the timer will be ready on any socket. This is used by applications with a listening socket which start to stream after receiving an initiation by the client. The write_xmit_timer is stopped when the application closes, as before. Was tested to work and to remove the timer bug reported on dccp@vger. Also moved timer initialisation into timer.c (static). Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: David S. Miller <davem@davemloft.net>
2007-03-09[IPV4]: Fix rtm_to_ifaddr() error handling.Evgeniy Polyakov1-1/+3
Return negative error value (embedded in the pointer) instead of returning NULL. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
2007-03-09[MIPS] Sibyte: Fix ZBbus profilerRalf Baechle4-218/+283
o Fix build error. o Handle error returns. o Deal with signals received while sleeping. o Don't allow to be selected when we're not building the directory with the driver anyway. o Coding style cleanups. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2007-03-09[MIPS] Sibyte: Do not allow enabling LDT support if PCI is disabled.Ralf Baechle1-4/+6
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2007-03-09Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds1-3/+0
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] DEC: Remove call to register_prom_console.
2007-03-09Merge git://git.infradead.org/mtd-2.6Linus Torvalds15-38/+115
* git://git.infradead.org/mtd-2.6: [JFFS2] print a message when marking bad block [JFFS2] Check for all-zero node headers [MTD] [OneNAND] Classify the page data and oob buffer [MTD] [OneNAND] Exit the loop when transferring/filling of the oob is finished [MTD] [OneNAND] add Nokia Copyright and a credit [MTD] [OneNAND] Fix typo & wrong comments [MTD] [OneNAND] Use oob buffer instead of main one in oob functions [MTD] Correct partition failed erase address [JFFS2] Use yield() between GC passes in background thread. [MTD] [NAND] Correct misspelled preprocessor variable. [MTD] [MAPS] dilnetpc: Fix printk warning [MTD] [NOR] Fix oops in cfi_amdstd_sync [MTD] ESB2 check for closed ROM window [JFFS2] Fix writebuffer recovery in the first page of a block [MTD] [NAND] make oobavail public