diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-21 18:01:35 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-21 18:01:35 -0200 |
| commit | 69a2c9e0c4084d3a1345407cdd901bf5aad253d8 (patch) | |
| tree | 89999a7fbeeccde718acc0be9758e8b78b612248 /linux | |
| parent | f6d43b4abf8f3952809dd9890402d842847ee0a7 (diff) | |
| download | mediapointer-dvb-s2-69a2c9e0c4084d3a1345407cdd901bf5aad253d8.tar.gz mediapointer-dvb-s2-69a2c9e0c4084d3a1345407cdd901bf5aad253d8.tar.bz2 | |
Two cleanups made at kernel tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/zoran_device.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index 6aaafc023..e7a104098 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -196,7 +196,7 @@ static void em28xx_config_i2c(struct em28xx *dev) route.input = INPUT(dev->ctl_input)->vmux; route.output = 0; - em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, 0); + em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL); em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route); em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL); diff --git a/linux/drivers/media/video/zoran_device.c b/linux/drivers/media/video/zoran_device.c index 583ba4cb6..72d1e5f14 100644 --- a/linux/drivers/media/video/zoran_device.c +++ b/linux/drivers/media/video/zoran_device.c @@ -1421,7 +1421,7 @@ zoran_irq (int irq, struct zoran *zr; unsigned long flags; - zr = (struct zoran *) dev_id; + zr = dev_id; count = 0; if (zr->testing) { |