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

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

[media] gspca - sonixj: Simplify and clarify the hv7131r probe function 



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

drivers/media/video/gspca/sonixj.c

+9 −9
Original line number Diff line number Diff line
@@ -1598,6 +1598,8 @@ static void i2c_w_seq(struct gspca_dev *gspca_dev, 
	}

}



/* check the ID of the hv7131 sensor */

/* this sequence is needed because it activates the sensor */

static void hv7131r_probe(struct gspca_dev *gspca_dev)

{

	i2c_w1(gspca_dev, 0x02, 0);		/* sensor wakeup */
@@ -1605,15 +1607,13 @@ static void hv7131r_probe(struct gspca_dev *gspca_dev) 
	reg_w1(gspca_dev, 0x02, 0x66);		/* Gpio on */

	msleep(10);

	i2c_r(gspca_dev, 0, 5);			/* read sensor id */

	if (gspca_dev->usb_buf[0] == 0x02

	if (gspca_dev->usb_buf[0] == 0x02	/* chip ID (02 is R) */

	    && gspca_dev->usb_buf[1] == 0x09

	    && gspca_dev->usb_buf[2] == 0x01

	    && gspca_dev->usb_buf[3] == 0x00

	    && gspca_dev->usb_buf[4] == 0x00) {

		PDEBUG(D_PROBE, "Sensor sn9c102P HV7131R found");

	    && gspca_dev->usb_buf[2] == 0x01) {

		PDEBUG(D_PROBE, "Sensor HV7131R found");

		return;

	}

	PDEBUG(D_PROBE, "Sensor 0x%02x 0x%02x 0x%02x - sn9c102P not found",

	warn("Erroneous HV7131R ID 0x%02x 0x%02x 0x%02x",

		gspca_dev->usb_buf[0], gspca_dev->usb_buf[1],

		gspca_dev->usb_buf[2]);

}