From 428a966f445b92d487c999aa2bd4e1f1c558ad7a Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 11 May 2008 19:51:07 +0000 Subject: fix handling of tea5761_autodetection return value From: Marcin Slusarz tea5761_autodetection returns -EINVAL on error Signed-off-by: Marcin Slusarz Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/common/tuners/tea5761.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/drivers/media/common/tuners') diff --git a/linux/drivers/media/common/tuners/tea5761.c b/linux/drivers/media/common/tuners/tea5761.c index 11e2991ef..f5fadcd4b 100644 --- a/linux/drivers/media/common/tuners/tea5761.c +++ b/linux/drivers/media/common/tuners/tea5761.c @@ -301,7 +301,7 @@ struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe, { struct tea5761_priv *priv = NULL; - if (tea5761_autodetection(i2c_adap, i2c_addr) == EINVAL) + if (tea5761_autodetection(i2c_adap, i2c_addr) != 0) return NULL; priv = kzalloc(sizeof(struct tea5761_priv), GFP_KERNEL); -- cgit v1.2.3 From 775ba6a274cfac356d94849e5f33cd937a581d02 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 16 May 2008 00:15:53 +0000 Subject: tuners/mxl5005s.c: don't define variables for enums From: Adrian Bunk It doesn't seem to be intended that "tuner_modu_type" and "MXL5005_ControlName" were global variables. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/common/tuners/mxl5005s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media/common/tuners') diff --git a/linux/drivers/media/common/tuners/mxl5005s.c b/linux/drivers/media/common/tuners/mxl5005s.c index 961a8af08..80f87c19f 100644 --- a/linux/drivers/media/common/tuners/mxl5005s.c +++ b/linux/drivers/media/common/tuners/mxl5005s.c @@ -101,7 +101,7 @@ enum { MXL_QAM, MXL_ANALOG_CABLE, MXL_ANALOG_OTA -} tuner_modu_type; +}; /* MXL5005 Tuner Register Struct */ struct TunerReg { @@ -194,7 +194,7 @@ enum { RFSYN_DIVM, /* 88 */ DN_BYPASS_AGC_I2C /* 89 */ #endif -} MXL5005_ControlName; +}; /* * The following context is source code provided by MaxLinear. -- cgit v1.2.3 From 7ac2a0cdca5bb0c9c31c2691c298becb8d777077 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 26 May 2008 11:21:45 -0300 Subject: Backport some miscelaneous trivial fixes from mainstream From: Mauro Carvalho Chehab 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 --- linux/drivers/media/common/tuners/mxl5005s.c | 1 - 1 file changed, 1 deletion(-) (limited to 'linux/drivers/media/common/tuners') 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"); - -- cgit v1.2.3