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()
This commit is contained in:
Linus Torvalds 2011-10-19 06:44:11 -07:00
commit e4fcd69c9e
1 changed files with 1 additions and 1 deletions

View File

@ -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 * TODO: In the long run all drivers that use v4l2_device should use the
* v4l2_device release callback. This check will then be unnecessary. * 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; v4l2_dev = NULL;
/* Release video_device and perform other /* Release video_device and perform other