diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-02 08:56:35 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-02 08:56:35 -0300 |
| commit | b2f8e95b7447058a7d2911c4adefeccd19daa036 (patch) | |
| tree | 6aee52907389fa6243df72133e47ed0bc7ac7c70 /linux/drivers/media/video | |
| parent | 22cae52e1c559233a22ba0d3c26b72678563e0cf (diff) | |
| parent | 8f0e83410026fe17e678322dae788d75fb6cc03d (diff) | |
| download | mediapointer-dvb-s2-b2f8e95b7447058a7d2911c4adefeccd19daa036.tar.gz mediapointer-dvb-s2-b2f8e95b7447058a7d2911c4adefeccd19daa036.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 14 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7115.c | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 1e4be1e4e..3d3967d56 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -484,18 +484,18 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, lmin = pvr2_ctrl_get_min(hcp); lmax = pvr2_ctrl_get_max(hcp); - if (h < lmin) { - h = lmin; - } else if (h > lmax) { - h = lmax; - } - lmin = pvr2_ctrl_get_min(vcp); - lmax = pvr2_ctrl_get_max(vcp); if (w < lmin) { w = lmin; } else if (w > lmax) { w = lmax; } + lmin = pvr2_ctrl_get_min(vcp); + lmax = pvr2_ctrl_get_max(vcp); + if (h < lmin) { + h = lmin; + } else if (h > lmax) { + h = lmax; + } memcpy(vf, &pvr_format[PVR_FORMAT_PIX], sizeof(struct v4l2_format)); diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c index 31d9ee396..461b2fd68 100644 --- a/linux/drivers/media/video/saa7115.c +++ b/linux/drivers/media/video/saa7115.c @@ -1495,11 +1495,7 @@ static int saa711x_attach(struct i2c_adapter *adapter, int address, int kind) saa711x_write(client, 0, 5); chip_id = saa711x_read(client, 0) & 0x0f; - if (chip_id < 3 && chip_id > 5) { - v4l_dbg(1, debug, client, "saa7115 not found\n"); - kfree(client); - return 0; - } + snprintf(client->name, sizeof(client->name) - 1, "saa711%d",chip_id); v4l_info(client, "saa711%d found (%s) @ 0x%x (%s)\n", chip_id, name, address << 1, adapter->name); |