From: Jonathan Nieder <jrnieder@gmail.com>
To: David Fries <david@fries.net>
Cc: Istvan Varga <istvan_v@mailbox.hu>,
linux-media@vger.kernel.org, Darron Broad <darron@kewl.org>,
Steven Toth <stoth@kernellabs.com>,
"Igor M. Liplianin" <liplianin@me.by>
Subject: [PATCH 7/9] [media] dm1105: handle errors from dvb_net_init
Date: Sat, 31 Dec 2011 06:08:45 -0600 [thread overview]
Message-ID: <20111231120845.GI16802@elie.Belkin> (raw)
In-Reply-To: <20111231115117.GB16802@elie.Belkin>
Clean up and error out if dvb_net_init fails (for example due to
ENOMEM). This involves moving the dvb_net_init call to before
frontend_init to make cleaning up a little easier.
>From an audit of dvb_net_init callers, now that dvb_net_init lets
callers know about errors.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
drivers/media/dvb/dm1105/dm1105.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 55e6533f15e9..70e040b999e7 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -1115,11 +1115,14 @@ static int __devinit dm1105_probe(struct pci_dev *pdev,
if (ret < 0)
goto err_remove_mem_frontend;
+ ret = dvb_net_init(dvb_adapter, &dev->dvbnet, dmx);
+ if (ret < 0)
+ goto err_disconnect_frontend;
+
ret = frontend_init(dev);
if (ret < 0)
goto err_disconnect_frontend;
- dvb_net_init(dvb_adapter, &dev->dvbnet, dmx);
dm1105_ir_init(dev);
INIT_WORK(&dev->work, dm1105_dmx_buffer);
--
1.7.8.2+next.20111228
next prev parent reply other threads:[~2011-12-31 12:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1RgiId-0003Qe-SC@www.linuxtv.org>
2011-12-31 11:51 ` [git:v4l-dvb/for_v3.3] [media] cx88-dvb avoid dangling core->gate_ctrl pointer Jonathan Nieder
2011-12-31 11:54 ` [PATCH 1/9] [media] DVB: dvb_net_init: return -errno on error Jonathan Nieder
2011-12-31 17:37 ` Darron Broad
2011-12-31 11:56 ` [PATCH 2/9] [media] videobuf-dvb: avoid spurious ENOMEM when CONFIG_DVB_NET=n Jonathan Nieder
2011-12-31 11:58 ` [PATCH 3/9] [media] dvb-bt8xx: use goto based exception handling Jonathan Nieder
2011-12-31 12:01 ` [PATCH 4/9] [media] ttusb-budget: use goto for " Jonathan Nieder
2011-12-31 12:04 ` [PATCH 5/9] [media] flexcop: handle errors from dvb_net_init Jonathan Nieder
2011-12-31 12:06 ` [PATCH 6/9] [media] dvb-bt8xx: " Jonathan Nieder
2011-12-31 12:08 ` Jonathan Nieder [this message]
2011-12-31 12:10 ` [PATCH 8/9] [media] dvb-usb: " Jonathan Nieder
2011-12-31 12:19 ` [PATCH 9/9] [media] firedtv: " Jonathan Nieder
2011-12-31 12:38 ` Stefan Richter
2012-01-06 14:52 ` Mauro Carvalho Chehab
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=20111231120845.GI16802@elie.Belkin \
--to=jrnieder@gmail.com \
--cc=darron@kewl.org \
--cc=david@fries.net \
--cc=istvan_v@mailbox.hu \
--cc=linux-media@vger.kernel.org \
--cc=liplianin@me.by \
--cc=stoth@kernellabs.com \
/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