diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-05 09:39:30 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-05 09:39:30 +0000 |
| commit | 24ef92f0974bf26cf8ca949b7ae21286cbca3fd3 (patch) | |
| tree | 9b6810e4a42293adbdfd1c354a5003157f057ba5 /linux/include/media | |
| parent | 974598b3e1d92694dec31bb072cd65be34fa012d (diff) | |
| download | mediapointer-dvb-s2-24ef92f0974bf26cf8ca949b7ae21286cbca3fd3.tar.gz mediapointer-dvb-s2-24ef92f0974bf26cf8ca949b7ae21286cbca3fd3.tar.bz2 | |
Fix race in infrared polling on rmmod
From: Jean Delvare <khali@linux-fr.org>
The race on rmmod I just fixed in cx88-input affects 3 other drivers.
Fix these the same way.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/ir-kbd-i2c.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/include/media/ir-kbd-i2c.h b/linux/include/media/ir-kbd-i2c.h index 00fa57eb9..18ec1dacd 100644 --- a/linux/include/media/ir-kbd-i2c.h +++ b/linux/include/media/ir-kbd-i2c.h @@ -14,8 +14,12 @@ struct IR_i2c { /* Used to avoid fast repeating */ unsigned char old; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) struct work_struct work; struct timer_list timer; +#else + struct delayed_work work; +#endif char phys[32]; int (*get_key)(struct IR_i2c*, u32*, u32*); }; |