From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 20 Jul 2020 07:37:31 +0000 (+0200)
Subject: Merge 5.8-rc6 into staging-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=263771dbc85bc6573b344c193351980c27fd2faa;p=linux.git

Merge 5.8-rc6 into staging-next

We need the staging fixes in here, and it resolves a merge issue with an
iio driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

263771dbc85bc6573b344c193351980c27fd2faa
diff --cc drivers/iio/magnetometer/ak8974.c
index c2260c84f7f1f,91c39352fba26..cece77d67386b
--- a/drivers/iio/magnetometer/ak8974.c
+++ b/drivers/iio/magnetometer/ak8974.c
@@@ -884,14 -890,10 +890,9 @@@ static int ak8974_probe(struct i2c_clie
  	ret = ak8974_reset(ak8974);
  	if (ret) {
  		dev_err(&i2c->dev, "AK8974 reset failed\n");
- 		goto power_off;
+ 		goto disable_pm;
  	}
  
- 	pm_runtime_set_autosuspend_delay(&i2c->dev,
- 					 AK8974_AUTOSUSPEND_DELAY);
- 	pm_runtime_use_autosuspend(&i2c->dev);
- 	pm_runtime_put(&i2c->dev);
- 
 -	indio_dev->dev.parent = &i2c->dev;
  	switch (ak8974->variant) {
  	case AK8974_WHOAMI_VALUE_AMI306:
  	case AK8974_WHOAMI_VALUE_AMI305: