Commit 54f6019b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] S_HW_FREQ_SEEK: set capability flags and return ENODATA instead of EAGAIN 



Set the new capability flags in G_TUNER and return ENODATA if no channels
were found.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e4cca4ed

drivers/media/radio/radio-mr800.c

+3 −2
Original line number Diff line number Diff line
@@ -295,7 +295,8 @@ static int vidioc_g_tuner(struct file *file, void *priv, 
	v->type = V4L2_TUNER_RADIO;

	v->rangelow = FREQ_MIN * FREQ_MUL;

	v->rangehigh = FREQ_MAX * FREQ_MUL;

	v->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;

	v->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |

		V4L2_TUNER_CAP_HWSEEK_WRAP;

	v->rxsubchans = is_stereo ? V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_MONO;

	v->audmode = radio->stereo ?

		V4L2_TUNER_MODE_STEREO : V4L2_TUNER_MODE_MONO;
@@ -372,7 +373,7 @@ static int vidioc_s_hw_freq_seek(struct file *file, void *priv, 
	timeout = jiffies + msecs_to_jiffies(30000);

	for (;;) {

		if (time_after(jiffies, timeout)) {

			retval = -EAGAIN;

			retval = -ENODATA;

			break;

		}

		if (schedule_timeout_interruptible(msecs_to_jiffies(10))) {

drivers/media/radio/radio-wl1273.c

+2 −1
Original line number Diff line number Diff line
@@ -1514,7 +1514,8 @@ static int wl1273_fm_vidioc_g_tuner(struct file *file, void *priv, 
	tuner->rangehigh = WL1273_FREQ(WL1273_BAND_OTHER_HIGH);



	tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_RDS |

		V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS_BLOCK_IO;

		V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS_BLOCK_IO |

		V4L2_TUNER_CAP_HWSEEK_BOUNDED | V4L2_TUNER_CAP_HWSEEK_WRAP;



	if (radio->stereo)

		tuner->audmode = V4L2_TUNER_MODE_STEREO;

drivers/media/radio/si470x/radio-si470x-common.c

+4 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static int si470x_set_seek(struct si470x_device *radio, 


	/* try again, if timed out */

	if (retval == 0 && timed_out)

		return -EAGAIN;

		return -ENODATA;

	return retval;

}
@@ -596,7 +596,9 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, 
	strcpy(tuner->name, "FM");

	tuner->type = V4L2_TUNER_RADIO;

	tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |

			    V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO;

			    V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |

			    V4L2_TUNER_CAP_HWSEEK_BOUNDED |

			    V4L2_TUNER_CAP_HWSEEK_WRAP;



	/* range limits */

	switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) {

drivers/media/radio/wl128x/fmdrv_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ int fm_rx_seek(struct fmdev *fmdev, u32 seek_upward, 
	if (!timeleft) {

		fmerr("Timeout(%d sec),didn't get tune ended int\n",

			   jiffies_to_msecs(FM_DRV_RX_SEEK_TIMEOUT) / 1000);

		return -ETIMEDOUT;

		return -ENODATA;

	}



	int_reason = fmdev->irq_info.flag & (FM_TUNE_COMPLETE | FM_BAND_LIMIT);

drivers/media/radio/wl128x/fmdrv_v4l2.c

+3 −1
Original line number Diff line number Diff line
@@ -285,7 +285,9 @@ static int fm_v4l2_vidioc_g_tuner(struct file *file, void *priv, 
	tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO |

	((fmdev->rx.rds.flag == FM_RDS_ENABLE) ? V4L2_TUNER_SUB_RDS : 0);

	tuner->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS |

			    V4L2_TUNER_CAP_LOW;

			    V4L2_TUNER_CAP_LOW |

			    V4L2_TUNER_CAP_HWSEEK_BOUNDED |

			    V4L2_TUNER_CAP_HWSEEK_WRAP;

	tuner->audmode = (stereo_mono_mode ?

			  V4L2_TUNER_MODE_MONO : V4L2_TUNER_MODE_STEREO);