From 0033901ddd6e9574c7a3c74274cf14d1cdc995ab Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 7 Sep 2012 12:50:02 -0300 Subject: [PATCH] --- yaml --- r: 331117 b: refs/heads/master c: 8c82c75c3950dea31fe03567125feea089893141 h: refs/heads/master i: 331115: ea7077332076c41307055683e5e346b52ffcd88c v: v3 --- [refs] | 2 +- trunk/drivers/media/v4l2-core/videobuf2-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b0e4cef49fb..da985bdacc7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2210f9e2e269975db413b8fe4de2f07e6a09b05 +refs/heads/master: 8c82c75c3950dea31fe03567125feea089893141 diff --git a/trunk/drivers/media/v4l2-core/videobuf2-core.c b/trunk/drivers/media/v4l2-core/videobuf2-core.c index 4da3df61901f..59ed5223393b 100644 --- a/trunk/drivers/media/v4l2-core/videobuf2-core.c +++ b/trunk/drivers/media/v4l2-core/videobuf2-core.c @@ -2278,7 +2278,7 @@ ssize_t vb2_fop_write(struct file *file, char __user *buf, goto exit; err = vb2_write(vdev->queue, buf, count, ppos, file->f_flags & O_NONBLOCK); - if (err >= 0) + if (vdev->queue->fileio) vdev->queue->owner = file->private_data; exit: if (lock) @@ -2300,7 +2300,7 @@ ssize_t vb2_fop_read(struct file *file, char __user *buf, goto exit; err = vb2_read(vdev->queue, buf, count, ppos, file->f_flags & O_NONBLOCK); - if (err >= 0) + if (vdev->queue->fileio) vdev->queue->owner = file->private_data; exit: if (lock)