Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
  [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
  mb86a20s: Add a few more register settings at the init seq
  mb86a20s: Group registers into the same line
  [media] [PATCH] don't reset the delivery system on DTV_CLEAR
  [media] [BUG] it913x-fe fix typo error making SNR levels unstable
  [media] cx23885: Query the CX25840 during enum_input for status
  [media] cx25840: Add support for g_input_status
  [media] rc-videomate-m1f.c Rename to match remote controler name
  [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
  [media] convert drivers/media/* to use module_platform_driver()
  [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
  [media] Exynos4 JPEG codec v4l2 driver
  [media] doc: v4l: selection: choose pixels as units for selection rectangles
  [media] v4l: s5p-tv: mixer: fix setup of VP scaling
  [media] v4l: s5p-tv: mixer: add support for selection API
  [media] v4l: emulate old crop API using extended crop/compose API
  [media] doc: v4l: add documentation for selection API
  [media] doc: v4l: add binary images for selection API
  [media] v4l: add support for selection api
  [media] hd29l2: fix review findings
  ...

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,
         case CIT_MODEL0:
                 cam->cam_mode = model0_mode;
                 cam->nmodes = ARRAY_SIZE(model0_mode);
-                cam->reverse_alts = 1;
                 gspca_dev->ctrl_dis = ~((1 << SD_CONTRAST) | (1 << SD_HFLIP));
                 sd->sof_len = 4;
                 break;
         case CIT_MODEL1:
                 cam->cam_mode = cif_yuv_mode;
                 cam->nmodes = ARRAY_SIZE(cif_yuv_mode);
-                cam->reverse_alts = 1;
                 gspca_dev->ctrl_dis = (1 << SD_HUE) | (1 << SD_HFLIP);
                 sd->sof_len = 4;
                 break;
@@ -2791,7 +2789,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)
         }
 
         /* Start isoc bandwidth "negotiation" at max isoc bandwidth */
-        alt = &gspca_dev->dev->config->intf_cache[0]->altsetting[1];
+        alt = &gspca_dev->dev->actconfig->intf_cache[0]->altsetting[1];
         alt->endpoint[0].desc.wMaxPacketSize = cpu_to_le16(max_packet_size);
 
         return 0;
@@ -2814,7 +2812,7 @@ static int sd_isoc_nego(struct gspca_dev *gspca_dev)
                 break;
         }
 
-        alt = &gspca_dev->dev->config->intf_cache[0]->altsetting[1];
+        alt = &gspca_dev->dev->actconfig->intf_cache[0]->altsetting[1];
         packet_size = le16_to_cpu(alt->endpoint[0].desc.wMaxPacketSize);
         if (packet_size <= min_packet_size)
                 return -EIO;