diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-12-02 15:38:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-09 03:22:33 +0100 |
| commit | 68aeeaaaf86b61c78dca09879ce262778a9080e4 (patch) | |
| tree | cdd99f95c8c79095b11e72d06a7375fd59abe5b0 /drivers/base/firmware_class.c | |
| parent | firmware: Use bit flags instead of boolean combos (diff) | |
| download | linux-68aeeaaaf86b61c78dca09879ce262778a9080e4.tar.xz linux-68aeeaaaf86b61c78dca09879ce262778a9080e4.zip | |
firmware: Suppress fallback warnings when CONFIG_FW_LOADER_USER_HELPER=n
The commit [3e358ac2bb5b: 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>
Diffstat (limited to 'drivers/base/firmware_class.c')
| -rw-r--r-- | drivers/base/firmware_class.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 65797742c6b6..33b87bf664ab 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -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 */ |