linux.git/drivers/staging/rt2860, branch v2.6.35-rc4

Staging: rt2870: add device id for Zyxel NWD-270N

2010-06-30T15:18:15+00:00

Add device id for Zyxel NWD-270N USB dongle.

Signed-off-by: Ozan Çağlayan 
Signed-off-by: Greg Kroah-Hartman

Staging: rc2860: return -EFAULT on copy_to_user errors

2010-06-04T20:38:58+00:00

copy_to_user() returns the number of bytes remaining but we want to
return a negative error code.  This is in the ioctl handler and the
error code gets passed to userspace.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

staging: rt2860: use new hex_to_bin() method

2010-05-25T15:07:05+00:00

Instead of using own implementation involve hex_to_bin() function.

Signed-off-by: Andy Shevchenko 
Cc: Greg Kroah-Hartman 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Merge staging-next tree into Linus's latest version

2010-05-21T19:48:55+00:00

Conflicts:
	drivers/staging/arlan/arlan-main.c
	drivers/staging/comedi/drivers/cb_das16_cs.c
	drivers/staging/cx25821/cx25821-alsa.c
	drivers/staging/dt3155/dt3155_drv.c
	drivers/staging/hv/hv.c
	drivers/staging/netwave/netwave_cs.c
	drivers/staging/wavelan/wavelan.c
	drivers/staging/wavelan/wavelan_cs.c
	drivers/staging/wlags49_h2/wl_cs.c

This required a bit of hand merging due to the conflicts
that happened in the later .34-rc releases, as well as
some staging driver changing coming in through other trees
(v4l and pcmcia).

Signed-off-by: Greg Kroah-Hartman

USB: staging: fix up usb_buffer_alloc calls in the staging tree

2010-05-20T20:21:38+00:00

This renames the functions usb_buffer_alloc and usb_buffer_free to the correct
ones for the drivers in the staging tree.

Cc: Daniel Mack 
Signed-off-by: Greg Kroah-Hartman

staging: trivial: fix typo "seperate"

2010-05-14T20:16:10+00:00

s/seperate/separate

Signed-off-by: Anand Gadiyar 
Cc: Jiri Kosina 
Signed-off-by: Greg Kroah-Hartman

Staging: Drop memory allocation cast

2010-05-11T23:06:48+00:00

Drop cast on the result of kmalloc and similar functions.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// 
@@
type T;
@@

- (T *)
  (\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...))
// 

Signed-off-by: Julia Lawall 
Signed-off-by: Greg Kroah-Hartman

Staging: rt2870: add device ID of MelCo.,Inc. WLI-UC-G301N

2010-05-11T18:36:19+00:00

My wireless LAN module 'MelCo.,Inc. WLI-UC-G301N' works fine,
if the following line is added into 2870_main_dev.c.

Signed-off-by: Nobhiro KUSUNO 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

Staging: rt2860: Hoist assign from if

2010-05-11T18:35:44+00:00

Signed-off-by: Joe Perches 
Signed-off-by: Greg Kroah-Hartman

Staging: rt2860: rtmp.h: Fixed all bar one error.

2010-05-11T18:35:42+00:00

All simple errors have been removed, including +80 line character limits
and various pointer syntax isues.

Signed-off-by: Neil Munro 
Signed-off-by: Greg Kroah-Hartman