Merge tag 'reset-for-4.10-fixes' of https://git.pengutronix.de/git/pza/linux into...
authorArnd Bergmann <arnd@arndb.de>
Fri, 17 Feb 2017 16:25:15 +0000 (17:25 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 17 Feb 2017 16:25:15 +0000 (17:25 +0100)
commit6fe1bfc46cad54a4ef337f9935f764a90865236b
tree262ed4eb9a46e931869c7df52bfefe5cb16d6b29
parent7089db84e356562f8ba737c29e472cc42d530dbc
parente5a1dadec3648019a838b85357b67f241fbb02e8
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