summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorPreetham Chandru <pchandru@nvidia.com>2012-03-07 18:43:52 +0530
committerVarun Colbert <vcolbert@nvidia.com>2012-03-09 21:30:57 -0800
commitc6d3a94af5e5b481155026643e06ee6b5c030f4b (patch)
tree8d1fd35d542ff98532a6f15cd7f64c7c2813db02 /drivers/staging
parent7988d9109fb6c274faf9e14dd9e8366c68214640 (diff)
staging: iio: magnetometer: ak8975: Retrieve the correct i2c client data
i2c_get_clientdata() returns an object of type struct indio_dev and not of type struct ak8975_data. Bug 946328 Signed-off-by: Preetham Chandru R <pchandru@nvidia.com> Change-Id: I5803306d6a7829cdf822d22f51fdcdb769fbea1d Reviewed-on: http://git-master/r/88329 Reviewed-by: Mursalin Akon <makon@nvidia.com> Reviewed-by: Shashank Sharma <shashanks@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/iio/magnetometer/ak8975.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c
index c56577540b87..ba923fc46656 100644
--- a/drivers/staging/iio/magnetometer/ak8975.c
+++ b/drivers/staging/iio/magnetometer/ak8975.c
@@ -109,8 +109,8 @@ static int ak8975_write_data(struct i2c_client *client,
struct i2c_msg msg;
u8 w_data[2];
int ret = 0;
-
- struct ak8975_data *data = i2c_get_clientdata(client);
+ struct iio_dev *indio_dev = i2c_get_clientdata(client);
+ struct ak8975_data *data = iio_priv(indio_dev);
regval = data->reg_cache[reg];
regval &= ~mask;
@@ -171,7 +171,8 @@ static int ak8975_read_data(struct i2c_client *client,
*/
static int ak8975_setup(struct i2c_client *client)
{
- struct ak8975_data *data = i2c_get_clientdata(client);
+ struct iio_dev *indio_dev = i2c_get_clientdata(client);
+ struct ak8975_data *data = iio_priv(indio_dev);
u8 device_id;
int ret;