diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:36:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:36:32 -0500 |
| commit | 593195f9b2309693f27b402f34573f7920b82c3e (patch) | |
| tree | 54d55557665e72e90ef35a1e0f008d381c17ed98 /drivers/media/video/tea5767.c | |
| parent | 983d5dbdb2b38d024935f560a91cddcf704875f3 (diff) | |
| parent | f9cfc08d640e1586e76eee63cc2b0a9360bc7c7e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/tea5767.c')
| -rw-r--r-- | drivers/media/video/tea5767.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/tea5767.c b/drivers/media/video/tea5767.c index 261b7a3c0417..921fe72f23d5 100644 --- a/drivers/media/video/tea5767.c +++ b/drivers/media/video/tea5767.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #define PREFIX "TEA5767 " | 18 | #define PREFIX "TEA5767 " |
| 19 | 19 | ||
| 20 | /* from tuner-core.c */ | 20 | /* from tuner-core.c */ |
| 21 | extern int debug; | 21 | extern int tuner_debug; |
| 22 | 22 | ||
| 23 | /*****************************************************************************/ | 23 | /*****************************************************************************/ |
| 24 | 24 | ||
| @@ -249,7 +249,7 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq) | |||
| 249 | if (5 != (rc = i2c_master_send(c, buffer, 5))) | 249 | if (5 != (rc = i2c_master_send(c, buffer, 5))) |
| 250 | tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc); | 250 | tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc); |
| 251 | 251 | ||
| 252 | if (debug) { | 252 | if (tuner_debug) { |
| 253 | if (5 != (rc = i2c_master_recv(c, buffer, 5))) | 253 | if (5 != (rc = i2c_master_recv(c, buffer, 5))) |
| 254 | tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc); | 254 | tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc); |
| 255 | else | 255 | else |