Unverified Commit 1e16a402 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.14/gpt12-fix-signed' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents d0dc706a 06a089ef

drivers/bus/ti-sysc.c

+3 −1
Original line number Diff line number Diff line
@@ -3097,8 +3097,10 @@ static int sysc_probe(struct platform_device *pdev) 
		return error;



	error = sysc_check_active_timer(ddata);

	if (error == -EBUSY)

	if (error == -ENXIO)

		ddata->reserved = true;

	else if (error)

		return error;



	error = sysc_get_clocks(ddata);

	if (error)