--- /dev/null
+--- a/hostapd/hostapd.c
++++ b/hostapd/hostapd.c
+@@ -1344,10 +1344,8 @@ static int setup_interface(struct hostap
+ if (hapd->iconf->country[0] && hapd->iconf->country[1]) {
+ os_memcpy(country, hapd->iconf->country, 3);
+ country[3] = '\0';
+- if (hostapd_set_country(hapd, country) < 0) {
++ if (hostapd_set_country(hapd, country) < 0)
+ wpa_printf(MSG_ERROR, "Failed to set country code");
+- return -1;
+- }
+ }
+
+ if (hapd->iconf->bridge_packets != INTERNAL_BRIDGE_DO_NOT_CONTROL &&