vserver 1.9.3

[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 f98d4c5..df79d5e 100644 (file)
--- a/drivers/media/radio/miropcm20-rds.c
+++ b/drivers/media/radio/miropcm20-rds.c
@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
+#include <linux/delay.h>
 #include <asm/uaccess.h>
 #include "miropcm20-rds-core.h"
 
@@ -53,15 +54,14 @@ static void print_matrix(char *ch, char out[])
        }
 }
 
-static ssize_t rds_f_read(struct file *file, char *buffer, size_t length, loff_t *offset)
+static ssize_t rds_f_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
 {
 //     i = sprintf(text_buffer, "length: %d, offset: %d\n", length, *offset);
 
        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))