public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "K. Y. Srinivasan" <kys@microsoft.com>
To: gregkh@suse.de, linux-kernel@vger.kernel.org,
	devel@linuxdriverproject.org, virtualization@lists.osdl.org
Cc: "K. Y. Srinivasan" <kys@microsoft.com>,
	Haiyang Zhang <haiyangz@microsoft.com>
Subject: [PATCH 7/8] Staging: hv: vmbus: Fix a bug in error handling in vmbus_bus_init()
Date: Mon, 15 Aug 2011 15:12:06 -0700	[thread overview]
Message-ID: <1313446327-10650-7-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1313446327-10650-1-git-send-email-kys@microsoft.com>

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


  parent reply	other threads:[~2011-08-15 21:52 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-15 22:10 [PATCH 0/8] Staging: hv: vmbus: Driver cleanup K. Y. Srinivasan
2011-08-15 22:12 ` [PATCH 1/8] Staging: hv: vmbus: Get rid of vmbus_on_isr() by inlining the code K. Y. Srinivasan
2011-08-15 22:12   ` [PATCH 2/8] Staging: hv: vmbus: Invoke vmbus_on_msg_dpc() directly K. Y. Srinivasan
2011-08-17 12:47     ` Sasha Levin
2011-08-17 18:43       ` KY Srinivasan
2011-08-18  5:50         ` Sasha Levin
2011-08-15 22:12   ` [PATCH 3/8] Staging: hv: vmbus: Check for events before messages K. Y. Srinivasan
2011-08-15 22:12   ` [PATCH 4/8] Staging: hv: vmbus: Do not enable auto eoi K. Y. Srinivasan
2011-08-15 22:12   ` [PATCH 5/8] Staging: hv: vmbus: Fixup indentation in vmbus_acpi_add() K. Y. Srinivasan
2011-08-15 22:12   ` [PATCH 6/8] Staging: hv: vmbus: Get rid of some dated/redundant comments K. Y. Srinivasan
2011-08-15 22:12   ` K. Y. Srinivasan [this message]
2011-08-17 13:26     ` [PATCH 7/8] Staging: hv: vmbus: Fix a bug in error handling in vmbus_bus_init() Sasha Levin
2011-08-17 19:10       ` KY Srinivasan
2011-08-15 22:12   ` [PATCH 8/8] Staging: hv: vmbus: Get rid of an unnecessary check in vmbus_connect() K. Y. Srinivasan
2011-08-23 23:18 ` [PATCH 0/8] Staging: hv: vmbus: Driver cleanup Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1313446327-10650-7-git-send-email-kys@microsoft.com \
    --to=kys@microsoft.com \
    --cc=devel@linuxdriverproject.org \
    --cc=gregkh@suse.de \
    --cc=haiyangz@microsoft.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=virtualization@lists.osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox