diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 10:02:56 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 10:02:56 -0200 |
| commit | aaf40c6ff3028f2396368689550f0141c7eebb07 (patch) | |
| tree | 2c7745186e484495900db17e55ba3788376c3a62 /linux/drivers/media | |
| parent | 4e2efa67516218f9c864b54ce1b948da74f613fd (diff) | |
| download | mediapointer-dvb-s2-aaf40c6ff3028f2396368689550f0141c7eebb07.tar.gz mediapointer-dvb-s2-aaf40c6ff3028f2396368689550f0141c7eebb07.tar.bz2 | |
Sync patches to kernel
From: Mauro Carvalho Chehab <mchehab@infradead.org>
dvb_bt8xx_remove return code changed to zero to avoid warning
tvp5150_read doesn't need to be inline
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tvp5150.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 0183dc607..dda2b501a 100644 --- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -908,7 +908,7 @@ static int dvb_bt8xx_probe(struct bttv_sub_device *sub) #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) static int dvb_bt8xx_remove(struct device *dev) #else -static int dvb_bt8xx_remove(struct bttv_sub_device *sub) +static void dvb_bt8xx_remove(struct bttv_sub_device *sub) #endif { #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) @@ -931,8 +931,6 @@ static int dvb_bt8xx_remove(struct bttv_sub_device *sub) dvb_unregister_adapter(&card->dvb_adapter); kfree(card); - - return 0; } static struct bttv_sub_driver driver = { diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c index da9c9e944..d3b64130e 100644 --- a/linux/drivers/media/video/tvp5150.c +++ b/linux/drivers/media/video/tvp5150.c @@ -124,7 +124,7 @@ struct tvp5150 { int sat; }; -static inline int tvp5150_read(struct i2c_client *c, unsigned char addr) +static int tvp5150_read(struct i2c_client *c, unsigned char addr) { unsigned char buffer[1]; int rc; |