diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-11 01:15:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-11 01:15:31 -0500 |
| commit | 8877870f8a8127b653f8c9a55c6b4de9f96f639b (patch) | |
| tree | cc2629911f6b011ee2e3f4a85febbb9b6cc63604 /net/wireless/nl80211.c | |
| parent | 7a1abd08d52fdeddb3e9a5a33f2f15cc6a5674d2 (diff) | |
| parent | 7379efeacb707f49729080791a7a562d8996aec4 (diff) | |
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 c506241f8637..4e78e3f26798 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
| @@ -224,8 +224,8 @@ static int nl80211_prepare_netdev_dump(struct sk_buff *skb, | |||
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | *rdev = cfg80211_get_dev_from_ifindex(sock_net(skb->sk), ifidx); | 226 | *rdev = cfg80211_get_dev_from_ifindex(sock_net(skb->sk), ifidx); |
| 227 | if (IS_ERR(dev)) { | 227 | if (IS_ERR(*rdev)) { |
| 228 | err = PTR_ERR(dev); | 228 | err = PTR_ERR(*rdev); |
| 229 | goto out_rtnl; | 229 | goto out_rtnl; |
| 230 | } | 230 | } |
| 231 | 231 | ||