From 5ab0188179f57bfb042617d28039d77e38984c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= Date: Fri, 23 Sep 2011 04:23:52 -0300 Subject: [PATCH] --- yaml --- r: 271905 b: refs/heads/master c: 6507b4232c2e136ccc338c3ed5c2f54b32b961b7 h: refs/heads/master i: 271903: ef69bac5db3e2fa4720903e696c9a67b92f0b9ee v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/spca1528.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6b679c153c68..40fb0ee9031f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e12950d86d695bdaf762476446a60ed5073eedc +refs/heads/master: 6507b4232c2e136ccc338c3ed5c2f54b32b961b7 diff --git a/trunk/drivers/media/video/gspca/spca1528.c b/trunk/drivers/media/video/gspca/spca1528.c index b7e8d408c989..695673106e76 100644 --- a/trunk/drivers/media/video/gspca/spca1528.c +++ b/trunk/drivers/media/video/gspca/spca1528.c @@ -311,8 +311,6 @@ static int sd_config(struct gspca_dev *gspca_dev, sd->color = COLOR_DEF; sd->sharpness = SHARPNESS_DEF; - gspca_dev->nbalt = 4; /* use alternate setting 3 */ - return 0; } @@ -353,6 +351,10 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev) reg_r(gspca_dev, 0x25, 0x0004, 1); reg_wb(gspca_dev, 0x27, 0x0000, 0x0000, 0x06); /* 420 */ reg_r(gspca_dev, 0x27, 0x0000, 1); + +/* not useful.. + gspca_dev->alt = 4; * use alternate setting 3 */ + return gspca_dev->usb_err; }