diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-19 14:22:34 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-19 14:22:34 -0400 |
| commit | 2972bf78c18e5084a90980cbba106f53a09427ab (patch) | |
| tree | e5c539f48d5e90132a8eb44c6ff04c324eac285e /drivers/media/video/v4l2-dev.c | |
| parent | ed569f46a07bb2089138292df8faa8e3d583b577 (diff) | |
| parent | e4fcd69c9e4e273352e0f87cabd9648606da0c3e (diff) | |
Merge commit 'v3.1-rc10-9-ge4fcd69' into linaro-3.1linux-linaro-3.1-2011.10-0
Diffstat (limited to 'drivers/media/video/v4l2-dev.c')
| -rw-r--r-- | drivers/media/video/v4l2-dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index d7215651772..a5c9ed128b9 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/drivers/media/video/v4l2-dev.c @@ -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 |