From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 17 Feb 2017 16:25:15 +0000 (+0100)
Subject: Merge tag 'reset-for-4.10-fixes' of https://git.pengutronix.de/git/pza/linux into... 
X-Git-Tag: v4.10~4^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6fe1bfc46cad54a4ef337f9935f764a90865236b;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'reset-for-4.10-fixes' of https://git.pengutronix.de/git/pza/linux into fixes

Pull "Reset controller fixes for v4.10" from Philipp Zabel:

- Remove erroneous negation of the error check of the reset function
  to decrement trigger_count in the error case, not on success. This
  fixes shared resets to actually only trigger once, as intended.

* tag 'reset-for-4.10-fixes' of https://git.pengutronix.de/git/pza/linux:
  reset: fix shared reset triggered_count decrement on error
---

6fe1bfc46cad54a4ef337f9935f764a90865236b