aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/winbond
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-25 15:52:56 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-25 15:52:56 -0700
commit71c62902469101ad476dc9f606421e956c3230a9 (patch)
tree608c6facf357707f378fb7b6ced675f4cd0f9338 /drivers/staging/winbond
parentstaging: winbond: Coding Style correction and removal of unused macro (diff)
parentstaging:iio:dummy: Fix potential NULL pointer dereference (diff)
downloadlinux-dev-71c62902469101ad476dc9f606421e956c3230a9.tar.xz
linux-dev-71c62902469101ad476dc9f606421e956c3230a9.zip
Merge tag 'iio-for-v3.7e' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Fifth round of new drivers and device support for the IIO subsystem in the 3.7 cycle. Here we have a mixed bag of new stuff, minor fixes and more major fixes for drivers added earlier in this cycle. 1) A number of fixes for the HID sensors code added in previous pull request. Typical stuff that has become apparent as more eyes have looked at the code post merging. Similar case for the ad5755 dac. 2) Cleanups of error handing in inkern.c - again typical stuff to see as code comes into heavier use and people notice the naughty short cuts that snuck in originally and kindly fix them. 3) A series from Lars that removes some incorrect error handling from the remove functions of a number of drivers. These have been there for a very long time hence I'm not pushing these out for the 3.6 cycle. 4) Support for more parts in the ad7780 driver. 5) A driver for the adcs on the lp8788 power management unit 6) A client driver for IIO to allow it's ADCs to be used for battery status measurement. Note this driver has some dependencies on some utility functions added to IIO in this series, hence it is coming via this tree rather than Anton's. 7) A null pointer dereference bug in the 'fake' driver. I'm not doing this as a fix for the 3.6 cycle because it only effects 'fake' hardware and that code is typically only used by people investigating how IIO works as part of writing new drivers. Hence it's hardly a critical fix.
Diffstat (limited to 'drivers/staging/winbond')
0 files changed, 0 insertions, 0 deletions