media: vp7045: do not read uninitialized values if usb transfer fails (26cff637) · Commits · 戴 / test

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

+14 −7

Original line number	Diff line number	Diff line
		@@ -96,10 +96,14 @@ static int vp7045_power_ctrl(struct dvb_usb_device *d, int onoff)

		static int vp7045_rc_query(struct dvb_usb_device *d)
		{
		int ret;
		u8 key;
		vp7045_usb_op(d,RC_VAL_READ,NULL,0,&key,1,20);

		deb_rc("remote query key: %x %d\n",key,key);
		ret = vp7045_usb_op(d, RC_VAL_READ, NULL, 0, &key, 1, 20);
		if (ret)
		return ret;

		deb_rc("remote query key: %x\n", key);

		if (key != 0x44) {
		/*
		@@ -115,11 +119,14 @@ static int vp7045_rc_query(struct dvb_usb_device *d)

		static int vp7045_read_eeprom(struct dvb_usb_device d,u8 buf, int len, int offset)
		{
		int i = 0;
		int i, ret;
		u8 v, br[2];
		for (i=0; i < len; i++) {
		v = offset + i;
		vp7045_usb_op(d,GET_EE_VALUE,&v,1,br,2,5);
		ret = vp7045_usb_op(d, GET_EE_VALUE, &v, 1, br, 2, 5);
		if (ret)
		return ret;

		buf[i] = br[1];
		}
		deb_info("VP7045 EEPROM read (offs: %d, len: %d) : ", offset, i);