From 3fb631e66b71b58873e9af78b77726c73173be72 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 15 May 2010 11:45:53 +0200 Subject: [PATCH] --- yaml --- r: 197875 b: refs/heads/master c: 0643e4c6e4fd67778fa886a89e6ec2320e0ff4d3 h: refs/heads/master i: 197873: 5b1275916866f6d1fcd7d7cde891632abec17400 197871: 98aca2de5adaf4bdaa191ce3631fb6bd5d690a01 v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 75bbb9b7e549..065577312bd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8345adbf96fc1bde7d9846aadbe5af9b2ae90882 +refs/heads/master: 0643e4c6e4fd67778fa886a89e6ec2320e0ff4d3 diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c index 458d907e3621..8c99bf1b5e9f 100644 --- a/trunk/drivers/char/virtio_console.c +++ b/trunk/drivers/char/virtio_console.c @@ -1090,7 +1090,7 @@ static int add_port(struct ports_device *portdev, u32 id) kfree(port); fail: /* The host might want to notify management sw about port add failure */ - send_control_msg(port, VIRTIO_CONSOLE_PORT_READY, 0); + __send_control_msg(portdev, id, VIRTIO_CONSOLE_PORT_READY, 0); return err; } @@ -1559,6 +1559,9 @@ static int __devinit virtcons_probe(struct virtio_device *vdev) return 0; free_vqs: + /* The host might want to notify mgmt sw about device add failure */ + __send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID, + VIRTIO_CONSOLE_DEVICE_READY, 0); vdev->config->del_vqs(vdev); kfree(portdev->in_vqs); kfree(portdev->out_vqs); @@ -1567,9 +1570,6 @@ static int __devinit virtcons_probe(struct virtio_device *vdev) free: kfree(portdev); fail: - /* The host might want to notify mgmt sw about device add failure */ - __send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID, - VIRTIO_CONSOLE_DEVICE_READY, 0); return err; }