diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-11-24 22:19:24 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-24 22:19:24 +0100 |
| commit | d7a066c92394f3e777351de0c903beeb8a08af76 (patch) | |
| tree | f54ce8ac77d32b4c3166b4a2ca92525174a3213b /net/wireless/nl80211.c | |
| parent | Revert "nl80211/mac80211: Report signal average" (diff) | |
| parent | wireless: b43: fix error path in SDIO (diff) | |
| download | linux-d7a066c92394f3e777351de0c903beeb8a08af76.tar.xz linux-d7a066c92394f3e777351de0c903beeb8a08af76.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 605553842226..b15eb77195d8 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -230,8 +230,8 @@ static int nl80211_prepare_netdev_dump(struct sk_buff *skb, } *rdev = cfg80211_get_dev_from_ifindex(sock_net(skb->sk), ifidx); - if (IS_ERR(dev)) { - err = PTR_ERR(dev); + if (IS_ERR(*rdev)) { + err = PTR_ERR(*rdev); goto out_rtnl; } |