diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-12 01:51:46 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-12 01:51:46 +0000 |
| commit | 8a774b9452dbd90b6d763a87beff874aec637ebc (patch) | |
| tree | 93309f9080e5fc98e4be3ab8651c0de23ac06c92 | |
| parent | cadd7bcfb7c57e359a9bce520cb0244c7b0934cd (diff) | |
| download | mediapointer-dvb-s2-8a774b9452dbd90b6d763a87beff874aec637ebc.tar.gz mediapointer-dvb-s2-8a774b9452dbd90b6d763a87beff874aec637ebc.tar.bz2 | |
Trivial changes to make sync with mainstream
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
kernel-sync
- Trivial patch breaking if (ret=foo()) into two lines on mt312
- Changes url for stradis.com
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| -rw-r--r-- | linux/drivers/media/dvb/frontends/mt312.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 2 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
3 files changed, 13 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/mt312.c b/linux/drivers/media/dvb/frontends/mt312.c index 8d672283c..ec4e641ac 100644 --- a/linux/drivers/media/dvb/frontends/mt312.c +++ b/linux/drivers/media/dvb/frontends/mt312.c @@ -501,7 +501,8 @@ static int mt312_set_frontend(struct dvb_frontend* fe, case ID_VP310: // For now we will do this only for the VP310. // It should be better for the mt312 as well, but tunning will be slower. ACCJr 09/29/03 - if ((ret = mt312_readreg(state, CONFIG, &config_val) < 0)) + ret = mt312_readreg(state, CONFIG, &config_val); + if (ret < 0) return ret; if (p->u.qpsk.symbol_rate >= 30000000) //Note that 30MS/s should use 90MHz { diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 2fe260fff..d82c8a30b 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -183,7 +183,7 @@ config VIDEO_STRADIS help Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video driver for PCI. There is a product page at - <http://www.stradis.com/decoder.html>. + <http://www.stradis.com/>. config VIDEO_ZORAN tristate "Zoran ZR36057/36067 Video For Linux" diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 9ba77f461..016cfc357 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2006-01-12 01:48 mchehab + + * linux/drivers/media/dvb/frontends/mt312.c: (mt312_set_frontend): + - Trivial patch breaking if (ret=foo()) into two lines + + * linux/drivers/media/video/Kconfig: + - Changes url for stradis.com + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2006-01-12 00:51 mchehab * linux/drivers/media/video/compat_ioctl32.c: (get_video_tuner32), |