From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 22 Sep 2014 14:54:10 +0000 (-0700)
Subject: staging: iio: fix up merge error
X-Git-Tag: v4.14-rc1~6739^2~303
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8deab4754c478149f8a139d6f54dc8b3ff665724;p=platform%2Fkernel%2Flinux-rpi.git

staging: iio: fix up merge error

Fix up a build merge error in drivers/iio/accel/bma180.c that I caused.

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

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index f081b00..1096da3 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -748,7 +748,7 @@ static int bma180_probe(struct i2c_client *client,
 		data->trig->dev.parent = &client->dev;
 		data->trig->ops = &bma180_trigger_ops;
 		iio_trigger_set_drvdata(data->trig, indio_dev);
-		indio_dev->trig = iio_trigger_get(trig);
+		indio_dev->trig = iio_trigger_get(data->trig);
 
 		ret = iio_trigger_register(data->trig);
 		if (ret)