diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-15 23:38:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-15 23:38:31 -0300 |
| commit | 09face28b78569cdcc7c6ab30a96e8548c85f319 (patch) | |
| tree | 012542b31853970a3efda0ece7a3c1e697e95ffd /linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | |
| parent | ad8c1665001c90893f44e6cb1d22a8309d16e16b (diff) | |
| parent | e4a9fb69a7c69cc46bd393234766c32403ad8f56 (diff) | |
| download | mediapointer-dvb-s2-09face28b78569cdcc7c6ab30a96e8548c85f319.tar.gz mediapointer-dvb-s2-09face28b78569cdcc7c6ab30a96e8548c85f319.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/cx88
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c index 500896d02..2517b2283 100644 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c @@ -121,16 +121,15 @@ int dvb_usb_dvb_init(struct dvb_usb_device *d) dvb_net_init(&d->dvb_adap, &d->dvb_net, &d->demux.dmx); - goto success; + d->state |= DVB_USB_STATE_DVB; + return 0; + err_dmx_dev: dvb_dmx_release(&d->demux); err_dmx: dvb_unregister_adapter(&d->dvb_adap); err: return ret; -success: - d->state |= DVB_USB_STATE_DVB; - return 0; } int dvb_usb_dvb_exit(struct dvb_usb_device *d) |