Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ff4ad81 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11377): v4l: increase version numbers of drivers converted to v4l2_subdev. 



With all the v4l2_subdev changes that were made to these drivers it is a
good idea to increase the version number of each driver.

It's just the patch level that is increased, except for the zoran and saa7146
drivers where the minor number was increased due to the more substantial
changes that were made to those two drivers.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 940088a1

drivers/media/video/bt8xx/bttvp.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define _BTTVP_H_



#include <linux/version.h>

#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,17)

#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,18)



#include <linux/types.h>

#include <linux/wait.h>

drivers/media/video/cx23885/cx23885.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <linux/version.h>

#include <linux/mutex.h>



#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 1)

#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 2)



#define UNSET (-1U)

drivers/media/video/cx88/cx88.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


#include <linux/version.h>

#include <linux/mutex.h>

#define CX88_VERSION_CODE KERNEL_VERSION(0,0,6)

#define CX88_VERSION_CODE KERNEL_VERSION(0,0,7)



#define UNSET (-1U)

drivers/media/video/ivtv/ivtv-driver.c

+2 −5
Original line number Diff line number Diff line
@@ -884,12 +884,9 @@ static void ivtv_load_and_init_modules(struct ivtv *itv) 
	}

	else if (itv->card->type == IVTV_CARD_GV_MVPRX ||

		 itv->card->type == IVTV_CARD_GV_MVPRX2E) {

		struct v4l2_crystal_freq crystal_freq;



		/* The crystal frequency of GVMVPRX is 24.576MHz */

		crystal_freq.freq = SAA7115_FREQ_24_576_MHZ;

		crystal_freq.flags = SAA7115_FREQ_FL_UCGC;

		v4l2_subdev_call(itv->sd_video, video, s_crystal_freq, &crystal_freq);

		v4l2_subdev_call(itv->sd_video, video, s_crystal_freq,

			SAA7115_FREQ_24_576_MHZ, SAA7115_FREQ_FL_UCGC);

	}



	if (hw & IVTV_HW_CX25840) {

drivers/media/video/ivtv/ivtv-fileops.c

+5 −10
Original line number Diff line number Diff line
@@ -860,12 +860,9 @@ int ivtv_v4l2_close(struct file *filp) 
		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);