aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next' into for-linusDmitry Torokhov2008-10-1551-352/+2309
|\
| * Input: wm97xx - update email address for Liam GirdwoodLiam Girdwood2008-10-136-16/+11
| | | | | | | | | | | | | | | | This updates the email address for Liam Girdwood as my old address is no longer valid. Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: i8042 - add Thinkpad R31 to nomux listColin B Macdonald2008-10-131-0/+7
| | | | | | | | | | | | | | | | | | | | Thinkpad R31 needs i8042 nomux quirk. Stops jittery jumping mouse and random keyboard input. Fixes kernel bug #11723. Cherry picked from Ubuntu who have sometimes (on-again-off-again) had a fix in their patched kernels. Signed-off-by: Colin B Macdonald <cbm@m.fsf.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: move map_to_7segment.h to include/linuxAtsushi Nemoto2008-10-103-4/+3
| | | | | | | | | | | | | | | | | | | | | | The map_to_7segment.h provides generic 7segment LED mappings and is designed to be used by other drivers. Moving it to common area will make it more usable. Also exporting it to userspace will help users of sysfs interface. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Acked-by: Henk Vergonet <henk.vergonet@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ads7846 - fix cache line sharing issueDmitry Torokhov2008-10-091-36/+51
| | | | | | | | | | | | | | | | | | | | We had a report a while back that the ads7846 driver had some issues when used with DMA-based SPI controllers (like atmel_spi) on systems where main memory is not DMA-coherent (most non-x86 boards). Allocate memory potentially used for DMA separately to avoid cache line issues. Reported-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: cm109 - add missing newlines to messagesDaniel Gimpelevich2008-10-091-12/+10
| | | | | | | | | | | | | | | | Recent conversion from err(), warn(), info() to dev_* variants caused loss of newlines at the end of messages, add them back. Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: document i8042.debug in kernel-parameters.txtJiri Kosina2008-10-081-0/+1
| | | | | | | | | | | | | | | | i8042.debug parameter was missing in Documentation/kernel-parameters.txt. Add it. Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: keyboard - fix potential out of bound access to key_mapDmitry Torokhov2008-10-081-1/+1
| | | | | | | | | | Reported-by: Michal Roszkowski <michal@roszkowski.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: psmouse - add OLPC touchpad driverAndres Salomon2008-09-216-2/+560
| | | | | | | | | | | | | | | | | | | | | | | | This adds support for OLPC's touchpad. It has lots of neat features, none of which are enabled because the hardware is too buggy. Instead, we use it like a normal touchpad, but with a number of workarounds in place to deal with the frequent hardware spasms. Humidity changes, sweat, tinfoil underwear, plugging in AC, drinks, evil felines.. All tend to cause the touchpad to freak out. Signed-off-by: Andres Salomon <dilinger@debian.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: psmouse - tweak PSMOUSE_DEFINE_ATTR to support raw set callbacksAndres Salomon2008-09-212-14/+23
| | | | | | | | | | | | | | | | | | | | | | We want to support attr->set callbacks that may need psmouse->state to not be updated, or may want to manually deal w/ enabling and disabling the device. To do that, we create __PSMOUSE_DEFINE_ATTR which enables us to set a 'protect' argument specifying whether or not the set callback should be protected with psmouse_disable and state setting. Signed-off-by: Andres Salomon <dilinger@debian.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: psmouse - add psmouse_queue_work() for ps/2 extension to make use ofAndres Salomon2008-09-212-5/+13
| | | | | | | | | | | | | | | | | | | | psmouse_queue_work is passed a delayed_work struct, and queues up the work with kpsmouse_wq. Since we're dealing with delayed_work stuff, this also switches resync_work to a delayed_work struct as well, and makes use of psmouse_queue_work when doing a resync within psmouse-base. Signed-off-by: Andres Salomon <dilinger@debian.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: psmouse - export psmouse_set_state for ps/2 extensions to useAndres Salomon2008-09-212-1/+2
| | | | | | | | | | Signed-off-by: Andres Salomon <dilinger@debian.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ads7846 - introduce .gpio_pendown to get pendown stateEric Miao2008-09-102-14/+57
| | | | | | | | | | | | | | | | | | The GPIO connected to ADS7846 nPENIRQ signal is usually used to get the pendown state as well. Introduce a .gpio_pendown, and use this to decide the pendown state if .get_pendown_state is NULL. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ALPS - add signature for DualPoint found in Dell Latitude E6500Elvis Pranskevichus2008-09-101-0/+1
| | | | | | | | | | Signed-off-by: Elvis Pranskevichus <el@prans.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: serio_raw - allow attaching to translated (SERIO_I8042XL) portsNiels de Vos2008-09-101-0/+6
| | | | | | | | | | | | | | | | | | | | serio_raw only binds to non-translated devices. Enable serio_raw to bind to normal (translated) keyboards which can have non-standard extensions (like POS Keyboards). With this it is possible to send commands to the device over /dev/serio_raw<n>. Signed-off-by: Niels de Vos <niels.devos@wincor-nixdorf.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: cm109 - don't use obsolete logging macrosStephen Rothwell2008-09-101-16/+16
| | | | | | | | | | | | | | err(), warn(), info() are being removed in favor of dev_* variants. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: atkbd - expand Latitude's force release quirk to other DellsMatthew Garrett2008-09-101-5/+5
| | | | | | | | | | | | | | | | | | | | Dell laptops fail to send key up events for several of their special keys. There's an existing quirk in the kernel to handle this, but it's limited to the Latitude range. This patch extends it to cover all portable Dells. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: bf54x-keys - add power management supportMichael Hennerich2008-09-101-1/+12
| | | | | | | | | | | | | | | | | | Fix Bug: does nor properply resume after suspend mem Fix for PM_SUSPEND_MEM: Save and restore peripheral base registers Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: atmel_tsadcc - improve accuracyDan Liang2008-09-101-13/+24
| | | | | | | | | | | | | | | | | | Discard the last sample just before pen is up because it is quite often errorneous. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Dan Liang <dan.liang@atmel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: convert drivers to use strict_strtoul()Joe Rouvier2008-09-106-51/+53
| | | | | | | | | | | | | | strict_strtoul() allows newline character at the end of the the input string and therefore is more user-friendly. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| * Input: appletouch - handle geyser 3/4 status bitsSven Anders2008-08-081-18/+35
| | | | | | | | | | | | | | | | Implement support for status bits on Geyser 3/4. Signed-off-by: Sven Anders <anders@anduras.de> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: appletouch - prepare for geyser 3/4 handlingSven Anders2008-08-081-69/+197
| | | | | | | | | | | | | | | | Split complete function into separate functions for GEYSER1/2 and GEYSER 3/4. Signed-off-by: Sven Anders <anders@anduras.de> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: gpio-keys - simplify argument list for report_eventUwe Kleine-König2008-08-081-4/+5
| | | | | | | | | | | | | | | | | | | | For now this only saves a few instructions (for gpio_keys_report_event, gpio_keys_isr and gpio_check_button one instraction each on ARM using arm-linux-gnu-gcc 4.2.3---I assume this is similar for other arch/compiler combinations). Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: gpio-keys - optimize interrupt handlerUwe Kleine-König2008-08-081-23/+12
| | | | | | | | | | | | | | | | By passing a gpio_button_data structure to the handler instead of the whole platform_device the search for the right button can go away. Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: wistron - add support for Fujitsu-Siemens Amilo Pro v3505Remi Herilier2008-08-081-0/+19
| | | | | | | | | | | | | | | | Wistron button support for Fujitsu-Siemens Amilo Pro Edition V3505. Signed-off-by: Remi Herilier <rherilier@yahoo.fr> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: add driver for USB VoIP phones with CM109 chipsetAlfred E. Heggestad2008-08-083-0/+898
| | | | | | | | | | Signed-off-by: Alfred E. Heggestad <aeh@db.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: add keycodes for remote controls/phone keypadsAristeu Rozanski2008-07-301-0/+13
| | | | | | | | | | | | | | | | | | The new keys are separate from normal numeric keys and standard numeric keypads. The userspace should not attempt to apply modifiers like shift and NumLock to these so tey work properly regardless of the language mapping used. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: expand keycode spaceDmitry Torokhov2008-07-302-2/+2
| | | | | | | | | | | | | | Expand the number of potential key codes from 512 to 768 since people are coming up with more and more keys. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ati_remote2 - add autosuspend supportVille Syrjala2008-07-301-6/+127
| | | | | | | | | | Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ati_remote2 - add loadable keymap supportVille Syrjala2008-07-301-29/+101
| | | | | | | | | | | | | | | | | | | | | | | | Support for loadable keymaps. The driver now supports individual keymaps for each of the five modes (AUX1-AUX4 and PC) of the remote. To achieve this the keymap scancode is interpreted as a combination of the mode and actual button scancode. The original keycode patches were done by Peter Stokes <linux@dadeos.co.uk> but I modified it quite a lot. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: gameport - mark gameport_register_driver() __must_checkDmitry Torokhov2008-07-301-1/+1
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: gameport - check return value of gameport_register_driver()Dmitry Torokhov2008-07-3012-25/+12
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: gameport - make gameport_register_driver() return errorsDmitry Torokhov2008-07-302-24/+71
| | | | | | | | | | | | | | | | | | | | Perform actual driver registration right in gameport_register_driver() instead of offloading it to kgameportd and return proper error code to callers if driver registration fails. Note that driver <-> port matching is still done by kgameportd. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Linux 2.6.27Linus Torvalds2008-10-091-1/+1
| |
* | Don't allow splice() to files opened with O_APPENDLinus Torvalds2008-10-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is debatable, but while we're debating it, let's disallow the combination of splice and an O_APPEND destination. It's not entirely clear what the semantics of O_APPEND should be, and POSIX apparently expects pwrite() to ignore O_APPEND, for example. So we could make up any semantics we want, including the old ones. But Miklos convinced me that we should at least give it some thought, and that accepting writes at arbitrary offsets is wrong at least for IS_APPEND() files (which always have O_APPEND set, even if the reverse isn't true: you can obviously have O_APPEND set on a regular file). So disallow O_APPEND entirely for now. I doubt anybody cares, and this way we have one less gray area to worry about. Reported-and-argued-for-by: Miklos Szeredi <miklos@szeredi.hu> Acked-by: Jens Axboe <ens.axboe@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6Linus Torvalds2008-10-095-36/+83
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: (abituguru3) Enable DMI probing feature on Abit AT8 32X hwmon: (abituguru3) Enable reading from AUX3 fan on Abit AT8 32X hwmon: (adt7473) Fix some bogosity in documentation file hwmon: Define sysfs interface for energy consumption register hwmon: (it87) Prevent power-off on Shuttle SN68PT eeepc-laptop: Fix hwmon interface
| * | hwmon: (abituguru3) Enable DMI probing feature on Abit AT8 32XAlistair John Strachan2008-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable driver checking of the DMI product name (when enabled) on an Abit AT8 32X, instead of falling back to a manual probe. This eliminates false negatives and eventually will help avoid unnecessary bus probes on unsupported mainboards. Signed-off-by: Alistair John Strachan <alistair@devzero.co.uk> Tested-by: Daniel Exner <dex@dragonslave.de> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (abituguru3) Enable reading from AUX3 fan on Abit AT8 32XAlistair John Strachan2008-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The table for the Abit AT8 32X was incorrectly missing an entry for the sixth ("AUX3") fan. Add this entry, exporting the fan reading to userspace. Closes lm-sensors.org ticket #2339. Signed-off-by: Alistair John Strachan <alistair@devzero.co.uk> Tested-by: Daniel Exner <dex@dragonslave.de> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (adt7473) Fix some bogosity in documentation fileDarrick J. Wong2008-10-091-13/+5
| | | | | | | | | | | | | | | Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: Define sysfs interface for energy consumption registerDarrick J. Wong2008-10-091-0/+12
| | | | | | | | | | | | | | | | | | | | | Describe the sysfs files that were introduced in the ibmaem driver. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | hwmon: (it87) Prevent power-off on Shuttle SN68PTJean Delvare2008-10-091-19/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Shuttle SN68PT, FAN_CTL2 is apparently not connected to a fan, but to something else. One user has reported instant system power-off when changing the PWM2 duty cycle, so we disable it. I use the board name string as the trigger in case the same board is ever used in other systems. This closes lm-sensors ticket #2349: pwmconfig causes a hard poweroff http://www.lm-sensors.org/ticket/2349 Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * | eeepc-laptop: Fix hwmon interfaceCorentin Chary2008-10-091-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a name file in the sysfs directory, that is needed for the libsensors library to work. Also rename fan1_pwm to pwm1 and scale its value as needed. This fixes bug #11520: http://bugzilla.kernel.org/show_bug.cgi?id=11520 Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
* | | Merge branch 'fixes' of ↵Linus Torvalds2008-10-093-8/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] correct broken links and email addresses
| * | | [CPUFREQ] correct broken links and email addressesNémeth Márton2008-10-093-8/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | Replace the no longer working links and email address in the documentation and in source code. Signed-off-by: Márton Németh <nm127@freemail.hu> Signed-off-by: Dave Jones <davej@redhat.com>
* | | SLOB: fix bogus ksize calculation fixMatt Mackall2008-10-091-3/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | This fixes the previous fix, which was completely wrong on closer inspection. This version has been manually tested with a user-space test harness and generates sane values. A nearly identical patch has been boot-tested. The problem arose from changing how kmalloc/kfree handled alignment padding without updating ksize to match. This brings it in sync. Signed-off-by: Matt Mackall <mpm@selenic.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2008-10-081-0/+4
|\ \ | | | | | | | | | | | | * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Sibyte: Register PIO PATA device only for Swarm and Litte Sur
| * | [MIPS] Sibyte: Register PIO PATA device only for Swarm and Litte SurRalf Baechle2008-10-081-0/+4
| | | | | | | | | | | | | | | | | | | | | Symbol name spaghetti which is too complicated to cleanup on this stage of the release cycle breaks the build on BCM1480 platforms. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-10-089-39/+38
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: tcp: Fix tcp_hybla zero congestion window growth with small rho and large cwnd. net: Fix netdev_run_todo dead-lock tcp: Fix possible double-ack w/ user dma net: only invoke dev->change_rx_flags when device is UP netrom: Fix sock_orphan() use in nr_release ax25: Quick fix for making sure unaccepted sockets get destroyed. Revert "ax25: Fix std timer socket destroy handling." [Bluetooth] Add reset quirk for A-Link BlueUSB21 dongle [Bluetooth] Add reset quirk for new Targus and Belkin dongles [Bluetooth] Fix double frees on error paths of btusb and bpa10x drivers
| * | tcp: Fix tcp_hybla zero congestion window growth with small rho and large cwnd.Daniele Lacamera2008-10-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of rounding, in certain conditions, i.e. when in congestion avoidance state rho is smaller than 1/128 of the current cwnd, TCP Hybla congestion control starves and the cwnd is kept constant forever. This patch forces an increment by one segment after #send_cwnd calls without increments(newreno behavior). Signed-off-by: Daniele Lacamera <root@danielinux.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | net: Fix netdev_run_todo dead-lockHerbert Xu2008-10-072-22/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benjamin Thery tracked down a bug that explains many instances of the error unregister_netdevice: waiting for %s to become free. Usage count = %d It turns out that netdev_run_todo can dead-lock with itself if a second instance of it is run in a thread that will then free a reference to the device waited on by the first instance. The problem is really quite silly. We were trying to create parallelism where none was required. As netdev_run_todo always follows a RTNL section, and that todo tasks can only be added with the RTNL held, by definition you should only need to wait for the very ones that you've added and be done with it. There is no need for a second mutex or spinlock. This is exactly what the following patch does. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>