Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 878595f6 authored by Darron Broad's avatar Darron Broad Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9335): videobuf: split unregister bus creating self-contained frontend de-allocator 



This creates a self contained frontend de-allocator
for the instances where an adapter has not been
registered yet frontend de-allocation may
be required.

Signed-off-by: default avatarDarron Broad <darron@kewl.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0fcd488d

drivers/media/video/videobuf-dvb.c

+29 −23
Original line number Diff line number Diff line
@@ -296,29 +296,7 @@ EXPORT_SYMBOL(videobuf_dvb_register_bus); 


void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f)

{

	struct list_head *list, *q;

	struct videobuf_dvb_frontend *fe;



	mutex_lock(&f->lock);

	list_for_each_safe(list, q, &f->felist) {

		fe = list_entry(list, struct videobuf_dvb_frontend, felist);

		if (fe->dvb.net.dvbdev) {

			dvb_net_release(&fe->dvb.net);

			fe->dvb.demux.dmx.remove_frontend(&fe->dvb.demux.dmx,

				&fe->dvb.fe_mem);

			fe->dvb.demux.dmx.remove_frontend(&fe->dvb.demux.dmx,

				&fe->dvb.fe_hw);

			dvb_dmxdev_release(&fe->dvb.dmxdev);

			dvb_dmx_release(&fe->dvb.demux);

			dvb_unregister_frontend(fe->dvb.frontend);

		}

		if (fe->dvb.frontend)

			/* always allocated, may have been reset */

			dvb_frontend_detach(fe->dvb.frontend);

		list_del(list);

		kfree(fe);

	}

	mutex_unlock(&f->lock);

	videobuf_dvb_dealloc_frontends(f);



	dvb_unregister_adapter(&f->adapter);

}
@@ -389,3 +367,31 @@ fail_alloc: 
	return fe;

}

EXPORT_SYMBOL(videobuf_dvb_alloc_frontend);



void videobuf_dvb_dealloc_frontends(struct videobuf_dvb_frontends *f)

{

	struct list_head *list, *q;

	struct videobuf_dvb_frontend *fe;



	mutex_lock(&f->lock);

	list_for_each_safe(list, q, &f->felist) {

		fe = list_entry(list, struct videobuf_dvb_frontend, felist);

		if (fe->dvb.net.dvbdev) {

			dvb_net_release(&fe->dvb.net);

			fe->dvb.demux.dmx.remove_frontend(&fe->dvb.demux.dmx,

				&fe->dvb.fe_mem);

			fe->dvb.demux.dmx.remove_frontend(&fe->dvb.demux.dmx,

				&fe->dvb.fe_hw);

			dvb_dmxdev_release(&fe->dvb.dmxdev);

			dvb_dmx_release(&fe->dvb.demux);

			dvb_unregister_frontend(fe->dvb.frontend);

		}

		if (fe->dvb.frontend)

			/* always allocated, may have been reset */

			dvb_frontend_detach(fe->dvb.frontend);

		list_del(list); /* remove list entry */

		kfree(fe);	/* free frontend allocation */

	}

	mutex_unlock(&f->lock);

}

EXPORT_SYMBOL(videobuf_dvb_dealloc_frontends);

include/media/videobuf-dvb.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ int videobuf_dvb_register_bus(struct videobuf_dvb_frontends *f, 
void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f);



struct videobuf_dvb_frontend * videobuf_dvb_alloc_frontend(struct videobuf_dvb_frontends *f, int id);

void videobuf_dvb_dealloc_frontends(struct videobuf_dvb_frontends *f);



struct videobuf_dvb_frontend * videobuf_dvb_get_frontend(struct videobuf_dvb_frontends *f, int id);

int videobuf_dvb_find_frontend(struct videobuf_dvb_frontends *f, struct dvb_frontend *p);