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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
irda
/
stir4200.c
diff --git
a/drivers/net/irda/stir4200.c
b/drivers/net/irda/stir4200.c
index
66f488c
..
31867e4
100644
(file)
--- a/
drivers/net/irda/stir4200.c
+++ b/
drivers/net/irda/stir4200.c
@@
-678,10
+678,9
@@
static void turnaround_delay(const struct stir_cb *stir, long us)
return;
ticks = us / (1000000 / HZ);
return;
ticks = us / (1000000 / HZ);
- if (ticks > 0) {
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(1 + ticks);
- } else
+ if (ticks > 0)
+ schedule_timeout_interruptible(1 + ticks);
+ else
udelay(us);
}
udelay(us);
}
@@
-763,7
+762,7
@@
static int stir_transmit_thread(void *arg)
{
#ifdef CONFIG_PM
/* if suspending, then power off and wait */
{
#ifdef CONFIG_PM
/* if suspending, then power off and wait */
- if (unlikely(
current->flags & PF_FREEZE
)) {
+ if (unlikely(
freezing(current)
)) {
if (stir->receiving)
receive_stop(stir);
else
if (stir->receiving)
receive_stop(stir);
else
@@
-771,7
+770,7
@@
static int stir_transmit_thread(void *arg)
write_reg(stir, REG_CTRL1, CTRL1_TXPWD|CTRL1_RXPWD);
write_reg(stir, REG_CTRL1, CTRL1_TXPWD|CTRL1_RXPWD);
- refrigerator(
PF_FREEZE
);
+ refrigerator();
if (change_speed(stir, stir->speed))
break;
if (change_speed(stir, stir->speed))
break;
@@
-1153,7
+1152,6
@@
static int stir_resume(struct usb_interface *intf)
* USB device callbacks
*/
static struct usb_driver irda_driver = {
* USB device callbacks
*/
static struct usb_driver irda_driver = {
- .owner = THIS_MODULE,
.name = "stir4200",
.probe = stir_probe,
.disconnect = stir_disconnect,
.name = "stir4200",
.probe = stir_probe,
.disconnect = stir_disconnect,