lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge ../bleed-2.6

Browse Source
This commit is contained in:
Greg KH
2005-10-28 10:13:16 -07:00
committed by Greg Kroah-Hartman
parent 1a222bca26 27d1097d39
commit 6fbfddcb52
591 changed files with 23717 additions and 10531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wan/cosa.c
View File

@ -1617,8 +1617,7 @@ static int get_wait_data(struct cosa_data *cosa)
return r;
}
/* sleep if not ready to read */
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(1);
schedule_timeout_interruptible(1);
}
printk(KERN_INFO "cosa: timeout in get_wait_data (status 0x%x)\n",
cosa_getstatus(cosa));
@ -1644,8 +1643,7 @@ static int put_wait_data(struct cosa_data *cosa, int data)
}
#if 0
/* sleep if not ready to read */
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(1);
schedule_timeout_interruptible(1);
#endif
}
printk(KERN_INFO "cosa%d: timeout in put_wait_data (status 0x%x)\n",