patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / net / irda / irport.c

diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index aee6526..6ad80ed 100644 (file)
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -452,7 +452,7 @@ int __irport_change_speed(struct irda_task *task)
                        task->state = IRDA_TASK_WAIT;
 
                        /* Try again later */
-                       ret = MSECS_TO_JIFFIES(20);
+                       ret = msecs_to_jiffies(20);
                        break;
                }
 
@@ -474,7 +474,7 @@ int __irport_change_speed(struct irda_task *task)
                        irda_task_next_state(task, IRDA_TASK_CHILD_WAIT);
 
                        /* Give dongle 1 sec to finish */
-                       ret = MSECS_TO_JIFFIES(1000);
+                       ret = msecs_to_jiffies(1000);
                } else
                        /* Child finished immediately */
                        irda_task_next_state(task, IRDA_TASK_CHILD_DONE);