aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-08-25 08:35:07 -0700
committerKevin Hilman <khilman@linaro.org>2015-08-25 08:35:07 -0700
commit0da403e78ff8b7b494616571bdc73436a129b188 (patch)
treeb5d36bb7a6952d087a1835f6244965d5509935d7
parent12b27ff59a1ecad4b4441bb1a56c0c7a62f71c73 (diff)
downloadlinux-linaro-stable-v3.18/topic/for-stable.tar.gz
Revert "media: remove unused variable that causes a warning"v3.18/topic/for-stable
This reverts commit 12b27ff59a1ecad4b4441bb1a56c0c7a62f71c73. This fix was rejected by LTS
-rw-r--r--drivers/media/v4l2-core/videobuf2-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 5c1977933c4d..f2e43de3dd87 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -3222,6 +3222,7 @@ EXPORT_SYMBOL_GPL(vb2_thread_start);
int vb2_thread_stop(struct vb2_queue *q)
{
struct vb2_threadio_data *threadio = q->threadio;
+ struct vb2_fileio_data *fileio = q->fileio;
int err;
if (threadio == NULL)