diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2012-09-07 23:07:53 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:09:20 -0700 |
| commit | 9f1ab7af88fe9858c3c90eef44b0cc62b98c264e (patch) | |
| tree | bfd65d9b25ef6054d37d073bc9f545bdda17ab79 /drivers/iio | |
| parent | 794fa47369dbc7670cef5dc6c3d9057ccc0797a6 (diff) | |
unknown changes from android-tegra-nv-3.4
Rebase-Id: R940fad74c7e91ef3d1d3d589a48064ccb7335541
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/magnetometer/ak8975.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c index af6c320a534e..21c8f48341d3 100644 --- a/drivers/iio/magnetometer/ak8975.c +++ b/drivers/iio/magnetometer/ak8975.c @@ -409,12 +409,6 @@ static int ak8975_probe(struct i2c_client *client, } data = iio_priv(indio_dev); i2c_set_clientdata(client, indio_dev); - /* Perform some basic start-of-day setup of the device. */ - err = ak8975_setup(client); - if (err < 0) { - dev_err(&client->dev, "AK8975 initialization fails\n"); - goto exit_free_iio; - } data->client = client; mutex_init(&data->lock); @@ -425,6 +419,13 @@ static int ak8975_probe(struct i2c_client *client, indio_dev->info = &ak8975_info; indio_dev->modes = INDIO_DIRECT_MODE; + /* Perform some basic start-of-day setup of the device. */ + err = ak8975_setup(client); + if (err < 0) { + dev_err(&client->dev, "AK8975 initialization fails\n"); + goto exit_free_iio; + } + err = iio_device_register(indio_dev); if (err < 0) goto exit_free_iio; |