From: Greg Kroah-Hartman Date: Sun, 29 Jun 2014 16:43:23 +0000 (-0700) Subject: Merge tag 'iio-fixes-for-3.16b' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: firefly_0821_release~176^2~3666^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6b64168de843b16e96a22f9e98c6afc92ee1da71;p=firefly-linux-kernel-4.4.55.git Merge tag 'iio-fixes-for-3.16b' of git://git./linux/kernel/git/jic23/iio into staging-linus Jonathan writes: Second set of IIO fixes for the 3.16 cycle. * A fix for a bug in setting threshold levels within the ad799x driver which prevents correct setting of the thresholds. * In ad7291 fix an case where a ERR_PTR value was returned directly instead of having PTR_ERR applied. Hence it would report success instead of failure. * of_iio_channel_get_by_name returned a non null pointer if it fails and the callee was expecting NULL to indicate failure. Fixed by returning NULL in the error cases. --- 6b64168de843b16e96a22f9e98c6afc92ee1da71