bluetooth/bluecard: replace
Subsystems (2)
PATCH 1/1 bluetooth/bluecard: replace
I am really sorry for this, but I didn't change what I had changed before in the compileable patch (msleep(10) instead of mlseep(100)). This is the final one, I swear (I think).
Please find below the corrected version, which compiles without error for me.
I would appreciate any comments from the janitors list. This is one (of many) cases where I made a decision about replacing
set_current_state(TASK_INTERRUPTIBLE);schedule_timeout(some_time);
with
msleep(jiffies_to_msecs(some_time));
msleep() is not exactly the same as the previous code, but I only did this replacement where I thought long delays were *desired*. If this is not the case here, then just disregard this patch.
Thanks,
Nish
Applys-to: 2.6.7
Description: Uses msleep() instead of schedule_timeout() to guarantee the task delays at least the desired time amount.
drivers/bluetooth/bluecard_cs.c +3 -4
@@ -34,6 +34,7 @@#include <linux/ioport.h> #include <linux/spinlock.h> #include <linux/skbuff.h> +#include <linux/delay.h> #include <asm/io.h> #include <pcmcia/version.h>
@@ -776,8 +777,7 @@ int bluecard_open(bluecard_info_t *info)outb (0x80 , iobase +0x30 );/* Wait some time */ -set_current_state (TASK_INTERRUPTIBLE ); -schedule_timeout (HZ /100 ); +msleep (10 );/* Turn FPGA on */ outb (0x00 , iobase +0x30 );
@@ -823,8 +823,7 @@ int bluecard_open(bluecard_info_t *info)outb ((0x0f <<RTS_LEVEL_SHIFT_BITS ) |1 , iobase +REG_RX_CONTROL );/* Timeout before it is safe to send the first HCI packet */ -set_current_state (TASK_INTERRUPTIBLE ); -schedule_timeout ((HZ *5 ) /4 );// or set it to 3/2 +msleep (1250 );/* Register HCI device */ if (hci_register_dev (hdev) <0 ) {
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
Marcel Holtmann
maintainerHi Nish,
Quoted 13 lines
I am really sorry for this, but I didn't change what I had changed before in the compileable patch (msleep(10) instead of mlseep(100)). This is the final one, I swear (I think).
Please find below the corrected version, which compiles without error for me.
I would appreciate any comments from the janitors list. This is one (of many) cases where I made a decision about replacing
set_current_state(TASK_INTERRUPTIBLE);schedule_timeout(some_time);
Quoted 7 lines
with
msleep(jiffies_to_msecs(some_time));
msleep()is not exactly the same as the previous code, but I only did this replacement where I thought long delays were *desired*. If this is not the case here, then just disregard this patch.
you haven't had to resend the patches. I already applied all of them and fixed the warning in my tree. And I took the right one for bluecard_cs.
Regards
Marcel
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors