diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-01 06:04:58 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-01 06:04:58 -0200 |
| commit | 4c7633ab0fff49a85890bea7316af9bb505fbd04 (patch) | |
| tree | beca452a503e0cedf6c9a38b935c83354b43f604 | |
| parent | eaf6bdcc22aa742bdec32708647fe07d891631db (diff) | |
| parent | f0177a6944d2424bf957046add61d6472ae49237 (diff) | |
| download | mediapointer-dvb-s2-4c7633ab0fff49a85890bea7316af9bb505fbd04.tar.gz mediapointer-dvb-s2-4c7633ab0fff49a85890bea7316af9bb505fbd04.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 10 |
2 files changed, 1 insertions, 11 deletions
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]); 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( |