diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-24 18:18:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-24 18:18:09 -0400 |
| commit | 1805b2f04855f07afe3a71d620a68f483b0ed74f (patch) | |
| tree | b823b90f37f5404fcaef70f785c70112ca74a329 /drivers/media | |
| parent | 78d81d15b74246c7cedf84894434890b33da3907 (diff) | |
| parent | f42af6c486aa5ca6ee62800cb45c5b252020509d (diff) | |
| download | linux-1805b2f04855f07afe3a71d620a68f483b0ed74f.tar.bz2 | |
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/media')
| -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 d72156517726..a5c9ed128b97 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 |