From: Mark Brown <broonie@kernel.org>
Date: Thu, 4 Jul 2019 16:34:32 +0000 (+0100)
Subject: Merge branch 'regulator-5.3' into regulator-next
X-Git-Tag: v5.3-rc1~174^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65244e5b1f4fade54b490b47b871cefe1d7d07f0;p=thirdparty%2Flinux.git

Merge branch 'regulator-5.3' into regulator-next
---

65244e5b1f4fade54b490b47b871cefe1d7d07f0
diff --cc drivers/regulator/s2mps11.c
index 5b7ba7c6c4f6f,e5a74ae406870..054baaadfdfdd
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@@ -828,10 -843,11 +850,12 @@@ static void s2mps14_pmic_dt_parse_ext_c
  				0,
  				GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE,
  				"s2mps11-regulator");
- 		if (IS_ERR(gpio[reg])) {
+ 		if (PTR_ERR(gpio[reg]) == -ENOENT)
+ 			gpio[reg] = NULL;
+ 		else if (IS_ERR(gpio[reg])) {
  			dev_err(&pdev->dev, "Failed to get control GPIO for %d/%s\n",
  				reg, rdata[reg].name);
 +			gpio[reg] = NULL;
  			continue;
  		}
  		if (gpio[reg])