Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353864
b: refs/heads/master
c: 7f62248
h: refs/heads/master
v: v3
  • Loading branch information
Johan Meiring authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent b3425fd commit 7d8aef6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ac6cf1b8e427068860cf4903215b2e9296e7c981
refs/heads/master: 7f622485ee768715719058b5ee9a84434cbc02f7
10 changes: 3 additions & 7 deletions trunk/drivers/staging/wlags49_h2/wl_priv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1158,9 +1158,8 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
break;
}

if (ltvAllocated) {
if (ltvAllocated)
kfree(pLtv);
}
} else {
urq->result = UIL_FAILURE;
}
Expand Down Expand Up @@ -1490,9 +1489,8 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp)
case CFG_CFI_ACT_RANGES_STA:
case CFG_CUR_SCALE_THRH:
case CFG_AUTHENTICATION_ALGORITHMS:
for (i = 0; i < (lp->ltvRecord.len - 1); i++) {
for (i = 0; i < (lp->ltvRecord.len - 1); i++)
lp->ltvRecord.u.u16[i] = CNV_INT_TO_LITTLE(lp->ltvRecord.u.u16[i]);
}
break;
/* done at init time, and endian handled then */
case CFG_PRI_IDENTITY:
Expand All @@ -1515,10 +1513,8 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp)
// Copy the LTV into the user's buffer.
copy_to_user(urq->data, &(lp->ltvRecord), urq->len);

if (ltvAllocated) {
if (ltvAllocated)
kfree(&(lp->ltvRecord));
}

urq->result = UIL_SUCCESS;
} else {
urq->result = UIL_FAILURE;
Expand Down

0 comments on commit 7d8aef6

Please sign in to comment.