Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b97254a authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android

parents da27f618 699406f8

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

+0 −1
Original line number Diff line number Diff line
@@ -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)