Module Name: src
Committed By: nonaka
Date: Sat Feb 14 05:00:24 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwm.c
Log Message:
print error message when fail to load firmware.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_iwm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.5 src/sys/dev/pci/if_iwm.c:1.6
--- src/sys/dev/pci/if_iwm.c:1.5 Fri Feb 13 18:57:47 2015
+++ src/sys/dev/pci/if_iwm.c Sat Feb 14 05:00:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.5 2015/02/13 18:57:47 nonaka Exp $ */
+/* $NetBSD: if_iwm.c,v 1.6 2015/02/14 05:00:23 nonaka Exp $ */
/* OpenBSD: if_iwm.c,v 1.18 2015/02/11 01:12:42 brad Exp */
/*
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.5 2015/02/13 18:57:47 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.6 2015/02/14 05:00:23 nonaka Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -2840,7 +2840,12 @@ iwm_start_fw(struct iwm_softc *sc, enum
IWM_WRITE(sc, IWM_CSR_UCODE_DRV_GP1_CLR, IWM_CSR_UCODE_SW_BIT_RFKILL);
/* Load the given image to the HW */
- return iwm_load_firmware(sc, ucode_type);
+ error = iwm_load_firmware(sc, ucode_type);
+ if (error) {
+ aprint_error_dev(sc->sc_dev, "failed to load firmware: %d\n",
+ error);
+ }
+ return error;
}
static int