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

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

V4L/DVB: gspca - vc032x: Move the first VC0321 settings to sd_init() 



The first VC0321 settings were done at webcam connection only. They must also
be done on resume after suspend.

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

drivers/media/video/gspca/vc032x.c

+12 −13
Original line number Diff line number Diff line
@@ -3415,13 +3415,6 @@ static int sd_config(struct gspca_dev *gspca_dev, 
	if (sd->sensor == SENSOR_OV7670)

		sd->flags |= FL_HFLIP | FL_VFLIP;



	if (sd->bridge == BRIDGE_VC0321) {

		reg_r(gspca_dev, 0x8a, 0, 3);

		reg_w(gspca_dev, 0x87, 0x00, 0x0f0f);



		reg_r(gspca_dev, 0x8b, 0, 3);

		reg_w(gspca_dev, 0x88, 0x00, 0x0202);

	}

	return 0;

}
@@ -3430,6 +3423,11 @@ static int sd_init(struct gspca_dev *gspca_dev) 
{

	struct sd *sd = (struct sd *) gspca_dev;



	if (sd->bridge == BRIDGE_VC0321) {

		reg_r(gspca_dev, 0x8a, 0, 3);

		reg_w(gspca_dev, 0x87, 0x00, 0x0f0f);

		reg_r(gspca_dev, 0x8b, 0, 3);

		reg_w(gspca_dev, 0x88, 0x00, 0x0202);

		if (sd->sensor == SENSOR_POxxxx) {

			reg_r(gspca_dev, 0xa1, 0xb300, 1);

			if (gspca_dev->usb_buf[0] != 0) {
@@ -3438,6 +3436,7 @@ static int sd_init(struct gspca_dev *gspca_dev) 
				reg_w(gspca_dev, 0xa0, 0x00, 0xb300);

			}

		}

	}

	return gspca_dev->usb_err;

}