From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753592Ab1HQN1X (ORCPT ); Wed, 17 Aug 2011 09:27:23 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:59014 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753389Ab1HQN1W (ORCPT ); Wed, 17 Aug 2011 09:27:22 -0400 Subject: Re: [PATCH 7/8] Staging: hv: vmbus: Fix a bug in error handling in vmbus_bus_init() From: Sasha Levin To: "K. Y. Srinivasan" Cc: gregkh@suse.de, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, virtualization@lists.osdl.org, Haiyang Zhang In-Reply-To: <1313446327-10650-7-git-send-email-kys@microsoft.com> References: <1313446210-10611-1-git-send-email-kys@microsoft.com> <1313446327-10650-1-git-send-email-kys@microsoft.com> <1313446327-10650-7-git-send-email-kys@microsoft.com> Content-Type: text/plain; charset="us-ascii" Date: Wed, 17 Aug 2011 16:26:10 +0300 Message-ID: <1313587570.18295.2.camel@lappy> Mime-Version: 1.0 X-Mailer: Evolution 2.32.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2011-08-15 at 15:12 -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 > --- vmbus_bus_init() has a 'cleanup' label which is used just for returning, while the cleanup logic is replicated all over the code. Can't we just move all of it to the cleanup label? > 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; -- Sasha.