Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337770
b: refs/heads/master
c: 0421226
h: refs/heads/master
v: v3
  • Loading branch information
Malcolm Priestley authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent e851489 commit d0e8777
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 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: d77fb7f7567ef94112ee8aed3960fab0092cd534
refs/heads/master: 04212268286249b65e589c4d3bbf3760c2ac504d
10 changes: 4 additions & 6 deletions trunk/drivers/staging/vt6656/iwctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1488,17 +1488,15 @@ int iwctl_siwencodeext(struct net_device *dev, struct iw_request_info *info,
size_t seq_len = 0;
size_t key_len = 0;
u8 *buf;
size_t blen;
u8 key_array[64];
int ret = 0;

PRINT_K("SIOCSIWENCODEEXT...... \n");
PRINT_K("SIOCSIWENCODEEXT......\n");

blen = sizeof(*param);
buf = kmalloc((int)blen, (int)GFP_KERNEL);
buf = kzalloc(sizeof(struct viawget_wpa_param), GFP_KERNEL);
if (buf == NULL)
return -ENOMEM;
memset(buf, 0, blen);

param = (struct viawget_wpa_param *)buf;

// recover alg_name
Expand Down Expand Up @@ -1592,7 +1590,7 @@ int iwctl_siwencodeext(struct net_device *dev, struct iw_request_info *info,
spin_unlock_irq(&pDevice->lock);

error:
kfree(param);
kfree(buf);
return ret;
}

Expand Down

0 comments on commit d0e8777

Please sign in to comment.