mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
V4L/DVB (11332): pvrusb2: Fix incorrect reporting of default value for non-integer controls
Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
f2cf250af1
commit
5b72d71525
1 changed files with 5 additions and 7 deletions
|
@ -137,14 +137,12 @@ int pvr2_ctrl_get_min(struct pvr2_ctrl *cptr)
|
|||
int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr, int *valptr)
|
||||
{
|
||||
int ret = 0;
|
||||
if (!cptr) return 0;
|
||||
if (!cptr) return -EINVAL;
|
||||
LOCK_TAKE(cptr->hdw->big_lock); do {
|
||||
if (cptr->info->type == pvr2_ctl_int) {
|
||||
if (cptr->info->get_def_value) {
|
||||
ret = cptr->info->get_def_value(cptr, valptr);
|
||||
} else {
|
||||
*valptr = cptr->info->default_value;
|
||||
}
|
||||
if (cptr->info->get_def_value) {
|
||||
ret = cptr->info->get_def_value(cptr, valptr);
|
||||
} else {
|
||||
*valptr = cptr->info->default_value;
|
||||
}
|
||||
} while(0); LOCK_GIVE(cptr->hdw->big_lock);
|
||||
return ret;
|
||||
|
|
Loading…
Reference in a new issue