Pekka Enberg [Mon, 1 Nov 2010 20:29:31 +0000 (22:29 +0200)]
Staging: w35und: Kill struct hwdata ->SurpriseRemoveCount
This patch kills the ->SurpriseRemoveCount member of struct hwdata. It's not
used at all so it's safe to remove it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 20:29:30 +0000 (22:29 +0200)]
Staging: w35und: Kill struct hwdata ->HwStop
This patch kills the ->HwStop member of struct hwdata. It's a read-only
variable that's always zero so it's safe to remove it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 20:29:29 +0000 (22:29 +0200)]
Staging: w35und: Kill struct hwdata ->NullPacketCount
This patch kills the NullPacketCount member of struct hwdata. It's not used for
anything so it's safe to remove it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 20:29:28 +0000 (22:29 +0200)]
Staging: w35und: Kill empty Mds_Destroy function
The Mds_Destroy() function doesn't do anything so kill it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mauro Schilman [Mon, 1 Nov 2010 17:12:05 +0000 (14:12 -0300)]
Staging: frontier: fix space and * coding style issues in alphatrack.c
This is a patch to the alphatrack.c file that fixes up a space warning
and a space after '*' warning found by the checkpatch.pl tool
Signed-off-by: Mauro Schilman <maurito.s@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 19:50:06 +0000 (21:50 +0200)]
Staging: w35und: Rename wbhal_s.h to wbhal.h
This patch renames the wbhal_s.h header file to wbhal.h now that it contains
both structure and function definitions.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg [Mon, 1 Nov 2010 19:50:05 +0000 (21:50 +0200)]
Staging: w35und: Merge wbhal_f.h to wbhal_s.h
This patch merges HAL struct and function definitions into one header file.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Felipe Andres Besoain Pino [Fri, 29 Oct 2010 22:15:58 +0000 (19:15 -0300)]
staging: vt6656: resolved checkpatch finding
removed spaces at the start of a lines.
Signed-off-by: Felipe Andres Besoain Pino <fbesoain@gnome.cl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ariel Savini [Fri, 29 Oct 2010 22:19:20 +0000 (19:19 -0300)]
staging: vt6656 resolved parenthesis not spaces
removes before parenthesis
Signed-off-by: Ariel Savini <arielsavini@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mariano Reingart [Fri, 29 Oct 2010 22:15:26 +0000 (19:15 -0300)]
staging: vt6656: resolved checkpatch finding
removed a C99 '//' comment and added a space around '='
Signed-off-by: Mariano Reingart <reingart@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Matias De la Puente [Fri, 29 Oct 2010 22:07:45 +0000 (19:07 -0300)]
staging: vt6656: resolved checkpatch finding
removed parentesis and spaces at the start of a line of a return
Signed-off-by: Matias De la Puente <mfpuente.ar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Sat, 30 Oct 2010 21:08:38 +0000 (14:08 -0700)]
Staging: solo6x10: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Eric Dumazet [Fri, 29 Oct 2010 13:19:27 +0000 (15:19 +0200)]
staging: get rid of dev_base_lock
dev_base_lock was the legacy rwlock used to protect netdevice list, and
is expected to vanish.
We now use RTNL and RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:22 +0000 (21:44 -0400)]
staging: iio: adis16209: tuning spi delay to make hardware more stable
Looks like one spot was missed in the previous spi tune patch.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Graf Yang [Thu, 28 Oct 2010 01:44:21 +0000 (21:44 -0400)]
staging: iio: resolver: new driver for AD2S1210 devices
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Graf Yang [Thu, 28 Oct 2010 01:44:20 +0000 (21:44 -0400)]
staging: iio: resolver: new driver for AD2S1200/1205 devices
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Graf Yang [Thu, 28 Oct 2010 01:44:19 +0000 (21:44 -0400)]
staging: iio: resolver: new driver for AD2S90 devices
This also kicks off the new resolver subsection.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:18 +0000 (21:44 -0400)]
staging: iio: meter: new driver for ADE7854/58/68/78 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:17 +0000 (21:44 -0400)]
staging: iio: meter: new driver for ADE7759 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:16 +0000 (21:44 -0400)]
staging: iio: meter: new driver for ADE7758 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:15 +0000 (21:44 -0400)]
staging: iio: meter: new driver for ADE7754 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:14 +0000 (21:44 -0400)]
staging: iio: meter: new driver for ADE7753/6 devices
This also kicks off the new meter subsection.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:13 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD9951 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:12 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD9910 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:11 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD9852/4 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:10 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD9850/1 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:09 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD9832/3/4/5 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Cliff Cai [Thu, 28 Oct 2010 01:44:08 +0000 (21:44 -0400)]
staging: iio: dds: new driver for AD5930/2 devices
This is the initial driver in the new Direct Digital Synthesis section.
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:07 +0000 (21:44 -0400)]
staging: iio: dac: new driver for AD5624R devices
This is used to convert digital streams into voltages.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:06 +0000 (21:44 -0400)]
staging: iio: gyro: new driver for ADIS16130 digital output gyros
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:05 +0000 (21:44 -0400)]
staging: iio: gyro: new driver for ADIS16080 digital output gyros
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:04 +0000 (21:44 -0400)]
staging: iio: gyro: new driver for ADIS16060 digital output gyros
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:44:03 +0000 (21:44 -0400)]
staging: iio: gyro: new driver for ADIS16251 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:44:02 +0000 (21:44 -0400)]
staging: iio: adc: new driver for ADT7410 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:44:01 +0000 (21:44 -0400)]
staging: iio: adc: new driver for ADT7310 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:44:00 +0000 (21:44 -0400)]
staging: iio: adc: new driver for ADT75 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:43:59 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7816 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:58 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7745/6/7 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:43:57 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7314 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:43:56 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7298 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:43:55 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7291 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:54 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7152/3 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:53 +0000 (21:43 -0400)]
staging: iio: adc: new driver for AD7150/1/6 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sonic Zhang [Thu, 28 Oct 2010 01:43:52 +0000 (21:43 -0400)]
staging: iio: new ADT7316/7/8 and ADT7516/7/9 driver
IIO driver for temperature sensor, ADC and DAC devices over SPI and I2C.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:51 +0000 (21:43 -0400)]
staging: iio: new adis16204 driver
IIO driver for Programmable High-g Digital Impact Sensor and Recorder.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:50 +0000 (21:43 -0400)]
staging: iio: new adis16203 driver
IIO driver for Programmable 360 Degrees Inclinometer adis16203 parts.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Barry Song [Thu, 28 Oct 2010 01:43:49 +0000 (21:43 -0400)]
staging: iio: new adis16201 driver
IIO driver for dual Axis Accelerometer/inclinometer adis16201 parts.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike Frysinger [Thu, 28 Oct 2010 01:43:48 +0000 (21:43 -0400)]
staging: iio: add ADI info to TODO
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michael Hennerich [Thu, 28 Oct 2010 01:43:47 +0000 (21:43 -0400)]
staging: iio: gyro: make sure grep can find the ADIS16265 support
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mike Frysinger [Thu, 28 Oct 2010 01:43:46 +0000 (21:43 -0400)]
staging: iio: adis16350: add missing reference to temp offset
We declare this attr but never link it in to the attr list.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jesper Juhl [Mon, 8 Nov 2010 23:10:02 +0000 (00:10 +0100)]
Staging: brcm80211: Remove unnecessary casts of void ptr returning alloc function return values
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.
This patch removes such casts from drivers/staging/brcm80211/
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ben Hutchings [Sun, 7 Nov 2010 17:20:37 +0000 (17:20 +0000)]
Staging: brcmfmac: Fix MAC header lookup on 64-bit architectures
Fix direct use of sk_buff::mac_header which is an offset rather
than a pointer on 64-bit architectures.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Sat, 6 Nov 2010 02:20:16 +0000 (19:20 -0700)]
staging: brcm80211: migrate #includes from headers into .c files.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Thu, 4 Nov 2010 02:53:59 +0000 (19:53 -0700)]
staging: brcm80211: Remove pkttag from osl
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Thu, 4 Nov 2010 02:53:58 +0000 (19:53 -0700)]
staging: brcm80211: Remove 'failed' field from osh
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Nicolas Kaiser [Fri, 29 Oct 2010 22:10:29 +0000 (00:10 +0200)]
Staging: brcm80211: simplify expression
Simplify: ((a && b) || !a) => (b || !a)
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 2 Nov 2010 00:10:18 +0000 (17:10 -0700)]
staging: brcm80211: Remove cruft from wlioctl.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 2 Nov 2010 00:10:17 +0000 (17:10 -0700)]
staging: brcm80211: Remove OSL_ERROR entry point
Get rid of generic OSL_ERROR and error code
translation to the only place that needs it: dhd.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 2 Nov 2010 00:10:16 +0000 (17:10 -0700)]
staging: brcm80211: Remove dead code from osl.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 2 Nov 2010 00:10:15 +0000 (17:10 -0700)]
staging: brcm80211: Remove abstraction layer for dma alignment
Directly align buffers instead of abstracting it.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Wed, 27 Oct 2010 22:47:53 +0000 (15:47 -0700)]
staging: brcm80211: purge epivers.h
Purge include/epivers.h moving individual lines to where
they are needed and delete unused refs.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Wed, 27 Oct 2010 01:37:24 +0000 (18:37 -0700)]
staging: brcm80211: Separate fullmac vs softmac defs in shared file
wlioctl.h is shared by fullmac and softmac but mostly fullmac. Separate out
fullmac to purge extranous code in softmac and possibly as a step towards it own file.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 26 Oct 2010 22:23:09 +0000 (15:23 -0700)]
staging: brcm80211: Move #include from bcmutils.h out to .c files
Part of effort to move #includes out of .h files and unwind the include mess.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 26 Oct 2010 18:55:23 +0000 (11:55 -0700)]
staging: brcm80211: Purge linuxver.h and redistribute #includes as required
Linuxver.h only included other .h files. Delete it and move #includes to .c's as needed.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 26 Oct 2010 16:17:06 +0000 (09:17 -0700)]
staging: brcm80211: Move #includes out of d11.h
Move #includes out of d11.h and into .c files
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 26 Oct 2010 16:17:05 +0000 (09:17 -0700)]
staging: brcm80211: Purge unused includes from d11.h
Purge unused #includes from d11.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Tue, 26 Oct 2010 16:17:04 +0000 (09:17 -0700)]
staging: brcm80211: Purge unused lines from bcmdefs.h/wlc_pub.h
Purge unused lines
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sven Eckelmann [Mon, 25 Oct 2010 21:43:14 +0000 (23:43 +0200)]
Staging: batman-adv: Remove useless braces
77099f0afe94928b5b0066a7efa5fa9f81696b54 added changes to vis.c which
trigger a checkpatch.pl warning about braces which are not necessary
anymore.
WARNING: braces {} are not necessary for any arm of this statement
+ if (entry->primary)
[...]
+ else {
[...]
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Naveen Kumar Gaddipati [Tue, 2 Nov 2010 12:08:45 +0000 (17:38 +0530)]
Staging: add Synaptics RMI4 touchpad driver support
Added the Synaptics RMI4 touchpad driver support.
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Christopher Heiny <cheiny@synaptics.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ramesh Agarwal [Fri, 22 Oct 2010 13:00:20 +0000 (14:00 +0100)]
Staging: add Synaptics TM1217 Touchscreen Controller driver
This is submitted as a staging driver because there is a more generic driver
"on the way" for all these devices and has been for some time. The intent is
that as soon as the general drivers are in the mainstream this one will get
any leftovers integrated and then be dumped. Until this unspecified future
data at least people can actually use their hardware.
As its interface is simply input layer we can do that without pain.
Some clean up by Alan Cox
- Extract gpio support and IRQ support more sanely
- Tidying
Signed-off-by: Ramesh Agarwal <ramesh.agarwal@intel.com>
[avoid deference NULL ts if kzalloc fails]
[finger_touched may be used uninitialized]
[fix missing sync which confused twm]
Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Atul Sowani [Wed, 3 Nov 2010 13:10:56 +0000 (18:40 +0530)]
Staging: xgifb: change obsolete pci_find_device() with pci_get_device()
Replaced obsolete pci_find_device() calls with pci_get_device() calls.
This is recommended in pci.txt filei in PCI Documentation.
Signed-off-by: Atul Sowani <sowani@gmail.com>
Acked-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Uwe Kleine-König [Tue, 26 Oct 2010 19:57:53 +0000 (21:57 +0200)]
Staging: trivial: fix typos concerning "controller"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Uwe Kleine-König [Tue, 26 Oct 2010 19:57:52 +0000 (21:57 +0200)]
Staging: trivial: fix typos concerning "configure"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tracey Dent [Fri, 22 Oct 2010 21:30:28 +0000 (17:30 -0400)]
Staging: msm: Makefile: replace the use of <module>-objs with <module>-y
Changed <module>-objs to <module>-y in Makefile.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Joe Perches [Thu, 21 Oct 2010 01:51:06 +0000 (18:51 -0700)]
Staging: intel_sst: Use pr_fmt, fix misspellings
Remove leading "sst: " from format strings.
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Prefix is changed from "sst: " to "snd_intel_sst: "
Add missing newlines
Trim trailing spaces after newlines
Fix several different misspellings
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Tue, 9 Nov 2010 21:43:45 +0000 (13:43 -0800)]
Merge git://git./linux/kernel/git/shemminger/beceem into work-next
Linus Torvalds [Mon, 8 Nov 2010 19:54:53 +0000 (11:54 -0800)]
Merge branch 'for_linus' of git://git./linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: Add new ext4 inode tracepoints
ext4: Don't call sb_issue_discard() in ext4_free_blocks()
ext4: do not try to grab the s_umount semaphore in ext4_quota_off
ext4: fix potential race when freeing ext4_io_page structures
ext4: handle writeback of inodes which are being freed
ext4: initialize the percpu counters before replaying the journal
ext4: "ret" may be used uninitialized in ext4_lazyinit_thread()
ext4: fix lazyinit hang after removing request
Linus Torvalds [Mon, 8 Nov 2010 18:55:29 +0000 (10:55 -0800)]
Merge git://git./linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
TTY: move .gitignore from drivers/char/ to drivers/tty/vt/
TTY: create drivers/tty/vt and move the vt code there
TTY: create drivers/tty and move the tty core files there
Linus Torvalds [Mon, 8 Nov 2010 18:54:49 +0000 (10:54 -0800)]
Merge branch 'staging-linus' of git://git./linux/kernel/git/gregkh/staging-next-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6:
Staging: ath6kl: remove empty files that mess with 'distclean'
staging: ath6kl: Fixing the driver to use modified mmc_host structure
Staging: solo6x10: fix build problem
Linus Torvalds [Mon, 8 Nov 2010 18:54:23 +0000 (10:54 -0800)]
Merge branch 'rmobile-fixes-for-linus' of git://git./linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
mmc: sh_mmcif: Convert extern inline to static inline.
ARM: mach-shmobile: Allow GPIO chips to register IRQ mappings.
ARM: mach-shmobile: fix sh7372 after a recent clock framework rework
ARM: mach-shmobile: include drivers/sh/Kconfig
ARM: mach-shmobile: ap4evb: Add HDMI sound support
ARM: mach-shmobile: clock-sh7372: Add FSIDIV clock support
ARM: shmobile: remove sh_timer_config clk member
Linus Torvalds [Mon, 8 Nov 2010 18:53:21 +0000 (10:53 -0800)]
Merge branch 'sh-fixes-for-linus' of git://git./linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: clkfwk: Fix up checkpatch warnings.
sh: make some needlessly global sh7724 clocks static
sh: add clk_round_parent() to optimize parent clock rate
sh: Simplify phys_addr_mask()/PTE_PHYS_MASK for 29/32-bit.
sh: nommu: Support building without an uncached mapping.
sh: nommu: use 32-bit phys mode.
sh: mach-se: Fix up SE7206 no ioport build.
sh: intc: Update for single IRQ reservation helper.
sh: clkfwk: Fix up rate rounding error handling.
sh: mach-se: Rip out superfluous 7751 PIO routines.
sh: mach-se: Rip out superfluous 770x PIO routines.
sh: mach-edosk7705: Kill off machtype, consolidate board def.
sh: mach-edosk7705: update for this century, kill off PIO trapping.
sh: mach-se: Rip out superfluous 7206 PIO routines.
sh: mach-systemh: Kill off dead board.
sh: mach-snapgear: Kill off machtype, consolidate board def.
sh: mach-snapgear: Rip out superfluous PIO routines.
sh: mach-microdev: SuperIO-relative ioport mapping.
Theodore Ts'o [Mon, 8 Nov 2010 18:51:33 +0000 (13:51 -0500)]
ext4: Add new ext4 inode tracepoints
Add ext4_evict_inode, ext4_drop_inode, ext4_mark_inode_dirty, and
ext4_begin_ordered_truncate()
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o [Mon, 8 Nov 2010 18:49:33 +0000 (13:49 -0500)]
ext4: Don't call sb_issue_discard() in ext4_free_blocks()
Commit
5c521830cf (ext4: Support discard requests when running in
no-journal mode) attempts to add sb_issue_discard() for data blocks
(in data=writeback mode) and in no-journal mode. Unfortunately, this
no longer works, because in commit
dd3932eddf (block: remove
BLKDEV_IFL_WAIT), sb_issue_discard() only presents a synchronous
interface, and there are times when we call ext4_free_blocks() when we
are are holding a spinlock, or are otherwise in an atomic context.
For now, I've removed the call to sb_issue_discard() to prevent a
deadlock or (if spinlock debugging is enabled) failures like this:
BUG: scheduling while atomic: rc.sysinit/1376/0x00000002
Pid: 1376, comm: rc.sysinit Not tainted 2.6.36-ARCH #1
Call Trace:
[<
ffffffff810397ce>] __schedule_bug+0x5e/0x70
[<
ffffffff81403110>] schedule+0x950/0xa70
[<
ffffffff81060bad>] ? insert_work+0x7d/0x90
[<
ffffffff81060fbd>] ? queue_work_on+0x1d/0x30
[<
ffffffff81061127>] ? queue_work+0x37/0x60
[<
ffffffff8140377d>] schedule_timeout+0x21d/0x360
[<
ffffffff812031c3>] ? generic_make_request+0x2c3/0x540
[<
ffffffff81402680>] wait_for_common+0xc0/0x150
[<
ffffffff81041490>] ? default_wake_function+0x0/0x10
[<
ffffffff812034bc>] ? submit_bio+0x7c/0x100
[<
ffffffff810680a0>] ? wake_bit_function+0x0/0x40
[<
ffffffff814027b8>] wait_for_completion+0x18/0x20
[<
ffffffff8120a969>] blkdev_issue_discard+0x1b9/0x210
[<
ffffffff811ba03e>] ext4_free_blocks+0x68e/0xb60
[<
ffffffff811b1650>] ? __ext4_handle_dirty_metadata+0x110/0x120
[<
ffffffff811b098c>] ext4_ext_truncate+0x8cc/0xa70
[<
ffffffff810d713e>] ? pagevec_lookup+0x1e/0x30
[<
ffffffff81191618>] ext4_truncate+0x178/0x5d0
[<
ffffffff810eacbb>] ? unmap_mapping_range+0xab/0x280
[<
ffffffff810d8976>] vmtruncate+0x56/0x70
[<
ffffffff811925cb>] ext4_setattr+0x14b/0x460
[<
ffffffff811319e4>] notify_change+0x194/0x380
[<
ffffffff81117f80>] do_truncate+0x60/0x90
[<
ffffffff811e08fa>] ? security_inode_permission+0x1a/0x20
[<
ffffffff811eaec1>] ? tomoyo_path_truncate+0x11/0x20
[<
ffffffff81127539>] do_last+0x5d9/0x770
[<
ffffffff811278bd>] do_filp_open+0x1ed/0x680
[<
ffffffff8140644f>] ? page_fault+0x1f/0x30
[<
ffffffff81132bfc>] ? alloc_fd+0xec/0x140
[<
ffffffff81118db1>] do_sys_open+0x61/0x120
[<
ffffffff81118e8b>] sys_open+0x1b/0x20
[<
ffffffff81002e6b>] system_call_fastpath+0x16/0x1b
https://bugzilla.kernel.org/show_bug.cgi?id=22302
Reported-by: Mathias Burén <mathias.buren@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: jiayingz@google.com
Dmitry Monakhov [Mon, 8 Nov 2010 18:47:33 +0000 (13:47 -0500)]
ext4: do not try to grab the s_umount semaphore in ext4_quota_off
It's not needed to sync the filesystem, and it fixes a lock_dep complaint.
Signed-off-by: Dmitry Monakhov <dmonakhov@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Theodore Ts'o [Mon, 8 Nov 2010 18:45:33 +0000 (13:45 -0500)]
ext4: fix potential race when freeing ext4_io_page structures
Use an atomic_t and make sure we don't free the structure while we
might still be submitting I/O for that page.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Theodore Ts'o [Mon, 8 Nov 2010 18:43:33 +0000 (13:43 -0500)]
ext4: handle writeback of inodes which are being freed
The following BUG can occur when an inode which is getting freed when
it still has dirty pages outstanding, and it gets deleted (in this
because it was the target of a rename). In ordered mode, we need to
make sure the data pages are written just in case we crash before the
rename (or unlink) is committed. If the inode is being freed then
when we try to igrab the inode, we end up tripping the BUG_ON at
fs/ext4/page-io.c:146.
To solve this problem, we need to keep track of the number of io
callbacks which are pending, and avoid destroying the inode until they
have all been completed. That way we don't have to bump the inode
count to keep the inode from being destroyed; an approach which
doesn't work because the count could have already been dropped down to
zero before the inode writeback has started (at which point we're not
allowed to bump the count back up to 1, since it's already started
getting freed).
Thanks to Dave Chinner for suggesting this approach, which is also
used by XFS.
kernel BUG at /scratch_space/linux-2.6/fs/ext4/page-io.c:146!
Call Trace:
[<
ffffffff811075b1>] ext4_bio_write_page+0x172/0x307
[<
ffffffff811033a7>] mpage_da_submit_io+0x2f9/0x37b
[<
ffffffff811068d7>] mpage_da_map_and_submit+0x2cc/0x2e2
[<
ffffffff811069b3>] mpage_add_bh_to_extent+0xc6/0xd5
[<
ffffffff81106c66>] write_cache_pages_da+0x2a4/0x3ac
[<
ffffffff81107044>] ext4_da_writepages+0x2d6/0x44d
[<
ffffffff81087910>] do_writepages+0x1c/0x25
[<
ffffffff810810a4>] __filemap_fdatawrite_range+0x4b/0x4d
[<
ffffffff810815f5>] filemap_fdatawrite_range+0xe/0x10
[<
ffffffff81122a2e>] jbd2_journal_begin_ordered_truncate+0x7b/0xa2
[<
ffffffff8110615d>] ext4_evict_inode+0x57/0x24c
[<
ffffffff810c14a3>] evict+0x22/0x92
[<
ffffffff810c1a3d>] iput+0x212/0x249
[<
ffffffff810bdf16>] dentry_iput+0xa1/0xb9
[<
ffffffff810bdf6b>] d_kill+0x3d/0x5d
[<
ffffffff810be613>] dput+0x13a/0x147
[<
ffffffff810b990d>] sys_renameat+0x1b5/0x258
[<
ffffffff81145f71>] ? _atomic_dec_and_lock+0x2d/0x4c
[<
ffffffff810b2950>] ? cp_new_stat+0xde/0xea
[<
ffffffff810b29c1>] ? sys_newlstat+0x2d/0x38
[<
ffffffff810b99c6>] sys_rename+0x16/0x18
[<
ffffffff81002a2b>] system_call_fastpath+0x16/0x1b
Reported-by: Nick Bowler <nbowler@elliptictech.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Tested-by: Nick Bowler <nbowler@elliptictech.com>
Paul Mundt [Mon, 8 Nov 2010 00:51:41 +0000 (09:51 +0900)]
Merge branch 'rmobile/core' into rmobile-fixes-for-linus
Paul Mundt [Mon, 8 Nov 2010 00:42:43 +0000 (09:42 +0900)]
Merge branches 'sh/pio-death', 'sh/nommu', 'sh/clkfwk', 'sh/core' and 'sh/intc-extension' into sh-fixes-for-linus
Paul Mundt [Mon, 8 Nov 2010 00:40:23 +0000 (09:40 +0900)]
sh: clkfwk: Fix up checkpatch warnings.
The clk_round_parent() change introduced various checkpatch warnings,
tidy them up.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Guennadi Liakhovetski [Thu, 4 Nov 2010 14:14:29 +0000 (14:14 +0000)]
sh: make some needlessly global sh7724 clocks static
These clocks are currently only used inside one .c file and are not
declared in any headers, therefore having them global is useless.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Guennadi Liakhovetski [Tue, 2 Nov 2010 11:27:24 +0000 (11:27 +0000)]
sh: add clk_round_parent() to optimize parent clock rate
Sometimes it is possible and reasonable to adjust the parent clock rate to
improve precision of the child clock, e.g., if the child clock has no siblings.
clk_round_parent() is a new addition to the SH clock-framework API, that
implements such an optimization for child clocks with divisors, taking all
integer values in a range.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Greg Kroah-Hartman [Sat, 6 Nov 2010 18:27:04 +0000 (11:27 -0700)]
Staging: ath6kl: remove empty files that mess with 'distclean'
These two .h files would get removed from the tree when doing
make distclean
It turns out they are not needed at all, so just delete them which fixes
people's git trees when doing development.
Reported-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Vivek Goyal [Sat, 6 Nov 2010 12:16:05 +0000 (08:16 -0400)]
floppy: fix another use-after-free
While scanning the floopy code due to
c093ee4f07f4 ("floppy: fix
use-after-free in module load failure path"), I found one more instance
of trying to access disk->queue pointer after doing put_disk() on
gendisk. For some reason , floppy moule still loads/unloads fine. The
object is probably still around with right pointer values.
o There seems to be one more instance of trying to cleanup the request
queue after we have called put_disk() on associated gendisk.
o This fix is more out of code inspection. Even without this fix for
some reason I am able to load/unload floppy module without any
issues.
o Floppy module loads/unloads fine after the fix.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Greg Kroah-Hartman [Sat, 6 Nov 2010 05:18:23 +0000 (22:18 -0700)]
TTY: move .gitignore from drivers/char/ to drivers/tty/vt/
The autogenerated files (consolemap_deftbl.c and defkeymap.c) need to
be ignored by git, so move the .gitignore file that was doing it to the
properly location now that the files have moved as well.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Linus Torvalds [Sat, 6 Nov 2010 01:57:04 +0000 (18:57 -0700)]
ipw2x00: remove the right /proc/net entry
Commit
27ae60f8f7aa ("ipw2x00: replace "ieee80211" with "libipw" where
appropriate") changed DRV_NAME to be "libipw", but didn't properly fix
up the places where it was used to specify the name for the /proc/net/
directory.
For backwards compatibility reasons, that directory name remained
"ieee80211", but due to the DRV_NAME change, the error case printouts
and the cleanup functions now used "libipw" instead. Which made it all
fail badly.
For example, on module unload as reported by Randy:
WARNING: at fs/proc/generic.c:816 remove_proc_entry+0x156/0x35e()
name 'libipw'
because it's trying to unregister a /proc directory that obviously
doesn't even exist.
Clean it all up to use DRV_PROCNAME for the actual /proc directory name.
Reported-and-tested-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Pavel Roskin <proski@gnu.org>
Cc: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Sat, 6 Nov 2010 00:49:22 +0000 (17:49 -0700)]
Merge branch 'kvm-updates/2.6.37' of git://git./virt/kvm/kvm
* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: PPC: BookE: Load the lower half of MSR
KVM: PPC: BookE: fix sleep with interrupts disabled
KVM: PPC: e500: Call kvm_vcpu_uninit() before kvmppc_e500_tlb_uninit().
PPC: KVM: Book E doesn't have __end_interrupts.
KVM: x86: Issue smp_call_function_many with preemption disabled
KVM: x86: fix information leak to userland
KVM: PPC: fix information leak to userland
KVM: MMU: fix rmap_remove on non present sptes
KVM: Write protect memory after slot swap
Linus Torvalds [Sat, 6 Nov 2010 00:45:59 +0000 (17:45 -0700)]
floppy: fix use-after-free in module load failure path
Commit
488211844e0c ("floppy: switch to one queue per drive instead of
sharing a queue") introduced a use-after-free. We do "put_disk()" on
the disk device _before_ we then clean up the queue associated with that
disk.
Move the put_disk() down to avoid dereferencing a free'd data structure.
Cc: Jens Axboe <jaxboe@fusionio.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Reported-and-tested-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
David Daney [Fri, 5 Nov 2010 23:17:39 +0000 (16:17 -0700)]
watchdog: Fix section mismatch and potential undefined behavior.
Commit
d9ca07a05ce1 ("watchdog: Avoid kernel crash when disabling
watchdog") introduces a section mismatch.
Now that we reference no_watchdog from non-__init code it can no longer
be __initdata.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Fri, 5 Nov 2010 22:25:48 +0000 (15:25 -0700)]
Merge git://git./linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (41 commits)
inet_diag: Make sure we actually run the same bytecode we audited.
netlink: Make nlmsg_find_attr take a const nlmsghdr*.
fib: fib_result_assign() should not change fib refcounts
netfilter: ip6_tables: fix information leak to userspace
cls_cgroup: Fix crash on module unload
memory corruption in X.25 facilities parsing
net dst: fix percpu_counter list corruption and poison overwritten
rds: Remove kfreed tcp conn from list
rds: Lost locking in loop connection freeing
de2104x: fix panic on load
atl1 : fix panic on load
netxen: remove unused firmware exports
caif: Remove noisy printout when disconnecting caif socket
caif: SPI-driver bugfix - incorrect padding.
caif: Bugfix for socket priority, bindtodev and dbg channel.
smsc911x: Set Ethernet EEPROM size to supported device's size
ipv4: netfilter: ip_tables: fix information leak to userland
ipv4: netfilter: arp_tables: fix information leak to userland
cxgb4vf: remove call to stop TX queues at load time.
cxgb4: remove call to stop TX queues at load time.
...
Linus Torvalds [Fri, 5 Nov 2010 21:17:22 +0000 (14:17 -0700)]
Merge branch 'fixes' of git://git./linux/kernel/git/ieee1394/linux1394-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: ohci: fix race when reading count in AR descriptor
firewire: ohci: avoid reallocation of AR buffers
firewire: ohci: fix race in AR split packet handling
firewire: ohci: fix buffer overflow in AR split packet handling
git.openpandora.org / pandora-kernel.git / log