[PATCH 7/8] Staging: hv: vmbus: Fix a bug in error handling in vmbus_bus_init()
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: 2011-08-15 21:52:21
Also in:
lkml
Subsystem:
staging subsystem, the rest · Maintainers:
Greg Kroah-Hartman, Linus Torvalds
Fix a bug in error handling in vmbus_bus_init(). Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> --- drivers/staging/hv/vmbus_drv.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index f20ab9a..0b0bff3 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c@@ -463,8 +463,10 @@ static int vmbus_bus_init(int irq) tasklet_init(&event_dpc, vmbus_on_event, 0); ret = bus_register(&hv_bus); - if (ret) + if (ret) { + hv_cleanup(); return ret; + } ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM, driver_name, hv_acpi_dev);
@@ -473,6 +475,7 @@ static int vmbus_bus_init(int irq) pr_err("Unable to request IRQ %d\n", irq); + hv_cleanup(); bus_unregister(&hv_bus); return ret;
@@ -487,6 +490,7 @@ static int vmbus_bus_init(int irq) on_each_cpu(hv_synic_init, (void *)&vector, 1); ret = vmbus_connect(); if (ret) { + hv_cleanup(); free_irq(irq, hv_acpi_dev); bus_unregister(&hv_bus); return ret;
--
1.7.4.1