aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-12-27 23:13:53 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:34:24 -0200
commit98752102dccfd3f1bb3eac3d7833c9b38ac22fef (patch)
tree0e62f27a280e3786f048ad1cfdad653869bc9471
parent8079384eeb1c490d0ad679cef061205e1b5a1c8a (diff)
V4L/DVB (5042): Pvrusb2: Make units uniform when tracking tuning frequency
The initial radio implementation used different units for tuning when in radio mode. This changes everything to Hz. Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw.c4
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 39d04d8644a..fe290f2f4e1 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -40,8 +40,8 @@
#define TV_MIN_FREQ 55250000L
#define TV_MAX_FREQ 850000000L
-#define RADIO_MIN_FREQ 1392000L //87MHz
-#define RADIO_MAX_FREQ 1728000L //108MHz
+#define RADIO_MIN_FREQ 87000000L
+#define RADIO_MAX_FREQ 108000000L
struct usb_device_id pvr2_device_table[] = {
[PVR2_HDW_TYPE_29XXX] = { USB_DEVICE(0x2040, 0x2900) },
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index ed4eed4d55c..98731c4f7df 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -169,8 +169,6 @@ static void set_frequency(struct pvr2_hdw *hdw)
fv = hdw->freqVal;
pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_freq(%lu)",fv);
memset(&freq,0,sizeof(freq));
- if (hdw->input_val == PVR2_CVAL_INPUT_TV)
- fv /= 62500;
freq.frequency = fv;
freq.tuner = 0;
freq.type = (hdw->input_val == PVR2_CVAL_INPUT_RADIO) ?