summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-12 07:10:24 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-12 07:10:24 -0300
commit9a09794eece0cb3e40b69aee140b81d87f914fc1 (patch)
treeca92ed7735e27bbfa58a596f49e9378d230b77a0 /linux/drivers/media/video/pwc
parent3c00de0d74330e4761f5592f873d1a2b7553e8b3 (diff)
parent883dc7792c9ded24211969d851819da1b01aaca3 (diff)
downloadmediapointer-dvb-s2-9a09794eece0cb3e40b69aee140b81d87f914fc1.tar.gz
mediapointer-dvb-s2-9a09794eece0cb3e40b69aee140b81d87f914fc1.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/lgdt3305
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pwc')
-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);