From 968369e67c80cefdbca1c2c63377d3bd400665c4 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 25 Oct 2012 15:30:06 +0300 Subject: [PATCH] --- yaml --- r: 337336 b: refs/heads/master c: db9d1f6dd2601aee860304ffc1023a7d5709f314 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8712/rtl871x_cmd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ff2ada4cd54f..1a7ba128c9c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e33909c6d43b3f3913a5d5a370d9ff1335e4bd58 +refs/heads/master: db9d1f6dd2601aee860304ffc1023a7d5709f314 diff --git a/trunk/drivers/staging/rtl8712/rtl871x_cmd.c b/trunk/drivers/staging/rtl8712/rtl871x_cmd.c index 659683e022b9..31f31dbf7f31 100644 --- a/trunk/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/trunk/drivers/staging/rtl8712/rtl871x_cmd.c @@ -814,7 +814,7 @@ u8 r8712_setassocsta_cmd(struct _adapter *padapter, u8 *mac_addr) struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_obj *ph2c; struct set_assocsta_parm *psetassocsta_para; - struct set_stakey_rsp *psetassocsta_rsp = NULL; + struct set_assocsta_rsp *psetassocsta_rsp = NULL; ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj)); if (ph2c == NULL) @@ -825,7 +825,7 @@ u8 r8712_setassocsta_cmd(struct _adapter *padapter, u8 *mac_addr) kfree((u8 *) ph2c); return _FAIL; } - psetassocsta_rsp = (struct set_stakey_rsp *)_malloc( + psetassocsta_rsp = (struct set_assocsta_rsp *)_malloc( sizeof(struct set_assocsta_rsp)); if (psetassocsta_rsp == NULL) { kfree((u8 *)ph2c);