aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/hostap.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-05-24 00:06:26 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-05-24 00:06:26 -0700
commitb73077eb03f510a84b102fb97640e595a958403c (patch)
tree8b639000418e2756bf6baece4e00e07d2534bccc /drivers/staging/vt6655/hostap.c
parentInput: ads7846 - remove unused variable from struct ads7845_ser_req (diff)
parentInput: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander (diff)
downloadlinux-dev-b73077eb03f510a84b102fb97640e595a958403c.tar.xz
linux-dev-b73077eb03f510a84b102fb97640e595a958403c.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/staging/vt6655/hostap.c')
-rw-r--r--drivers/staging/vt6655/hostap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
index 5b83f942cdab..773502702203 100644
--- a/drivers/staging/vt6655/hostap.c
+++ b/drivers/staging/vt6655/hostap.c
@@ -860,8 +860,7 @@ int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
}
out:
- if (param != NULL)
- kfree(param);
+ kfree(param);
return ret;
}