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

Commit bde316a4 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7683): pvrusb2-dvb: set to DTV mode before attaching frontend

parent bb8ce9d9
Loading
Loading
Loading
Loading
+19 −1
Original line number Diff line number Diff line
@@ -346,13 +346,31 @@ static int pvr2_dvb_adapter_exit(struct pvr2_dvb_adapter *adap)

static int pvr2_dvb_frontend_init(struct pvr2_dvb_adapter *adap)
{
	struct pvr2_dvb_props *dvb_props = adap->pvr->hdw->hdw_desc->dvb_props;
	struct pvr2_hdw *hdw = adap->pvr->hdw;
	struct pvr2_dvb_props *dvb_props = hdw->hdw_desc->dvb_props;
	int ret;

	if (dvb_props == NULL) {
		err("fe_props not defined!");
		return -EINVAL;
	}

	/* FIXME: This code should be moved into the core,
	 * and should only be called if we don't already have
	 * control of the bus.
	 *
	 * We can't call "pvr2_dvb_bus_ctrl(adap->fe, 1)" from here,
	 * because adap->fe isn't defined yet.
	 */
	ret = pvr2_ctrl_set_value(pvr2_hdw_get_ctrl_by_id(hdw,
							  PVR2_CID_INPUT),
				  PVR2_CVAL_INPUT_DTV);
	if (ret != 0)
		return ret;

	pvr2_hdw_commit_ctl(hdw);


	if (dvb_props->frontend_attach == NULL) {
		err("frontend_attach not defined!");
		return -EINVAL;