aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/accel/bma180.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-22 10:54:10 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-22 10:54:10 -0400
commit8deab4754c478149f8a139d6f54dc8b3ff665724 (patch)
tree85e3c6907fce6a83440cce2f7b5e759051966138 /drivers/iio/accel/bma180.c
parentd84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a (diff)
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>
Diffstat (limited to 'drivers/iio/accel/bma180.c')
-rw-r--r--drivers/iio/accel/bma180.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index f081b007f7d2..1096da327130 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,
748 data->trig->dev.parent = &client->dev; 748 data->trig->dev.parent = &client->dev;
749 data->trig->ops = &bma180_trigger_ops; 749 data->trig->ops = &bma180_trigger_ops;
750 iio_trigger_set_drvdata(data->trig, indio_dev); 750 iio_trigger_set_drvdata(data->trig, indio_dev);
751 indio_dev->trig = iio_trigger_get(trig); 751 indio_dev->trig = iio_trigger_get(data->trig);
752 752
753 ret = iio_trigger_register(data->trig); 753 ret = iio_trigger_register(data->trig);
754 if (ret) 754 if (ret)