diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-24 14:16:13 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-24 14:16:13 -0700 |
| commit | 1b97254afc9e522901d369074aea9f4bbd5bf8b0 (patch) | |
| tree | 9db3245c54983e119affac9e84862df477cafa7a | |
| parent | da27f61833f6796f83eedba90b74c177d16b6f17 (diff) | |
| parent | 699406f84e3cfbbc4dee6b91e6ce3c0edec97f08 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android
| -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) |