diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-02 13:29:14 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-02 13:29:14 -0300 |
| commit | 4bfa4fa781eda2c15066a2c171786d43fdc62d4f (patch) | |
| tree | 239329564433e760e56019d3a473a55232357e21 /linux/drivers/media/video | |
| parent | bb3a30517cfdbe8b19b6157d9701721e4d4eb58c (diff) | |
| download | mediapointer-dvb-s2-4bfa4fa781eda2c15066a2c171786d43fdc62d4f.tar.gz mediapointer-dvb-s2-4bfa4fa781eda2c15066a2c171786d43fdc62d4f.tar.bz2 | |
Partially reverting last patch
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Last patch did included two experimental stuff there, on cx88
and on pvrusb2. Reverting...
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-i2c.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c index 896a70dd0..79cf9d9ee 100644 --- a/linux/drivers/media/video/cx88/cx88-i2c.c +++ b/linux/drivers/media/video/cx88/cx88-i2c.c @@ -168,7 +168,7 @@ static struct i2c_algo_bit_data cx8800_i2c_algo_template = { .setscl = cx8800_bit_setscl, .getsda = cx8800_bit_getsda, .getscl = cx8800_bit_getscl, - .udelay = 5, + .udelay = 16, .mdelay = 10, .timeout = 200, }; diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 366de1e0d..211b789ff 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -745,7 +745,7 @@ static const struct pvr2_ctl_info control_defs[] = { .internal_id = PVR2_CID_HRES, .default_value = 720, DEFREF(res_hor), - DEFINT(1,2000), + DEFINT(320,720), #ifdef CONFIG_VIDEO_PVRUSB2_24XXX /* Hook in check for clamp on horizontal resolution in order to avoid unsolved problem involving cx25840. */ @@ -758,7 +758,7 @@ static const struct pvr2_ctl_info control_defs[] = { .internal_id = PVR2_CID_VRES, .default_value = 480, DEFREF(res_ver), - DEFINT(1,625), + DEFINT(200,625), },{ .v4l_id = V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ, .default_value = V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000, |