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>

2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index 07adb1070fc2..e10dca3ed74b 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -497,6 +497,8 @@ static int at91_adc_probe(struct platform_device *pdev)
         if (ret)
                 goto vref_disable;
 
+        platform_set_drvdata(pdev, indio_dev);
+
         ret = iio_device_register(indio_dev);
         if (ret < 0)
                 goto per_clk_disable_unprepare;
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index dbf066129a04..609a2c401b5d 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -502,6 +502,8 @@ static int ak8975_setup_irq(struct ak8975_data *data)
         int rc;
         int irq;
 
+        init_waitqueue_head(&data->data_ready_queue);
+        clear_bit(0, &data->flags);
         if (client->irq)
                 irq = client->irq;
         else
@@ -517,8 +519,6 @@ static int ak8975_setup_irq(struct ak8975_data *data)
                 return rc;
         }
 
-        init_waitqueue_head(&data->data_ready_queue);
-        clear_bit(0, &data->flags);
         data->eoc_irq = irq;
 
         return rc;
@@ -851,7 +851,7 @@ static int ak8975_probe(struct i2c_client *client,
         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);