Skip to content

Commit

Permalink
[media] stk-webcam.c: webcam LED bug fix
Browse files Browse the repository at this point in the history
This is an improved version of the patch I sent a little ago.

The problem was:
	On my DC-1125 webcam chip from Syntek, whenever the webcam turns
	on, the LED light on it is turned on also and never turns off again unless
	system is shut downed or restarted.

The previous version seemed to break some other laptop webcam work. Thanks
to Andrea Anacleto for the bug report and solution.

Signed-off-by: Andrea Anacleto <andreaanacleto@libero.it>
Signed-off-by: Arvydas Sidorenko <asido4@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Arvydas Sidorenko authored and Mauro Carvalho Chehab committed Sep 24, 2011
1 parent 69967a7 commit 7b1c8f5
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion drivers/media/video/stk-webcam.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ MODULE_AUTHOR("Jaime Velasco Juan <jsagarribay@gmail.com> and Nicolas VIVIEN");
MODULE_DESCRIPTION("Syntek DC1125 webcam driver");


/* bool for webcam LED management */
int first_init = 1;

/* Some cameras have audio interfaces, we aren't interested in those */
static struct usb_device_id stkwebcam_table[] = {
Expand Down Expand Up @@ -560,6 +562,12 @@ static int v4l_stk_open(struct file *fp)

if (dev == NULL || !is_present(dev))
return -ENXIO;

if (!first_init)
stk_camera_write_reg(dev, 0x0, 0x24);
else
first_init = 0;

fp->private_data = dev;
usb_autopm_get_interface(dev->interface);

Expand All @@ -573,7 +581,7 @@ static int v4l_stk_release(struct file *fp)
if (dev->owner == fp) {
stk_stop_stream(dev);
stk_free_buffers(dev);
stk_camera_write_reg(dev, 0x0, 0x48); /* turn off the LED */
stk_camera_write_reg(dev, 0x0, 0x49); /* turn off the LED */
unset_initialised(dev);
dev->owner = NULL;
}
Expand Down Expand Up @@ -1350,6 +1358,7 @@ static int stk_camera_resume(struct usb_interface *intf)
return 0;
unset_initialised(dev);
stk_initialise(dev);
stk_camera_write_reg(dev, 0x0, 0x49);
stk_setup_format(dev);
if (is_streaming(dev))
stk_start_stream(dev);
Expand Down

0 comments on commit 7b1c8f5

Please sign in to comment.