linux.git/drivers/staging, branch v3.0-rc4

staging: fix iio builds when IIO_RING_BUFFER is not enabled

2011-06-16T15:29:00+00:00

Fix build by moving enum list outside of
#ifdef CONFIG_IIO_RING_BUFFER.

  drivers/staging/iio/accel/adis16201_core.c:413: error: 'ADIS16201_SCAN_SUPPLY' undeclared here (not in a function)
  drivers/staging/iio/accel/adis16201_core.c:417: error: 'ADIS16201_SCAN_TEMP' undeclared here (not in a function)
  ..

  drivers/staging/iio/accel/adis16203_core.c:374: error: 'ADIS16203_SCAN_SUPPLY' undeclared here (not in a function)
  drivers/staging/iio/accel/adis16203_core.c:378: error: 'ADIS16203_SCAN_AUX_ADC' undeclared here (not in a function)
  ..

Signed-off-by: Randy Dunlap 
Acked-by: Jonathan Cameron 
Cc: linux-iio@vger.kernel.org
Signed-off-by: Linus Torvalds

staging: iio: max517: Fix iio_info changes

2011-06-09T17:07:47+00:00

struct iio_info introduced a bug where the second channel of a MAX518 can't be
used. This commit fixes the typo (using max518 instead of the max517 struct).

Signed-off-by: Roland Stigge 
Signed-off-by: Greg Kroah-Hartman

Staging: mei: fix debug code

2011-06-09T17:07:47+00:00

! has higher precedence than !=.  H_RDY is 8 and since neither 0 nor
1 are equal to 8 the original condition was always true.

Signed-off-by: Dan Carpenter 
Acked-by: Tomas Winkler 
Signed-off-by: Greg Kroah-Hartman

staging: iio: error case memory leak fix

2011-06-07T19:28:43+00:00

The data pointer should be freed in the error
cases of adis16400_trigger_handler().

Signed-off-by: Andre Bartke 
Acked-by: Jonathan Cameron 
Signed-off-by: Greg Kroah-Hartman

staging: ath6kl: Fix a kernel panic during suspend/resume

2011-06-07T19:28:42+00:00

The kernel panic happens when we try to complete a pending
scan request while going to suspend state. The cause for this
kernel panic is accessing a freed memory (ar->arWmin). This
is freed before ar6k_cfg80211_scanComplete_event() getting
called where it is dereferenced.

RIP: 0010:[]  [] wlan_iterate_nodes+0x16/0xc0 [ath6kl]
RSP: 0018:ffff8800719fbce8  EFLAGS: 00010296
RAX: ffff880071bbcc00 RBX: ffff880037b22520 RCX: ffff880077413c80
RDX: ffff880037b221c0 RSI: ffffffffa041ef10 RDI: 0000000000000020
RBP: ffff8800719fbd18 R08: 0000000000000001 R09: 0000000000000001
R10: 0000000000000400 R11: 0000000000000000 R12: 0000000000000010
R13: ffff8800719fbdd8 R14: 00007fff83a84b60 R15: 0000000000000001
FS:  00007fdccb8a7700(0000) GS:ffff880077400000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 0000000000000148 CR3: 0000000070604000 CR4: 00000000000006f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
	DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process rmmod (pid: 1998, threadinfo ffff8800719fa000, task ffff880066712d80)
	Stack:
	0000000000000000 ffff880037b22520 0000000000000010 ffff8800719fbdd8
	00007fff83a84b60 0000000000000001 ffff8800719fbd28 ffffffffa0429fe2
	ffff8800719fbd58 ffffffffa041ee5f ffff8800719fbd58 ffff880037b22520
	Call Trace:
	[] wmi_iterate_nodes+0x12/0x20 [ath6kl]
	[] ar6k_cfg80211_scanComplete_event+0x3f/0xf0 [ath6kl]
	[] ar6000_close+0x61/0x100 [ath6kl]
	[] __dev_close_many+0x96/0x100
	[] dev_close_many+0x9d/0x120
	[] rollback_registered_many+0xe8/0x290
	[] unregister_netdevice_queue+0x96/0x100
	[] unregister_netdev+0x20/0x30
	[] ar6000_destroy+0x119/0x180 [ath6kl]
	[] ar6k_cleanup_module+0x2a/0x33 [ath6kl]
	[] sys_delete_module+0x19e/0x270
	[] system_call_fastpath+0x16/0x1b
	Code: c3 0f 1f 40 00 48 89 df e8 68 ff ff ff eb df 66 0f 1f 44 00 00 55 48 89 e5 41 57 41 56 41 55 41 54 53 48 83 ec 08 0f 1f 44 00 00
	8b af 28 01 00 00 4c 8d 7f 08 49 89 fc 48 89 f3 49 89 d6 41
	RIP  [] wlan_iterate_nodes+0x16/0xc0 [ath6kl]
	RSP 

Signed-off-by: Vasanthakumar Thiagarajan 
Signed-off-by: Greg Kroah-Hartman

staging: gma500: get control from firmware framebuffer if conflicts

2011-06-07T19:28:42+00:00

Many Linux distributions would enable vesafb in order to display
early stage boot splash. In this case, we will get garbled X
Window screen if running X fbdev on psbfb.

This is because fb0 is occupied by vesafb while psbfb is on fb1.
They tried to drive the same pieces of hardware at the same
time. With unmodified X start-up, it would try to use default
fb0 framebuffer device and unfortunately it is now broken
becaues fb1 supersedes it.

We should let psbfb takeover framebuffer control from vesafb
to get around this problem.

See also commit : 4410f3910947dcea8672280b3adecd53cec4e85e

Signed-off-by: Michael Chang 
Cc: Alan Cox 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

staging: gma500: Skip bogus LVDS VBT mode and check for LVDS before adding backlight

2011-06-07T19:28:41+00:00

On the Fit-PC2 the VBT reports an invalid fixed panel mode for LVDS, this gets
in the way for SDVO. This patch makes VBT parsing skip the invalid mode. When
there is no LVDS output the backlight support crashes so the patch also checks
for this before enabling it.

Signed-off-by: Patrik Jakobsson 
Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

staging: usbip: bugfix prevent driver unbind

2011-06-07T19:28:41+00:00

Implemented pre_reset and post_reset methods of the driver to prevent the
driver from being unbound upon a device reset. Because of this also the
asynchronous reset introduced to prevent a race condition is no longer necessary
(and sometimes causes problems, because it comes later then expected).

Signed-off-by: Arjan Mels 
Cc: Greg Kroah-Hartman 
Cc: Takahiro Hirofuchi 
Cc: Max Vozeler 
Cc: usbip-devel 
Signed-off-by: Greg Kroah-Hartman

staging: iio: industrialio-trigger: set iio_poll_func private_data

2011-06-07T19:28:41+00:00

Failure to set iio_poll_func private_data, causes zero pointer access
violations in all consumer trigger handlers.

Signed-off-by: Michael Hennerich 
Acked-by: Jonathan Cameron 
Signed-off-by: Greg Kroah-Hartman

staging: rts_pstor: use bitwise operator instead of logical one

2011-06-07T19:28:40+00:00

Looks like a typo.

Signed-off-by: Nicolas Kaiser 
Reviewed-by: Peter Huewe 
Signed-off-by: Greg Kroah-Hartman