From: Hans Verkuil <[email protected]>

VIDIOC_S_HW_FREQ_SEEK should return EAGAIN when called in non-blocking
mode. This might change in the future if we add support for this in the
future, but right now this is not supported.

Signed-off-by: Hans Verkuil <[email protected]>
---
 drivers/media/radio/radio-mr800.c                |    3 +++
 drivers/media/radio/radio-tea5777.c              |    3 +++
 drivers/media/radio/radio-wl1273.c               |    3 +++
 drivers/media/radio/si470x/radio-si470x-common.c |    3 +++
 drivers/media/radio/wl128x/fmdrv_v4l2.c          |    3 +++
 5 files changed, 15 insertions(+)

diff --git a/drivers/media/radio/radio-mr800.c 
b/drivers/media/radio/radio-mr800.c
index 3182b26..ec7acfa 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -360,6 +360,9 @@ static int vidioc_s_hw_freq_seek(struct file *file, void 
*priv,
        if (seek->tuner != 0 || !seek->wrap_around)
                return -EINVAL;
 
+       if (file->f_flags & O_NONBLOCK)
+               return -EWOULDBLOCK;
+
        retval = amradio_send_cmd(radio,
                        AMRADIO_SET_SEARCH_LVL, 0, buf, 8, false);
        if (retval)
diff --git a/drivers/media/radio/radio-tea5777.c 
b/drivers/media/radio/radio-tea5777.c
index ef82898..50935d5 100644
--- a/drivers/media/radio/radio-tea5777.c
+++ b/drivers/media/radio/radio-tea5777.c
@@ -395,6 +395,9 @@ static int vidioc_s_hw_freq_seek(struct file *file, void 
*fh,
        if (a->tuner || a->wrap_around)
                return -EINVAL;
 
+       if (file->f_flags & O_NONBLOCK)
+               return -EWOULDBLOCK;
+
        if (a->rangelow || a->rangehigh) {
                for (i = 0; i < ARRAY_SIZE(bands); i++) {
                        if (i == BAND_AM && !tea->has_am)
diff --git a/drivers/media/radio/radio-wl1273.c 
b/drivers/media/radio/radio-wl1273.c
index a22ad1c..7ff2b3de 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -1693,6 +1693,9 @@ static int wl1273_fm_vidioc_s_hw_freq_seek(struct file 
*file, void *priv,
        if (seek->tuner != 0 || seek->type != V4L2_TUNER_RADIO)
                return -EINVAL;
 
+       if (file->f_flags & O_NONBLOCK)
+               return -EWOULDBLOCK;
+
        if (mutex_lock_interruptible(&core->lock))
                return -EINTR;
 
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c 
b/drivers/media/radio/si470x/radio-si470x-common.c
index 9bb65e1..fd74f5c 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -708,6 +708,9 @@ static int si470x_vidioc_s_hw_freq_seek(struct file *file, 
void *priv,
        if (seek->tuner != 0)
                return -EINVAL;
 
+       if (file->f_flags & O_NONBLOCK)
+               return -EWOULDBLOCK;
+
        return si470x_set_seek(radio, seek);
 }
 
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c 
b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index db2248e..8d1c094 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -408,6 +408,9 @@ static int fm_v4l2_vidioc_s_hw_freq_seek(struct file *file, 
void *priv,
        struct fmdev *fmdev = video_drvdata(file);
        int ret;
 
+       if (file->f_flags & O_NONBLOCK)
+               return -EWOULDBLOCK;
+
        if (fmdev->curr_fmmode != FM_MODE_RX) {
                ret = fmc_set_mode(fmdev, FM_MODE_RX);
                if (ret != 0) {
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to