Commit 68aeeaaa authored Dec 02, 2013 by Takashi Iwai Committed by Greg Kroah-Hartman Dec 08, 2013

firmware: Suppress fallback warnings when CONFIG_FW_LOADER_USER_HELPER=n



The commit [3e358ac2: firmware: Be a bit more verbose about direct
firmware loading failure] introduced a new warning message about
falling back to user helper, but this isn't true when
CONFIG_FW_LOADER_USER_HELPER isn't set.

In this patch, clear the FW_OPT_FALLBACK flag in the case without
userhelper, so that the corresponding code will be disabled.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 14c4bae7

drivers/base/firmware_class.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -99,7 +99,11 @@ static inline long firmware_loading_timeout(void)
		/* firmware behavior options */
		#define FW_OPT_UEVENT (1U << 0)
		#define FW_OPT_NOWAIT (1U << 1)
		#ifdef CONFIG_FW_LOADER_USER_HELPER
		#define FW_OPT_FALLBACK (1U << 2)
		#else
		#define FW_OPT_FALLBACK 0
		#endif

		struct firmware_cache {
		/* firmware_buf instance will be added into the below list */