diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-03 23:31:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-03 23:31:48 -0700 |
| commit | 7d2dbd95386a6ef97abead5cffd60ecc979c02da (patch) | |
| tree | d217fd339e61e5914463f9afa5e4a163d01103ce /drivers/net | |
| parent | bf5ab4a6aa83cabb3860156fb47ce6ac142d197d (diff) | |
| parent | 95a027ead7d44a2c80ebeccdc0f70317e1712dbf (diff) | |
Merge "Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'"
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index 6df3ee561d52..515aa3f993f3 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c @@ -836,25 +836,30 @@ static int hfa384x_get_rid(struct net_device *dev, u16 rid, void *buf, int len, spin_lock_bh(&local->baplock); res = hfa384x_setup_bap(dev, BAP0, rid, 0); - if (!res) - res = hfa384x_from_bap(dev, BAP0, &rec, sizeof(rec)); + if (res) + goto unlock; + + res = hfa384x_from_bap(dev, BAP0, &rec, sizeof(rec)); + if (res) + goto unlock; if (le16_to_cpu(rec.len) == 0) { /* RID not available */ res = -ENODATA; + goto unlock; } rlen = (le16_to_cpu(rec.len) - 1) * 2; - if (!res && exact_len && rlen != len) { + if (exact_len && rlen != len) { printk(KERN_DEBUG "%s: hfa384x_get_rid - RID len mismatch: " "rid=0x%04x, len=%d (expected %d)\n", dev->name, rid, rlen, len); res = -ENODATA; } - if (!res) - res = hfa384x_from_bap(dev, BAP0, buf, len); + res = hfa384x_from_bap(dev, BAP0, buf, len); +unlock: spin_unlock_bh(&local->baplock); mutex_unlock(&local->rid_bap_mtx); |