From b45459fe1b001ec61e9443c8a801dcd88dea7d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Diakhat=C3=A9?= Date: Tue, 23 Mar 2010 18:23:15 +0530 Subject: [PATCH] --- yaml --- r: 189637 b: refs/heads/master c: 162a689a13ed61c0752726edb75427b2cd4186c1 h: refs/heads/master i: 189635: 1c3fab0e65440c5ab302a02b4c995d9bf23321cd v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e1732ffccca7..41ee8133d3bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a82446bd269b130a9ac270e720e65c3843d4d0c +refs/heads/master: 162a689a13ed61c0752726edb75427b2cd4186c1 diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c index 026ea6c27e07..48306bc733f7 100644 --- a/trunk/drivers/char/virtio_console.c +++ b/trunk/drivers/char/virtio_console.c @@ -646,13 +646,13 @@ static int put_chars(u32 vtermno, const char *buf, int count) { struct port *port; + if (unlikely(early_put_chars)) + return early_put_chars(vtermno, buf, count); + port = find_port_by_vtermno(vtermno); if (!port) return 0; - if (unlikely(early_put_chars)) - return early_put_chars(vtermno, buf, count); - return send_buf(port, (void *)buf, count); }