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

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

Staging: hv: vmbus: Cleanup error handling in vmbus_bus_init() 



Cleanup error handling in vmbus_bus_init().

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6de925b1

drivers/staging/hv/vmbus_drv.c

+6 −10
Original line number Original line Diff line number Diff line
@@ -535,7 +535,7 @@ static int vmbus_bus_init(int irq) 
	ret = hv_init();

	ret = hv_init();

	if (ret != 0) {

	if (ret != 0) {

		pr_err("Unable to initialize the hypervisor - 0x%x\n", ret);

		pr_err("Unable to initialize the hypervisor - 0x%x\n", ret);

		goto cleanup;

		return ret;

	}

	}





	/* Initialize the bus context */

	/* Initialize the bus context */
@@ -544,10 +544,8 @@ static int vmbus_bus_init(int irq) 




	/* Now, register the bus  with LDM */

	/* Now, register the bus  with LDM */

	ret = bus_register(&hv_bus);

	ret = bus_register(&hv_bus);

	if (ret) {

	if (ret)

		ret = -1;

		return ret;

		goto cleanup;

	}





	/* Get the interrupt resource */

	/* Get the interrupt resource */

	ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM,

	ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM,
@@ -559,8 +557,7 @@ static int vmbus_bus_init(int irq) 




		bus_unregister(&hv_bus);

		bus_unregister(&hv_bus);





		ret = -1;

		return ret;

		goto cleanup;

	}

	}





	vector = IRQ0_VECTOR + irq;

	vector = IRQ0_VECTOR + irq;
@@ -574,14 +571,13 @@ static int vmbus_bus_init(int irq) 
	if (ret) {

	if (ret) {

		free_irq(irq, hv_acpi_dev);

		free_irq(irq, hv_acpi_dev);

		bus_unregister(&hv_bus);

		bus_unregister(&hv_bus);

		goto cleanup;

		return ret;

	}

	}









	vmbus_request_offers();

	vmbus_request_offers();





cleanup:

	return 0;

	return ret;

}

}





/**

/**