diff options
Diffstat (limited to 'drivers/media/video/tda9887.c')
-rw-r--r-- | drivers/media/video/tda9887.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index 39773633cc3c..ee35562f4d1a 100644 --- a/drivers/media/video/tda9887.c +++ b/drivers/media/video/tda9887.c | |||
@@ -368,7 +368,7 @@ static int tda9887_set_tvnorm(struct tda9887 *t, char *buf) | |||
368 | if (t->radio_mode == V4L2_TUNER_MODE_MONO) | 368 | if (t->radio_mode == V4L2_TUNER_MODE_MONO) |
369 | norm = &radio_mono; | 369 | norm = &radio_mono; |
370 | else | 370 | else |
371 | norm = &radio_stereo; | 371 | norm = &radio_stereo; |
372 | } else { | 372 | } else { |
373 | for (i = 0; i < ARRAY_SIZE(tvnorms); i++) { | 373 | for (i = 0; i < ARRAY_SIZE(tvnorms); i++) { |
374 | if (tvnorms[i].std & t->std) { | 374 | if (tvnorms[i].std & t->std) { |
@@ -566,7 +566,6 @@ static int tda9887_configure(struct tda9887 *t) | |||
566 | if (UNSET != t->pinnacle_id) { | 566 | if (UNSET != t->pinnacle_id) { |
567 | tda9887_set_pinnacle(t,buf); | 567 | tda9887_set_pinnacle(t,buf); |
568 | } | 568 | } |
569 | |||
570 | tda9887_set_config(t,buf); | 569 | tda9887_set_config(t,buf); |
571 | tda9887_set_insmod(t,buf); | 570 | tda9887_set_insmod(t,buf); |
572 | 571 | ||
@@ -615,8 +614,8 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind) | |||
615 | t->pinnacle_id = UNSET; | 614 | t->pinnacle_id = UNSET; |
616 | t->radio_mode = V4L2_TUNER_MODE_STEREO; | 615 | t->radio_mode = V4L2_TUNER_MODE_STEREO; |
617 | 616 | ||
618 | i2c_set_clientdata(&t->client, t); | 617 | i2c_set_clientdata(&t->client, t); |
619 | i2c_attach_client(&t->client); | 618 | i2c_attach_client(&t->client); |
620 | 619 | ||
621 | return 0; | 620 | return 0; |
622 | } | 621 | } |