[WORKAROUND] wlan: prevent country code change

Prevent any country code change, so it will keep the
default one which is US.
Returning an error will inform the upper layer that country
code is not applied and so prevent any incoherency risk.

Change-Id: I50df1dab4a73e2a5ecfac6a4be7af6a4515229b9
Tracked-On: https://jira.ndg.intel.com/browse/MARVIN-944
Signed-off-by: Honore Tricot <honorex.tricot@intel.com>
Reviewed-on: https://android.intel.com/425635
Reviewed-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com>
Tested-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com>
diff --git a/drivers/net/wireless/bcmdhd/wl_android.c b/drivers/net/wireless/bcmdhd/wl_android.c
index c9b31eb..cbb1dff 100644
--- a/drivers/net/wireless/bcmdhd/wl_android.c
+++ b/drivers/net/wireless/bcmdhd/wl_android.c
@@ -2262,6 +2262,10 @@
 	/* CUSTOMER_SET_COUNTRY feature is define for only GGSM model */
 	else if (strnicmp(command, CMD_COUNTRY, strlen(CMD_COUNTRY)) == 0) {
 		char *country_code = command + strlen(CMD_COUNTRY) + 1;
+		ret = -EINVAL;
+		goto exit;
 #ifdef CUSTOMER_HW5
 		/* Customer_hw5 want to keep connections */
 		bytes_written = wldev_set_country(net, country_code, true, false);