From 8ed13d291cb417caa6ac09635ff3fedc8bb37260 Mon Sep 17 00:00:00 2001
From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sun, 13 Mar 2011 00:29:08 -0500
Subject: [PATCH] --- yaml --- r: 236463 b: refs/heads/master c:
 b7977fa250c1732d1fc1b5832f257655fd7471a4 h: refs/heads/master i:   236461:
 48ae26cc34016b962635f6eb35994073f54eebe7   236459:
 5fe85380cb8a29dbc4c73699d587b648feac7ff2   236455:
 e81a090ea6673b8ea3cbd00ecd900df3456cec89   236447:
 50f08e01ec5580ea538569ef1349624b6d55ad7e v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d19d483332c6..a80ff4eaf52c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e72714fb20b2bac88e6bc06401a124243791ca08
+refs/heads/master: b7977fa250c1732d1fc1b5832f257655fd7471a4
diff --git a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 8ebfdd620ba4..bd315c77610a 100644
--- a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -1873,8 +1873,7 @@ static int r871x_mp_ioctl_hdl(struct net_device *dev,
 		goto _r871x_mp_ioctl_hdl_exit;
 	}
 _r871x_mp_ioctl_hdl_exit:
-	if (pparmbuf != NULL)
-		kfree(pparmbuf);
+	kfree(pparmbuf);
 	return ret;
 }