Merge 3.15-rc6 into staging-next.

This resolves the conflicts in the files:
	drivers/iio/adc/Kconfig
	drivers/staging/rtl8723au/os_dep/usb_ops_linux.c

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

3 files changed, 10 insertions, 7 deletions

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 6cbf34a90c04..90f596db940d 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -117,7 +117,7 @@ config AT91_ADC
           Say yes here to build support for Atmel AT91 ADC.
 
 config EXYNOS_ADC
-        bool "Exynos ADC driver support"
+        tristate "Exynos ADC driver support"
         depends on ARCH_EXYNOS || (OF && COMPILE_TEST)
         help
           Core support for the ADC block found in the Samsung EXYNOS series
@@ -125,7 +125,7 @@ config EXYNOS_ADC
           this resource.
 
 config LP8788_ADC
-        bool "LP8788 ADC driver"
+        tristate "LP8788 ADC driver"
         depends on MFD_LP8788
         help
           Say yes here to build support for TI LP8788 ADC.
diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index d325aeafe5cb..010578f1d762 100644
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -351,7 +351,7 @@ static int exynos_adc_probe(struct platform_device *pdev)
 
         exynos_adc_hw_init(info);
 
-        ret = of_platform_populate(np, exynos_adc_match, NULL, &pdev->dev);
+        ret = of_platform_populate(np, exynos_adc_match, NULL, &indio_dev->dev);
         if (ret < 0) {
                 dev_err(&pdev->dev, "failed adding child nodes\n");
                 goto err_of_populate;
@@ -360,7 +360,7 @@ static int exynos_adc_probe(struct platform_device *pdev)
         return 0;
 
 err_of_populate:
-        device_for_each_child(&pdev->dev, NULL,
+        device_for_each_child(&indio_dev->dev, NULL,
                                 exynos_adc_remove_devices);
         iio_device_unregister(indio_dev);
 err_irq:
@@ -378,7 +378,7 @@ static int exynos_adc_remove(struct platform_device *pdev)
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
         struct exynos_adc *info = iio_priv(indio_dev);
 
-        device_for_each_child(&pdev->dev, NULL,
+        device_for_each_child(&indio_dev->dev, NULL,
                                 exynos_adc_remove_devices);
         iio_device_unregister(indio_dev);
         free_irq(info->irq, info);
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index af287bf71915..0c6517c94a9d 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -660,6 +660,7 @@ static int inv_mpu_probe(struct i2c_client *client,
 {
         struct inv_mpu6050_state *st;
         struct iio_dev *indio_dev;
+        struct inv_mpu6050_platform_data *pdata;
         int result;
 
         if (!i2c_check_functionality(client->adapter,
@@ -672,8 +673,10 @@ static int inv_mpu_probe(struct i2c_client *client,
 
         st = iio_priv(indio_dev);
         st->client = client;
-        st->plat_data = *(struct inv_mpu6050_platform_data
-                                *)dev_get_platdata(&client->dev);
+        pdata = (struct inv_mpu6050_platform_data
+                        *)dev_get_platdata(&client->dev);
+        if (pdata)
+                st->plat_data = *pdata;
         /* power is turned on inside check chip type*/
         result = inv_check_and_setup_chip(st, id);
         if (result)