Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dda95f8 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Staging: hv: vmbus: Don't wait indefinitely for IRQ resouces 



If an attempt is made to load the vmbus driver on a non-Hyper-V platform,
the load operation will hang since we currently wait indefinitely to
retrieve the IRQ information. This is done in the context of an acpi callback
context (which will obviously not happen when this driver is
loaded on a non-Hyper-V platform). This patch fixes the problem.

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 ab8ac090

drivers/staging/hv/vmbus_drv.c

+14 −5
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ MODULE_DEVICE_TABLE(pci, microsoft_hv_pci_table); 


static int __init hv_acpi_init(void)

{

	int ret;

	int ret, t;



	init_completion(&probe_event);
@@ -781,15 +781,24 @@ static int __init hv_acpi_init(void) 
	if (ret)

		return ret;



	wait_for_completion(&probe_event);

	t = wait_for_completion_timeout(&probe_event, 5*HZ);

	if (t == 0) {

		ret = -ETIMEDOUT;

		goto cleanup;

	}



	if (irq <= 0) {

		acpi_bus_unregister_driver(&vmbus_acpi_driver);

		return -ENODEV;

		ret = -ENODEV;

		goto cleanup;

	}



	ret = vmbus_bus_init(irq);

	if (ret)

		goto cleanup;



	return 0;



cleanup:

	acpi_bus_unregister_driver(&vmbus_acpi_driver);

	return ret;

}