From: Jean-François Moine Date: Fri, 23 Sep 2011 07:23:52 +0000 (-0300) Subject: [media] gspca - spca1528: Don't force the USB transfer alternate setting X-Git-Tag: MMI-PSA29.97-13-9~18177^2~77 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6507b4232c2e136ccc338c3ed5c2f54b32b961b7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [media] gspca - spca1528: Don't force the USB transfer alternate setting As the choice of the alternate setting has been enhanced in the gspca main, forcing its number here is no more useful. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/gspca/spca1528.c b/drivers/media/video/gspca/spca1528.c index b7e8d408c989..695673106e76 100644 --- a/drivers/media/video/gspca/spca1528.c +++ b/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; }