summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Staging: bcm: Add min/max restrictions for IOCTL_BCM_REGISTER_READ_PRIVATEKevin McKinney2011-09-291-1/+5
| | | | | | | | | | | | | | | | | | This patch fixes two issues within bcm/Bcmchar.c. The first condition in the or statement checks if variable IoBuffer.OutputLength, defined from user space, is greater than the maximum value allowed for an unsigned short. IoBuffer.OutputLength is then used in a kmalloc call to return a pointer to memory. If this size is greater than an unsigned short, it becomes useless. The second condition in the or statement checks if the same variable, IoBuffer.OutputLength is equal to zero before invoking the kmalloc call. In this case, if a zero size is sent to kmalloc, a valid pointer to memory is returned instead of the expected NULL. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: hv: remove the carrier status check from netvsc_open()Haiyang Zhang2011-09-292-14/+7
| | | | | | | | Checking carrier status in netvsc_open() is not necessary. Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: vt6656: potential memory corruptionDan Carpenter2011-09-291-3/+15
| | | | | | | | param->u.wpa_key.key_len comes from the user. If it's too large we would write past the end of the array. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio: unwind the IIO_IN -> IIO_VOLTAGE defineJonathan Cameron2011-09-2925-137/+141
| | | | | | | | | This was originally there to avoid churn during a complex change. Now everything is stable lets get rid of this as it is missleading and confusing. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: hv: Update the TODO fileK. Y. Srinivasan2011-09-261-2/+0
| | | | | | | | | Now that all vmbus audit related comments have been addressed, update the TODO file to reflect this. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: wlags49_h2: Use IW_HANDLER macroDavid Kilroy2011-09-261-58/+31
| | | | | | | to declare wireless handlers. Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: wlags49_h2: Stop playing with length in GIWESSID handlerDavid Kilroy2011-09-261-10/+1
| | | | | | | | | WE21 clarified that ESSID should not be NULL terminated. The existing code didn't NULL terminate, but did play with length and then reset it again. Just stop it. Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: wlags49_h2: Declare support for WEXT 21David Kilroy2011-09-261-1/+2
| | | | | | | | WEXT changes between versions 15 and 21 have been taken care of, so update the declared support. Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: wlags49_h2: Fixup WEXT capabilitiesDavid Kilroy2011-09-261-7/+9
| | | | | | | | | | Add recently added events to the capabilities reported in iw_range. Use capability macros instead of assuming the array offsets. Explicitly list scan capabilities. Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* drivers:staging:comedi:drivers:cb_das_cs.c codeing style issueChristopher Rice2011-09-261-2/+3
| | | | | | | | drivers: staging: comedi: cb_das16_cs.c fixed over 80 line issue, and removed a space before tab issue. Signed-off-by: Christopher Rice <rice.christopher.a@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: comedi: Added log subjects to printk()s in pcmmioJohannes Thumshirn2011-09-261-17/+17
| | | | | | | Added log subject to printk()s in drivers/staging/comedi/drivers/pcmmio.c. Signed-off-by: Johannes Thumshirn <morbidrsa@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: vt6655-6: potential info leak in private_ioctl()Dan Carpenter2011-09-262-0/+2
| | | | | | | | | | | Smatch has a new check for Rosenberg type information leaks where structs are copied to the user with uninitialized stack data in them. In this path, the .uLinkRate member doesn't get initialized so I've set it to zero. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* drivers/staging/bcm/InterfaceDld.c: Fix checkpatch warningsMarcos Paulo de Souza2011-09-261-47/+46
| | | | | | | | In the source file there are a lot of warnings. I will send it in parts to be more easy to review. All the changes in this file its just alignment, and things like that. Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: et131x: Bugfix - driver doesn't autoreneg after cable unplug/plug ↵Mark Einon2011-09-261-0/+4
| | | | | | | | | | | | events This driver has a long standing bug where removing and inserting the ethernet cable results in no packets being trnasmitted / received and hence no autonegotiation occurring. Fixed by resetting the rx/tx engines and queue on detecting a cable being removed. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: et131x: Remove header declaration of et131x_check_mii()Mark Einon2011-09-261-2/+0
| | | | | | | et131x_check_mii no longer exists, remove its declaration from the header file Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: et131x: Create et131x_[dis|en]able_txrx() callsMark Einon2011-09-262-78/+50
| | | | | | | | In et131x_netdev.c, a series of calls to enable and diasble the rx/tx engine and queue are being used in several different places. Create two functions to encapsulate these calls, and replace many calls with just the one. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: et131x: Remove et131x_check_mii() and move functionality into ↵Mark Einon2011-09-262-184/+98
| | | | | | | | | | | et131x_adjust_link() et131x_check_mii() is now only being called from et131x_adjust_link. Removed this call and associated subroutines, putting the functionality directly into et131x_adjust_link(), in preparation for further simplification. Changed register checks from bare BMSR checks to use phydev/netif versions, also now uses adapter->link to track link state changes. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: et131x: Add link status to adapter structMark Einon2011-09-261-0/+3
| | | | | | | | This will be used to determine if the link state has changed when the phydev informs the et131x that a change has occurred (in et131x_adjust_link) Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: et131x: support register dump in ethtool opsMark Einon2011-09-261-3/+135
| | | | | | | Not an exhaustive dump of the et131x registers, used while debugging a specific problem - seems a shame not to keep it around. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: gma500: gtt based hardware scrolling consoleAlan Cox2011-09-263-16/+123
| | | | | | | | | | | | Add support for GTT based scrolling. Instead of pushing bits around we simply use the GTT to change the mappings. This provides us with a very fast way to scroll the display providing we have enough memory to allocate on 4K line boundaries. In practice this seems to be the case except for very big displays such as HDMI. It works out nicely on the usual configurations are netbooks and tablets. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: gma500: frame buffer lockingAlan Cox2011-09-263-6/+8
| | | | | | | | | | | If we are the console then a printk can hit us with a spin lock held (and in fact the kernel will do its best to take printing lock). In that case we cannot politely sleep when synching after an accelerated op but must behave obnixously to be sure of getting the bits out. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio: Prevent reading from buffer chrdev when device has no buffer.Jonathan Cameron2011-09-263-8/+13
| | | | | | | Silly bug introduced during the chrdev merge series. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:magnetometer:ak8975: Fix probe() error-handlingStephen Warren2011-09-261-1/+1
| | | | | | | | | | | Fix ak8975_probe() to jump to the appropriate exit labels when an error occurs. With the previous code, some cleanup actions were being skipped for some error conditions. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Andrew Chew <achew@nvidia.com> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:magnetometer:ak8975: Don't assume 0 is an invalid GPIOStephen Warren2011-09-261-6/+5
| | | | | | | | | | gpio_is_valid() is the defined mechanism to determine whether a GPIO is valid. Use this instead of assuming that 0 is an invalid GPIO. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Andrew Chew <achew@nvidia.com> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:magnetometer:ak8975 use platform_data to pass the gpio number.Jonathan Cameron2011-09-261-1/+4
| | | | | | | | | | | | | Tegra doesn't have irq_to_gpio() any more, and ak8975 is included in tegra_defconfig. This causes a build failure. Instead, pass the GPIO name through platform data. [swarren: Rewrote commit description when I squashed this with my patch to remove the irq_to_gpio() call] Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:accel:lis3l02dq ring->buffer renames.Jonathan Cameron2011-09-263-60/+61
| | | | | | | | This driver already supports kfifo usage, so the term ring is misleading and hence replaced. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio: replacing term ring with buffer in the IIO core.Jonathan Cameron2011-09-2648-678/+680
| | | | | | | They aren't always ring buffers, so just use buffer for all naming. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio: rename ring_generic.h -> buffer_generic.hJonathan Cameron2011-09-2631-33/+32
| | | | | | | Nothing in this file is specific to RING buffers so rename it. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio: tree wide IIO_RING_BUFFER config symbol to IIO_BUFFERJonathan Cameron2011-09-2629-89/+89
| | | | | | | Functionality is generic, so name is missleading. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio: tree wide IIO_RING_TRIGGERED -> IIO_BUFFER_TRIGGEREDJonathan Cameron2011-09-2626-39/+39
| | | | | | | | | also, IIO_RING_HARDWARE_BUFFER -> IIO_BUFFER_HARDWARE These aren't always rings so the naming should not imply that. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio: treewide rename iio_triggered_ring_* to iio_triggered_buffer_*Jonathan Cameron2011-09-2619-40/+40
| | | | | | | | | Not always a ring so naming is missleading. Also, kfifo_buf is probably first buffer to take out of staging and it definitely isn't a ring. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:documentation Add abi docs for capacitance adcs.Jonathan Cameron2011-09-261-0/+19
| | | | | Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging:iio:documentation general refresh of abi docs.Jonathan Cameron2011-09-261-92/+91
| | | | | | | Numerous small fixes and additions of missing elements. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: iio: Move sensor drivers to sub menusManuel Stahl2011-09-2612-12/+34
| | | | | | | | | We have a lot of drivers now, so the iio sub menu becomes quite large. This patch creates sub menus for the different sensors. Signed-off-by: Manuel Stahl <manuel.stahl@iis.fraunhofer.de> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: iio: adc: Replace, rewrite ad7745 from scratch.Michael Hennerich2011-09-265-675/+835
| | | | | | | | | The existing ad7745 driver didn't conform with the IIO spec for such devices. It was way simpler to rewrite the existing driver, than actually fixing it. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: intel_sst: instel_sst: fixed some coding style issues.Jaap Crezee2011-09-261-4/+6
| | | | | | | Fixed a coding style issue. Signed-off-by: Jaap Crezee <jaap@jcz.nl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: mei: Organize the initialization state machine.Oren Weil2011-09-263-24/+42
| | | | | | | | | moving the final state, clearing of the client maps and updating of mei state out from mei_host_client_properties function. Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Oren Weil <oren.jer.weil@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: rtl8192e: off by one in rtl8192_get_channel_map()Dan Carpenter2011-09-261-1/+1
| | | | | | | | | | COUNTRY_CODE_MAX is not a valid country code. We're off by one here. This gets passed to Dot11d_Channelmap() where it's used as an offset into the ChannelPlan[] array. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: simplified internal ioctl function once moreRoland Vossen2011-09-263-35/+24
| | | | | | | | | Code cleanup. Merged two functions. Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: consistent naming of struct net_device *ndevRoland Vossen2011-09-264-216/+225
| | | | | | | | | | Code cleanup. Various names (ndev, net, dev) were used for the same structure. Settled for 'ndev'. Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: clarified fullmac io and event codesRoland Vossen2011-09-263-0/+11
| | | | | | | | | | Added comments to make code more readable. Reported-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: removed log after kzalloc()/kmalloc() failureRoland Vossen2011-09-2612-124/+41
| | | | | | | | | | kzalloc/kmalloc already reports an allocation failure themselves. Reported-by: Dan Carpenter <error27@gmail.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: removed likely/unlikely callsRoland Vossen2011-09-263-110/+107
| | | | | | | | | | There was no performance rationale to use these guys. Reported-by: Dan Carpenter <error27@gmail.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: added endianness check flag to fullmac MakefileRoland Vossen2011-09-261-0/+1
| | | | | | | | Reported-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: removed two fullmac sparse spinlock warningsRoland Vossen2011-09-262-35/+20
| | | | | | | | | | | | By deleting three redundant functions. The spinlock was related to event queue operation. Event queue data members were also renamed to make their function more clear. Reported-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: remove global variables for data frame boundaryFranky Lin2011-09-262-18/+10
| | | | | | | | | | Put boundary settings in brcmf_bus structure Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: remove fullmac module_param brcmf_idletimeFranky Lin2011-09-262-4/+2
| | | | | | | | | | Use constant for idle time setting. Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: remove fullmac module_param for watchdogFranky Lin2011-09-263-32/+21
| | | | | | | | | | Use constant to replace global variable used for watchdog polling Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: remove fullmac module_param brcmf_sdiod_drive_strengthFranky Lin2011-09-261-4/+2
| | | | | | | | | | Replaced the global variable with constant Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: brcm80211: remove fullmac module_param brcmf_dongle_memsizeFranky Lin2011-09-262-33/+5
| | | | | | | | | | remove unused module parameter brcmf_dongle_memsize and related code Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud