Jelajahi Sumber

[POWERPC] QE: Make qe_get_firmware_info reentrant

The function was returning NULL the second time it was
called if the firmware was uploaded from the boot loader
or the first time it was called if the firmware was
uploaded from the kernel.

Signed-off-by: Ionut Nicu <ionut.nicu@freescale.com>
Acked-By: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Ionut Nicu 18 tahun lalu
induk
melakukan
86f4e5d433
1 mengubah file dengan 4 tambahan dan 1 penghapusan
  1. 4 1
      arch/powerpc/sysdev/qe_lib/qe.c

+ 4 - 1
arch/powerpc/sysdev/qe_lib/qe.c

@@ -609,7 +609,10 @@ struct qe_firmware_info *qe_get_firmware_info(void)
 	 * If we haven't checked yet, and a driver hasn't uploaded a firmware
 	 * If we haven't checked yet, and a driver hasn't uploaded a firmware
 	 * yet, then check the device tree for information.
 	 * yet, then check the device tree for information.
 	 */
 	 */
-	if (initialized || qe_firmware_uploaded)
+	if (qe_firmware_uploaded)
+		return &qe_firmware_info;
+
+	if (initialized)
 		return NULL;
 		return NULL;
 
 
 	initialized = 1;
 	initialized = 1;