diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c index 33688094e1fdc016632a434b791fd9382643b577..bc0393a41d29bf8e230cebc073b72db6d2e7172e 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 fd589e381e31771d7b7c870b3341ae1507d9eff1..44b203b95a2290fe9f355e277a477222331eb8d0 100644 --- a/drivers/staging/hv/connection.c +++ b/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/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c index 8f94f433961f18e45699cfcfdb75dafea7813bd9..6fa462109ce973eea48968ba5c9b741c91160fc5 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;