Skip to content

Commit

Permalink
[media] flexcop: handle errors from dvb_net_init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonathan Nieder authored and Mauro Carvalho Chehab committed Jan 6, 2012
1 parent 42702de commit 01732eb
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/media/dvb/b2c2/flexcop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 01732eb

Please sign in to comment.