Commit d531babe authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman

Staging: hv: util: Deal with driver register failures

Properly deal with vmbus_driver_register() failures.
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 06b3f44a
...@@ -277,6 +277,7 @@ static struct hv_driver util_drv = { ...@@ -277,6 +277,7 @@ static struct hv_driver util_drv = {
static int __init init_hyperv_utils(void) static int __init init_hyperv_utils(void)
{ {
int ret;
pr_info("Registering HyperV Utility Driver\n"); pr_info("Registering HyperV Utility Driver\n");
if (hv_kvp_init()) if (hv_kvp_init())
...@@ -289,12 +290,15 @@ static int __init init_hyperv_utils(void) ...@@ -289,12 +290,15 @@ static int __init init_hyperv_utils(void)
if (!shut_txf_buf || !time_txf_buf || !hbeat_txf_buf) { if (!shut_txf_buf || !time_txf_buf || !hbeat_txf_buf) {
pr_info("Unable to allocate memory for receive buffer\n"); pr_info("Unable to allocate memory for receive buffer\n");
kfree(shut_txf_buf); ret = -ENOMEM;
kfree(time_txf_buf); goto err;
kfree(hbeat_txf_buf);
return -ENOMEM;
} }
ret = vmbus_driver_register(&util_drv);
if (ret != 0)
goto err;
hv_cb_utils[HV_SHUTDOWN_MSG].callback = &shutdown_onchannelcallback; hv_cb_utils[HV_SHUTDOWN_MSG].callback = &shutdown_onchannelcallback;
hv_cb_utils[HV_TIMESYNC_MSG].callback = &timesync_onchannelcallback; hv_cb_utils[HV_TIMESYNC_MSG].callback = &timesync_onchannelcallback;
...@@ -303,7 +307,14 @@ static int __init init_hyperv_utils(void) ...@@ -303,7 +307,14 @@ static int __init init_hyperv_utils(void)
hv_cb_utils[HV_KVP_MSG].callback = &hv_kvp_onchannelcallback; hv_cb_utils[HV_KVP_MSG].callback = &hv_kvp_onchannelcallback;
return vmbus_driver_register(&util_drv); return 0;
err:
kfree(shut_txf_buf);
kfree(time_txf_buf);
kfree(hbeat_txf_buf);
return ret;
} }
static void exit_hyperv_utils(void) static void exit_hyperv_utils(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment