diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-08 21:13:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-08 21:13:13 -0400 |
| commit | d2daeabf62a5fb205d413c35cf604021db17536b (patch) | |
| tree | 844ced1a54745c14ea45d33ccad4eae6e7253322 /net/wireless/nl80211.c | |
| parent | c3b85423072c0739d76b7c54080d3f3ccc5dad4d (diff) | |
| parent | 1ce822fa04fd6878f079461a4b8affe4bb5ec27b (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 241bddd0b4f1..43bdb1372cae 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
| @@ -447,6 +447,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) | |||
| 447 | 447 | ||
| 448 | rdev = __cfg80211_drv_from_info(info); | 448 | rdev = __cfg80211_drv_from_info(info); |
| 449 | if (IS_ERR(rdev)) { | 449 | if (IS_ERR(rdev)) { |
| 450 | mutex_unlock(&cfg80211_mutex); | ||
| 450 | result = PTR_ERR(rdev); | 451 | result = PTR_ERR(rdev); |
| 451 | goto unlock; | 452 | goto unlock; |
| 452 | } | 453 | } |