summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-12-22staging:iio: Disallow modifying buffer size when buffer is enabledLars-Peter Clausen
The buffer buffer storage is only update when enabling the buffer. Changing the buffer size while the buffer is enabled will confuse the buffer in regard to its actual buffer size and can cause potential memory corruption. Thus it is only safe to modify the buffer size when the buffer is disabled. Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-22staging:iio: Disallow changing scan elements in all buffered modesLars-Peter Clausen
Currently we only disallow changing the scan elements, while the buffer is enabled, in triggered buffer mode. This patch changes it to disallow it for all buffered modes. Disabling or enabling scan elements while the buffer is enabled will cause undefined behavior since the reader will not be able to tell samples with the new and old scan element set apart and thus wont be able to extract any meaningful data from the buffer. Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-22staging:iio: Use iio_buffer_enabled instead of open coding itLars-Peter Clausen
Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-22drivers: staging: vt6656: card.c: Remove useless return statementMarcos Paulo de Souza
This patch removes the return of the function CARDbSetMediaChannel, that always return TRUE value. Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-22drivers: staging: vt6656: Remove not used returned data of functionMarcos Paulo de Souza
This function always return TRUE, and it is not used by the funtions who calls it. Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-22staging:iio: Remove unused variableLars-Peter Clausen
Fixes the following warning: drivers/staging/iio/industrialio-buffer.c: In function ‘iio_scan_mask_query’: drivers/staging/iio/industrialio-buffer.c:620: warning: unused variable ‘mask’ Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-22Staging: android: fixed 80 characters warnings in lowmemorykiller.cMarco Navarra
This patch fixes some 80 chatacters limit warnings in the lowmemorykiller.c file Signed-off-by: Marco Navarra <fromenglish@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-22Staging: android: fixed a space warning in binder.hMarco Navarra
This patch fixes a simple tab-space warning in binder.h found by checkpatch tool Signed-off-by: Marco Navarra <fromenglish@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-22staging: gma500: Fix warning in power.cRakib Mullick
gma_resume_display() wants 'struct pci_dev *' as it's parameter, so lets pass dev->pdev instead of dev. Fixes the following warning. drivers/staging/gma500/power.c: In function ‘gma_power_begin’: drivers/staging/gma500/power.c:269:3: warning: passing argument 1 of ‘gma_resume_display’ from incompatible pointer type drivers/staging/gma500/power.c:99:13: note: expected ‘struct pci_dev *’ but argument is of type ‘struct drm_device *’ Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-22Staging: bcm: Fix an invalid dereference to a kmalloc in IOCTL_BCM_BULK_WRMKevin McKinney
Variable IoBuffer.InputLength is chosen from userspace, and can therefore be less than the intended size. In this case,the memory from the kmalloc call is eventually cast to a PBULKWRM_BUFFER. If the IoBuffer.InputLength does not meet the minimum size of PBULKWRM_BUFFER, then we will get a kernel Oops. To resolve this issue, this patch verifies IoBuffer.InputLength meets the minimum size before invoking the kmalloc call. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-22Staging: bcm: Fix information leak in IOCTL_BCM_GET_DRIVER_VERSIONKevin McKinney
This ioctl, IOCTL_BCM_GET_DRIVER_VERSION, is responsible for sending the driver version to userspace. However, the requested size stored in IoBuffer.OutputLength may be incorrect. Therefore, we altered the code to send the exact length of the version, plus one for the null character. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-21staging: Remove LTTng from MAINTAINERS fileMathieu Desnoyers
LTTng has been removed from the staging tree. Complete this removal by removing the LTTng entry from the MAINTAINERS file. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> CC: Ingo Molnar <mingo@elte.hu> CC: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-21ashmem: Whitespace cleanupsJohn Stultz
Fixes checkpatch warnings with the ashmem.c file CC: Brian Swetland <swetland@google.com> CC: Colin Cross <ccross@android.com> CC: Arve Hjønnevåg <arve@android.com> CC: Dima Zavin <dima@android.com> CC: Robert Love <rlove@google.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-21ashmem: Fix arguments to ashmem_shrinkColin Cross
The arguments to shrink functions have changed, update ashmem_shrink to match. Signed-off-by: Colin Cross <ccross@android.com> [jstultz: tweaked commit subject] CC: Brian Swetland <swetland@google.com> CC: Colin Cross <ccross@android.com> CC: Arve Hjønnevåg <arve@android.com> CC: Dima Zavin <dima@android.com> CC: Robert Love <rlove@google.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-21ashmem: Support lseek(2) in ashmem driverBjorn Bringert
Signed-off-by: Bjorn Bringert <bringert@android.com> [jstultz: tweaked commit subject] CC: Brian Swetland <swetland@google.com> CC: Colin Cross <ccross@android.com> CC: Arve Hjønnevåg <arve@android.com> CC: Dima Zavin <dima@android.com> CC: Robert Love <rlove@google.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-21ashmem: Update arguments of shrinker for 2.6.35Colin Cross
Signed-off-by: Colin Cross <ccross@google.com> CC: Brian Swetland <swetland@google.com> CC: Colin Cross <ccross@android.com> CC: Arve Hjønnevåg <arve@android.com> CC: Dima Zavin <dima@android.com> CC: Robert Love <rlove@google.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-21ashmem: Fix ASHMEM_SET_PROT_MASK.Arve Hjønnevåg
Signed-off-by: Arve Hjønnevåg <arve@android.com> CC: Brian Swetland <swetland@google.com> CC: Colin Cross <ccross@android.com> CC: Arve Hjønnevåg <arve@android.com> CC: Dima Zavin <dima@android.com> CC: Robert Love <rlove@google.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-21ashmem: Implement read(2) in ashmem driverBjorn Bringert
Signed-off-by: Bjorn Bringert <bringert@android.com> [jstultz: Tweaked commit subject] CC: Brian Swetland <swetland@google.com> CC: Colin Cross <ccross@android.com> CC: Arve Hjønnevåg <arve@android.com> CC: Dima Zavin <dima@android.com> CC: Robert Love <rlove@google.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-21ashmem: Anonymous shared memory subsystemRobert Love
The anonymous shared memory (ashmem) subsystem provides a Unix-y,file-based shared memory interface to user-space. It works like anonymous memory (e.g. mmapping fd=0) except if you share the file descriptor via the usual means, you will share the mapping. The shared memory can be accessed via both mmap or file I/O. The backing store is a simple shmem file. Additionally, ashmem introduces the concept of page pinning. Pinned pages (the default) behave like any anonymous memory. Unpinned pages are available to the kernel for eviction during VM pressure. When repinning the pages, the return value instructs user-space as to any eviction. In this manner, user-space processes may implement caching and similar resource management that efficiently integrates with kernel memory management. Signed-off-by: Robert Love <rlove@google.com> ashmem: Don't install fault handler for private mmaps. Ashmem is used to create named private heaps. If this heap is backed by a tmpfs file it will allocate two pages for every page touched. In 2.6.27, the extra page would later be freed, but 2.6.29 does not scan anonymous pages when running without swap so the memory is not freed while the file is referenced. This change changes the behavior of private ashmem mmaps to match /dev/zero instead tmpfs. Signed-off-by: Arve Hjønnevåg <arve@android.com> ashmem: Add common prefix to name reported in /proc/pid/maps Signed-off-by: Arve Hjønnevåg <arve@android.com> ashmem: don't require a page aligned size This makes ashmem more similar to shmem and mmap, by not requiring the specified size to be page aligned, instead rounding it internally as needed. Signed-off-by: Marco Nelissen <marcone@android.com> [jstultz: Improved commit subject and included patch description from rlove. Also moved ashmem files to staging dir, and reworked code to avoid touching mm/shmem.c while we're in staging.] CC: Brian Swetland <swetland@google.com> CC: Colin Cross <ccross@android.com> CC: Arve Hjønnevåg <arve@android.com> CC: Dima Zavin <dima@android.com> CC: Robert Love <rlove@google.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging: android: add pmem driverRebecca Schultz
This adds the Android pmem driver to the staging tree. [At this point in time, it is dependent on the ARM platform, due to some build issues that require it. - gregkh] Signed-off-by: Rebecca Schultz <rschultz@google.com> Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com> Signed-off-by: Dima Zavin <dima@android.com> Signed-off-by: Jamie Gennis <jgennis@google.com> Cc: Brian Swetland <swetland@google.com> Cc: Arve Hjønnevåg <arve@android.com> Cc: Colin Cross <ccross@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging: android: switch: minor code formatting cleanupsGreg Kroah-Hartman
This fixes a number of minor space issues in the Android switch code. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging: android: switch: switch class and GPIO drivers.Mike Lockwood
This adds the Android switch driver code to the staging tree. [Note, this code was located in drivers/switch/ in the Android kernel releases, but as that api wasn't generally accepted, and the interface is working toward changing to the newly proposed extcon inteface, this driver was placed here until the extcon code is merged into mainline and the Android userspace code is converted over to using it. - gregkh] Signed-off-by: Arve Hjønnevåg <arve@android.com> Signed-off-by: Mike Lockwood <lockwood@android.com> Cc: MyungJoo Ham <myungjoo.ham@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Donggeun Kim <dg77.kim@samsung.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: MyungJoo Ham <myungjoo.ham@gmail.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: NeilBrown <neilb@suse.de> Cc: Morten CHRISTIANSEN <morten.christiansen@stericsson.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging: drm/omap: add debugfs supportAndy Gross
Right now just a tiler_map file to dump a 2d map of which areas in tiler/dmm have pinned buffers (or reservations). In the future more could be added. Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging: drm/omap: avoid aquiring mutex in atomic context (v2)Rob Clark
omap_gem_roll() could be called by fbcon in atomic context or when struct_mutext is held. Avoid aquiring mutex (deadlock), or calling tiler_pin() (which itself is not safe for atomic context) in these cases. Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging: drm/omap: add ywrap module paramRob Clark
Can be set at boot or module load time to prevent YWRAP scrolling from being enabled. Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging: fix build problem with staging/rtl8192eSean MacLennan
The rtllib and rtllib_crypt drivers are both required for a fully functional rtllib. Make sure both are always available by having rtllib select rtllib_crypt. Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Sean MacLennan <seanm@seanm.ca> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging:iio: iio_trigger contains defunct owner field. Remove it.Jonathan Cameron
This field moved into the trigger_ops structure a while back, but somehow never quite got cleared up. This clears the last few drivers to set it (nothing uses it) and gets rid of it entirely. Signed-off-by: Jonathan Cameron <jic23@kernel.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging:iio: Make sure all triggers have a trigger_ops for the owner field.Jonathan Cameron
The core needs the owner field to prevent module removal whilst in use and uses it without confirming that the trigger_ops structure actually exists. Signed-off-by: Jonathan Cameron <jic23@kernel.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16iio: gyro: ADXRS450: Add support for ADXRS453 Digital GyroscopeMichael Hennerich
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16iio: gyro: ADXRS450: Add missing read support for calibbias attributeMichael Hennerich
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16iio: gyro: ADXRS450: Add missing scale attributesMichael Hennerich
Add missing scale attributes. Temperature data is presented as 10-bit, twos complement number. Therefore use singed and shift accordingly. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging: comedi_fops.c whitespace fixesFlorian Schmaus
Changed whitespaces in comedi/*.c to tabs where necessary. All .c files within comedi now have no obvious style problems as reported by checkpatch.pl Signed-off-by: Florian Schmaus <fschmaus@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16staging: crystalhd: bc_dts_defs.h: Fix up coding styleJorgyano Vieira
Fix comments style on structs and enums Break long lines. Signed-off-by: Jorgyano Vieira <jorgyano@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-16Staging: android: fixed white spaces coding style issue in logger.cMarco Navarra
This patch fixes some space-before-tabs warnings found by checkpatch tool on the staging android driver file logger.c Signed-off-by: Marco Navarra <fromenglish@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in contec_pci_dio.cRavishankar karkala Mallikarjunayya
This is a patch to the contec_pci_dio.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in das1800.cRavishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printk to dev_<levels>. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in das1800.cRavishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a printk warning found by the checkpatch.pl tool. Included KERN_facility levels for printk. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in cb_pcidas64.cRavishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas64.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels> and Removed unnecessary printk statements. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in cb_pcidas64.cRavishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas64.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels> and Removed unnecessary printk statements. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in cb_pcidas.cRavishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels>.. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in cb_pcidas.cRavishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg().. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in das1800.cRavishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in das1800.cRavishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a printk warning found by the checkpatch.pl tool. Coverted printks to dev_<levels>. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in daqboard2000.cRavishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in das1800.cRavishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels>. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix brace coding style issue in ni_at_a2150.cRavishankar karkala Mallikarjunayya
This is a patch to the ni_at_a2150.c file that fixes up a brace warning found by the checkpatch.pl tool. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in jr3_pci.cRavishankar karkala Mallikarjunayya
This is a patch to the jr3_pci.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_<levels> and Removed unnecessary printk statements. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in jr3_pci.cRavishankar karkala Mallikarjunayya
This is a patch to the jr3_pci.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in daqboard2000.cRavishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a printk warning found by the checkpatch.pl tool. converted printks to dev_printk and Removed unnecessary printk statements. Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-13Staging: comedi: fix printk issue in daqboard2000.cRavishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a printk warning found by the checkpatch.pl tool. Converted printks to dev_dbg(). Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>