diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2011-03-13 00:29:00 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 12:36:14 -0700 |
| commit | dd9b15dc03075993f63a8a69667a3a8989aedfa1 (patch) | |
| tree | a49c8b4a5ae885d5a9f3cea7ec83c278b86ee534 | |
| parent | e13a0b5a4b2ca9e318896a1c8c4b45d62477c956 (diff) | |
staging: hv: Remove NULL check before kfree
This patch was generated by the following semantic patch:
// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);
@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Mike Sterling <mike.sterling@microsoft.com>
Cc: Abhishek Kane <v-abkane@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/hv/channel_mgmt.c | 3 | ||||
| -rw-r--r-- | drivers/staging/hv/connection.c | 4 | ||||
| -rw-r--r-- | drivers/staging/hv/hv_mouse.c | 12 |
3 files changed, 6 insertions, 13 deletions
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c index 33688094e1fd..bc0393a41d29 100644 --- a/drivers/staging/hv/channel_mgmt.c +++ b/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/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c index fd589e381e31..44b203b95a22 100644 --- a/drivers/staging/hv/connection.c +++ b/drivers/staging/hv/connection.c @@ -186,9 +186,7 @@ Cleanup: vmbus_connection.monitor_pages = NULL; } - if (msginfo) { - kfree(msginfo); - } + kfree(msginfo); return ret; } diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c index 8f94f433961f..6fa462109ce9 100644 --- a/drivers/staging/hv/hv_mouse.c +++ b/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; |