diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
| commit | 9cb5baba5e3acba0994ad899ee908799104c9965 (patch) | |
| tree | d5ff16000256a0bf56279926e6114b4603ede2b4 /drivers/media/common/tuners/tda18271-common.c | |
| parent | 7142d17e8f935fa842e9f6eece2281b6d41625d6 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge commit 'v2.6.39-rc7' into sched/core
Diffstat (limited to 'drivers/media/common/tuners/tda18271-common.c')
| -rw-r--r-- | drivers/media/common/tuners/tda18271-common.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/media/common/tuners/tda18271-common.c b/drivers/media/common/tuners/tda18271-common.c index 5466d47db899..aae40e52af5b 100644 --- a/drivers/media/common/tuners/tda18271-common.c +++ b/drivers/media/common/tuners/tda18271-common.c | |||
| @@ -533,16 +533,7 @@ int tda18271_calc_main_pll(struct dvb_frontend *fe, u32 freq) | |||
| 533 | if (tda_fail(ret)) | 533 | if (tda_fail(ret)) |
| 534 | goto fail; | 534 | goto fail; |
| 535 | 535 | ||
| 536 | regs[R_MPD] = (0x77 & pd); | 536 | regs[R_MPD] = (0x7f & pd); |
| 537 | |||
| 538 | switch (priv->mode) { | ||
| 539 | case TDA18271_ANALOG: | ||
| 540 | regs[R_MPD] &= ~0x08; | ||
| 541 | break; | ||
| 542 | case TDA18271_DIGITAL: | ||
| 543 | regs[R_MPD] |= 0x08; | ||
| 544 | break; | ||
| 545 | } | ||
| 546 | 537 | ||
| 547 | div = ((d * (freq / 1000)) << 7) / 125; | 538 | div = ((d * (freq / 1000)) << 7) / 125; |
| 548 | 539 | ||