summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common/tuners
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-05-26 11:55:24 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-26 11:55:24 -0300
commit3a06e7be6db2c2b35e97a92b23c9191888a07042 (patch)
tree528aeb42700f9199d79e1b20dba205d74933b355 /linux/drivers/media/common/tuners
parent6c704b27377af4d7802223b3e7a7ec4f154fb158 (diff)
parentff1932a9bc2b54a130d135a19cc82e5c61130db0 (diff)
downloadmediapointer-dvb-s2-3a06e7be6db2c2b35e97a92b23c9191888a07042.tar.gz
mediapointer-dvb-s2-3a06e7be6db2c2b35e97a92b23c9191888a07042.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/cleanups
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common/tuners')
-rw-r--r--linux/drivers/media/common/tuners/mxl5005s.c5
-rw-r--r--linux/drivers/media/common/tuners/tea5761.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/linux/drivers/media/common/tuners/mxl5005s.c b/linux/drivers/media/common/tuners/mxl5005s.c
index 961a8af08..e356db855 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.
@@ -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/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);