Merge remote-tracking branch 'kraxel/chardev.7' into staging

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/chardev.7:
  chardev: fix pty_chr_timer

Message-id: 1378972894-11185-1-git-send-email-kraxel@redhat.com
This commit is contained in:
Anthony Liguori 2013-09-17 09:49:43 -05:00
commit 25afd6eb15

View File

@ -1026,15 +1026,11 @@ static gboolean pty_chr_timer(gpointer opaque)
struct CharDriverState *chr = opaque; struct CharDriverState *chr = opaque;
PtyCharDriver *s = chr->opaque; PtyCharDriver *s = chr->opaque;
if (s->connected) { s->timer_tag = 0;
goto out; if (!s->connected) {
}
/* Next poll ... */ /* Next poll ... */
pty_chr_update_read_handler(chr); pty_chr_update_read_handler(chr);
}
out:
s->timer_tag = 0;
return FALSE; return FALSE;
} }