From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 29 Jan 2013 19:03:20 +0000 (-0500)
Subject: Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
X-Git-Tag: v3.9-rc1~139^2~2^2^2~42^2~50
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=56e1bd770614da94f35e88c150cf9edf8d0b57a2;p=linux.git

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

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

56e1bd770614da94f35e88c150cf9edf8d0b57a2
diff --cc drivers/net/wireless/ti/wlcore/main.c
index ce6e62a37e14,d42b58086f2a..685693c865c0
--- a/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;
  
  	}
+ 
+ 	if (likely(wl->state == WLCORE_STATE_ON))
+ 		wlcore_regdomain_config(wl);
 -
 -	return 0;
  }
  
  static int wl1271_set_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,