git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
media
/
radio
/
miropcm20-rds.c
diff --git
a/drivers/media/radio/miropcm20-rds.c
b/drivers/media/radio/miropcm20-rds.c
index
6b11044
..
e092140
100644
(file)
--- a/
drivers/media/radio/miropcm20-rds.c
+++ b/
drivers/media/radio/miropcm20-rds.c
@@
-14,6
+14,8
@@
#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
+#include <linux/sched.h> /* current, TASK_*, schedule_timeout() */
+#include <linux/delay.h>
#include <asm/uaccess.h>
#include "miropcm20-rds-core.h"
#include <asm/uaccess.h>
#include "miropcm20-rds-core.h"
@@
-60,8
+62,7
@@
static ssize_t rds_f_read(struct file *file, char __user *buffer, size_t length,
char c;
char bits[8];
char c;
char bits[8];
- current->state=TASK_UNINTERRUPTIBLE;
- schedule_timeout(2*HZ);
+ msleep(2000);
aci_rds_cmd(RDS_STATUS, &c, 1);
print_matrix(&c, bits);
if (copy_to_user(buffer, bits, 8))
aci_rds_cmd(RDS_STATUS, &c, 1);
print_matrix(&c, bits);
if (copy_to_user(buffer, bits, 8))