Commit fec2e415 authored by Stefan Brüns's avatar Stefan Brüns Committed by Mauro Carvalho Chehab
Browse files

media: dvbsky: Remove duplicate error reporting for dvbsky_usb_generic_rw 



Errors are already reported by the common code in dvb_usb_v2_generic_io
(which dvbsky_usb_generic_rw is a wrapper of), so there is no reason
report the error again.

Signed-off-by: default avatarStefan Brüns <stefan.bruens@rwth-aachen.de>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent dd5f551b

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

+0 −11
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ static int dvbsky_gpio_ctrl(struct dvb_usb_device *d, u8 gport, u8 value) 
	obuf[1] = gport;

	obuf[2] = value;

	ret = dvbsky_usb_generic_rw(d, obuf, 3, ibuf, 1);

	if (ret)

		dev_err(&d->udev->dev, "failed=%d\n", ret);

	return ret;

}
@@ -139,8 +137,6 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], 
			obuf[3] = msg[0].addr;

			ret = dvbsky_usb_generic_rw(d, obuf, 4,

					ibuf, msg[0].len + 1);

			if (ret)

				dev_err(&d->udev->dev, "failed=%d\n", ret);

			if (!ret)

				memcpy(msg[0].buf, &ibuf[1], msg[0].len);

		} else {
@@ -151,8 +147,6 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], 
			memcpy(&obuf[3], msg[0].buf, msg[0].len);

			ret = dvbsky_usb_generic_rw(d, obuf,

					msg[0].len + 3, ibuf, 1);

			if (ret)

				dev_err(&d->udev->dev, "failed=%d\n", ret);

		}

	} else {

		if ((msg[0].len > 60) || (msg[1].len > 60)) {
@@ -170,9 +164,6 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], 
		memcpy(&obuf[4], msg[0].buf, msg[0].len);

		ret = dvbsky_usb_generic_rw(d, obuf,

			msg[0].len + 4, ibuf, msg[1].len + 1);

		if (ret)

			dev_err(&d->udev->dev, "failed=%d\n", ret);



		if (!ret)

			memcpy(msg[1].buf, &ibuf[1], msg[1].len);

	}
@@ -201,8 +192,6 @@ static int dvbsky_rc_query(struct dvb_usb_device *d) 


	obuf[0] = 0x10;

	ret = dvbsky_usb_generic_rw(d, obuf, 1, ibuf, 2);

	if (ret)

		dev_err(&d->udev->dev, "failed=%d\n", ret);

	if (ret == 0)

		code = (ibuf[0] << 8) | ibuf[1];

	if (code != 0xffff) {