Greg Kroah-Hartman [Fri, 10 Dec 2010 18:56:18 +0000 (10:56 -0800)]
Staging: iio: fix up world writable sysfs files.
You should not be able to write to sysfs files from any user.
Cc: Graf Yang <graf.yang@analog.com>
Cc: Michael Hennerich <michael.hennerich@analog.com>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Fri, 10 Dec 2010 18:55:27 +0000 (10:55 -0800)]
Staging: ft1000: fix world writable debugfs file
You should not be able to write to a debugfs file from any user.
Cc: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Fri, 10 Dec 2010 18:46:30 +0000 (10:46 -0800)]
Staging: cxt1e1: rename global log_level variable
The driver should not have such a generic global variable name.
Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
Cc: Bob Beers <bob.beers@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Fri, 10 Dec 2010 15:37:48 +0000 (07:37 -0800)]
staging: sep: fix comments in sep_get_static_pool_addr_handler
Original comments were inaccurate
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Carpenter [Fri, 10 Dec 2010 12:41:18 +0000 (15:41 +0300)]
Staging: rtl8192u: add missing curly braces
The if condition was ignored in the original code and we just used the
default channel.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Xenofon Foukas [Fri, 3 Dec 2010 22:17:55 +0000 (00:17 +0200)]
Staging: comedi: Fix coding style issues in drivers.c
This patch fixes line over 80 characters warning issues found
in file drivers.c
Signed-off-by: Xenofon Foukas <foukas.xenofon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:32:53 +0000 (09:32 -0800)]
Staging: sep: eliminate kernel crash due to null parameter in dma_alloc_coherent
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:32:38 +0000 (09:32 -0800)]
Staging: sep: ensure that caller id buffer is little endian
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:32:26 +0000 (09:32 -0800)]
Staging: sep: reduce 64 and 32 bit compile warnings
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:32:13 +0000 (09:32 -0800)]
Staging: sep: limit time to wait for reconfig shared area complete
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:31:57 +0000 (09:31 -0800)]
Staging: sep: remove completed items in TODO
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:31:43 +0000 (09:31 -0800)]
Staging: sep: remove code for Moorestown device
The Moorestown (older device) will be added to driver
later.
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:31:31 +0000 (09:31 -0800)]
Staging: sep: initialize driver copy of send and receive count with device
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:31:18 +0000 (09:31 -0800)]
Staging: sep: clean up error checking in probe function
Add pci_disable
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:30:31 +0000 (09:30 -0800)]
Staging: sep: sram_addr is 32 bit; this is not a kernel address, but device internal value
This does not have to be 64 bits wide
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:30:17 +0000 (09:30 -0800)]
Staging: sep: remove spaces at end of lines
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Allyn [Thu, 9 Dec 2010 17:30:03 +0000 (09:30 -0800)]
Staging: sep: remove virtual address being passed to user space application
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:54 +0000 (16:13 +0100)]
staging: ft1000: Add file header to ft1000_proc.c
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:53 +0000 (16:13 +0100)]
staging: ft1000: Remove dead code.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:52 +0000 (16:13 +0100)]
staging: ft1000: Fix coding style.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:51 +0000 (16:13 +0100)]
staging: ft1000: Coding style fix in ft1000ReadProc.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:50 +0000 (16:13 +0100)]
staging: ft1000: Fix coding style in ft1000NotifyProc.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:49 +0000 (16:13 +0100)]
staging: ft1000: Use return value for ft1000InitProc.
Add checking for return value ft1000InitProc and cleanup
if something fail.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:48 +0000 (16:13 +0100)]
staging: ft1000: Fix coding style.
Fix coding style in ft1000CleanupProc and ft1000InitProc
functions.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 15:13:47 +0000 (16:13 +0100)]
staging: ft1000: Fix proc initialization handling.
Cleaning proc entries when error occures was not handled correctly.
So fix and also add proper cleaning.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:53 +0000 (11:26 +0100)]
staging: ft1000: Fix debug messages.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:52 +0000 (11:26 +0100)]
staging: ft1000: Remove unused headers.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:51 +0000 (11:26 +0100)]
staging: ft1000: Remove dead code.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:50 +0000 (11:26 +0100)]
staging: ft1000: Fix camelcase functions and variables.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:49 +0000 (11:26 +0100)]
staging: ft1000: Remove unused variable.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:48 +0000 (11:26 +0100)]
staging: ft1000: Remove unused pdevobj array.
We don't need to store pointer to device in some local
array because we always pass to debugfs correct device pointer.
So remove it.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:47 +0000 (11:26 +0100)]
staging: ft1000: Fix private data pointer usage.
Assign private data pointer to device for usage in file operations.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Marek Belisko [Thu, 9 Dec 2010 10:26:46 +0000 (11:26 +0100)]
staging: ft1000: Convert char device to debugfs.
Character device was used only for debugging purposes.
Convert it to debugfs functionality. For every plugged device
create new directory with one file.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Randy Dunlap [Thu, 9 Dec 2010 17:38:34 +0000 (09:38 -0800)]
staging: solo6010 depends on I2C
This driver uses i2c interfaces, so it should depend on I2C
(unless someone wants to break it into pieces or make it more
config-dependent).
drivers/staging/solo6x10/solo6010-i2c.c:47: error: implicit declaration of function 'i2c_transfer'
drivers/staging/solo6x10/solo6010-i2c.c:299: error: implicit declaration of function 'i2c_add_adapter'
drivers/staging/solo6x10/solo6010-i2c.c:310: error: implicit declaration of function 'i2c_del_adapter'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Ben Collins <bcollins@bluecherry.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Thu, 9 Dec 2010 18:36:08 +0000 (19:36 +0100)]
staging: brcm80211: removed ap related comments
Code cleanup, reaction on the 2nd email from Dan Carpenter.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:25 +0000 (01:40 +0900)]
Staging: sm7xx: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:27 +0000 (01:40 +0900)]
Staging: rtl8192e: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:26 +0000 (01:40 +0900)]
Staging: cx25821: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:28 +0000 (01:40 +0900)]
Staging: phison: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:29 +0000 (01:40 +0900)]
Staging: vme_tsi148: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Namhyung Kim [Thu, 9 Dec 2010 16:40:30 +0000 (01:40 +0900)]
Staging: vme_ca91cx42: use DEFINE_PCI_DEVICE_TABLE
Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tobias Klauser [Thu, 9 Dec 2010 15:01:07 +0000 (16:01 +0100)]
staging: brcm80211: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Chen, Chien-Chia [Thu, 9 Dec 2010 02:52:08 +0000 (10:52 +0800)]
Staging: rt2860: fix previous patch error
Somehow Greg messed up the last patch and missed a chunk. This patch
contains the missing chunk.
Acked-by: Lee, Chun-Yi <jlee@novell.com>
Signed-off-by: Chen, Chien-Chia <machen@novell.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Peter Huewe [Tue, 7 Dec 2010 22:44:33 +0000 (23:44 +0100)]
staging/zram: Fix sparse warning 'Using plain integer as NULL pointer'
This patch fixes the warning generated by sparse: "Using plain integer
as NULL pointer" by replacing the offending 0s with NULL.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Peter Huewe [Tue, 7 Dec 2010 22:38:02 +0000 (23:38 +0100)]
staging/line6: Fix sparse warning 'Using plain integer as NULL pointer'
This patch fixes the warning generated by sparse: "Using plain integer
as NULL pointer" by replacing the offending 0s with NULL.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Henry Ptasinski [Wed, 8 Dec 2010 21:18:04 +0000 (13:18 -0800)]
staging: brcm80211: fix documentation on installing firmware
Fix the documentation to have the current firmware filenames and use the
correct path.
Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Henry Ptasinski [Wed, 8 Dec 2010 21:09:49 +0000 (13:09 -0800)]
MAINTAINERS: update the entry for the BRCM80211 driver
This time with Signed-off-by ...
Removed Nohee, added Roland, Arend and Dowan. Changes were previously made
to drivers/staging/brcm80211{README,TODO}, but MAINTAINERS was missed.
Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Wed, 8 Dec 2010 19:16:02 +0000 (20:16 +0100)]
staging: brcm80211: removed unused struct wlc_ap_info
Code cleanup, reaction on the email from Dan Carpenter.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:46 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wlc_pub_t by struct wlc_pub
Code cleanup
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:45 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wlccore_t by struct wlccore
Code cleanup
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:44 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wlcband_t by struct wlcband
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:43 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef hnddma_t by struct hnddma_pub
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:42 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wl_if_t by struct wl_if
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:41 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef bmac_pmq_t by struct bmac_pmq
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:40 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef antsel_info_t by struct antsel_info
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:39 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wlc_ap_info_t by struct wlc_ap_info
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:38 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef ampdu_info_t by struct ampdu_info
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:37 +0000 (17:45 +0100)]
staging: brcm80211: replaced typedef wlc_if_t by struct wlc_if
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:36 +0000 (17:45 +0100)]
staging: brcm80211: removed unused macro's and typedefs from wpa.h
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Tue, 7 Dec 2010 16:45:35 +0000 (17:45 +0100)]
staging: brcm80211: removed unused typedefs
Code cleanup.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Chen, Chien-Chia [Wed, 8 Dec 2010 22:20:33 +0000 (14:20 -0800)]
Staging: rt3090: Fix RT3090 scan AP function
Fix RT3090 scan AP function.
This patch fixes the rt3090 wireless module failed
to scan AP around due to Windows driver causing
rt3090 module unable to scan AP in Linux.
Acked-by: Lee, Chun-Yi <jlee@novell.com>
Signed-off-by: Chen, Chien-Chia <machen@novell.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman [Tue, 7 Dec 2010 18:47:56 +0000 (10:47 -0800)]
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Linus Torvalds [Tue, 7 Dec 2010 04:09:04 +0000 (20:09 -0800)]
Linux 2.6.37-rc5
Linus Torvalds [Tue, 7 Dec 2010 04:08:25 +0000 (20:08 -0800)]
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2_connection_find() returns pointer to bad structure
ocfs2: char is not always signed
Ocfs2: Stop tracking a negative dentry after dentry_iput().
ocfs2: fix memory leak
fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock
Olof Johansson [Tue, 7 Dec 2010 01:36:32 +0000 (19:36 -0600)]
ARM: tegra: fix regression from addruart rewrite
Commit
0ea129300982 ("arm: return both physical and virtual addresses
from addruart") took out the test for MMU on/off but didn't switch the
ldr instructions to no longer be conditionals based on said test.
Fix that.
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Colin Cross <ccross@android.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Hank Janssen [Mon, 6 Dec 2010 20:26:51 +0000 (12:26 -0800)]
staging: hv: Convert camel case local variables in blkvsc.c to lowercase
Convert camel case local variables in blkvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:50 +0000 (12:26 -0800)]
staging: hv: Convert camel case function names in blkvsc.c to lowercase
Convert camel case function names in blkvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:49 +0000 (12:26 -0800)]
staging: hv: Convert camel case local variables in storvsc.c to lowercase
Convert camel case local variables in storvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:48 +0000 (12:26 -0800)]
staging: hv: Convert camel case function names in storvsc.c to lowercase
Convert camel case function names in storvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:47 +0000 (12:26 -0800)]
staging: hv: Convert camel case struct fields in storvsc.c to lowercase
Convert camel cased struct fields in storvsc.c to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:46 +0000 (12:26 -0800)]
staging: hv: Convert camel case functions in storvsc_api.h to lowercase
Convert camel case functions in storvsc_api.h to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:45 +0000 (12:26 -0800)]
staging: hv: Convert camel case struct fields in storvsc_api.h to lowercase
Convert camel case struct fields in vstorage.h to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Hank Janssen [Mon, 6 Dec 2010 20:26:44 +0000 (12:26 -0800)]
staging: hv: Convert camel case struct fields in vstorage.h to lowercase
Convert camel case struct fields in vstorage.h to lowercase
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Carpenter [Mon, 6 Dec 2010 07:03:38 +0000 (10:03 +0300)]
Staging: Beceem: more checkpatch.pl changes to InterfaceInit.c
The only checkpatch.pl issues remaining still remaining are line length
complaints.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Carpenter [Mon, 6 Dec 2010 07:03:13 +0000 (10:03 +0300)]
Staging: Beceem: improve debug printk statements
These are just small changes. Some grammar and wording changes. I added
new lines to the end of all the print statements.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Carpenter [Mon, 6 Dec 2010 07:02:55 +0000 (10:02 +0300)]
Staging: Beceem: use after free in bcm_exit()
We can't call class_destroy() until after the driver has been deregistered.
It leads to a NULL deref on module unload.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Carpenter [Mon, 6 Dec 2010 07:02:36 +0000 (10:02 +0300)]
Staging: Beceem: remove old kernel compatibility code
This drops compatability for everything from 2.4 to 2.6.35. Now it only
works on the latest kernel.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Carpenter [Mon, 6 Dec 2010 07:02:11 +0000 (10:02 +0300)]
Staging: Beceem: white space changes to InterfaceInit.c
This patch only changes:
1) spaces, tabs, and newline characters.
2) comment styles.
The compiled object file is the same before and after except for line
number changes.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Carpenter [Mon, 6 Dec 2010 07:01:41 +0000 (10:01 +0300)]
Staging: Beceem: use lower case "int" instead of "INT"
This patch changes:
INT => int
ULONG => unsigned long
VOID => void
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dan Carpenter [Mon, 6 Dec 2010 07:01:16 +0000 (10:01 +0300)]
Staging: Beceem: add USB id for BCSM250 Mobile WiMAX
Signed-off-by: Dan Carpenter <error27@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Mon, 6 Dec 2010 21:42:48 +0000 (22:42 +0100)]
staging: brcm80211: replaced wlc_hw_info_t by struct wlc_hw_info
Part of code cleanup effort.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Sat, 4 Dec 2010 15:35:43 +0000 (16:35 +0100)]
staging: brcm80211: remove macro usage for sk_buff release
PKTFREE macro calls osl_pktfree. This function has been renamed to
pkt_buf_free_skb as it comprises of functionality additional to
dev_kfree_skb(_any) function and to get rid of the OSL concept in
this driver.
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Dowan Kim <dowan@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Arend van Spriel [Sat, 4 Dec 2010 15:35:42 +0000 (16:35 +0100)]
staging: brcm80211: remove macro usage for sk_buff allocation
PKTGET macro calls osl_pktget. This function has been renamed to
pkt_buf_get_skb as it comprises of functionality additional to
dev_alloc_skb function and to get rid of the OSL concept in this driver.
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Dowan Kim <dowan@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Roland Vossen [Sat, 4 Dec 2010 07:38:02 +0000 (08:38 +0100)]
staging: brcm80211: replaced wlc_info_t by struct wlc_info.
Part of code cleanup effort. Global replace of wlc_info_t with struct wlc_info.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Sat, 4 Dec 2010 02:00:26 +0000 (18:00 -0800)]
staging: brcm80211: Removing cruft from osl.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Sat, 4 Dec 2010 02:00:25 +0000 (18:00 -0800)]
staging: brcm80211: migrate register ops macros to bcmutils.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Sat, 4 Dec 2010 02:00:24 +0000 (18:00 -0800)]
staging: brcm80211: move dma specific macros from osl to dma code
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Sat, 4 Dec 2010 00:30:39 +0000 (16:30 -0800)]
staging: brcm80211: move fullmac-only code from osl to fullmac files
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Sat, 4 Dec 2010 00:30:38 +0000 (16:30 -0800)]
staging: brcm80211: Remove unused softmac macros
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Sat, 4 Dec 2010 00:30:37 +0000 (16:30 -0800)]
staging: brcm80211: Move osl_pub into osl
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Brett Rudley [Sat, 4 Dec 2010 00:30:36 +0000 (16:30 -0800)]
staging: brcm80211: OSLREGOPS is unused, remove checks for it.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Linus Torvalds [Mon, 6 Dec 2010 23:51:14 +0000 (15:51 -0800)]
Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Hibernate: Fix memory corruption related to swap
PM / Hibernate: Use async I/O when reading compressed hibernation image
Rafael J. Wysocki [Fri, 3 Dec 2010 21:57:45 +0000 (22:57 +0100)]
PM / Hibernate: Fix memory corruption related to swap
There is a problem that swap pages allocated before the creation of
a hibernation image can be released and used for storing the contents
of different memory pages while the image is being saved. Since the
kernel stored in the image doesn't know of that, it causes memory
corruption to occur after resume from hibernation, especially on
systems with relatively small RAM that need to swap often.
This issue can be addressed by keeping the GFP_IOFS bits clear
in gfp_allowed_mask during the entire hibernation, including the
saving of the image, until the system is finally turned off or
the hibernation is aborted. Unfortunately, for this purpose
it's necessary to rework the way in which the hibernate and
suspend code manipulates gfp_allowed_mask.
This change is based on an earlier patch from Hugh Dickins.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-by: Ondrej Zary <linux@rainbow-software.org>
Acked-by: Hugh Dickins <hughd@google.com>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: stable@kernel.org
Linus Torvalds [Mon, 6 Dec 2010 22:49:51 +0000 (14:49 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6524/1: GIC irq desciptor bug fix
ARM: 6523/1: iop: ensure sched_clock() is notrace
ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.
ARM: 6519/1: kuser: Fix incorrect cmpxchg syscall in kuser helpers
ARM: 6505/1: kprobes: Don't HAVE_KPROBES when CONFIG_THUMB2_KERNEL is selected
ARM: 6508/1: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
ARM: 6507/1: RealView: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
ARM: 6504/1: Thumb-2: Fix long-distance conditional branches in head.S for Thumb-2.
ARM: 6503/1: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL
ARM: 6502/1: Thumb-2: Fix CONFIG_THUMB2_KERNEL breakage in compressed/head.S
ARM: 6501/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in mm/proc-v7.S
ARM: 6500/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in kernel/head.S
ARM: 6499/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S
ARM: 6498/1: vfp: Correct data alignment for CONFIG_THUMB2_KERNEL
ARM: 6497/1: kexec: Correct data alignment for CONFIG_THUMB2_KERNEL
ARM: 6496/1: GIC: Do not try to register more then NR_IRQS interrupts
ARM: cns3xxx: Fix build with CONFIG_PCI=y
Bojan Smojver [Thu, 25 Nov 2010 22:41:39 +0000 (23:41 +0100)]
PM / Hibernate: Use async I/O when reading compressed hibernation image
This is a fix for reading LZO compressed image using async I/O.
Essentially, instead of having just one page into which we keep
reading blocks from swap, we allocate enough of them to cover the
largest compressed size and then let block I/O pick them all up. Once
we have them all (and here we wait), we decompress them, as usual.
Obviously, the very first block we still pick up synchronously,
because we need to know the size of the lot before we pick up the
rest.
Also fixed the copyright line, which I've forgotten before.
Signed-off-by: Bojan Smojver <bojan@rexursive.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Russell King [Mon, 6 Dec 2010 15:39:23 +0000 (15:39 +0000)]
Merge branch 'for-rmk-fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx
Chao Xie [Mon, 6 Dec 2010 06:01:10 +0000 (07:01 +0100)]
ARM: 6524/1: GIC irq desciptor bug fix
gic_set_cpu will directly use irq_desc[]. If CONFIG_SPARSE_IRQ is
enabled, there is no irq_desc[]. So we need use irq_to_desc(irq) to
get the descriptor for irq.
Signed-off-by: Chao Xie <chao.xie@marvell.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Torvalds [Mon, 6 Dec 2010 00:45:02 +0000 (16:45 -0800)]
Merge branch 'slab/urgent' of git://git./linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Fix a crash during slabinfo -v
Linus Torvalds [Mon, 6 Dec 2010 00:41:13 +0000 (16:41 -0800)]
Merge branch 'rc-fixes' of git://git./linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
initramfs: Really fix build break on symbol-prefixed archs
[media] Fix Kconfig errors due to two visible menus
i2c/algos: convert Kconfig to use the menu's `visible' keyword
media/video: convert Kconfig to use the menu's `visible' keyword
Revert "i2c: Fix Kconfig dependencies"
kconfig: regen parser
kconfig: add an option to determine a menu's visibility
Linus Torvalds [Mon, 6 Dec 2010 00:40:31 +0000 (16:40 -0800)]
Merge branch 'fixes' of git://git./linux/kernel/git/kyle/parisc-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: Fix GSC PS/2 driver name for keyboard and mouse
parisc: KittyHawk LCD fix
parisc: convert the rest of the irq handlers to simple/percpu
parisc: fix dino/gsc interrupts
parisc: remove redundant initialization in sigsegv path of sys_rt_sigreturn
projects / platform / upstream / kernel-adaptation-pc.git / log