From c28d559e98c7275ad3064fd8c4f35ada52776e21 Mon Sep 17 00:00:00 2001 From: Martin Fuzzey Date: Mon, 9 Mar 2009 20:16:00 -0300 Subject: [PATCH] --- yaml --- r: 138142 b: refs/heads/master c: 5c8e2403ba06d39f04f6ae62f3afe5542e0eb533 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pwc/pwc-if.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 28355735c868..5c6e3754348b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76ecf4599e55fd16bdb333a737c6243105c916e6 +refs/heads/master: 5c8e2403ba06d39f04f6ae62f3afe5542e0eb533 diff --git a/trunk/drivers/media/video/pwc/pwc-if.c b/trunk/drivers/media/video/pwc/pwc-if.c index a7c2e7284c20..7c542caf248e 100644 --- a/trunk/drivers/media/video/pwc/pwc-if.c +++ b/trunk/drivers/media/video/pwc/pwc-if.c @@ -1125,6 +1125,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; @@ -1149,7 +1150,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);