summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttusb-budget
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-08-08 14:10:09 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 16:53:29 +0200
commitf52a838b74be70b4054ab27e435e9acb92d8c50a (patch)
tree81b9b3dff85a069781244636c0a4cf29f0220d86 /drivers/media/dvb/ttusb-budget
parentV4L/DVB (4389): Remove duplication _release() op. (diff)
downloadlinux-f52a838b74be70b4054ab27e435e9acb92d8c50a.tar.xz
linux-f52a838b74be70b4054ab27e435e9acb92d8c50a.zip
V4L/DVB (4391): Refactor dvb_detach calls into a single dvb_frontend_detach function.
Remove buggy dvb_detach() macro and replace with unified dvb_frontend_detach() call. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Acked-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/ttusb-budget')
-rw-r--r--drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 6f58c66d6ef9..234199875f53 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1625,9 +1625,7 @@ static void frontend_init(struct ttusb* ttusb)
} else {
if (dvb_register_frontend(&ttusb->adapter, ttusb->fe)) {
printk("dvb-ttusb-budget: Frontend registration failed!\n");
- dvb_detach(ttusb->fe->ops.release_sec, ttusb->fe);
- dvb_detach(ttusb->fe->ops.tuner_ops.release, ttusb->fe);
- dvb_detach(ttusb->fe->ops.release, ttusb->fe);
+ dvb_frontend_detach(ttusb->fe);
ttusb->fe = NULL;
}
}
@@ -1766,9 +1764,7 @@ static void ttusb_disconnect(struct usb_interface *intf)
dvb_dmx_release(&ttusb->dvb_demux);
if (ttusb->fe != NULL) {
dvb_unregister_frontend(ttusb->fe);
- dvb_detach(ttusb->fe->ops.release_sec, ttusb->fe);
- dvb_detach(ttusb->fe->ops.tuner_ops.release, ttusb->fe);
- dvb_detach(ttusb->fe->ops.release, ttusb->fe);
+ dvb_frontend_detach(ttusb->fe);
}
i2c_del_adapter(&ttusb->i2c_adap);
dvb_unregister_adapter(&ttusb->adapter);