From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 8 Feb 2016 01:34:04 +0000 (-0800)
Subject: Merge 4.5-rc3 into staging-next
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flinux.git;a=commitdiff_plain;h=5ba907a949562cd4839b0170a13dda6841055e70

Merge 4.5-rc3 into staging-next

We want the upstream staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

5ba907a949562cd4839b0170a13dda6841055e70
diff --cc drivers/iio/dac/mcp4725.c
index fb4b3364d8e0,b4dde8315210..cca935c06f2b
--- a/drivers/iio/dac/mcp4725.c
+++ b/drivers/iio/dac/mcp4725.c
@@@ -346,8 -300,9 +346,9 @@@ static int mcp4725_probe(struct i2c_cli
  	data->client = client;
  
  	indio_dev->dev.parent = &client->dev;
+ 	indio_dev->name = id->name;
  	indio_dev->info = &mcp4725_info;
 -	indio_dev->channels = &mcp4725_channel;
 +	indio_dev->channels = &mcp472x_channel[id->driver_data];
  	indio_dev->num_channels = 1;
  	indio_dev->modes = INDIO_DIRECT_MODE;
  
diff --cc drivers/iio/humidity/dht11.c
index 96185f8fad88,cfc5a051ab9f..20b500da94db
--- a/drivers/iio/humidity/dht11.c
+++ b/drivers/iio/humidity/dht11.c
@@@ -177,12 -161,12 +177,12 @@@ static int dht11_read_raw(struct iio_de
  			int *val, int *val2, long m)
  {
  	struct dht11 *dht11 = iio_priv(iio_dev);
 -	int ret, timeres;
 +	int ret, timeres, offset;
  
  	mutex_lock(&dht11->lock);
- 	if (dht11->timestamp + DHT11_DATA_VALID_TIME < ktime_get_real_ns()) {
+ 	if (dht11->timestamp + DHT11_DATA_VALID_TIME < ktime_get_boot_ns()) {
  		timeres = ktime_get_resolution_ns();
 -		if (DHT11_DATA_BIT_HIGH < 2 * timeres) {
 +		if (timeres > DHT11_MIN_TIMERES) {
  			dev_err(dht11->dev, "timeresolution %dns too low\n",
  				timeres);
  			/* In theory a better clock could become available