summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc/pwc-if.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-13 18:06:14 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-13 18:06:14 -0300
commit9840199e825a71000f4d87e61380867fe3dc7f80 (patch)
treeaaee9b6e6b95130e5409343389d9f65dd9867094 /linux/drivers/media/video/pwc/pwc-if.c
parentf689c3bd615386cf4c5238d1b4de1aaf4b58ce69 (diff)
parentc3ce9d2f22c72aa484146a24d87be98d1a29ab9f (diff)
downloadmediapointer-dvb-s2-9840199e825a71000f4d87e61380867fe3dc7f80.tar.gz
mediapointer-dvb-s2-9840199e825a71000f4d87e61380867fe3dc7f80.tar.bz2
merge: http://linuxtv.org/hg/~hgoede/libv4l
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc-if.c')
-rw-r--r--linux/drivers/media/video/pwc/pwc-if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-if.c b/linux/drivers/media/video/pwc/pwc-if.c
index 49a918636..b3765e280 100644
--- a/linux/drivers/media/video/pwc/pwc-if.c
+++ b/linux/drivers/media/video/pwc/pwc-if.c
@@ -1133,6 +1133,7 @@ static int pwc_video_open(struct file *file)
}
mutex_lock(&pdev->modlock);
+ pwc_construct(pdev); /* set min/max sizes correct */
if (!pdev->usb_init) {
PWC_DEBUG_OPEN("Doing first time initialization.\n");
pdev->usb_init = 1;
@@ -1157,7 +1158,6 @@ static int pwc_video_open(struct file *file)
if (pwc_set_leds(pdev, led_on, led_off) < 0)
PWC_DEBUG_OPEN("Failed to set LED on/off time.\n");
- pwc_construct(pdev); /* set min/max sizes correct */
/* So far, so good. Allocate memory. */
i = pwc_allocate_buffers(pdev);