diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-25 17:59:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-25 17:59:04 +0200 |
| commit | e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b (patch) | |
| tree | 389fbdf161a3c28c9b2f98fdc1ccd89d474ef884 /drivers/iio/temperature | |
| parent | Merge tag 'iio-for-3.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/ji... (diff) | |
| parent | Linux 3.12-rc2 (diff) | |
| download | linux-e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b.tar.xz linux-e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b.zip | |
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/temperature')
| -rw-r--r-- | drivers/iio/temperature/tmp006.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iio/temperature/tmp006.c b/drivers/iio/temperature/tmp006.c index 4e950979f43e..84a0789c3d96 100644 --- a/drivers/iio/temperature/tmp006.c +++ b/drivers/iio/temperature/tmp006.c @@ -252,12 +252,14 @@ static int tmp006_remove(struct i2c_client *client) #ifdef CONFIG_PM_SLEEP static int tmp006_suspend(struct device *dev) { - return tmp006_powerdown(iio_priv(dev_to_iio_dev(dev))); + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); + return tmp006_powerdown(iio_priv(indio_dev)); } static int tmp006_resume(struct device *dev) { - struct tmp006_data *data = iio_priv(dev_to_iio_dev(dev)); + struct tmp006_data *data = iio_priv(i2c_get_clientdata( + to_i2c_client(dev))); return i2c_smbus_write_word_swapped(data->client, TMP006_CONFIG, data->config | TMP006_CONFIG_MOD_MASK); } |