2002-10-06 17:14:10

by Alan Cox

[permalink] [raw]
Subject: PATCH: 2.5.40 clena up sf16fmi radio

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.2.5.40/drivers/media/radio/radio-sf16fmi.c linux.2.5.40-ac5/drivers/media/radio/radio-sf16fmi.c
--- linux.2.5.40/drivers/media/radio/radio-sf16fmi.c 2002-07-20 20:11:13.000000000 +0100
+++ linux.2.5.40-ac5/drivers/media/radio/radio-sf16fmi.c 2002-10-05 23:38:39.000000000 +0100
@@ -116,15 +116,8 @@
val = dev->curvol ? 0x08 : 0x00; /* unmute/mute */
outb(val, myport);
outb(val | 0x10, myport);
- for(i=0; i< 100; i++)
- {
- udelay(1400);
- cond_resched();
- }
-/* If this becomes allowed use it ...
- current->state = TASK_UNINTERRUPTIBLE;
+ set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(HZ/7);
-*/
res = (int)inb(myport+1);
outb(val, myport);

@@ -296,7 +289,7 @@
if (io < 0)
io = isapnp_fmi_probe();
if (io < 0) {
- printk(KERN_ERR "radio-sf16fmi: No PnP card found.");
+ printk(KERN_ERR "radio-sf16fmi: No PnP card found.\n");
return io;
}
if (!request_region(io, 2, "radio-sf16fmi")) {