diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 17:54:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 17:54:35 -0400 |
| commit | d6f410bdbcb435c744c4f8259d6659ae2c6e447a (patch) | |
| tree | 5426dd9fd8a358fe7e3517c00f83f38ba7f9dca7 /drivers/media/radio/radio-cadet.c | |
| parent | eaf729c8a8bfc9c7a5ff5659e3b2584bf2ef22e1 (diff) | |
| parent | 1b2232ab879993fcf5b9391c3febf6ab5d78201e (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (5880): wm8775/wm8739: Fix memory leak when unloading module
V4L/DVB (5877): radio-gemtek-pci: remove unused structure member
V4L/DVB (5871): Conexant 2388x: check for kthread_run
V4L/DVB (5869): Add check for valid control ID to v4l2_ctrl_next.
V4L/DVB (5867): videodev2.h: add missing <sys/time.h> for userspace
V4L/DVB (5866): ivtv: fix DMA timeout when capturing VBI + another stream
V4L/DVB (5865): Remove usage of HZ on ivtv driver, replacing by msecs_to_jiffies
V4L/DVB (5861): Use msecs_to_jiffies instead of HZ on bttv, cx88 and saa7134
V4L/DVB (5860): Use msecs_to_jiffies instead of HZ on some webcam drivers
V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout
V4L/DVB (5858): Use msecs_to_jiffies instead of HZ on media/video I2C drivers
V4L/DVB (5857): Use msecs_to_jiffies instead of HZ on radio drivers
V4L/DVB (5855): ivtv: fix Kconfig typo and refer to the driver homepage.
V4L/DVB (5854): ivtv: cleanup of driver messages
V4L/DVB (5853): ivtv: add support to suppress high volume i2c debug messages.
V4L/DVB (5852): ivtv: don't recompile needlessly
V4L/DVB (5851): ivtv: fix missing I2C_ALGOBIT config option
V4L/DVB (5850): ivtv: improve API command debugging
V4L/DVB (5848): Av7110: fix typo
Diffstat (limited to 'drivers/media/radio/radio-cadet.c')
| -rw-r--r-- | drivers/media/radio/radio-cadet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c index 8cf2e9df5c8a..34e317ced5a3 100644 --- a/drivers/media/radio/radio-cadet.c +++ b/drivers/media/radio/radio-cadet.c | |||
| @@ -329,7 +329,7 @@ cadet_handler(unsigned long data) | |||
| 329 | init_timer(&readtimer); | 329 | init_timer(&readtimer); |
| 330 | readtimer.function=cadet_handler; | 330 | readtimer.function=cadet_handler; |
| 331 | readtimer.data=(unsigned long)0; | 331 | readtimer.data=(unsigned long)0; |
| 332 | readtimer.expires=jiffies+(HZ/20); | 332 | readtimer.expires=jiffies+msecs_to_jiffies(50); |
| 333 | add_timer(&readtimer); | 333 | add_timer(&readtimer); |
| 334 | } | 334 | } |
| 335 | 335 | ||
| @@ -349,7 +349,7 @@ cadet_read(struct file *file, char __user *data, size_t count, loff_t *ppos) | |||
| 349 | init_timer(&readtimer); | 349 | init_timer(&readtimer); |
| 350 | readtimer.function=cadet_handler; | 350 | readtimer.function=cadet_handler; |
| 351 | readtimer.data=(unsigned long)0; | 351 | readtimer.data=(unsigned long)0; |
| 352 | readtimer.expires=jiffies+(HZ/20); | 352 | readtimer.expires=jiffies+msecs_to_jiffies(50); |
| 353 | add_timer(&readtimer); | 353 | add_timer(&readtimer); |
| 354 | } | 354 | } |
| 355 | if(rdsin==rdsout) { | 355 | if(rdsin==rdsout) { |