From 66cbf6e8fe0d4362c89d6444603146921031f1fe Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Wed, 5 Sep 2012 00:56:43 +0530 Subject: [PATCH] --- yaml --- r: 324786 b: refs/heads/master c: 6f6ed3db33720276068d70c17ce305e4132a123f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/csr/sme_sys.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c7fd0310e294..b767b4cead57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34f86d06f07cdf87598daa1588a08110047c0b2f +refs/heads/master: 6f6ed3db33720276068d70c17ce305e4132a123f diff --git a/trunk/drivers/staging/csr/sme_sys.c b/trunk/drivers/staging/csr/sme_sys.c index 4330f2a3029f..240344c6be45 100644 --- a/trunk/drivers/staging/csr/sme_sys.c +++ b/trunk/drivers/staging/csr/sme_sys.c @@ -2121,7 +2121,7 @@ static int peer_add_new_record(unifi_priv_t *priv,CsrWifiRouterCtrlPeerAddReq *r /* Allocate for the new station record , to avoid race condition would happen between ADD_PEER & * DEL_PEER the allocation made atomic memory rather than kernel memory */ - newRecord = (CsrWifiRouterCtrlStaInfo_t *) kmalloc(sizeof(CsrWifiRouterCtrlStaInfo_t), GFP_ATOMIC); + newRecord = kmalloc(sizeof(CsrWifiRouterCtrlStaInfo_t), GFP_ATOMIC); if (!newRecord) { unifi_error(priv, "failed to allocate the %d bytes of mem for station record\n", sizeof(CsrWifiRouterCtrlStaInfo_t));