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

Commit 0d3ab841 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] dvb core: must check dvb_create_media_graph() 



If media controller is enabled and mdev is filled, it should
ensure that the media graph will be properly initialized.

Enforce that.

Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 13f6e888

drivers/media/common/siano/smsdvb-main.c

+5 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,11 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev, 
	if (smsdvb_debugfs_create(client) < 0)

		pr_info("failed to create debugfs node\n");



	dvb_create_media_graph(&client->adapter);

	rc = dvb_create_media_graph(&client->adapter);

	if (rc < 0) {

		pr_err("dvb_create_media_graph failed %d\n", rc);

		goto client_error;

	}



	pr_info("DVB interface registered.\n");

	return 0;

drivers/media/dvb-core/dvbdev.h

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ int dvb_register_device(struct dvb_adapter *adap, 
void dvb_unregister_device(struct dvb_device *dvbdev);



#ifdef CONFIG_MEDIA_CONTROLLER_DVB

int dvb_create_media_graph(struct dvb_adapter *adap);

__must_check int dvb_create_media_graph(struct dvb_adapter *adap);

static inline void dvb_register_media_controller(struct dvb_adapter *adap,

						 struct media_device *mdev)

{

drivers/media/usb/au0828/au0828-dvb.c

+5 −3
Original line number Diff line number Diff line
@@ -486,12 +486,14 @@ static int dvb_register(struct au0828_dev *dev) 
	dvb->start_count = 0;

	dvb->stop_count = 0;



#ifdef CONFIG_MEDIA_CONTROLLER_DVB

	dvb_create_media_graph(&dvb->adapter);

#endif

	result = dvb_create_media_graph(&dvb->adapter);

	if (result < 0)

		goto fail_create_graph;



	return 0;



fail_create_graph:

	dvb_net_release(&dvb->net);

fail_fe_conn:

	dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_mem);

fail_fe_mem:

drivers/media/usb/cx231xx/cx231xx-dvb.c

+5 −1
Original line number Diff line number Diff line
@@ -551,10 +551,14 @@ static int register_dvb(struct cx231xx_dvb *dvb, 


	/* register network adapter */

	dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);

	dvb_create_media_graph(&dvb->adapter);

	result = dvb_create_media_graph(&dvb->adapter);

	if (result < 0)

		goto fail_create_graph;



	return 0;



fail_create_graph:

	dvb_net_release(&dvb->net);

fail_fe_conn:

	dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_mem);

fail_fe_mem:

drivers/media/usb/dvb-usb-v2/dvb_usb_core.c

+3 −1
Original line number Diff line number Diff line
@@ -698,7 +698,9 @@ static int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap) 
		}

	}



	dvb_create_media_graph(&adap->dvb_adap);

	ret = dvb_create_media_graph(&adap->dvb_adap);

	if (ret < 0)

		goto err_dvb_unregister_frontend;



	return 0;