diff options
| -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) | |||
| 829 | 829 | ||
| 830 | 830 | ||
| 831 | cleanup: | 831 | cleanup: |
| 832 | if (msginfo) | 832 | kfree(msginfo); |
| 833 | kfree(msginfo); | ||
| 834 | 833 | ||
| 835 | return ret; | 834 | return ret; |
| 836 | } | 835 | } |
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: | |||
| 186 | vmbus_connection.monitor_pages = NULL; | 186 | vmbus_connection.monitor_pages = NULL; |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | if (msginfo) { | 189 | kfree(msginfo); |
| 190 | kfree(msginfo); | ||
| 191 | } | ||
| 192 | 190 | ||
| 193 | return ret; | 191 | return ret; |
| 194 | } | 192 | } |
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 | |||
| 402 | return; | 402 | return; |
| 403 | 403 | ||
| 404 | Cleanup: | 404 | Cleanup: |
| 405 | if (InputDevice->HidDesc) { | 405 | kfree(InputDevice->HidDesc); |
| 406 | kfree(InputDevice->HidDesc); | 406 | InputDevice->HidDesc = NULL; |
| 407 | InputDevice->HidDesc = NULL; | ||
| 408 | } | ||
| 409 | 407 | ||
| 410 | if (InputDevice->ReportDesc) { | 408 | kfree(InputDevice->ReportDesc); |
| 411 | kfree(InputDevice->ReportDesc); | 409 | InputDevice->ReportDesc = NULL; |
| 412 | InputDevice->ReportDesc = NULL; | ||
| 413 | } | ||
| 414 | 410 | ||
| 415 | InputDevice->DeviceInfoStatus = -1; | 411 | InputDevice->DeviceInfoStatus = -1; |
| 416 | InputDevice->device_wait_condition = 1; | 412 | InputDevice->device_wait_condition = 1; |
