Commit 4d3437df authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7904): v4l/tuner-core: consistent handling of return values 



change check_mode and set_mode to return negative errors and fix all callers

Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 7fa7b858

drivers/media/video/tuner-core.c

+15 −15
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static void set_addr(struct i2c_client *c, struct tuner_setup *tun_setup) 
static inline int check_mode(struct tuner *t, char *cmd)

{

	if ((1 << t->mode & t->mode_mask) == 0) {

		return EINVAL;

		return -EINVAL;

	}



	switch (t->mode) {
@@ -730,11 +730,11 @@ static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode, 


	t->mode = mode;



	if (check_mode(t, cmd) == EINVAL) {

	if (check_mode(t, cmd) == -EINVAL) {

		t->mode = T_STANDBY;

		if (analog_ops->standby)

			analog_ops->standby(&t->fe);

		return EINVAL;

		return -EINVAL;

	}

	return 0;

}
@@ -776,13 +776,13 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		break;

	case AUDC_SET_RADIO:

		if (set_mode(client, t, V4L2_TUNER_RADIO, "AUDC_SET_RADIO")

				== EINVAL)

				== -EINVAL)

			return 0;

		if (t->radio_freq)

			set_freq(client, t->radio_freq);

		break;

	case TUNER_SET_STANDBY:

		if (check_mode(t, "TUNER_SET_STANDBY") == EINVAL)

		if (check_mode(t, "TUNER_SET_STANDBY") == -EINVAL)

			return 0;

		t->mode = T_STANDBY;

		if (analog_ops->standby)
@@ -790,7 +790,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		break;

#ifdef CONFIG_VIDEO_ALLOW_V4L1

	case VIDIOCSAUDIO:

		if (check_mode(t, "VIDIOCSAUDIO") == EINVAL)

		if (check_mode(t, "VIDIOCSAUDIO") == -EINVAL)

			return 0;

		if (check_v4l2(t) == EINVAL)

			return 0;
@@ -813,7 +813,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
			if (check_v4l2(t) == EINVAL)

				return 0;



			if (set_mode(client,t,V4L2_TUNER_ANALOG_TV, "VIDIOCSCHAN")==EINVAL)

			if (set_mode(client,t,V4L2_TUNER_ANALOG_TV, "VIDIOCSCHAN")==-EINVAL)

				return 0;



			if (vc->norm < ARRAY_SIZE(map))
@@ -827,7 +827,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		{

			unsigned long *v = arg;



			if (check_mode(t, "VIDIOCSFREQ") == EINVAL)

			if (check_mode(t, "VIDIOCSFREQ") == -EINVAL)

				return 0;

			if (check_v4l2(t) == EINVAL)

				return 0;
@@ -839,7 +839,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		{

			struct video_tuner *vt = arg;



			if (check_mode(t, "VIDIOCGTUNER") == EINVAL)

			if (check_mode(t, "VIDIOCGTUNER") == -EINVAL)

				return 0;

			if (check_v4l2(t) == EINVAL)

				return 0;
@@ -883,7 +883,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		{

			struct video_audio *va = arg;



			if (check_mode(t, "VIDIOCGAUDIO") == EINVAL)

			if (check_mode(t, "VIDIOCGAUDIO") == -EINVAL)

				return 0;

			if (check_v4l2(t) == EINVAL)

				return 0;
@@ -925,7 +925,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
			v4l2_std_id *id = arg;



			if (set_mode (client, t, V4L2_TUNER_ANALOG_TV, "VIDIOC_S_STD")

					== EINVAL)

					== -EINVAL)

				return 0;



			switch_v4l2();
@@ -941,7 +941,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
			struct v4l2_frequency *f = arg;



			if (set_mode (client, t, f->type, "VIDIOC_S_FREQUENCY")

					== EINVAL)

					== -EINVAL)

				return 0;

			switch_v4l2();

			set_freq(client,f->frequency);
@@ -952,7 +952,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		{

			struct v4l2_frequency *f = arg;



			if (check_mode(t, "VIDIOC_G_FREQUENCY") == EINVAL)

			if (check_mode(t, "VIDIOC_G_FREQUENCY") == -EINVAL)

				return 0;

			switch_v4l2();

			f->type = t->mode;
@@ -973,7 +973,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		{

			struct v4l2_tuner *tuner = arg;



			if (check_mode(t, "VIDIOC_G_TUNER") == EINVAL)

			if (check_mode(t, "VIDIOC_G_TUNER") == -EINVAL)

				return 0;

			switch_v4l2();
@@ -1020,7 +1020,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) 
		{

			struct v4l2_tuner *tuner = arg;



			if (check_mode(t, "VIDIOC_S_TUNER") == EINVAL)

			if (check_mode(t, "VIDIOC_S_TUNER") == -EINVAL)

				return 0;



			switch_v4l2();