diff options
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/colibri-imx6ull_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/colibri_imx6_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/colibri_imx7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/cfg80211.c | 5 |
6 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index c620ccceb955..268f9b9b00dd 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -515,7 +515,6 @@ CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_PRINTK_TIME=y -CONFIG_CONSOLE_LOGLEVEL_DEFAULT=4 CONFIG_DEBUG_FS=y # CONFIG_DEBUG_MISC is not set # CONFIG_SCHED_DEBUG is not set diff --git a/arch/arm/configs/colibri-imx6ull_defconfig b/arch/arm/configs/colibri-imx6ull_defconfig index 42a81bf3ee71..15b84356953e 100644 --- a/arch/arm/configs/colibri-imx6ull_defconfig +++ b/arch/arm/configs/colibri-imx6ull_defconfig @@ -484,7 +484,6 @@ CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_PRINTK_TIME=y -CONFIG_CONSOLE_LOGLEVEL_DEFAULT=4 CONFIG_DEBUG_FS=y # CONFIG_DEBUG_MISC is not set # CONFIG_SCHED_DEBUG is not set diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig index 1ec3d1573431..ad273b2a077f 100644 --- a/arch/arm/configs/colibri_imx6_defconfig +++ b/arch/arm/configs/colibri_imx6_defconfig @@ -513,7 +513,6 @@ CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_PRINTK_TIME=y -CONFIG_CONSOLE_LOGLEVEL_DEFAULT=4 CONFIG_DEBUG_FS=y # CONFIG_DEBUG_MISC is not set # CONFIG_SCHED_DEBUG is not set diff --git a/arch/arm/configs/colibri_imx7_defconfig b/arch/arm/configs/colibri_imx7_defconfig index 8f6468bb5cad..4f2b5ebb4c72 100644 --- a/arch/arm/configs/colibri_imx7_defconfig +++ b/arch/arm/configs/colibri_imx7_defconfig @@ -493,7 +493,6 @@ CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_PRINTK_TIME=y -CONFIG_CONSOLE_LOGLEVEL_DEFAULT=4 CONFIG_DEBUG_FS=y # CONFIG_DEBUG_MISC is not set # CONFIG_SCHED_DEBUG is not set diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index aa1e6aeef54e..882429442ae0 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -856,7 +856,6 @@ CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_PRINTK_TIME=y -CONFIG_CONSOLE_LOGLEVEL_DEFAULT=4 CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index bef8e24a727e..4d9ac4ae29b1 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -2674,11 +2674,8 @@ mwifiex_cfg80211_sched_scan_start(struct wiphy *wiphy, struct mwifiex_bg_scan_cfg *bgscan_cfg; struct ieee_types_header *ie; - if (!request || (!request->n_ssids && !request->n_match_sets)) { - wiphy_notice(wiphy, "%s : Invalid Sched_scan parameters", - __func__); + if (!request || (!request->n_ssids && !request->n_match_sets)) return -EINVAL; - } wiphy_info(wiphy, "sched_scan start : n_ssids=%d n_match_sets=%d ", request->n_ssids, request->n_match_sets); |