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

Commit 65f33396 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8817): gspca: LED and proble changes in sonixb.



- turn the led of the cam off after plugging in the cam
- move the probe code from open to config, so that if the probe fails
  we never register

Signed-off-by: default avatarHans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e2ad2a54
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -756,6 +756,11 @@ static int sd_config(struct gspca_dev *gspca_dev,
	struct sd *sd = (struct sd *) gspca_dev;
	struct cam *cam;
	int sif = 0;
	const __u8 stop = 0x09; /* Disable stream turn of LED */

	reg_r(gspca_dev, 0x00);
	if (gspca_dev->usb_buf[0] != 0x10)
		return -ENODEV;

	/* copy the webcam info from the device id */
	sd->sensor = (id->driver_info >> 24) & 0xff;
@@ -788,15 +793,15 @@ static int sd_config(struct gspca_dev *gspca_dev,
		sd->autogain = AUTOGAIN_DEF;
	sd->freq = FREQ_DEF;

	/* Disable stream turn of LED */
	reg_w(gspca_dev, 0x01, &stop, 1);

	return 0;
}

/* this function is called at open time */
static int sd_open(struct gspca_dev *gspca_dev)
{
	reg_r(gspca_dev, 0x00);
	if (gspca_dev->usb_buf[0] != 0x10)
		return -ENODEV;
	return 0;
}