Commit 5b72d715 authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab

V4L/DVB (11332): pvrusb2: Fix incorrect reporting of default value for non-integer controls

Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f2cf250a
...@@ -137,14 +137,12 @@ int pvr2_ctrl_get_min(struct pvr2_ctrl *cptr) ...@@ -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 pvr2_ctrl_get_def(struct pvr2_ctrl *cptr, int *valptr)
{ {
int ret = 0; int ret = 0;
if (!cptr) return 0; if (!cptr) return -EINVAL;
LOCK_TAKE(cptr->hdw->big_lock); do { LOCK_TAKE(cptr->hdw->big_lock); do {
if (cptr->info->type == pvr2_ctl_int) { if (cptr->info->get_def_value) {
if (cptr->info->get_def_value) { ret = cptr->info->get_def_value(cptr, valptr);
ret = cptr->info->get_def_value(cptr, valptr); } else {
} else { *valptr = cptr->info->default_value;
*valptr = cptr->info->default_value;
}
} }
} while(0); LOCK_GIVE(cptr->hdw->big_lock); } while(0); LOCK_GIVE(cptr->hdw->big_lock);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment