lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: hv: vmbus: Fix a bug in error handling in vmbus_bus_init()

Browse Source 
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan
2011-08-31 14:35:55 -07:00
committed by Greg Kroah-Hartman
parent d531babe82
commit 8b9987e905
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/hv/vmbus_drv.c
View File

@@ -492,7 +492,7 @@ static int vmbus_bus_init(int irq)
ret = bus_register(&hv_bus); ret = bus_register(&hv_bus);
if (ret) if (ret)
return ret; goto err_cleanup;
ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM, ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM,
driver_name, hv_acpi_dev); driver_name, hv_acpi_dev);
@@ -500,10 +500,7 @@ static int vmbus_bus_init(int irq)
if (ret != 0) { if (ret != 0) {
pr_err("Unable to request IRQ %d\n", pr_err("Unable to request IRQ %d\n",
irq); irq);
goto err_unregister;
bus_unregister(&hv_bus);
return ret;
} }
vector = IRQ0_VECTOR + irq; vector = IRQ0_VECTOR + irq;
@@ -514,16 +511,23 @@ static int vmbus_bus_init(int irq)
*/ */
on_each_cpu(hv_synic_init, (void *)&vector, 1); on_each_cpu(hv_synic_init, (void *)&vector, 1);
ret = vmbus_connect(); ret = vmbus_connect();
if (ret) { if (ret)
free_irq(irq, hv_acpi_dev); goto err_irq;
bus_unregister(&hv_bus);
return ret;
}
vmbus_request_offers(); vmbus_request_offers();
return 0; return 0;
err_irq:
free_irq(irq, hv_acpi_dev);
err_unregister:
bus_unregister(&hv_bus);
err_cleanup:
hv_cleanup();
return ret;
} }
/** /**