X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Firda%2Firport.c;h=6ad80edb2efa824641a3a6ef9cba9acb4df90425;hb=720b94a4e7548e78be55ab8fd3be4686c57dc808;hp=aee6526cb37817794ea5e8fdae39823f43202c8f;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c index aee6526cb..6ad80edb2 100644 --- 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);