From a47ffd3fc4c1468c7d66d9b452c2b7cf6a35d0d1 Mon Sep 17 00:00:00 2001
From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sun, 13 Mar 2011 00:29:00 -0500
Subject: [PATCH] --- yaml --- r: 236544 b: refs/heads/master c:
 dd9b15dc03075993f63a8a69667a3a8989aedfa1 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/hv/channel_mgmt.c |  3 +--
 trunk/drivers/staging/hv/connection.c   |  4 +---
 trunk/drivers/staging/hv/hv_mouse.c     | 12 ++++--------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 242ab31db233..bb422aa4fd70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e13a0b5a4b2ca9e318896a1c8c4b45d62477c956
+refs/heads/master: dd9b15dc03075993f63a8a69667a3a8989aedfa1
diff --git a/trunk/drivers/staging/hv/channel_mgmt.c b/trunk/drivers/staging/hv/channel_mgmt.c
index 33688094e1fd..bc0393a41d29 100644
--- a/trunk/drivers/staging/hv/channel_mgmt.c
+++ b/trunk/drivers/staging/hv/channel_mgmt.c
@@ -829,8 +829,7 @@ int vmbus_request_offers(void)
 
 
 cleanup:
-	if (msginfo)
-		kfree(msginfo);
+	kfree(msginfo);
 
 	return ret;
 }
diff --git a/trunk/drivers/staging/hv/connection.c b/trunk/drivers/staging/hv/connection.c
index fd589e381e31..44b203b95a22 100644
--- a/trunk/drivers/staging/hv/connection.c
+++ b/trunk/drivers/staging/hv/connection.c
@@ -186,9 +186,7 @@ int vmbus_connect(void)
 		vmbus_connection.monitor_pages = NULL;
 	}
 
-	if (msginfo) {
-		kfree(msginfo);
-	}
+	kfree(msginfo);
 
 	return ret;
 }
diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c
index 8f94f433961f..6fa462109ce9 100644
--- a/trunk/drivers/staging/hv/hv_mouse.c
+++ b/trunk/drivers/staging/hv/hv_mouse.c
@@ -402,15 +402,11 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
 	return;
 
 Cleanup:
-	if (InputDevice->HidDesc) {
-		kfree(InputDevice->HidDesc);
-		InputDevice->HidDesc = NULL;
-	}
+	kfree(InputDevice->HidDesc);
+	InputDevice->HidDesc = NULL;
 
-	if (InputDevice->ReportDesc) {
-		kfree(InputDevice->ReportDesc);
-		InputDevice->ReportDesc = NULL;
-	}
+	kfree(InputDevice->ReportDesc);
+	InputDevice->ReportDesc = NULL;
 
 	InputDevice->DeviceInfoStatus = -1;
 	InputDevice->device_wait_condition = 1;