Merge 3.8-rc5 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / iio / adc / lp8788_adc.c

diff --git a/drivers/iio/adc/lp8788_adc.c b/drivers/iio/adc/lp8788_adc.c
index 72955e45e9e043bf96bd4d177abefe4d8b1e5e95..f8bcb1f5892df23e2c3c4e25289eaa1fc96752ba 100644 (file)
--- a/drivers/iio/adc/lp8788_adc.c
+++ b/drivers/iio/adc/lp8788_adc.c
@@ -179,7 +179,7 @@ static int lp8788_iio_map_register(struct iio_dev *indio_dev,
 
        ret = iio_map_array_register(indio_dev, map);
        if (ret) {
-               dev_err(adc->lp->dev, "iio map err: %d\n", ret);
+               dev_err(&indio_dev->dev, "iio map err: %d\n", ret);
                return ret;
        }
 
@@ -214,7 +214,7 @@ static int lp8788_adc_probe(struct platform_device *pdev)
 
        mutex_init(&adc->lock);
 
-       indio_dev->dev.parent = lp->dev;
+       indio_dev->dev.parent = &pdev->dev;
        indio_dev->name = pdev->name;
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &lp8788_adc_info;
@@ -223,7 +223,7 @@ static int lp8788_adc_probe(struct platform_device *pdev)
 
        ret = iio_device_register(indio_dev);
        if (ret) {
-               dev_err(lp->dev, "iio dev register err: %d\n", ret);
+               dev_err(&pdev->dev, "iio dev register err: %d\n", ret);
                goto err_iio_device;
        }