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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
media
/
radio
/
radio-sf16fmi.c
diff --git
a/drivers/media/radio/radio-sf16fmi.c
b/drivers/media/radio/radio-sf16fmi.c
index
9962c43
..
ec3ff0e
100644
(file)
--- a/
drivers/media/radio/radio-sf16fmi.c
+++ b/
drivers/media/radio/radio-sf16fmi.c
@@
-89,8
+89,7
@@
static inline int fmi_setfreq(struct fmi_device *dev)
outbits(16, RSF16_ENCODE(freq), myport);
outbits(8, 0xC0, myport);
outbits(16, RSF16_ENCODE(freq), myport);
outbits(8, 0xC0, myport);
- current->state = TASK_UNINTERRUPTIBLE;
- schedule_timeout(HZ/7);
+ msleep(143); /* was schedule_timeout(HZ/7) */
up(&lock);
if (dev->curvol) fmi_unmute(myport);
return 0;
up(&lock);
if (dev->curvol) fmi_unmute(myport);
return 0;
@@
-107,8
+106,7
@@
static inline int fmi_getsigstr(struct fmi_device *dev)
val = dev->curvol ? 0x08 : 0x00; /* unmute/mute */
outb(val, myport);
outb(val | 0x10, myport);
val = dev->curvol ? 0x08 : 0x00; /* unmute/mute */
outb(val, myport);
outb(val | 0x10, myport);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(HZ/7);
+ msleep(143); /* was schedule_timeout(HZ/7) */
res = (int)inb(myport+1);
outb(val, myport);
res = (int)inb(myport+1);
outb(val, myport);
@@
-314,9
+312,9
@@
MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood");
MODULE_DESCRIPTION("A driver for the SF16MI radio.");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("A driver for the SF16MI radio.");
MODULE_LICENSE("GPL");
-
MODULE_PARM(io, "i"
);
+
module_param(io, int, 0
);
MODULE_PARM_DESC(io, "I/O address of the SF16MI card (0x284 or 0x384)");
MODULE_PARM_DESC(io, "I/O address of the SF16MI card (0x284 or 0x384)");
-
MODULE_PARM(radio_nr, "i"
);
+
module_param(radio_nr, int, 0
);
static void __exit fmi_cleanup_module(void)
{
static void __exit fmi_cleanup_module(void)
{