diff options
| author | Clark Williams <williams@redhat.com> | 2012-04-04 10:52:26 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-04 10:52:26 -0500 |
| commit | 2d93eaf2d4ace5853a74a4b0596f601aa62cb840 (patch) | |
| tree | b0a2e2083c1749c4e3b8ae23db7bb13a7ca9aafe /drivers/net/wireless/rtlwifi/rtl8192de/fw.c | |
| parent | 003133585fc61d7bd36d3a097d7fde62e64a9550 (diff) | |
| parent | 23d8c3f8f494c8516c9b4c05529e118e6a485956 (diff) | |
Merge commit 'v3.2.14' into rt-3.2.14-rt23v3.2.14-rt23
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192de/fw.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c index 82f060bdbc0b..c44757f31389 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c @@ -763,12 +763,16 @@ void rtl92d_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished) "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n", u1RsvdPageLoc, 3); skb = dev_alloc_skb(totalpacketlen); - memcpy((u8 *) skb_put(skb, totalpacketlen), &reserved_page_packet, - totalpacketlen); - rtstatus = _rtl92d_cmd_send_packet(hw, skb); + if (!skb) { + dlok = false; + } else { + memcpy((u8 *) skb_put(skb, totalpacketlen), + &reserved_page_packet, totalpacketlen); + rtstatus = _rtl92d_cmd_send_packet(hw, skb); - if (rtstatus) - dlok = true; + if (rtstatus) + dlok = true; + } if (dlok) { RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("Set RSVD page location to Fw.\n")); |