diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:17 -0400 |
| commit | 9583f3d9c00974911daf227cbaa12d6c1caaabad (patch) | |
| tree | f37466204ecbfea37c7d567fd06c9bece0cc663d /drivers/media/common/tuners/tda18271-common.c | |
| parent | 962cf36c5bf6d2840b8d66ee9a606fae2f540bbd (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/softirq
Diffstat (limited to 'drivers/media/common/tuners/tda18271-common.c')
| -rw-r--r-- | drivers/media/common/tuners/tda18271-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/tuners/tda18271-common.c b/drivers/media/common/tuners/tda18271-common.c index 42b5f5d4bfe6..f1894fec32b9 100644 --- a/drivers/media/common/tuners/tda18271-common.c +++ b/drivers/media/common/tuners/tda18271-common.c | |||
| @@ -648,11 +648,11 @@ int tda18271_calc_rf_cal(struct dvb_frontend *fe, u32 *freq) | |||
| 648 | unsigned char *regs = priv->tda18271_regs; | 648 | unsigned char *regs = priv->tda18271_regs; |
| 649 | u8 val; | 649 | u8 val; |
| 650 | 650 | ||
| 651 | tda18271_lookup_map(fe, RF_CAL, freq, &val); | 651 | int ret = tda18271_lookup_map(fe, RF_CAL, freq, &val); |
| 652 | 652 | ||
| 653 | regs[R_EB14] = val; | 653 | regs[R_EB14] = val; |
| 654 | 654 | ||
| 655 | return 0; | 655 | return ret; |
| 656 | } | 656 | } |
| 657 | 657 | ||
| 658 | /* | 658 | /* |