aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/saa7146_i2c.c8
-rw-r--r--drivers/media/common/tuners/mxl5005s.c2
-rw-r--r--drivers/media/common/tuners/tda18271.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 74ee172b5bc9..b2ba9dc0dd6d 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -161,7 +161,7 @@ static int saa7146_i2c_reset(struct saa7146_dev *dev)
161 msleep(SAA7146_I2C_DELAY); 161 msleep(SAA7146_I2C_DELAY);
162 } 162 }
163 163
164 /* if any error is still present, a fatal error has occured ... */ 164 /* if any error is still present, a fatal error has occurred ... */
165 status = saa7146_i2c_status(dev); 165 status = saa7146_i2c_status(dev);
166 if ( dev->i2c_bitrate != status ) { 166 if ( dev->i2c_bitrate != status ) {
167 DEB_I2C(("fatal error. status:0x%08x\n",status)); 167 DEB_I2C(("fatal error. status:0x%08x\n",status));
@@ -326,9 +326,9 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m
326 if ( 0 != err) { 326 if ( 0 != err) {
327 /* this one is unsatisfying: some i2c slaves on some 327 /* this one is unsatisfying: some i2c slaves on some
328 dvb cards don't acknowledge correctly, so the saa7146 328 dvb cards don't acknowledge correctly, so the saa7146
329 thinks that an address error occured. in that case, the 329 thinks that an address error occurred. in that case, the
330 transaction should be retrying, even if an address error 330 transaction should be retrying, even if an address error
331 occured. analog saa7146 based cards extensively rely on 331 occurred. analog saa7146 based cards extensively rely on
332 i2c address probing, however, and address errors indicate that a 332 i2c address probing, however, and address errors indicate that a
333 device is really *not* there. retrying in that case 333 device is really *not* there. retrying in that case
334 increases the time the device needs to probe greatly, so 334 increases the time the device needs to probe greatly, so
@@ -365,7 +365,7 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m
365 DEB_I2C(("transmission successful. (msg:%d).\n",err)); 365 DEB_I2C(("transmission successful. (msg:%d).\n",err));
366out: 366out:
367 /* another bug in revision 0: the i2c-registers get uploaded randomly by other 367 /* another bug in revision 0: the i2c-registers get uploaded randomly by other
368 uploads, so we better clear them out before continueing */ 368 uploads, so we better clear them out before continuing */
369 if( 0 == dev->revision ) { 369 if( 0 == dev->revision ) {
370 __le32 zero = 0; 370 __le32 zero = 0;
371 saa7146_i2c_reset(dev); 371 saa7146_i2c_reset(dev);
diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c
index 605e28b73263..0d6e09419044 100644
--- a/drivers/media/common/tuners/mxl5005s.c
+++ b/drivers/media/common/tuners/mxl5005s.c
@@ -106,7 +106,7 @@ enum {
106/* MXL5005 Tuner Register Struct */ 106/* MXL5005 Tuner Register Struct */
107struct TunerReg { 107struct TunerReg {
108 u16 Reg_Num; /* Tuner Register Address */ 108 u16 Reg_Num; /* Tuner Register Address */
109 u16 Reg_Val; /* Current sw programmed value waiting to be writen */ 109 u16 Reg_Val; /* Current sw programmed value waiting to be written */
110}; 110};
111 111
112enum { 112enum {
diff --git a/drivers/media/common/tuners/tda18271.h b/drivers/media/common/tuners/tda18271.h
index 3abb221f3d07..50cfa8cebb93 100644
--- a/drivers/media/common/tuners/tda18271.h
+++ b/drivers/media/common/tuners/tda18271.h
@@ -98,7 +98,7 @@ struct tda18271_config {
98 /* output options that can be disabled */ 98 /* output options that can be disabled */
99 enum tda18271_output_options output_opt; 99 enum tda18271_output_options output_opt;
100 100
101 /* some i2c providers cant write all 39 registers at once */ 101 /* some i2c providers can't write all 39 registers at once */
102 enum tda18271_small_i2c small_i2c; 102 enum tda18271_small_i2c small_i2c;
103 103
104 /* force rf tracking filter calibration on startup */ 104 /* force rf tracking filter calibration on startup */