diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-25 08:35:45 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-25 08:35:45 -0700 |
| commit | bfec7011603c22166364c6c9a6bba9e278f433f5 (patch) | |
| tree | 5c93a9e9b04e8cf1fa3e37cda6cc0e6f91211cbd | |
| parent | 699406f84e3cfbbc4dee6b91e6ce3c0edec97f08 (diff) | |
| parent | 0da403e78ff8b7b494616571bdc73436a129b188 (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, 1 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index c59f9391dd82..cc9537ef4829 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -3221,6 +3221,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) |