Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (120 commits)
  cx231xx: Convert to snd_card_create()
  V4L/DVB (11440): PWC: fix build error when CONFIG_INPUT=m
  V4L/DVB (11439): UVC: uvc_status_cleanup(): undefined reference to `input_unregister_device'
  V4L/DVB (11438): au0828: fix Kconfig dependance
  V4L/DVB (11437): pvrusb2: Drop client_register/unregister stubs
  V4L/DVB (11436): radio-mr800: convert to to v4l2_device
  V4L/DVB (11435): dsbr100 radio: convert to to v4l2_device
  V4L/DVB: zr364xx: remove unused #include <version.h>
  V4L/DVB: usbvision: remove unused #include <version.h>
  V4L/DVB (11427): gspca - m5602: Minor cleanups
  V4L/DVB (11426): gspca - m5602: Don't touch hflip/vflip register on Read/Modify/Write
  V4L/DVB (11425): gspca - m5602: Move the vflip quirk to probe stage.
  V4L/DVB (11424): gspca - m5602-ov9650: Use the local ctrl cache. Adjust image on vflip.
  V4L/DVB (11423): gspca - m5602-ov9650: Add a disconnect hook, setup a ctrl cache ctrl.
  V4L/DVB (11422): gspca - m5602-ov9650: Replace a magic constant with a define
  V4L/DVB (11421): gspca - m5602-ov9650: Synthesize modesetting.
  V4L/DVB (11420): gspca - m5602: Improve error handling in the ov9650 driver
  V4L/DVB (11419): gspca - m5602-ov9650: Don't read exposure data from COM1.
  V4L/DVB (11418): gspca - m5602-ov9650: Auto white balancing is on by default
  V4L/DVB (11417): gspca - m5602-ov9650: Autogain is on by default
  ...

1 files changed, 6 insertions, 11 deletions

diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index cfaacf6096d0..e707ef3086b2 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -857,15 +857,12 @@ int ivtv_v4l2_close(struct file *filp)
                 /* Mark that the radio is no longer in use */
                 clear_bit(IVTV_F_I_RADIO_USER, &itv->i_flags);
                 /* Switch tuner to TV */
-                ivtv_call_all(itv, tuner, s_std, itv->std);
+                ivtv_call_all(itv, core, s_std, itv->std);
                 /* Select correct audio input (i.e. TV tuner or Line in) */
                 ivtv_audio_set_io(itv);
-                if (itv->hw_flags & IVTV_HW_SAA711X)
-                {
-                        struct v4l2_crystal_freq crystal_freq;
-                        crystal_freq.freq = SAA7115_FREQ_32_11_MHZ;
-                        crystal_freq.flags = 0;
-                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq, &crystal_freq);
+                if (itv->hw_flags & IVTV_HW_SAA711X) {
+                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq,
+                                        SAA7115_FREQ_32_11_MHZ, 0);
                 }
                 if (atomic_read(&itv->capturing) > 0) {
                         /* Undo video mute */
@@ -956,10 +953,8 @@ static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)
                 /* Select the correct audio input (i.e. radio tuner) */
                 ivtv_audio_set_io(itv);
                 if (itv->hw_flags & IVTV_HW_SAA711X) {
-                        struct v4l2_crystal_freq crystal_freq;
-                        crystal_freq.freq = SAA7115_FREQ_32_11_MHZ;
-                        crystal_freq.flags = SAA7115_FREQ_FL_APLL;
-                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq, &crystal_freq);
+                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq,
+                                SAA7115_FREQ_32_11_MHZ, SAA7115_FREQ_FL_APLL);
                 }
                 /* Done! Unmute and continue. */
                 ivtv_unmute(itv);