AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

regulator: Fixes for v4.16

Browse Source 
A couple of fixes here:
 
  - Another half of the supend to idle fix from Geert that went in
    earlier, both he and I are confused as to why he didn't notice that
    this was missing when his earlier fix was merged.
  - A simple fix for a test done the wrong way round in the stm32-vrefbuf
    driver.
 -----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlqf/AYTHGJyb29uaWVA
 a2VybmVsLm9yZwAKCRAk1otyXVSH0PLYB/9H+ZNwr1xaV6qGl739IzJ/jkvSKVwz
 q9Yunm5EG2a8IYlRYVQCsrnTjzbljgOwPRwtPQX+Gozwquv4eY9VuM33H7yw7SBC
 pOAS0wLCdpRTtqYS699wwmmNoVulU9fVHosnXObP+t+JeiHovDDNQs7nwj1+DTqk
 vioNsP7Vz1rQSd2mhN1yfCTefkf/ATJAE59ZQNLsxC8VzWlU+Olq4s+3Si7CCClN
 DqZV19dZoQka67ZYDIzBpz2UPL5xMpqovTT4U5MN/5NXNAouP7jv/xC9LbpubdV/
 s/4HtKRbApD8TK/0UMK48jViztDu1XKbvnh7HoAg4n2RMyYpSbQVYuD6
 =mlao
 -----END PGP SIGNATURE-----

Merge tag 'regulator-fix-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A couple of fixes here:

   - another half of the supend to idle fix from Geert that went in
     earlier, both he and I are confused as to why he didn't notice that
     this was missing when his earlier fix was merged.

   - a simple fix for a test done the wrong way round in the
     stm32-vrefbuf driver"

* tag 'regulator-fix-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Fix resume from suspend to idle
  regulator: stm32-vrefbuf: fix check on ready flag
This commit is contained in:
Linus Torvalds 2018-03-07 10:54:11 -08:00
commit b910a91836
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/core.c
View File

@ -4310,7 +4310,7 @@ static int _regulator_resume_early(struct device *dev, void *data)
rstate = regulator_get_suspend_state(rdev, *state);
if (rstate == NULL)
return -EINVAL;
return 0;
mutex_lock(&rdev->mutex);

2
drivers/regulator/stm32-vrefbuf.c
View File

@ -51,7 +51,7 @@ static int stm32_vrefbuf_enable(struct regulator_dev *rdev)
* arbitrary timeout.
*/
ret = readl_poll_timeout(priv->base + STM32_VREFBUF_CSR, val,
!(val & STM32_VRR), 650, 10000);
val & STM32_VRR, 650, 10000);
if (ret) {
dev_err(&rdev->dev, "stm32 vrefbuf timed out!\n");
val = readl_relaxed(priv->base + STM32_VREFBUF_CSR);