From 1147be450980ac6951d12c17aab7a63636e49566 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Wed, 14 Sep 2011 13:06:44 +0530 Subject: [PATCH] --- yaml --- r: 273211 b: refs/heads/master c: ce072a0cee420782ed0a079ac17c7ca26056fb95 h: refs/heads/master i: 273209: afe653ef57d79f6d7211802eb8beefa06589d800 273207: f2fed80353107c6ad27f103ce91b767af7eb99e1 v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0574ffba12b4..eddca7950f97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d25a9ddae93ca97aa03fdab1363baf0e0c35d960 +refs/heads/master: ce072a0cee420782ed0a079ac17c7ca26056fb95 diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c index cb5edf33bebf..0538425e9a71 100644 --- a/trunk/drivers/char/virtio_console.c +++ b/trunk/drivers/char/virtio_console.c @@ -387,8 +387,7 @@ static void discard_port_data(struct port *port) { struct port_buffer *buf; struct virtqueue *vq; - unsigned int len; - int ret; + unsigned int len, err; if (!port->portdev) { /* Device has been unplugged. vqs are already gone. */ @@ -400,18 +399,18 @@ static void discard_port_data(struct port *port) else buf = virtqueue_get_buf(vq, &len); - ret = 0; + err = 0; while (buf) { if (add_inbuf(vq, buf) < 0) { - ret++; + err++; free_buf(buf); } buf = virtqueue_get_buf(vq, &len); } port->inbuf = NULL; - if (ret) + if (err) dev_warn(port->dev, "Errors adding %d buffers back to vq\n", - ret); + err); } static bool port_has_data(struct port *port)