summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-04-19 23:59:11 -0500
committerMike Isely <isely@pobox.com>2006-04-19 23:59:11 -0500
commitf6ff726f1d538206996f33ae3cce23dfaf21d1ad (patch)
treea52c83ffec2f3c594a279c873bd7a13b7d3dd359 /linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
parentbbfdc6d1fdaea36ca996bb4cfdcc493d998a65f6 (diff)
downloadmediapointer-dvb-s2-f6ff726f1d538206996f33ae3cce23dfaf21d1ad.tar.gz
mediapointer-dvb-s2-f6ff726f1d538206996f33ae3cce23dfaf21d1ad.tar.bz2
Another rework of pvrusb2 video standard handling
From: Mike Isely <isely@pobox.com> Clean up logic for handling video standards in the pvrusb2 driver. New implementation should be able to handle all possible V4L defined video standards now, and it should be far easier to maintain this going forward. Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index b2c43a389..e55f43e44 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -514,8 +514,8 @@ int pvr2_ctrl_value_to_sym_internal(struct pvr2_ctrl *cptr,
}
} else if (cptr->info->type == pvr2_ctl_bitmask) {
*len = gen_bitmask_string(
- mask & cptr->info->def.type_bitmask.valid_bits,
- val,0,
+ val & mask & cptr->info->def.type_bitmask.valid_bits,
+ ~0,!0,
cptr->info->def.type_bitmask.bit_names,
buf,maxlen);
}