Commit e08d8f0f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: dib0700: cleanup start/stop streaming logic 

Having two different paths to start/stop streaming, depending
weather the USB endpoints are 0x82/0x83 or not makes it more
prune to errors.

Unify the logic.

Link: https://lore.kernel.org/linux-media/065a6fff925a42153671fa5202c81882ca12c59c.1632689033.git.mchehab+huawei@kernel.org



Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab <mchehab+huawei@kernel.org>, Mauro Carvalho Chehab <mchehab@kernel.org>, Michael Kuron <michael.kuron@gmail.com>, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, pb@linuxtv.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent f7b77ebe

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

+14 −12
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw 
int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)

{

	struct dib0700_state *st = adap->dev->priv;

	int ret;

	int ret, adapt_nr;



	if ((onoff != 0) && (st->fw_version >= 0x10201)) {

		/* for firmware later than 1.20.1,
@@ -610,24 +610,26 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) 


	st->buf[3] = 0x00;



	deb_info("modifying (%d) streaming state for %d\n", onoff, adap->id);



	st->channel_state &= ~0x3;



	if ((adap->fe_adap[0].stream.props.endpoint != 2)

	    && (adap->fe_adap[0].stream.props.endpoint != 3)) {

		deb_info("the endpoint number (%i) is not correct, use the adapter id instead", adap->fe_adap[0].stream.props.endpoint);

		if (onoff)

			st->channel_state |=	1 << (adap->id);

		deb_info("the endpoint number (%i) is not correct, use the adapter id instead\n",

			 adap->fe_adap[0].stream.props.endpoint);

		adapt_nr = adap->id;

	} else {

		adapt_nr = adap->fe_adap[0].stream.props.endpoint - 2;

	}



	if (onoff)

			st->channel_state |=	1 << (adap->fe_adap[0].stream.props.endpoint-2);

		st->channel_state |= 1 << adapt_nr;

	else

			st->channel_state |=	1 << (3-adap->fe_adap[0].stream.props.endpoint);

	}

		st->channel_state |= 1 << (1 - adapt_nr);



	st->buf[2] |= st->channel_state;



	deb_info("data for streaming: %x %x\n", st->buf[1], st->buf[2]);

	deb_info("adapter %d, streaming %s: %*ph\n",

		adapt_nr, onoff ? "ON" : "OFF", 3, st->buf);



	ret = dib0700_ctrl_wr(adap->dev, st->buf, 4);

	mutex_unlock(&adap->dev->usb_mutex);