From 668a09d846c72467de7777a58c87bea71cbdc93a Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sun, 28 Oct 2007 20:15:33 -0500 Subject: pvrusb2: Fix associativity logic error From: Roel Kluin <12o3l@tiscali.nl> if(!x & y) should either be if(!(x & y)) or if(!x && y) I made changes as seemed appropriate, but please review this is against current git. Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Mike Isely --- linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c index 83d1484a9..cdbd92ed0 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c @@ -415,7 +415,7 @@ static int parse_mtoken(const char *ptr,unsigned int len, int msk; *valptr = 0; for (idx = 0, msk = 1; valid_bits; idx++, msk <<= 1) { - if (!msk & valid_bits) continue; + if (!(msk & valid_bits)) continue; valid_bits &= ~msk; if (!names[idx]) continue; slen = strlen(names[idx]); -- cgit v1.2.3 From f0177a6944d2424bf957046add61d6472ae49237 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sun, 28 Oct 2007 20:19:53 -0500 Subject: pvrusb2: Remove dead sysfs code From: Mike Isely The pvrusb2 driver's sysfs implementation had long since implemented a dummy hotplug function because at the time the kernel would oops without at least the empty function being present. Today - after numerous class interface changes in the kernel - this pvrusb2 change had been dutifully carried forward but an inspection of the kernel sources shows that it is no longer needed. So remove the dummy function and its reference. This also solves a recurring backwards compatibility issue in the pvrusb2 driver as the class interface has been getting thrashed in the kernel. Signed-off-by: Mike Isely --- linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c index 8537b5b05..7bcf0996f 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c @@ -922,14 +922,6 @@ static int pvr2_sysfs_hotplug(struct class_device *cd,char **envp, because sysfs will still try to call it. */ return 0; } -#else -static int pvr2_sysfs_hotplug(struct device *d, - struct kobj_uevent_env *env) -{ - /* Even though we don't do anything here, we still need this function - because sysfs will still try to call it. */ - return 0; -} #endif struct pvr2_sysfs_class *pvr2_sysfs_class_create(void) @@ -949,8 +941,6 @@ struct pvr2_sysfs_class *pvr2_sysfs_class_create(void) clp->class.hotplug = pvr2_sysfs_hotplug; #elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) clp->class.uevent = pvr2_sysfs_hotplug; -#else - clp->class.dev_uevent = pvr2_sysfs_hotplug; #endif if (class_register(&clp->class)) { pvr2_sysfs_trace( -- cgit v1.2.3