From 9570413dda5028bf00c0ee99b5c2ce18b99ec72d Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Wed, 22 Oct 2008 14:51:56 -0300 Subject: [PATCH] --- yaml --- r: 124153 b: refs/heads/master c: 8fe2f1d522bb599eccfff6ef4fc55f7b7abbaeec h: refs/heads/master i: 124151: 871b51a4cf49444769e32b30c73a31b95c686f5c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/finepix.c | 3 --- trunk/drivers/media/video/gspca/gspca.c | 6 ++++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 96245a3910a0..4cad5f8a4ffd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5017c7bde46abc859e0a350bcd591f502442d6af +refs/heads/master: 8fe2f1d522bb599eccfff6ef4fc55f7b7abbaeec diff --git a/trunk/drivers/media/video/gspca/finepix.c b/trunk/drivers/media/video/gspca/finepix.c index 607942fd7970..03cb94466323 100644 --- a/trunk/drivers/media/video/gspca/finepix.c +++ b/trunk/drivers/media/video/gspca/finepix.c @@ -314,9 +314,6 @@ static int sd_start(struct gspca_dev *gspca_dev) int ret; int size_ret; - /* Reset bulk in endpoint */ - usb_clear_halt(gspca_dev->dev, gspca_dev->cam.epaddr); - /* Init the device */ memset(gspca_dev->usb_buf, 0, 12); gspca_dev->usb_buf[0] = 0xc6; diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c index 6e23fd4a203f..afddb18024a8 100644 --- a/trunk/drivers/media/video/gspca/gspca.c +++ b/trunk/drivers/media/video/gspca/gspca.c @@ -597,6 +597,12 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev) if (ret < 0) goto out; + /* clear the bulk endpoint */ + if (gspca_dev->alt == 0) /* if bulk transfer */ + usb_clear_halt(gspca_dev->dev, + usb_rcvintpipe(gspca_dev->dev, + gspca_dev->cam.epaddr)); + /* start the cam */ ret = gspca_dev->sd_desc->start(gspca_dev); if (ret < 0) {