diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 07:54:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 07:54:10 -0700 |
| commit | 8deab4754c478149f8a139d6f54dc8b3ff665724 (patch) | |
| tree | 85e3c6907fce6a83440cce2f7b5e759051966138 /drivers/iio/accel | |
| parent | Merge 3.17-rc6 into staging-next. (diff) | |
| download | linux-dev-8deab4754c478149f8a139d6f54dc8b3ff665724.tar.xz linux-dev-8deab4754c478149f8a139d6f54dc8b3ff665724.zip | |
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')
| -rw-r--r-- | drivers/iio/accel/bma180.c | 2 |
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, 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) |