From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759304Ab2DZVs0 (ORCPT ); Thu, 26 Apr 2012 17:48:26 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:44033 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755195Ab2DZVsX (ORCPT ); Thu, 26 Apr 2012 17:48:23 -0400 Date: Thu, 26 Apr 2012 17:42:22 -0400 From: Konrad Rzeszutek Wilk To: Julia Lawall , FlorianSchandinat@gmx.de Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, Florian Tobias Schandinat , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-fbdev@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [Xen-devel] [PATCH] drivers/video/xen-fbfront.c: add missing cleanup code Message-ID: <20120426214222.GA11289@phenom.dumpdata.com> References: <1335088660-13219-1-git-send-email-Julia.Lawall@lip6.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1335088660-13219-1-git-send-email-Julia.Lawall@lip6.fr> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Apr 22, 2012 at 11:57:40AM +0200, Julia Lawall wrote: > From: Julia Lawall > > The operations in the subsequent error-handling code appear to be also > useful here. How about doing it this way? Florian, are you OK me carrying this patch in my tree for Linus or would you prefer to do it? commit a833fb9973b47cb30d1086e73f20b62a425bcd85 Author: Julia Lawall Date: Sun Apr 22 11:57:40 2012 +0200 drivers/video/xen-fbfront.c: add missing cleanup code The operations in the subsequent error-handling code appear to be also useful here. Signed-off-by: Julia Lawall [v1: Collapse some of the error handling functions] Signed-off-by: Konrad Rzeszutek Wilk diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c index cb4529c..aa42160 100644 --- a/drivers/video/xen-fbfront.c +++ b/drivers/video/xen-fbfront.c @@ -458,26 +458,31 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, xenfb_init_shared_page(info, fb_info); ret = xenfb_connect_backend(dev, info); - if (ret < 0) - goto error; + if (ret < 0) { + xenbus_dev_fatal(dev, ret, "xenfb_connect_backend"); + goto error_fb; + } ret = register_framebuffer(fb_info); if (ret) { - fb_deferred_io_cleanup(fb_info); - fb_dealloc_cmap(&fb_info->cmap); - framebuffer_release(fb_info); xenbus_dev_fatal(dev, ret, "register_framebuffer"); - goto error; + goto error_fb; } info->fb_info = fb_info; xenfb_make_preferred_console(); return 0; - error_nomem: - ret = -ENOMEM; - xenbus_dev_fatal(dev, ret, "allocating device memory"); - error: +error_fb: + fb_deferred_io_cleanup(fb_info); + fb_dealloc_cmap(&fb_info->cmap); + framebuffer_release(fb_info); +error_nomem: + if (!ret) { + ret = -ENOMEM; + xenbus_dev_fatal(dev, ret, "allocating device memory"); + } +error: xenfb_remove(dev); return ret; } > > Signed-off-by: Julia Lawall > > --- > Not tested. > > drivers/video/xen-fbfront.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c > index cb4529c..b0bd59c 100644 > --- a/drivers/video/xen-fbfront.c > +++ b/drivers/video/xen-fbfront.c > @@ -458,8 +458,13 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, > xenfb_init_shared_page(info, fb_info); > > ret = xenfb_connect_backend(dev, info); > - if (ret < 0) > + if (ret < 0) { > + fb_deferred_io_cleanup(fb_info); > + fb_dealloc_cmap(&fb_info->cmap); > + framebuffer_release(fb_info); > + xenbus_dev_fatal(dev, ret, "xenfb_connect_backend"); > goto error; > + } > > ret = register_framebuffer(fb_info); > if (ret) { > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel