diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-25 08:59:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-25 08:59:04 -0700 |
| commit | e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b (patch) | |
| tree | 389fbdf161a3c28c9b2f98fdc1ccd89d474ef884 /drivers/iio/accel | |
| parent | 3ffdea3feca9e2c95c2e93e217d77c9c368f747a (diff) | |
| parent | 4a10c2ac2f368583138b774ca41fac4207911983 (diff) | |
Merge 3.12-rc2 into staging-next.
This resolves the merge problem with two iio drivers that Stephen
Rothwell pointed out.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/accel')
| -rw-r--r-- | drivers/iio/accel/bma180.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c index bda7a8343ddd..28b39283bccf 100644 --- a/drivers/iio/accel/bma180.c +++ b/drivers/iio/accel/bma180.c @@ -617,7 +617,7 @@ static int bma180_remove(struct i2c_client *client) #ifdef CONFIG_PM_SLEEP static int bma180_suspend(struct device *dev) { - struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); struct bma180_data *data = iio_priv(indio_dev); int ret; @@ -630,7 +630,7 @@ static int bma180_suspend(struct device *dev) static int bma180_resume(struct device *dev) { - struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); struct bma180_data *data = iio_priv(indio_dev); int ret; |