Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ https://git.shady.money/linux/atom?h=v2.6.35 2010-06-30T22:45:59Z 2010-06-30T22:45:59Z Linus Torvalds torvalds@linux-foundation.org 2010-06-30T22:45:59Z urn:sha1:980019d74e4b2428362b36a0506519d6d9460800 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: rtl8192u_usb: Add LG device ID 043e:7a01 Staging: rtl8192s_usb: Remove duplicate device ID Staging: rt2870: add device id for Zyxel NWD-270N Staging: comedi: fix read past end of array in cb_pcidda_attach() Staging: rtl8192su: add device ids Staging: rtl8192su: remove device ids Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2 Staging: wlags49_h2: Fix build error when CONFIG_SYSFS is not set Staging: wlags49_h2: add missing <linux/string.h> for strlen Staging: hv: fix hv_utils module to properly autoload staging: hv: Fix race condition on vmbus channel initialization Staging: comedi: drivers: adl_pci9111: Fix AI commands in TRIG_FOLLOW case Staging: mrst-touchscreen: fix dereferencing free memory Staging: batman-adv: fix function prototype Staging: batman-adv: return -EFAULT on copy_to_user errors staging: usbip: usbip_common: kill rx thread on tx thread creation error. 2010-06-30T15:18:15Z Ben Hutchings ben@decadent.org.uk 2010-06-25T00:35:49Z urn:sha1:e10ac155828324c475637827d4c3525012391f02 Add another device ID as listed in the vendor driver version 0003.0825.2009. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 2010-06-30T15:18:15Z Ben Hutchings ben@decadent.org.uk 2010-06-25T00:35:01Z urn:sha1:081a52924623df3e550be8cd124b1416fc77b4f1 Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 2010-06-30T15:18:15Z Ozan Çağlayan ozan@pardus.org.tr 2010-06-21T11:00:56Z urn:sha1:9674e57a4fa9686c3ef4df5c194a4c445745d03f Add device id for Zyxel NWD-270N USB dongle. Signed-off-by: Ozan Çağlayan <ozan@pardus.org.tr> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 2010-06-30T15:18:15Z Dan Carpenter error27@gmail.com 2010-06-21T06:49:25Z urn:sha1:821e67a135d8773c8e9c0b97088b2e64c3d0d631 There are only 6 elements in the cb_pcidda_boards[] array so the original code read past the end. After this change nothing uses N_BOARDS so I removed the definition. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 2010-06-30T15:18:15Z Florian Schilhabel florian.c.schilhabel@googlemail.com 2010-06-08T01:47:13Z urn:sha1:15d93ed070125d51693f102a0f94045dcaf30d9b This patch adds some device ids. The list of supported devices was extracted from realteks driver package. (0x050d, 0x815F) and (0x0df6, 0x004b) are not in the official list of supported devices and may not work correctly. In case of problems with these, they should probably be removed from the list. Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 2010-06-30T15:18:15Z Florian Schilhabel florian.c.schilhabel@googlemail.com 2010-06-08T01:46:26Z urn:sha1:60b42de30ad6fb131dc8e9dbd11a8a9ea0ab394c This patch removes some device-ids. The list of unsupported devices was extracted from realteks driver package. removed IDs are: (0x0bda, 0x8192) (0x0bda, 0x8709) (0x07aa, 0x0043) (0x050d, 0x805E) (0x0df6, 0x0031) (0x1740, 0x9201) (0x2001, 0x3301) (0x5a57, 0x0290) These devices are _not_ rtl819su based. Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 2010-06-30T15:18:15Z Larry Finger Larry.Finger@lwfinger.net 2010-06-07T17:00:44Z urn:sha1:f84f927e081e16e1a4fcd92d28c3bc81c7b1864b In commit bbfb5652, the spacing in the definitions of eqMacAddr and cpMacAddr in drivers/staging/rtl8187se/r8180_core.c were changed to conform to kernel standards. These definitions were duplicates of lines found in drivers/staging/rtl8187se/ieee80211/dot11d.h. Once the change was made, the following warnings were emitted: CC [M] drivers/staging/rtl8187se/r8180_core.o drivers/staging/rtl8187se/r8180_core.c:69:0: warning: "eqMacAddr" redefined drivers/staging/rtl8187se/ieee80211/dot11d.h:39:0: note: this is the location of the previous definition drivers/staging/rtl8187se/r8180_core.c:70:0: warning: "cpMacAddr" redefined drivers/staging/rtl8187se/ieee80211/dot11d.h:40:0: note: this is the location of the previous definition The fix is to keep only the difinition in the header file. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 2010-06-30T15:18:15Z Javier Martinez Canillas martinez.javier@gmail.com 2010-06-17T05:17:44Z urn:sha1:d268e0d28165340c3799a8a4944bc40f444f49fd I got a wlags49_h2 driver build error in linux-next when CONFIG_SYSFS is not set. CC [M] drivers/staging/wlags49_h2/wl_cs.o In file included from drivers/staging/wlags49_h2/wl_cs.c:104: drivers/staging/wlags49_h2/wl_sysfs.h: In function ‘register_wlags_sysfs’: drivers/staging/wlags49_h2/wl_sysfs.h:5: error: parameter name omitted drivers/staging/wlags49_h2/wl_sysfs.h: In function ‘unregister_wlags_sysfs’: drivers/staging/wlags49_h2/wl_sysfs.h:6: error: parameter name omitted make[1]: *** [drivers/staging/wlags49_h2/wl_cs.o] Error 1 make: *** [_module_drivers/staging/wlags49_h2] Error 2 This is due a wrong function definition (it does not include parameters names). Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 2010-06-30T15:18:15Z Jeff Mahoney jeffm@suse.com 2010-06-09T20:01:10Z urn:sha1:8174fc04e8e71b3969a45c9be288f6535d6b90d3 On ia64, the build fails with incompatible implicit definition of strlen. This patch adds the <linux/string.h> include to get the real prototype. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>