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>, Uwe Bugla <uwe.bugla@gmx.de>
Subject: [PATCH 5/9] [media] flexcop: handle errors from dvb_net_init
Date: Sat, 31 Dec 2011 06:04:25 -0600 [thread overview]
Message-ID: <20111231120425.GG16802@elie.Belkin> (raw)
In-Reply-To: <20111231115117.GB16802@elie.Belkin>
Bail out if dvb_net_init encounters an error (for example an
out-of-memory condition), now that it reports them.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
drivers/media/dvb/b2c2/flexcop.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c
index 2df1b0214dcd..ed3f42776fee 100644
--- a/drivers/media/dvb/b2c2/flexcop.c
+++ b/drivers/media/dvb/b2c2/flexcop.c
@@ -117,11 +117,16 @@ static int flexcop_dvb_init(struct flexcop_device *fc)
goto err_connect_frontend;
}
- dvb_net_init(&fc->dvb_adapter, &fc->dvbnet, &fc->demux.dmx);
+ if ((ret = dvb_net_init(&fc->dvb_adapter, &fc->dvbnet, &fc->demux.dmx)) < 0) {
+ err("dvb_net_init failed: error %d", ret);
+ goto err_net;
+ }
fc->init_state |= FC_STATE_DVB_INIT;
return 0;
+err_net:
+ fc->demux.dmx.disconnect_frontend(&fc->demux.dmx);
err_connect_frontend:
fc->demux.dmx.remove_frontend(&fc->demux.dmx, &fc->mem_frontend);
err_dmx_add_mem_frontend:
--
1.7.8.2+next.20111228
next prev parent reply other threads:[~2011-12-31 12:04 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 ` Jonathan Nieder [this message]
2011-12-31 12:06 ` [PATCH 6/9] [media] dvb-bt8xx: handle errors from dvb_net_init Jonathan Nieder
2011-12-31 12:08 ` [PATCH 7/9] [media] dm1105: " Jonathan Nieder
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=20111231120425.GG16802@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=stoth@kernellabs.com \
--cc=uwe.bugla@gmx.de \
/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