diff --git a/[refs] b/[refs] index 5b1ebef45baf..8d6e610d9785 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c2808e2fd4c30a19268215c2958d4a340f057c5 +refs/heads/master: 2d06d5dd2d945780f24169af0ac86e1e03ffee19 diff --git a/trunk/drivers/media/video/gspca/benq.c b/trunk/drivers/media/video/gspca/benq.c index f4357f77b2d6..6ae26160b81f 100644 --- a/trunk/drivers/media/video/gspca/benq.c +++ b/trunk/drivers/media/video/gspca/benq.c @@ -86,20 +86,6 @@ static int sd_init(struct gspca_dev *gspca_dev) return 0; } -static int sd_isoc_init(struct gspca_dev *gspca_dev) -{ - int ret; - - ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, - gspca_dev->nbalt - 1); - if (ret < 0) { - pr_err("usb_set_interface failed\n"); - return ret; - } -/* reg_w(gspca_dev, 0x0003, 0x0002); */ - return 0; -} - /* -- start the camera -- */ static int sd_start(struct gspca_dev *gspca_dev) { @@ -271,7 +257,6 @@ static const struct sd_desc sd_desc = { .nctrls = ARRAY_SIZE(sd_ctrls), .config = sd_config, .init = sd_init, - .isoc_init = sd_isoc_init, .start = sd_start, .stopN = sd_stopN, .pkt_scan = sd_pkt_scan,