summaryrefslogtreecommitdiff
path: root/drivers/iio/accel
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-22 07:30:03 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-22 07:30:03 -0700
commitd84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a (patch)
treeea756d49395ac4a08d6cdff98d74e60384a322a6 /drivers/iio/accel
parent3f76a4ea5383ba2f9e76f9625f77ff246907a134 (diff)
parent0f33be009b89d2268e94194dc4fd01a7851b6d51 (diff)
Merge 3.17-rc6 into staging-next.
We want the fixes in there, and it resolves a merge issue with drivers/iio/accel/bma180.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/accel')
-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 6ef19641457c..f081b007f7d2 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 = data->trig;
+ indio_dev->trig = iio_trigger_get(trig);
ret = iio_trigger_register(data->trig);
if (ret)