Merge branch 'v3.18/topic/for-stable' into linux-linaro-lsk-v3.18 (bfec7011) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/v4l2-core/videobuf2-core.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3221,6 +3221,7 @@ EXPORT_SYMBOL_GPL(vb2_thread_start);
	int vb2_thread_stop(struct vb2_queue *q)		int vb2_thread_stop(struct vb2_queue *q)
	{		{
	struct vb2_threadio_data *threadio = q->threadio;		struct vb2_threadio_data *threadio = q->threadio;
			struct vb2_fileio_data *fileio = q->fileio;
	int err;		int err;

	if (threadio == NULL)		if (threadio == NULL)