From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 9 May 2016 11:20:04 +0000 (+0200)
Subject: Merge 4.6-rc7 into staging-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4096e645d85d575e7b6e699f470f5519c34fda5d;p=linux.git

Merge 4.6-rc7 into staging-next

This fixes some merge issues with some iio drivers that were found in
linux-next.

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

4096e645d85d575e7b6e699f470f5519c34fda5d
diff --cc drivers/iio/magnetometer/ak8975.c
index dbf066129a040,0e931a9a16694..609a2c401b5dc
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@@ -851,13 -732,11 +851,13 @@@ static int ak8975_probe(struct i2c_clie
  	int eoc_gpio;
  	int err;
  	const char *name = NULL;
- 	enum asahi_compass_chipset chipset;
+ 	enum asahi_compass_chipset chipset = AK_MAX_TYPE;
 +	const struct ak8975_platform_data *pdata =
 +		dev_get_platdata(&client->dev);
  
  	/* Grab and set up the supplied GPIO. */
 -	if (client->dev.platform_data)
 -		eoc_gpio = *(int *)(client->dev.platform_data);
 +	if (pdata)
 +		eoc_gpio = pdata->eoc_gpio;
  	else if (client->dev.of_node)
  		eoc_gpio = of_get_gpio(client->dev.of_node, 0);
  	else