diff options
Diffstat (limited to 'drivers/media/video/gspca/xirlink_cit.c')
-rw-r--r-- | drivers/media/video/gspca/xirlink_cit.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/xirlink_cit.c b/drivers/media/video/gspca/xirlink_cit.c index fbb6ed25ec31..ecada178bceb 100644 --- a/drivers/media/video/gspca/xirlink_cit.c +++ b/drivers/media/video/gspca/xirlink_cit.c | |||
@@ -995,14 +995,12 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
995 | case CIT_MODEL0: | 995 | case CIT_MODEL0: |
996 | cam->cam_mode = model0_mode; | 996 | cam->cam_mode = model0_mode; |
997 | cam->nmodes = ARRAY_SIZE(model0_mode); | 997 | cam->nmodes = ARRAY_SIZE(model0_mode); |
998 | cam->reverse_alts = 1; | ||
999 | gspca_dev->ctrl_dis = ~((1 << SD_CONTRAST) | (1 << SD_HFLIP)); | 998 | gspca_dev->ctrl_dis = ~((1 << SD_CONTRAST) | (1 << SD_HFLIP)); |
1000 | sd->sof_len = 4; | 999 | sd->sof_len = 4; |
1001 | break; | 1000 | break; |
1002 | case CIT_MODEL1: | 1001 | case CIT_MODEL1: |
1003 | cam->cam_mode = cif_yuv_mode; | 1002 | cam->cam_mode = cif_yuv_mode; |
1004 | cam->nmodes = ARRAY_SIZE(cif_yuv_mode); | 1003 | cam->nmodes = ARRAY_SIZE(cif_yuv_mode); |
1005 | cam->reverse_alts = 1; | ||
1006 | gspca_dev->ctrl_dis = (1 << SD_HUE) | (1 << SD_HFLIP); | 1004 | gspca_dev->ctrl_dis = (1 << SD_HUE) | (1 << SD_HFLIP); |
1007 | sd->sof_len = 4; | 1005 | sd->sof_len = 4; |
1008 | break; | 1006 | break; |
@@ -2791,7 +2789,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev) | |||
2791 | } | 2789 | } |
2792 | 2790 | ||
2793 | /* Start isoc bandwidth "negotiation" at max isoc bandwidth */ | 2791 | /* Start isoc bandwidth "negotiation" at max isoc bandwidth */ |
2794 | alt = &gspca_dev->dev->config->intf_cache[0]->altsetting[1]; | 2792 | alt = &gspca_dev->dev->actconfig->intf_cache[0]->altsetting[1]; |
2795 | alt->endpoint[0].desc.wMaxPacketSize = cpu_to_le16(max_packet_size); | 2793 | alt->endpoint[0].desc.wMaxPacketSize = cpu_to_le16(max_packet_size); |
2796 | 2794 | ||
2797 | return 0; | 2795 | return 0; |
@@ -2814,7 +2812,7 @@ static int sd_isoc_nego(struct gspca_dev *gspca_dev) | |||
2814 | break; | 2812 | break; |
2815 | } | 2813 | } |
2816 | 2814 | ||
2817 | alt = &gspca_dev->dev->config->intf_cache[0]->altsetting[1]; | 2815 | alt = &gspca_dev->dev->actconfig->intf_cache[0]->altsetting[1]; |
2818 | packet_size = le16_to_cpu(alt->endpoint[0].desc.wMaxPacketSize); | 2816 | packet_size = le16_to_cpu(alt->endpoint[0].desc.wMaxPacketSize); |
2819 | if (packet_size <= min_packet_size) | 2817 | if (packet_size <= min_packet_size) |
2820 | return -EIO; | 2818 | return -EIO; |