From fc959bd23f1071457a47854124126c84a6b17f3e Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Wed, 27 Jul 2016 13:59:38 +0200 Subject: [PATCH] kernel-module-qualcomm: do not log any error if dtb regdomain is not set Do not add a log error if there is not defined a device tree entry for the regulatory domain. Signed-off-by: Isaac Hermida --- .../kernel-module-qualcomm/qualcomm-pre-up | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up index 922b0ce17..60364501f 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up @@ -58,11 +58,13 @@ JP_CODE="0x2" # Check if the DTB_REGION_CODE is in the list of valid codes, # if not use the OTP programmed value. case "${DTB_REGION_CODE}" in - ${US_CODE}|${WW_CODE}|${JP_CODE}) - REGULATORY_DOMAIN=${DTB_REGION_CODE};; - *) - logger -t qca6564 "[ERROR] Invalid region code in device tree, using OTP value" - REGULATORY_DOMAIN=${OTP_REGION_CODE};; + ${US_CODE}|${WW_CODE}|${JP_CODE}) + REGULATORY_DOMAIN=${DTB_REGION_CODE};; + *) + if [ -n "${DTB_REGION_CODE}" ]; then + logger -t qca6564 "[ERROR] Invalid region code in device tree, using OTP value" + fi + REGULATORY_DOMAIN=${OTP_REGION_CODE};; esac BDATA_LINK="${FIRMWARE_DIR}/bdwlan30.bin"