From: Greg Kroah-Hartman Date: Mon, 22 May 2017 19:53:09 +0000 (+0200) Subject: Merge tag 'iio-fixes-for-4.12a' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.12-rc5~7^2~3 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5a4733df7ef255446a213ee84efa5713a9765688;p=linux-block.git Merge tag 'iio-fixes-for-4.12a' of git://git./linux/kernel/git/jic23/iio into staging-linus Jonathan writes: First set of IIO fixes in the 4.12 cycle. Matt finally set up the lightning storm he needed to test the as3935. * core - Fix a null pointer deference in iio_trigger_write_current when changing from a non existent trigger to another non existent trigger. * a3935 - Recalibrate the RCO after resume. - Fix interrupt mask so that we actually get some interrupts. - Use iio_trigger_poll_chained as we aren't in interrupt context. * am335x - Fix wrong allocation size provided for private data to iio_device_alloc. * bcm_iproc - Swapped primary and secondary isr handlers. * ltr501 - Fix swapped als/ps register fields when enabling interrupts * max9611 - Wrong scale factor for the shunt_resistor attribute. * sun4-gpadc - Module autoloading fixes by adding the device table declarations. - Fix parent device being used in devm functions. --- 5a4733df7ef255446a213ee84efa5713a9765688