From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754581Ab1H2SKN (ORCPT ); Mon, 29 Aug 2011 14:10:13 -0400 Received: from out2.smtp.messagingengine.com ([66.111.4.26]:55665 "EHLO out2.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753808Ab1H2SKI (ORCPT ); Mon, 29 Aug 2011 14:10:08 -0400 X-Sasl-enc: kUhBnoKqzy+VrGNErKeElcwXUv4wnQ5eqJUPeqnAwCA/ 1314641408 Date: Mon, 29 Aug 2011 11:08:42 -0700 From: Greg KH To: "K. Y. Srinivasan" Cc: gregkh@suse.de, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, virtualization@lists.osdl.org, Haiyang Zhang Subject: Re: [PATCH 41/46] Staging: hv: vmbus: Fix a bug in error handling in vmbus_bus_init() Message-ID: <20110829180842.GA23618@kroah.com> References: <1314469874-7017-1-git-send-email-kys@microsoft.com> <1314469905-7058-1-git-send-email-kys@microsoft.com> <1314469905-7058-41-git-send-email-kys@microsoft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1314469905-7058-41-git-send-email-kys@microsoft.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Aug 27, 2011 at 11:31:40AM -0700, K. Y. Srinivasan wrote: > Fix a bug in error handling in vmbus_bus_init(). > > Signed-off-by: K. Y. Srinivasan > Signed-off-by: Haiyang Zhang > --- > drivers/staging/hv/vmbus_drv.c | 21 ++++++++++----------- > 1 files changed, 10 insertions(+), 11 deletions(-) > > diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c > index 02edb11..4d1b123 100644 > --- a/drivers/staging/hv/vmbus_drv.c > +++ b/drivers/staging/hv/vmbus_drv.c > @@ -492,7 +492,7 @@ static int vmbus_bus_init(int irq) > > ret = bus_register(&hv_bus); > if (ret) > - return ret; > + goto err1; > > ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM, > driver_name, hv_acpi_dev); > @@ -500,10 +500,7 @@ static int vmbus_bus_init(int irq) > if (ret != 0) { > pr_err("Unable to request IRQ %d\n", > irq); > - > - bus_unregister(&hv_bus); > - > - return ret; > + goto err2; > } > > vector = IRQ0_VECTOR + irq; > @@ -514,16 +511,18 @@ static int vmbus_bus_init(int irq) > */ > on_each_cpu(hv_synic_init, (void *)&vector, 1); > ret = vmbus_connect(); > - if (ret) { > - free_irq(irq, hv_acpi_dev); > - bus_unregister(&hv_bus); > - return ret; > - } > - > + if (ret) > + goto err3; > > vmbus_request_offers(); > > return 0; > + > +err3: free_irq(irq, hv_acpi_dev); > +err2: bus_unregister(&hv_bus); > +err1: hv_cleanup(); The traditional way to write this is: err3: free_irq(irq, hv_acpi_dev); err2: bus_unregister(&hv_bus); err1: hv_cleanup(); Care to fix this up and resend it? thanks, greg k-h