summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
diff options
context:
space:
mode:
authorTrent Piepho2006-05-13 01:36:24 +0200
committerMauro Carvalho Chehab2006-06-25 07:00:23 +0200
commit8397703ee0cc9ca27df5c058f60c4d4f1dc69595 (patch)
treea4c3e7c3715778eb2ce6ef0981fcebea5499f3ec /drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
parentV4L/DVB (4013): Change the sweeprate for TT C1500 using QAM64 (diff)
downloadkernel-qcow2-linux-8397703ee0cc9ca27df5c058f60c4d4f1dc69595.tar.gz
kernel-qcow2-linux-8397703ee0cc9ca27df5c058f60c4d4f1dc69595.tar.xz
kernel-qcow2-linux-8397703ee0cc9ca27df5c058f60c4d4f1dc69595.zip
V4L/DVB (4014): Remove the spagetti code gotos that aren't useful
Some code had pointless gotos that just didn't make any sense. They didn't make the code smaller, or faster, or easier to understand. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb-dvb.c')
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-dvb.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index 500896d02d5a..2517b228381d 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/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)