diff options
author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-16 21:09:35 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-23 06:13:50 -0500 |
commit | 231ffc9c07021afcfb1afa229aa4935730e5163b (patch) | |
tree | 5f2e5a712dee0e1ee8d0600da17204e6308007be /drivers/media | |
parent | a67534a7824c7ef3c4c377f82e60fcaa137f9a2c (diff) |
V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to VIDIOC_INT_RESET command
Fix a NULL pointer dereference that would occur if the video decoder tied to
the em28xx supports the VIDIOC_INT_RESET call (for example: the cx25840 driver)
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 610f535a257c..4ea1f1e04897 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -549,10 +549,11 @@ static int em28xx_config(struct em28xx *dev) | |||
549 | static void em28xx_config_i2c(struct em28xx *dev) | 549 | static void em28xx_config_i2c(struct em28xx *dev) |
550 | { | 550 | { |
551 | struct v4l2_routing route; | 551 | struct v4l2_routing route; |
552 | int zero = 0; | ||
552 | 553 | ||
553 | route.input = INPUT(dev->ctl_input)->vmux; | 554 | route.input = INPUT(dev->ctl_input)->vmux; |
554 | route.output = 0; | 555 | route.output = 0; |
555 | em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL); | 556 | em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, &zero); |
556 | em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route); | 557 | em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route); |
557 | em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL); | 558 | em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL); |
558 | } | 559 | } |