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

Commit 14b67c29 authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab
Browse files

[media] gspca - ov534: Propagate errors to higher level 



Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ddffa49e

drivers/media/video/gspca/ov534.c

+16 −5
Original line number Diff line number Diff line
@@ -479,6 +479,9 @@ static void ov534_reg_write(struct gspca_dev *gspca_dev, u16 reg, u8 val) 
	struct usb_device *udev = gspca_dev->dev;

	int ret;



	if (gspca_dev->usb_err < 0)

		return;



	PDEBUG(D_USBO, "SET 01 0000 %04x %02x", reg, val);

	gspca_dev->usb_buf[0] = val;

	ret = usb_control_msg(udev,
@@ -486,8 +489,10 @@ static void ov534_reg_write(struct gspca_dev *gspca_dev, u16 reg, u8 val) 
			      0x01,

			      USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

			      0x00, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT);

	if (ret < 0)

	if (ret < 0) {

		err("write failed %d", ret);

		gspca_dev->usb_err = ret;

	}

}



static u8 ov534_reg_read(struct gspca_dev *gspca_dev, u16 reg)
@@ -495,14 +500,18 @@ static u8 ov534_reg_read(struct gspca_dev *gspca_dev, u16 reg) 
	struct usb_device *udev = gspca_dev->dev;

	int ret;



	if (gspca_dev->usb_err < 0)

		return 0;

	ret = usb_control_msg(udev,

			      usb_rcvctrlpipe(udev, 0),

			      0x01,

			      USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

			      0x00, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT);

	PDEBUG(D_USBI, "GET 01 0000 %04x %02x", reg, gspca_dev->usb_buf[0]);

	if (ret < 0)

	if (ret < 0) {

		err("read failed %d", ret);

		gspca_dev->usb_err = ret;

	}

	return gspca_dev->usb_buf[0];

}
@@ -563,8 +572,10 @@ static void sccb_reg_write(struct gspca_dev *gspca_dev, u8 reg, u8 val) 
	ov534_reg_write(gspca_dev, OV534_REG_WRITE, val);

	ov534_reg_write(gspca_dev, OV534_REG_OPERATION, OV534_OP_WRITE_3);



	if (!sccb_check_status(gspca_dev))

	if (!sccb_check_status(gspca_dev)) {

		err("sccb_reg_write failed");

		gspca_dev->usb_err = -EIO;

	}

}



static u8 sccb_reg_read(struct gspca_dev *gspca_dev, u16 reg)
@@ -885,7 +896,7 @@ static int sd_init(struct gspca_dev *gspca_dev) 
	ov534_set_led(gspca_dev, 0);

	set_frame_rate(gspca_dev);



	return 0;

	return gspca_dev->usb_err;

}



static int sd_start(struct gspca_dev *gspca_dev)
@@ -920,7 +931,7 @@ static int sd_start(struct gspca_dev *gspca_dev) 


	ov534_set_led(gspca_dev, 1);

	ov534_reg_write(gspca_dev, 0xe0, 0x00);

	return 0;

	return gspca_dev->usb_err;

}



static void sd_stopN(struct gspca_dev *gspca_dev)