Browse Source

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>
Greg Kroah-Hartman 11 years ago
parent
commit
8deab4754c
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/iio/accel/bma180.c

+ 1 - 1
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)