1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index e95792fd70f8..a26ded7d6fae 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -730,14 +730,10 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 {
                         struct v4l2_frequency *f = arg;
 
+                        if (set_mode (client, t, f->type, "VIDIOC_S_FREQUENCY")
+                                        == EINVAL)
+                                return 0;
                         switch_v4l2();
-                        if ((V4L2_TUNER_RADIO == f->type && V4L2_TUNER_RADIO != t->mode)
-                                || (V4L2_TUNER_DIGITAL_TV == f->type
-                                        && V4L2_TUNER_DIGITAL_TV != t->mode)) {
-                                if (set_mode (client, t, f->type, "VIDIOC_S_FREQUENCY")
-                                            == EINVAL)
-                                        return 0;
-                        }
                         set_freq(client,f->frequency);
 
                         break;