diff options
| author | Mike Isely <isely@pobox.com> | 2007-12-02 23:51:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 19:03:06 -0200 |
| commit | 6a540254966f8a01de0f7c78a27db17458c2d8f5 (patch) | |
| tree | a18a62aa65b78b8fcbdfdbb3c3ce94a3a8bfa794 /drivers/media/video/pvrusb2/pvrusb2-hdw.c | |
| parent | ea2562d94fade3d6ee9b22ed5addbbdba697d22a (diff) | |
| download | kernel_samsung_aries-6a540254966f8a01de0f7c78a27db17458c2d8f5.zip kernel_samsung_aries-6a540254966f8a01de0f7c78a27db17458c2d8f5.tar.gz kernel_samsung_aries-6a540254966f8a01de0f7c78a27db17458c2d8f5.tar.bz2 | |
V4L/DVB (6705): pvrusb2: Implement default standard selection based on device type
This adds a default video standard setting to the pvr2_device_desc
structure for describing device types. With this change it is
possible to set a reasonable default standard based on device type.
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw.c')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index a45721f..08b513b 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -1439,8 +1439,12 @@ static v4l2_std_id get_default_standard(struct pvr2_hdw *hdw) int tp = 0; if ((unit_number >= 0) && (unit_number < PVR_NUM)) { tp = video_std[unit_number]; + if (tp) return tp; } - return tp; + if (hdw->hdw_desc->default_std_mask) { + return hdw->hdw_desc->default_std_mask; + } + return 0; } |