Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...

Conflicts:
	drivers/net/wireless/ti/wlcore/main.c

diff --cc drivers/net/wireless/ti/wlcore/main.c
index ce6e62a37e1433341d3bb2c9a5ccb2c6d2cde7d4,d42b58086f2ae841262c21540021d594c7c385f4..685693c865c06844400419a5e29fd34aeca56771
--- 1/drivers/net/wireless/ti/wlcore/main.c
--- 2/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@@ -107,6 -107,11 +107,9 @@@ static void wl1271_reg_notify(struct wi
                                     IEEE80211_CHAN_PASSIVE_SCAN;
  
        }
 -
 -      return 0;
+ 
+       if (likely(wl->state == WLCORE_STATE_ON))
+               wlcore_regdomain_config(wl);
  }
  
  static int wl1271_set_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,