From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 19 Aug 2021 15:22:46 +0000 (+0200)
Subject: Merge tag 'omap-for-v5.14/gpt12-fix-signed' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v5.14-rc7~19^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1e16a40211208d2d6e217e5013607219f4272dff;p=users%2Fdwmw2%2Flinux.git

Merge tag 'omap-for-v5.14/gpt12-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes

Fix for omap gpt12 timer error handling

Two of the recent fixes for ti-sysc driver had bad interaction for a
function return value that caused one of the fixes to not work so we
need to change the return value handling. Otherwise early beagleboard
variants still have a boot issue.

* tag 'omap-for-v5.14/gpt12-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  bus: ti-sysc: Fix error handling for sysc_check_active_timer()

Link: https://lore.kernel.org/r/pull-1629354796-830948@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

1e16a40211208d2d6e217e5013607219f4272dff