From 90016af3fa73f5dfdf478c8dbcb2993e1fdf71b1 Mon Sep 17 00:00:00 2001
From: Patrik Rak <patrik@raxoft.cz>
Date: Fri, 4 Oct 2019 14:03:37 +0200
Subject: [PATCH] Fix dspInit() error handling in ndspInit().

The early return after dspInit() failure obviously keeps the refcount increased and the component loaded. This change properly unwinds all state changes.
---
 libctru/source/ndsp/ndsp.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libctru/source/ndsp/ndsp.c b/libctru/source/ndsp/ndsp.c
index 00b3cdc..ab6199e 100644
--- a/libctru/source/ndsp/ndsp.c
+++ b/libctru/source/ndsp/ndsp.c
@@ -479,23 +479,24 @@ Result ndspInit(void)
 	}
 
 	rc = dspInit();
-	if (R_FAILED(rc)) return rc;
+	if (R_FAILED(rc)) goto _fail1;
 
 	rc = ndspInitialize(false);
-	if (R_FAILED(rc)) goto _fail1;
+	if (R_FAILED(rc)) goto _fail2;
 
 	LightEvent_Init(&sleepEvent, RESET_ONESHOT);
 
 	ndspThread = threadCreate(ndspThreadMain, 0x0, NDSP_THREAD_STACK_SIZE, 0x18, -2, true);
-	if (!ndspThread) goto _fail2;
+	if (!ndspThread) goto _fail3;
 
 	aptHook(&aptCookie, ndspAptHook, NULL);
 	return 0;
 
-_fail2:
+_fail3:
 	ndspFinalize(false);
-_fail1:
+_fail2:
 	dspExit();
+_fail1:
 	if (componentFree)
 	{
 		free((void*)componentBin);