This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/v4l-utils.git tree:

Subject: v4l2-compliance: add hw_freq_seek test for invalid tuner.
Author:  Hans Verkuil <[email protected]>
Date:    Thu Sep 13 17:37:07 2012 +0200

Add a test for VIDIOC_S_HW_FREQ_SEEK to verify that selecting an invalid
tuner will return an error.

Signed-off-by: Hans Verkuil <[email protected]>
(cherry picked from commit c4da15a005ec1d853cf9a641f5f6f529568af0d4)

Signed-off-by: Gregor Jasny <[email protected]>

 utils/v4l2-compliance/v4l2-test-input-output.cpp |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

---

http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=f1a32e0283afd34ea900500285ba5986e99f5e61

diff --git a/utils/v4l2-compliance/v4l2-test-input-output.cpp 
b/utils/v4l2-compliance/v4l2-test-input-output.cpp
index 4f62411..20d30f5 100644
--- a/utils/v4l2-compliance/v4l2-test-input-output.cpp
+++ b/utils/v4l2-compliance/v4l2-test-input-output.cpp
@@ -285,11 +285,11 @@ int testTunerFreq(struct node *node)
 
 int testTunerHwSeek(struct node *node)
 {
+       struct v4l2_hw_freq_seek seek;
        unsigned t;
        int ret;
 
        for (t = 0; t < node->tuners; t++) {
-               struct v4l2_hw_freq_seek seek;
                struct v4l2_tuner tuner;
                
                tuner.index = t;
@@ -327,7 +327,13 @@ int testTunerHwSeek(struct node *node)
                if (check_0(seek.reserved, sizeof(seek.reserved)))
                        return fail("non-zero reserved fields\n");
        }
-       return 0;
+       memset(&seek, 0, sizeof(seek));
+       seek.tuner = node->tuners;
+       seek.type = V4L2_TUNER_RADIO;
+       ret = doioctl(node, VIDIOC_S_HW_FREQ_SEEK, &seek);
+       if (ret != EINVAL && ret != ENOTTY)
+               return fail("hw seek for invalid tuner didn't return EINVAL or 
ENOTTY\n");
+       return ret == ENOTTY ? ret : 0;
 }
 
 static int checkInput(struct node *node, const struct v4l2_input &descr, 
unsigned i)

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to