Fix logical bug in request_firmware() function.

Issue: #151

Signed-off-by: Hans Petter Selasky <hps@selasky.org>

Author: hselasky

sys/compat/linuxkpi/gplv2/src/linux_firmware.c

@@ -10,7 +10,7 @@
 #include <linux/dmi.h>
 #undef firmware
 
-MALLOC_DEFINE(M_LKPI_FW, "lkpifw", "linux kpi firmware");
+MALLOC_DEFINE(M_LKPI_FW, "lkpifw", "LinuxKPI firmware");
 
 int
 request_firmware(const struct linux_firmware **lkfwp, const char *name,
@@ -24,8 +24,7 @@ request_firmware(const struct linux_firmware **lkfwp, const char *name,
 
 	*lkfwp = NULL;
 	mapped_name = NULL;
-	if ((lkfw = malloc(sizeof(*lkfw), M_LKPI_FW, M_NOWAIT)) == NULL)
-		return (-ENOMEM);
+	lkfw = malloc(sizeof(*lkfw), M_LKPI_FW, M_WAITOK);
 
 	retries = 0;
 	fw = firmware_get(name);
@@ -52,9 +51,11 @@ request_firmware(const struct linux_firmware **lkfwp, const char *name,
 		pause("fwwait", hz/4);
 		fw = firmware_get(name);
 		if (fw == NULL) {
-			firmware_get(mapped_name);
-			if (retries++ < 10)
-				goto retry;
+			fw = firmware_get(mapped_name);
+			if (fw == NULL) {
+				if (retries++ < 10)
+					goto retry;
+			}
 		}
 
 #ifdef __notyet__