]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] media: stk1160: Ignore unchanged standard set
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Thu, 18 Jul 2013 12:01:23 +0000 (09:01 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 26 Jul 2013 16:31:33 +0000 (13:31 -0300)
This commit adds an early check to vidioc_s_std() to detect if the
new and current standards are equal, and exit with success in that
case.
This is needed to prevent userspace applications that might attempt
to re-set the same standard from failing if that's done when streaming
has started.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/usb/stk1160/stk1160-v4l.c

index ee46d82bed5dfa23a7c0b16270b08256af1fb517..c45c9881bb5f4fdad89cf9ffe45c1c05cf8d946c 100644 (file)
@@ -379,6 +379,9 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm)
        struct stk1160 *dev = video_drvdata(file);
        struct vb2_queue *q = &dev->vb_vidq;
 
+       if (dev->norm == norm)
+               return 0;
+
        if (vb2_is_busy(q))
                return -EBUSY;