Commit f6306078 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] Clean up sf16fmi radio

parent 41738f27
...@@ -116,15 +116,8 @@ static inline int fmi_getsigstr(struct fmi_device *dev) ...@@ -116,15 +116,8 @@ static inline int fmi_getsigstr(struct fmi_device *dev)
val = dev->curvol ? 0x08 : 0x00; /* unmute/mute */ val = dev->curvol ? 0x08 : 0x00; /* unmute/mute */
outb(val, myport); outb(val, myport);
outb(val | 0x10, myport); outb(val | 0x10, myport);
for(i=0; i< 100; i++) set_current_state(TASK_UNINTERRUPTIBLE);
{
udelay(1400);
cond_resched();
}
/* If this becomes allowed use it ...
current->state = TASK_UNINTERRUPTIBLE;
schedule_timeout(HZ/7); schedule_timeout(HZ/7);
*/
res = (int)inb(myport+1); res = (int)inb(myport+1);
outb(val, myport); outb(val, myport);
...@@ -296,7 +289,7 @@ static int __init fmi_init(void) ...@@ -296,7 +289,7 @@ static int __init fmi_init(void)
if (io < 0) if (io < 0)
io = isapnp_fmi_probe(); io = isapnp_fmi_probe();
if (io < 0) { if (io < 0) {
printk(KERN_ERR "radio-sf16fmi: No PnP card found."); printk(KERN_ERR "radio-sf16fmi: No PnP card found.\n");
return io; return io;
} }
if (!request_region(io, 2, "radio-sf16fmi")) { if (!request_region(io, 2, "radio-sf16fmi")) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment