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 2.0 rc7
[linux-2.6.git]
/
drivers
/
net
/
irda
/
act200l-sir.c
diff --git
a/drivers/net/irda/act200l-sir.c
b/drivers/net/irda/act200l-sir.c
index
dac04fa
..
d8b89c7
100644
(file)
--- a/
drivers/net/irda/act200l-sir.c
+++ b/
drivers/net/irda/act200l-sir.c
@@
-177,8
+177,7
@@
static int act200l_change_speed(struct sir_dev *dev, unsigned speed)
/* Write control bytes */
sirdev_raw_write(dev, control, 3);
/* Write control bytes */
sirdev_raw_write(dev, control, 3);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(msecs_to_jiffies(5));
+ msleep(5);
/* Go back to normal mode */
sirdev_set_dtr_rts(dev, TRUE, TRUE);
/* Go back to normal mode */
sirdev_set_dtr_rts(dev, TRUE, TRUE);
@@
-241,7
+240,7
@@
static int act200l_reset(struct sir_dev *dev)
dev->speed = 9600;
break;
default:
dev->speed = 9600;
break;
default:
- ERROR("%s(), unknown state %d\n", __FUNCTION__, state);
+
IRDA_
ERROR("%s(), unknown state %d\n", __FUNCTION__, state);
ret = -1;
break;
}
ret = -1;
break;
}