diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 11:21:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 11:21:45 -0300 |
| commit | 7ac2a0cdca5bb0c9c31c2691c298becb8d777077 (patch) | |
| tree | 162102c8a0bc06bfadac75ca81a6517b0216f18a /linux/drivers/media | |
| parent | 775ba6a274cfac356d94849e5f33cd937a581d02 (diff) | |
| download | mediapointer-dvb-s2-7ac2a0cdca5bb0c9c31c2691c298becb8d777077.tar.gz mediapointer-dvb-s2-7ac2a0cdca5bb0c9c31c2691c298becb8d777077.tar.bz2 | |
Backport some miscelaneous trivial fixes from mainstream
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Summary of changes:
linux/drivers/media/Makefile | 2 ++
linux/drivers/media/common/tuners/mxl5005s.c | 1 -
linux/drivers/media/video/cx18/cx18-driver.c | 2 +-
linux/drivers/media/video/saa7134/saa7134-video.c | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/Makefile | 2 | ||||
| -rw-r--r-- | linux/drivers/media/common/tuners/mxl5005s.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/Makefile b/linux/drivers/media/Makefile index 73f742c7e..cc11c4c0e 100644 --- a/linux/drivers/media/Makefile +++ b/linux/drivers/media/Makefile @@ -2,6 +2,8 @@ # Makefile for the kernel multimedia device drivers. # +obj-y := common/ + obj-$(CONFIG_VIDEO_MEDIA) += common/ # Since hybrid devices are here, should be compiled if DVB and/or V4L diff --git a/linux/drivers/media/common/tuners/mxl5005s.c b/linux/drivers/media/common/tuners/mxl5005s.c index 80f87c19f..e356db855 100644 --- a/linux/drivers/media/common/tuners/mxl5005s.c +++ b/linux/drivers/media/common/tuners/mxl5005s.c @@ -4110,4 +4110,3 @@ EXPORT_SYMBOL(mxl5005s_attach); MODULE_DESCRIPTION("MaxLinear MXL5005S silicon tuner driver"); MODULE_AUTHOR("Steven Toth"); MODULE_LICENSE("GPL"); - diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index 008745af2..0dd4e0529 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/drivers/media/video/cx18/cx18-driver.c @@ -607,7 +607,7 @@ static int __devinit cx18_probe(struct pci_dev *dev, } cx = kzalloc(sizeof(struct cx18), GFP_ATOMIC); - if (cx == 0) { + if (!cx) { spin_unlock(&cx18_cards_lock); return -ENOMEM; } diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 3b7774305..b8444429a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1641,7 +1641,7 @@ static int saa7134_s_fmt_overlay(struct file *file, void *priv, struct saa7134_fh *fh = priv; struct saa7134_dev *dev = fh->dev; int err; - unsigned int flags; + unsigned long flags; if (saa7134_no_overlay > 0) { printk(KERN_ERR "V4L2_BUF_TYPE_VIDEO_OVERLAY: no_overlay\n"); |