diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-12-31 08:04:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-06 12:46:58 -0200 |
| commit | 01732ebaac701638aab5d7b63ea2ee14452afd33 (patch) | |
| tree | 788fd432e9bfe8d84f94defaccac9f305737c369 | |
| parent | 42702de248d9edff22efe25e275c211a5bb80baf (diff) | |
| download | linux-01732ebaac701638aab5d7b63ea2ee14452afd33.tar.gz linux-01732ebaac701638aab5d7b63ea2ee14452afd33.tar.bz2 linux-01732ebaac701638aab5d7b63ea2ee14452afd33.zip | |
[media] flexcop: handle errors from dvb_net_init
Bail out if dvb_net_init encounters an error (for example an
out-of-memory condition), now that it reports them.
[mchehab@redhat.com: CodingStyle fix: don't use "if ((ret = foo()) < 0)"]
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/dvb/b2c2/flexcop.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c index 2df1b0214dcd..4d3caca466fd 100644 --- a/drivers/media/dvb/b2c2/flexcop.c +++ b/drivers/media/dvb/b2c2/flexcop.c @@ -117,11 +117,17 @@ static int flexcop_dvb_init(struct flexcop_device *fc) goto err_connect_frontend; } - dvb_net_init(&fc->dvb_adapter, &fc->dvbnet, &fc->demux.dmx); + ret = dvb_net_init(&fc->dvb_adapter, &fc->dvbnet, &fc->demux.dmx); + if (ret < 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: |