diff options
author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-07 12:30:28 +0000 |
---|---|---|
committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-07 12:30:28 +0000 |
commit | fcca0bf9fe4f592088e2263cc8586ea6cf10cec9 (patch) | |
tree | 7a98f3bd2c6e24ffbe01794c0f4a6a6eadbe20bc /linux/drivers/media | |
parent | 18f9f36ea729d7c6017dcfaaca08d7a8ed5a4935 (diff) | |
download | mediapointer-dvb-s2-fcca0bf9fe4f592088e2263cc8586ea6cf10cec9.tar.gz mediapointer-dvb-s2-fcca0bf9fe4f592088e2263cc8586ea6cf10cec9.tar.bz2 |
kernel-sync patches.
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r-- | linux/drivers/media/video/saa7134/Makefile | 5 | ||||
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-input.c | 6 | ||||
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-oss.c | 9 | ||||
-rw-r--r-- | linux/drivers/media/video/tuner-core.c | 6 | ||||
-rw-r--r-- | linux/drivers/media/video/tvaudio.c | 8 | ||||
-rw-r--r-- | linux/drivers/media/video/tveeprom.c | 2 | ||||
-rw-r--r-- | linux/drivers/media/video/tvp5150.c | 9 | ||||
-rw-r--r-- | linux/drivers/media/video/v4l1-compat.c | 8 |
9 files changed, 31 insertions, 26 deletions
diff --git a/linux/drivers/media/video/saa7134/Makefile b/linux/drivers/media/video/saa7134/Makefile index b339d5773..134f83a96 100644 --- a/linux/drivers/media/video/saa7134/Makefile +++ b/linux/drivers/media/video/saa7134/Makefile @@ -3,8 +3,9 @@ saa7134-objs := saa7134-cards.o saa7134-core.o saa7134-i2c.o \ saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o \ saa7134-video.o saa7134-input.o -obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o -obj-$(CONFIG_VIDEO_SAA7134) += saa7134-alsa.o saa7134-oss.o +obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o \ + saa6752hs.o saa7134-alsa.o \ + saa7134-oss.o obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o EXTRA_CFLAGS += -I$(src)/.. diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 04417b127..cda102e9c 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.58 2005/12/04 21:06:50 mkrufky Exp $ + * $Id: saa7134-core.c,v 1.59 2005/12/07 12:30:28 mchehab Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -252,7 +252,6 @@ static int need_empress; static int need_dvb; static int need_alsa; static int need_oss; -static int pending_registered=0; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #define request_module_depend(name,flag) request_module(name); @@ -274,6 +273,7 @@ static int pending_call(struct notifier_block *self, unsigned long state, return NOTIFY_DONE; } +static int pending_registered=0; static struct notifier_block pending_notifier = { .notifier_call = pending_call, }; diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c index d4f547fe9..613254d11 100644 --- a/linux/drivers/media/video/saa7134/saa7134-input.c +++ b/linux/drivers/media/video/saa7134/saa7134-input.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-input.c,v 1.45 2005/12/04 01:12:43 rmcc Exp $ + * $Id: saa7134-input.c,v 1.46 2005/12/07 12:30:28 mchehab Exp $ * * handle saa7134 IR remotes via linux kernel input layer. * @@ -726,14 +726,14 @@ int saa7134_input_init1(struct saa7134_dev *dev) return -ENOMEM; } + ir->dev = input_dev; + /* init hardware-specific stuff */ ir->mask_keycode = mask_keycode; ir->mask_keydown = mask_keydown; ir->mask_keyup = mask_keyup; ir->polling = polling; - ir->dev = input_dev; - /* init input device */ snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)", saa7134_boards[dev->board].name); diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c index 00f41642c..beab9a86a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-oss.c +++ b/linux/drivers/media/video/saa7134/saa7134-oss.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-oss.c,v 1.29 2005/11/20 15:50:31 mchehab Exp $ + * $Id: saa7134-oss.c,v 1.30 2005/12/07 12:30:28 mchehab Exp $ * * device driver for philips saa7134 based TV cards * oss dsp interface @@ -30,7 +30,6 @@ #include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/slab.h> -#include <linux/interrupt.h> #include <linux/sound.h> #include <linux/soundcard.h> @@ -983,12 +982,12 @@ static int saa7134_oss_init(void) } } - dmasound_init = oss_device_init; - dmasound_exit = oss_device_exit; - if (dev == NULL) printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n"); + dmasound_init = oss_device_init; + dmasound_exit = oss_device_exit; + return 0; } diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 62b1a9fe5..ccc3b1af9 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-core.c,v 1.88 2005/12/04 12:21:15 hverkuil Exp $ + * $Id: tuner-core.c,v 1.89 2005/12/07 12:30:28 mchehab Exp $ * * i2c tv tuner chip device driver * core core, i.e. kernel interfaces, registering and so on @@ -757,11 +757,13 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14) static int tuner_suspend(struct device *dev, pm_message_t state) -#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) +#else +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) static int tuner_suspend(struct device *dev, pm_message_t state, u32 level) #else static int tuner_suspend(struct device *dev, u32 state, u32 level) #endif +#endif { struct i2c_client *c = container_of (dev, struct i2c_client, dev); struct tuner *t = i2c_get_clientdata (c); diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c index 9373a0a87..87920d6b2 100644 --- a/linux/drivers/media/video/tvaudio.c +++ b/linux/drivers/media/video/tvaudio.c @@ -192,7 +192,8 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val) unsigned char buffer[2]; if (-1 == subaddr) { - tvaudio_dbg("%s: chip_write: 0x%x\n", chip->c.name, val); + tvaudio_dbg("%s: chip_write: 0x%x\n", + chip->c.name, val); chip->shadow.bytes[1] = val; buffer[0] = val; if (1 != i2c_master_send(&chip->c,buffer,1)) { @@ -232,7 +233,8 @@ static int chip_read(struct CHIPSTATE *chip) unsigned char buffer; if (1 != i2c_master_recv(&chip->c,&buffer,1)) { - tvaudio_warn("%s: I/O error (read)\n", chip->c.name); + tvaudio_warn("%s: I/O error (read)\n", + chip->c.name); return -1; } tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name, buffer); @@ -1599,7 +1601,7 @@ static int chip_probe(struct i2c_adapter *adap) { /* don't attach on saa7146 based cards, because dedicated drivers are used */ - if ((adap->id & I2C_HW_SAA7146)) + if ((adap->id == I2C_HW_SAA7146)) return 0; #ifdef I2C_CLASS_TV_ANALOG if (adap->class & I2C_CLASS_TV_ANALOG) diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index 3b66f1642..70676af9b 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -38,7 +38,9 @@ #include <linux/types.h> #include <linux/videodev.h> #include <linux/i2c.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #include <linux/slab.h> +#endif #include <media/tuner.h> #include <media/tveeprom.h> diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c index ff884d655..ab554510f 100644 --- a/linux/drivers/media/video/tvp5150.c +++ b/linux/drivers/media/video/tvp5150.c @@ -6,14 +6,15 @@ */ #include <linux/i2c.h> -#include <linux/module.h> -#include <linux/moduleparam.h> -#include <linux/delay.h> -#include <linux/slab.h> #include "compat.h" #include <linux/videodev.h> +#include <linux/delay.h> #include <linux/video_decoder.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/delay.h> +#include <linux/slab.h> #include <media/i2c-compat.h> #endif diff --git a/linux/drivers/media/video/v4l1-compat.c b/linux/drivers/media/video/v4l1-compat.c index d95342f46..42a41b1cb 100644 --- a/linux/drivers/media/video/v4l1-compat.c +++ b/linux/drivers/media/video/v4l1-compat.c @@ -1,5 +1,5 @@ /* - * $Id: v4l1-compat.c,v 1.13 2005/10/16 12:13:58 mchehab Exp $ + * $Id: v4l1-compat.c,v 1.14 2005/12/07 12:30:28 mchehab Exp $ * * Video for Linux Two * Backward Compatibility Layer @@ -1034,10 +1034,8 @@ v4l_compat_translate_ioctl(struct inode *inode, break; } - if (cap2) - kfree(cap2); - if (fmt2) - kfree(fmt2); + kfree(cap2); + kfree(fmt2); return err; } |