Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

[karo-tx-linux.git] / drivers / net / wireless / wl1251 / main.c

diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c
index 1c8b0775d8496b6df8594c25128c7d7dfac5e2a1..5a1c13878eafe50836b2f3f8b43701104f58e727 100644 (file)
--- a/drivers/net/wireless/wl1251/main.c
+++ b/drivers/net/wireless/wl1251/main.c
@@ -1050,6 +1050,9 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
 
        if (changed & BSS_CHANGED_BEACON) {
                beacon = ieee80211_beacon_get(hw, vif);
+               if (!beacon)
+                       goto out_sleep;
+
                ret = wl1251_cmd_template_set(wl, CMD_BEACON, beacon->data,
                                              beacon->len);