Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[pandora-kernel.git] / drivers / media / dvb / frontends / s5h1420.c

diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index 17f8cdf..3879d2e 100644 (file)
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -634,7 +634,7 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,
        struct s5h1420_state* state = fe->demodulator_priv;
        int frequency_delta;
        struct dvb_frontend_tune_settings fesettings;
-       uint8_t clock_settting;
+       uint8_t clock_setting;
 
        dprintk("enter %s\n", __func__);
 
@@ -684,19 +684,19 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,
        switch (state->fclk) {
        default:
        case 88000000:
-               clock_settting = 80;
+               clock_setting = 80;
                break;
        case 86000000:
-               clock_settting = 78;
+               clock_setting = 78;
                break;
        case 80000000:
-               clock_settting = 72;
+               clock_setting = 72;
                break;
        case 59000000:
-               clock_settting = 51;
+               clock_setting = 51;
                break;
        case 44000000:
-               clock_settting = 36;
+               clock_setting = 36;
                break;
        }
        dprintk("pll01: %d, ToneFreq: %d\n", state->fclk/1000000 - 8, (state->fclk + (TONE_FREQ * 32) - 1) / (TONE_FREQ * 32));