Commit 8deab475 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: iio: fix up merge error

Fix up a build merge error in drivers/iio/accel/bma180.c that I caused.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d84a2b0d
...@@ -748,7 +748,7 @@ static int bma180_probe(struct i2c_client *client, ...@@ -748,7 +748,7 @@ static int bma180_probe(struct i2c_client *client,
data->trig->dev.parent = &client->dev; data->trig->dev.parent = &client->dev;
data->trig->ops = &bma180_trigger_ops; data->trig->ops = &bma180_trigger_ops;
iio_trigger_set_drvdata(data->trig, indio_dev); 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); ret = iio_trigger_register(data->trig);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment