diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-24 11:02:38 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-24 11:02:38 -0700 |
| commit | 699406f84e3cfbbc4dee6b91e6ce3c0edec97f08 (patch) | |
| tree | 793b7fac6559a44e0d307fb4f37a8fce5e6b589d | |
| parent | 65c3187a0d2076486a129541bebb1f5fd6d51149 (diff) | |
| parent | 12b27ff59a1ecad4b4441bb1a56c0c7a62f71c73 (diff) | |
Merge branch 'v3.18/topic/for-stable' into linux-linaro-lsk-v3.18
| -rw-r--r-- | drivers/media/v4l2-core/videobuf2-core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index cc9537ef4829..c59f9391dd82 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -3221,7 +3221,6 @@ 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) |