summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Staging: android: delete android drivers"Greg Kroah-Hartman2011-11-3013-0/+5804
| | | | | | | | | | | | | | This reverts commit b0a0ccfad85b3657fe999805df65f5cfe634ab8a. Turns out I was wrong, we want these in the tree. Note, I've disabled the drivers from the build at the moment, so other patches can be applied to fix some build issues due to internal api changes since the code was removed from the tree. Cc: Arve Hjønnevåg <arve@android.com> Cc: Brian Swetland <swetland@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* rtl8192e: Split into two directoriesSean MacLennan2011-11-3039-32/+38
| | | | | | | | | | | | | | | Now that the rtl8192e driver is split up, it makes sense to keep the rtllib code in one directory and the rtl8192e specific code in another. This patch contains the split and the fixup of includes. Since rtl_core.h already included rtllib.h and dot11d.h, rtl_core.h was updated to point to the parent directory. All other references to rtllib.h and dot11d.h in the rtl8192e specific code where deleted rather than fixed. This leaves just one file that needs to know the real location of the rtllib includes. Signed-off-by: Sean MacLennan <seanm@seanm.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* rtl8192e: Split the driver upSean MacLennan2011-11-309-80/+103
| | | | | | | | | | | | | This patch splits the current r8192e_pci driver up into six different drivers: rtllib, rtllib_crypt, rtllib_crypt_ccmp, rtllib_crypt_tkip, rtllib_crypt_wep, and r8192e_pci. Now that they are proper modules, the init and exit functions do not need to be called directly. Also, the rtllib_*_null functions are not needed since they will be loaded on demand. Signed-off-by: Sean MacLennan <seanm@seanm.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* rtl8192e: Export symbolsSean MacLennan2011-11-3011-0/+58
| | | | | | | | | | The rtl8192e driver had a natural split between the more generic rtllib code and the more specific rtl8192e code. This patch exports all the symbols needed by the r8192 specific code from the rtllib generic code. Signed-off-by: Sean MacLennan <seanm@seanm.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* rtl8192e: create generic rtllib_debug.hSean MacLennan2011-11-309-10/+11
| | | | | | | | | | Rename rtl_debug.h to rtllib_debug.h. Source files should include rtllib.h if they are generic and rtl_core.h if they are r8192e specific. Files should never include both. Signed-off-by: Sean MacLennan <seanm@seanm.ca> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* rtl8192e: move RTL_DEBUG and proc prototypesSean MacLennan2011-11-302-41/+42
| | | | | | | | | | | | The RTL_DEBUG enum is used for rt_global_debug_component global variable and RT_TRACE. It should be in rtl_debug.h and not rtl_core.h. The rtl8192_proc_* functions are r8192 specific and should not be in rtl_debug.h. Move them to rtl_core.h. Signed-off-by: Sean MacLennan <seanm@seanm.ca> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* rtl8192e: cleanup rtl_debug.hSean MacLennan2011-11-303-344/+4
| | | | | | | | | | | | This patch cleans up rtl_debug.h by removing all the unused defines and stub functions. The changes to rtl_core.c are just to remove the deleted stub function calls. The changes to rtl_debug.c are functions that are never called. Signed-off-by: Sean MacLennan <seanm@seanm.ca> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: iio/accel: Changed return type of lis3l02dq_read_event_config() to intAndreas Ruprecht2011-11-301-1/+1
| | | | | | | | | | | | | | The lis3l02dq_read_event_config() function returned an ssize_t up to now, which lead to a compiler warning in line 660 (initialization from incompatible pointer type). The iio_info struct is defined to accept an int-returning function as the read_event_config parameter. Also it seems odd to have the check for (ret < 0) and return ret in this case, when the return type is signed. Signed-off-by: Andreas Ruprecht <rupran@einserver.de> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: VME: PIO2: Correct irq resetMartyn Welch2011-11-301-2/+7
| | | | | | | | | | | | | The loop used to reset the interrupt masks has faulty logic. There are 4 banks of 8 I/O, however each mask is comprised of 2 bits and thus there are 8 sets of registers to clear. Driver was wrongly equating this with 8 banks leading to a us writing past the end of the "bank" array (used to store mask configuration as these registers are write only) and thus causing memory corruption. Clear both registers of masks for each bank and half iterations. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: iio/adc: strict_strtoul was used with a long type variableAndreas Ruprecht2011-11-301-2/+2
| | | | | | | | | | | | | | | | | | The function ad7280_store_balance_timer() parses data from a char* buffer into a long variable, but uses the the function strict_strtoul which expects a pointer to an unsigned long variable as its third parameter. As Dan Carpenter mentioned, the values are capped a few lines later, but a check if val is negative is missing. Now this function will return -ERANGE if there is a representation of a negative number in buf. Additionally the checkpatch.pl considers strict_strtoul as obsolete. I replaced its call with the suggested kstrtoul. Signed-off-by: Andreas Ruprecht <rupran@einserver.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: iio: Use kcalloc instead of kzalloc to allocate arrayThomas Meyer2011-11-306-24/+20
| | | | | | | | | | | | The advantage of kcalloc is, that will prevent integer overflows which could result from the multiplication of number of elements and size and it is also a bit nicer to read. The semantic patch that makes this change is available in https://lkml.org/lkml/2011/11/25/107 Signed-off-by: Thomas Meyer <thomas@m3y3r.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: vt6656: integer overflows in private_ioctl()Xi Wang2011-11-301-0/+8
| | | | | | | | | | | There are two potential integer overflows in private_ioctl() if userspace passes in a large sList.uItem / sNodeList.uItem. The subsequent call to kmalloc() would allocate a small buffer, leading to a memory corruption. Reported-by: Dan Rosenberg <drosenberg@vsecurity.com> Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: vt6655: integer overflows in private_ioctl()Xi Wang2011-11-301-0/+8
| | | | | | | | | | | There are two potential integer overflows in private_ioctl() if userspace passes in a large sList.uItem / sNodeList.uItem. The subsequent call to kmalloc() would allocate a small buffer, leading to a memory corruption. Reported-by: Dan Rosenberg <drosenberg@vsecurity.com> Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: vt6656: card.c: Change return of CARDbAddBasicRate to voidMarcos Paulo de Souza2011-11-302-4/+2
| | | | | | | | | In all locations that call this function ignore your returna, so remove it. Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com> Cc: Forest Bond <forest@alittletooquiet.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: vt6656: baseband.c: Remove commented codeMarcos Paulo de Souza2011-11-302-99/+3
| | | | | | | | | This patch removes a lot of commented code, and some return calls of void functions. Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com> Cc: Forest Bond <forest@alittletooquiet.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: vt6656: baseband.c: Removed dead code, and fix coding standardsMarcos Paulo de Souza2011-11-301-45/+14
| | | | | | | | | Remved some commented code, and fixed some style issues. was removed too a redundant if statement. Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com> Cc: Forest Bond <forest@alittletooquiet.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: vt6656: 80211mgr.c: Code cleanup, removed return of void funcs.Marcos Paulo de Souza2011-11-301-33/+2
| | | | | | | | Removed return call of void functions. Removed some code style issues. Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com> Cc: Forest Bond <forest@alittletooquiet.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: vt6656: main_usb.c: Use kzalloc instead kmallocMarcos Paulo de Souza2011-11-301-2/+1
| | | | | | Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com> Cc: Forest Bond <forest@alittletooquiet.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:vt6656: iwctl.c: Removed unneeded functionMarcos Paulo de Souza2011-11-306-47/+2
| | | | | | | | | | Removed the function iwctl_giwnwid, that just return a error code. Changes v1 to v2: Removed same functions of vt6655 and vt6656. Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: hv: move hv_netvsc out of staging areaHaiyang Zhang2011-11-2911-9/+12
| | | | | | | | | | | | | hv_netvsc has been reviewed on netdev mailing list on 6/09/2011. All recommended changes have been made. We are requesting to move it out of staging area. Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: KY Srinivasan <kys@microsoft.com> Signed-off-by: Mike Sterling <Mike.Sterling@microsoft.com> Acked-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: iio/accel: Changed data type of val in store_measurement_mode to u8Andreas Ruprecht2011-11-291-2/+2
| | | | | | | | | | | | | | The code in sca3000_store_measurement_mode() uses the variable val to do bitwise operations with an int mask and or-s it into st->rx[0] which is an entry in a u8 array (see sca3000.h). This means up to now values larger than a u8 were silently ignored and just the lower 8 bits counted into the value that was written into st->rx[0]. This code will return -ERANGE if the value in buf was too large to fit into a u8. Signed-off-by: Andreas Ruprecht <rupran@einserver.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: iio/accel: Changed data type for val to unsigned long in ↵Andreas Ruprecht2011-11-291-2/+2
| | | | | | | | | | | | | | | | | | | write_frequency In lis3102dq_write_frequency() we used a long variable to store the value parsed from the char* buffer buf, as there only was a strict_strtol() function to parse values. Now we have got kstrto* which allows us to convert to the right data type in most cases. In this particular function we want to write a frequency value, and it doesn't make sense to allow negative values here (as Dan Carpenter pointed out in a previous email). This means we can now parse the value into an unsigned long and get an error for invalid (e.g. negative) values. Signed-off-by: Andreas Ruprecht <rupran@einserver.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: iio/accel: Changed data type in adis16220_write_16bit to u16Andreas Ruprecht2011-11-291-2/+2
| | | | | | | | | | | | | | | | In the adis16220_write_16bit() function we used a long value to store parsed data from the char* buffer buf. The called function to actually write the data, adis16220_spi_write_reg_16(), takes a u16 value as a parameter, so up to now a value larger than u16 was silently ignored as it was only truncated when passing the parameter. Now this function will only accept values fitting into a u16. Additionally the parsing function was changed to overcome the now obsolete strict_strtol() function. Signed-off-by: Andreas Ruprecht <rupran@einserver.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: bcm: Reverse semaphore locking in IOCTL_BCM_BUFFER_DOWNLOAD_STOP.Kevin McKinney2011-11-291-5/+5
| | | | | | | | | | | | | | This patch reorders the semaphore locking. It makes better sense to first evaluate fw_download_sema semaphore then NVMRdmWrmLocl semaphore. The fw_download_sema is suppose to be acquired in the START ioctl. If this is not true, then it does not make sense to continue. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: bcm: Alter code to move error handling closer to the calls.Kevin McKinney2011-11-291-66/+66
| | | | | | | | | | This is a cleanup patch. I've shuffled the code around to move the error handling closer to the calls. I've removed some indent levels. I've replaced break statements with direct returns. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: bcm: Clean up patch that calls semaphore down_trylock directly.Kevin McKinney2011-11-291-5/+2
| | | | | | | | | | | | This patch evaluates/calls the down_trylock locking function directly, instead of storing the results in a variable and evaluating the variable. These changes were made in: IOCTL_BCM_BUFFER_DOWNLOAD_STOP and IOCTL_BCM_BUFFER_DOWNLOAD_START. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: Add LTTng entry to MAINTAINERS fileMathieu Desnoyers2011-11-291-0/+7
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: add LTTng to buildMathieu Desnoyers2011-11-292-0/+3
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: toplevel Makefile and KconfigMathieu Desnoyers2011-11-292-0/+68
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: probe callbacksMathieu Desnoyers2011-11-2916-0/+1889
| | | | | | | | | | Implement the LTTng probe callbacks. One notable file here is lttng-events.h, which is the core implementation of the LTTng TRACE_EVENT macros for generation of probes and tracepoint decription from the TRACE_EVENT declarations. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: add system call instrumentation probeMathieu Desnoyers2011-11-291-0/+438
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: Add documentation and TODO filesMathieu Desnoyers2011-11-293-0/+212
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: debugfs and procfs ABIMathieu Desnoyers2011-11-292-0/+930
| | | | | | | | | | | Add the "lttng" virtual file to debugfs and procfs. All operations are performed through ioctls (LTTng ioctl range is already reserved upstream) on this virtual file and on anonymous file descriptors returned by these ioctls. Each file descriptor is associated with a tracer "object" (session, channel, stream, event, context). Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: timing calibration featureMathieu Desnoyers2011-11-291-0/+30
| | | | | | | | This calibration feature is fairly limited for now, but provides an example of how this can be performed. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: dynamically selectable context informationMathieu Desnoyers2011-11-2911-0/+1027
| | | | | | | | Events can be augmented with context information. This is dynamically configurable from the command line. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: tracer control and core structuresMathieu Desnoyers2011-11-296-0/+1751
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: lib ring buffer clientsMathieu Desnoyers2011-11-298-0/+1025
| | | | | | | | | Each lttng buffer configuration (discard mode, overwrite mode, mmap support, splice support, per-cpu buffers, global buffer for metadata) is a lib ring buffer client. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: syscall instrumentationMathieu Desnoyers2011-11-2921-0/+7573
| | | | | | | | | x86-32 and x86-64 system call instrumentation, along with the lttng-syscalls-generate-headers.sh script that generates the headers from the system call list. See README for details. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng instrumentation: tracepoint eventsMathieu Desnoyers2011-11-2912-0/+3113
| | | | | | | | | | Modifications to the in-kernel TRACE_EVENT are needed to generate the compact event descriptions and the probe code LTTng generates. These changes could apply to upstream TRACE_EVENT, but requires changing the in-kernel API. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng wrappersMathieu Desnoyers2011-11-2924-0/+417
| | | | | | | | Implement wrappers for compatibility with older kernel versions and kernels with had the libringbuffer (old) patchset applied. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng libs: add MakefileMathieu Desnoyers2011-11-291-0/+11
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: offset alignment headerMathieu Desnoyers2011-11-291-0/+61
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng: BUILD_RUNTIME_BUG_ONMathieu Desnoyers2011-11-291-0/+29
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng lib: portable bitfield read/write headerMathieu Desnoyers2011-11-291-0/+400
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng lib: ring bufferMathieu Desnoyers2011-11-2919-0/+6639
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* lttng lib: lttng priority heapMathieu Desnoyers2011-11-292-0/+324
| | | | | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/mei: don't check if list is empty before loopingTomas Winkler2011-11-284-183/+152
| | | | | | | | | | | | | | | | | | 1. No need to check if a list is empty before list_for_each_ looping as this is already checked by loop stopping conditional. The side effect is reduced indentation depth from: if (!list_empty) list_for_each() to: list_for_each() 2. drop cb_ prefix from cl_pos, cl_next variables used in list_for_each loops. The code is more compact and readable Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/mei: remove status member of mei_io_listTomas Winkler2011-11-285-61/+41
| | | | | | | status was never writen Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/mei: remove BUG_ON for testing of the response buffer size overflowTomas Winkler2011-11-281-3/+0
| | | | | | | | | We can remove BUG_ON in mei_irq_thread_read_client_message() as the testing for response buffer size overflow has already graceful handling in place. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: xgifb: vb_setmode: clean up a single statement ifAaro Koskinen2011-11-281-2/+1
| | | | | | | | | | | | | | | Eliminate the only remaining checkpatch.pl warning: WARNING: braces {} are not necessary for single statement blocks #7463: FILE: staging/xgifb/vb_setmode.c:7463: + if (ModeNo & 0x80) { + ModeNo = ModeNo & 0x7F; + } total: 0 errors, 1 warnings, 0 checks, 7554 lines checked Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud