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

Commit e4fcd69c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus 

* 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus:
  [media] videodev: fix a NULL pointer dereference in v4l2_device_release()
parents f91f6cfd e58fced2

drivers/media/video/v4l2-dev.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static void v4l2_device_release(struct device *cd) 
	 * TODO: In the long run all drivers that use v4l2_device should use the

	 * v4l2_device release callback. This check will then be unnecessary.

	 */

	if (v4l2_dev->release == NULL)

	if (v4l2_dev && v4l2_dev->release == NULL)

		v4l2_dev = NULL;



	/* Release video_device and perform other