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

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

[media] gspca - zc3xx: Fix bad images with the sensor hv7131r 



The problem was introduced by the commit 2af0b4c6.
Some registers were no more initialized.

Tested-by: default avatar&lt;Giovanni Scafora <giovanni@archlinux.org>
Tested-by: default avatar&lt;Sergey Manucharian <sm@ingeniware.com>
Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7c45f2c7

drivers/media/video/gspca/zc3xx.c

+15 −2
Original line number Original line Diff line number Diff line
@@ -5830,7 +5830,7 @@ static void setmatrix(struct gspca_dev *gspca_dev) 
		[SENSOR_GC0305] =	gc0305_matrix,

		[SENSOR_GC0305] =	gc0305_matrix,

		[SENSOR_HDCS2020b] =	NULL,

		[SENSOR_HDCS2020b] =	NULL,

		[SENSOR_HV7131B] =	NULL,

		[SENSOR_HV7131B] =	NULL,

		[SENSOR_HV7131R] =	NULL,

		[SENSOR_HV7131R] =	po2030_matrix,

		[SENSOR_ICM105A] =	po2030_matrix,

		[SENSOR_ICM105A] =	po2030_matrix,

		[SENSOR_MC501CB] =	NULL,

		[SENSOR_MC501CB] =	NULL,

		[SENSOR_MT9V111_1] =	gc0305_matrix,

		[SENSOR_MT9V111_1] =	gc0305_matrix,
@@ -5936,6 +5936,7 @@ static void setquality(struct gspca_dev *gspca_dev) 
	case SENSOR_ADCM2700:

	case SENSOR_ADCM2700:

	case SENSOR_GC0305:

	case SENSOR_GC0305:

	case SENSOR_HV7131B:

	case SENSOR_HV7131B:

	case SENSOR_HV7131R:

	case SENSOR_OV7620:

	case SENSOR_OV7620:

	case SENSOR_PAS202B:

	case SENSOR_PAS202B:

	case SENSOR_PO2030:

	case SENSOR_PO2030:
@@ -6108,10 +6109,12 @@ static void send_unknown(struct gspca_dev *gspca_dev, int sensor) 
		reg_w(gspca_dev, 0x02, 0x003b);

		reg_w(gspca_dev, 0x02, 0x003b);

		reg_w(gspca_dev, 0x00, 0x0038);

		reg_w(gspca_dev, 0x00, 0x0038);

		break;

		break;

	case SENSOR_HV7131R:

	case SENSOR_PAS202B:

	case SENSOR_PAS202B:

		reg_w(gspca_dev, 0x03, 0x003b);

		reg_w(gspca_dev, 0x03, 0x003b);

		reg_w(gspca_dev, 0x0c, 0x003a);

		reg_w(gspca_dev, 0x0c, 0x003a);

		reg_w(gspca_dev, 0x0b, 0x0039);

		reg_w(gspca_dev, 0x0b, 0x0039);

		if (sensor == SENSOR_PAS202B)

			reg_w(gspca_dev, 0x0b, 0x0038);

			reg_w(gspca_dev, 0x0b, 0x0038);

		break;

		break;

	}

	}
@@ -6704,10 +6707,13 @@ static int sd_start(struct gspca_dev *gspca_dev) 
		reg_w(gspca_dev, 0x02, 0x003b);

		reg_w(gspca_dev, 0x02, 0x003b);

		reg_w(gspca_dev, 0x00, 0x0038);

		reg_w(gspca_dev, 0x00, 0x0038);

		break;

		break;

	case SENSOR_HV7131R:

	case SENSOR_PAS202B:

	case SENSOR_PAS202B:

		reg_w(gspca_dev, 0x03, 0x003b);

		reg_w(gspca_dev, 0x03, 0x003b);

		reg_w(gspca_dev, 0x0c, 0x003a);

		reg_w(gspca_dev, 0x0c, 0x003a);

		reg_w(gspca_dev, 0x0b, 0x0039);

		reg_w(gspca_dev, 0x0b, 0x0039);

		if (sd->sensor == SENSOR_HV7131R)

			reg_w(gspca_dev, 0x50, ZC3XX_R11D_GLOBALGAIN);

		break;

		break;

	}

	}
@@ -6720,6 +6726,7 @@ static int sd_start(struct gspca_dev *gspca_dev) 
		break;

		break;

	case SENSOR_PAS202B:

	case SENSOR_PAS202B:

	case SENSOR_GC0305:

	case SENSOR_GC0305:

	case SENSOR_HV7131R:

	case SENSOR_TAS5130C:

	case SENSOR_TAS5130C:

		reg_r(gspca_dev, 0x0008);

		reg_r(gspca_dev, 0x0008);

		/* fall thru */

		/* fall thru */
@@ -6760,6 +6767,12 @@ static int sd_start(struct gspca_dev *gspca_dev) 
						/* ms-win + */

						/* ms-win + */

		reg_w(gspca_dev, 0x40, 0x0117);

		reg_w(gspca_dev, 0x40, 0x0117);

		break;

		break;

	case SENSOR_HV7131R:

		i2c_write(gspca_dev, 0x25, 0x04, 0x00);	/* exposure */

		i2c_write(gspca_dev, 0x26, 0x93, 0x00);

		i2c_write(gspca_dev, 0x27, 0xe0, 0x00);

		reg_w(gspca_dev, 0x00, ZC3XX_R1A7_CALCGLOBALMEAN);

		break;

	case SENSOR_GC0305:

	case SENSOR_GC0305:

	case SENSOR_TAS5130C:

	case SENSOR_TAS5130C:

		reg_w(gspca_dev, 0x09, 0x01ad);	/* (from win traces) */

		reg_w(gspca_dev, 0x09, 0x01ad);	/* (from win traces) */