summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/init.c
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-02-24 00:47:05 +0000
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-02-24 00:47:05 +0000
commit8aaaaf3cbfb96a9f74c5775c71067a9290244ec7 (patch)
tree67349c6a69740150b67c4c39de49cde9b3648aa5 /drivers/net/wireless/mwifiex/init.c
parent94f61a7666224ab307e387ff0d146055ae77e6ab (diff)
parente29206381a1436e0f47c0f5b9a23159a03c57715 (diff)
downloadblackbird-op-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.tar.gz
blackbird-op-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.zip
Merge branch 'fbdev-for-linus' into fbdev-next
Diffstat (limited to 'drivers/net/wireless/mwifiex/init.c')
-rw-r--r--drivers/net/wireless/mwifiex/init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index e05b417a3fae..1d0ec57a0143 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -382,7 +382,8 @@ mwifiex_free_adapter(struct mwifiex_adapter *adapter)
adapter->if_ops.cleanup_if(adapter);
- dev_kfree_skb_any(adapter->sleep_cfm);
+ if (adapter->sleep_cfm)
+ dev_kfree_skb_any(adapter->sleep_cfm);
}
/*
OpenPOWER on IntegriCloud