android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Try using whatever buffer we can get in smd_tty instead of sitting in an endless loop!"

Browse Source 
This reverts commit 6df8c16511.
This commit is contained in:
Jon Benson 2010-12-04 13:14:33 +11:00
parent 138ebc323a
commit fcfe8c7bef
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/arm/mach-msm/smd_tty.c
View File

@ -78,16 +78,19 @@ static void smd_tty_work_func(struct work_struct *work)
ptr = NULL;
avail = tty_prepare_flip_string(tty, &ptr, avail);
if (smd_read(info->ch, ptr, avail) != avail) {
/* shouldn't be possible since we're in interrupt
* context here and nobody else could 'steal' our
* characters.
*/
printk(KERN_ERR "OOPS - smd_tty_buffer mismatch?!");
}
wake_lock_timeout(&info->wake_lock, HZ / 2);
tty->low_latency = 1;
tty_flip_buffer_push(tty);
if (avail && ptr) {
if (smd_read(info->ch, ptr, avail) != avail) {
/* shouldn't be possible since we're in interrupt
* context here and nobody else could 'steal' our
* characters.
*/
printk(KERN_ERR "OOPS - smd_tty_buffer mismatch?!");
}
wake_lock_timeout(&info->wake_lock, HZ / 2);
tty->low_latency = 1;
tty_flip_buffer_push(tty);
} else
printk(KERN_ERR "smd_tty_work_func: tty_prepare_flip_string fail\n");
}
mutex_unlock(&smd_tty_lock);