From 7431e5695cef14f9c42223cfe42d439dea71bb68 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Thu, 15 Nov 2012 16:57:29 +0000 Subject: [PATCH] --- yaml --- r: 337975 b: refs/heads/master c: 2a38e6fcf9173ffa8acf827c0b5d69863e012434 h: refs/heads/master i: 337973: de9f587514658e5ddec03f48ab4276baa5902ad2 337971: 1b02fdc4d012a2d85eefd38e67399c8ac604b160 337967: 484dcc3295aa92a3ab38803fe446a047a8976de6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6656/iwctl.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 308b48fe6b3a..e916cba1f384 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4087641b255cb003ce653aac79e3445fcb864552 +refs/heads/master: 2a38e6fcf9173ffa8acf827c0b5d69863e012434 diff --git a/trunk/drivers/staging/vt6656/iwctl.c b/trunk/drivers/staging/vt6656/iwctl.c index a914d20cc0ea..08557fa9f007 100644 --- a/trunk/drivers/staging/vt6656/iwctl.c +++ b/trunk/drivers/staging/vt6656/iwctl.c @@ -655,9 +655,13 @@ int iwctl_giwaplist(struct net_device *dev, struct iw_request_info *info, return -EINVAL; sock = kzalloc(sizeof(struct sockaddr) * IW_MAX_AP, GFP_KERNEL); + if (sock == NULL) + return -ENOMEM; qual = kzalloc(sizeof(struct iw_quality) * IW_MAX_AP, GFP_KERNEL); - if (sock == NULL || qual == NULL) + if (qual == NULL) { + kfree(sock); return -ENOMEM; + } for (ii = 0, jj = 0; ii < MAX_BSS_NUM; ii++) { if (!pBSS[ii].bActive)