Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2763f92f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "Two more bugfixes that came in during this week:

   - a defconfig change to enable a vital driver used on some Qualcomm
     based phones. This was already queued for 4.11, but the maintainer
     asked to have it in 4.10 after all.

   - a regression fix for the reset controller framework, this got
     broken by a typo in the 4.10 merge window"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: multi_v7_defconfig: enable Qualcomm RPMCC
  reset: fix shared reset triggered_count decrement on error
parents b92ce305 69e05170

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -824,6 +824,7 @@ CONFIG_QCOM_SMSM=y 
CONFIG_QCOM_WCNSS_CTRL=m

CONFIG_ROCKCHIP_PM_DOMAINS=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_QCOM_CLK_RPM=y

CONFIG_CHROME_PLATFORMS=y

CONFIG_STAGING_BOARD=y

CONFIG_CROS_EC_CHARDEV=m

drivers/reset/core.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ int reset_control_reset(struct reset_control *rstc) 
	}



	ret = rstc->rcdev->ops->reset(rstc->rcdev, rstc->id);

	if (rstc->shared && !ret)

	if (rstc->shared && ret)

		atomic_dec(&rstc->triggered_count);



	return ret;