diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 17:47:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 17:47:20 -0500 |
| commit | d7fc3ca1cd0ecce82263299c6b1631fc83b0ec79 (patch) | |
| tree | a6471779a25cf2794542f9441213f5aa5f337f2f /drivers/media/video/tuner-core.c | |
| parent | fbfda6e71bbdd3b4d41a56c3f20f31762c455a5e (diff) | |
| parent | ed62178589929d248a0aaf4018ca3867e2f96d9d (diff) | |
| download | lwn-d7fc3ca1cd0ecce82263299c6b1631fc83b0ec79.tar.gz lwn-d7fc3ca1cd0ecce82263299c6b1631fc83b0ec79.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/tuner-core.c')
| -rw-r--r-- | drivers/media/video/tuner-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index e7ee619d62c5..b6101bf446d4 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c @@ -713,8 +713,9 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) struct v4l2_frequency *f = arg; switch_v4l2(); - if (V4L2_TUNER_RADIO == f->type && - V4L2_TUNER_RADIO != t->mode) { + 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; |