* Re: [Xen-devel] [PATCH] drivers/video/xen-fbfront.c: add missing cleanup code [not found] <1335088660-13219-1-git-send-email-Julia.Lawall@lip6.fr> @ 2012-04-26 21:42 ` Konrad Rzeszutek Wilk 2012-04-28 23:47 ` Florian Tobias Schandinat 0 siblings, 1 reply; 2+ messages in thread From: Konrad Rzeszutek Wilk @ 2012-04-26 21:42 UTC (permalink / raw) To: Julia Lawall Cc: Jeremy Fitzhardinge, xen-devel, Florian Tobias Schandinat, kernel-janitors, linux-kernel, virtualization, linux-fbdev On Sun, Apr 22, 2012 at 11:57:40AM +0200, Julia Lawall wrote: > From: Julia Lawall <Julia.Lawall@lip6.fr> > > 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 <Julia.Lawall@lip6.fr> 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 <Julia.Lawall@lip6.fr> [v1: Collapse some of the error handling functions] Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 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 <Julia.Lawall@lip6.fr> > > --- > 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 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Xen-devel] [PATCH] drivers/video/xen-fbfront.c: add missing cleanup code 2012-04-26 21:42 ` [Xen-devel] [PATCH] drivers/video/xen-fbfront.c: add missing cleanup code Konrad Rzeszutek Wilk @ 2012-04-28 23:47 ` Florian Tobias Schandinat 0 siblings, 0 replies; 2+ messages in thread From: Florian Tobias Schandinat @ 2012-04-28 23:47 UTC (permalink / raw) To: Konrad Rzeszutek Wilk Cc: Jeremy Fitzhardinge, xen-devel, kernel-janitors, linux-kernel, virtualization, Julia Lawall, linux-fbdev Hi Konrad, On 04/26/2012 09:42 PM, Konrad Rzeszutek Wilk wrote: > On Sun, Apr 22, 2012 at 11:57:40AM +0200, Julia Lawall wrote: >> From: Julia Lawall <Julia.Lawall@lip6.fr> >> >> The operations in the subsequent error-handling code appear to be also >> useful here. > > How about doing it this way? Looks good to me. > Florian, are you OK me carrying this patch in my tree for Linus or would > you prefer to do it? Yes, I'm okay with you carrying this patch. Feel free to add Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Best regards, Florian Tobias Schandinat > > commit a833fb9973b47cb30d1086e73f20b62a425bcd85 > Author: Julia Lawall <Julia.Lawall@lip6.fr> > 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 <Julia.Lawall@lip6.fr> > [v1: Collapse some of the error handling functions] > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > > 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 <Julia.Lawall@lip6.fr> >> >> --- >> 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 > ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-28 23:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1335088660-13219-1-git-send-email-Julia.Lawall@lip6.fr>
2012-04-26 21:42 ` [Xen-devel] [PATCH] drivers/video/xen-fbfront.c: add missing cleanup code Konrad Rzeszutek Wilk
2012-04-28 23:47 ` Florian Tobias Schandinat
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox