diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2013-11-15 04:10:37 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-15 20:29:30 +0100 |
| commit | 68b76e99d1f7b696d49b5e99286401150072987a (patch) | |
| tree | c2a420deb2a1be9b5ae054f8fbed65f7c1a227aa | |
| parent | rt2x00: fix a crash bug in the HT descriptor handling fix (diff) | |
| download | linux-68b76e99d1f7b696d49b5e99286401150072987a.tar.xz linux-68b76e99d1f7b696d49b5e99286401150072987a.zip | |
mwifiex: use return value of mwifiex_add_virtual_intf() correctly
mwifiex_add_virtual_intf() returns ERR_PTR values. So use IS_ERR()
macro instead of checking for NULL pointer.
Reported-by: Ujjal Roy <royujjal@gmail.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 9d7c9d354d34..7c7da3ea55a9 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -418,6 +418,7 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context) struct mwifiex_fw_image fw; struct semaphore *sem = adapter->card_sem; bool init_failed = false; + struct wireless_dev *wdev; if (!firmware) { dev_err(adapter->dev, @@ -474,8 +475,9 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context) rtnl_lock(); /* Create station interface by default */ - if (!mwifiex_add_virtual_intf(adapter->wiphy, "mlan%d", - NL80211_IFTYPE_STATION, NULL, NULL)) { + wdev = mwifiex_add_virtual_intf(adapter->wiphy, "mlan%d", + NL80211_IFTYPE_STATION, NULL, NULL); + if (IS_ERR(wdev)) { dev_err(adapter->dev, "cannot create default STA interface\n"); goto err_add_intf; } |