Prev: linux-next: manual merge of the fsnotify tree with the vfs tree
Next: linux-next: manual merge of the drbd tree with the block tree
From: Steven Liu on 18 May 2010 01:20 fix a code style in drivers/char/virtio_console.c Signed-off-by: Liu Qi <lingjiujianke(a)gmail.com> --- drivers/char/virtio_console.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 196428c..61dad7e 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1299,36 +1299,31 @@ static int init_vqs(struct ports_device *portdev) char **io_names; struct virtqueue **vqs; u32 i, j, nr_ports, nr_queues; - int err; + int err = -ENOMEM; nr_ports = portdev->config.max_nr_ports; nr_queues = use_multiport(portdev) ? (nr_ports + 1) * 2 : 2; vqs = kmalloc(nr_queues * sizeof(struct virtqueue *), GFP_KERNEL); if (!vqs) { - err = -ENOMEM; goto fail; } io_callbacks = kmalloc(nr_queues * sizeof(vq_callback_t *), GFP_KERNEL); if (!io_callbacks) { - err = -ENOMEM; goto free_vqs; } io_names = kmalloc(nr_queues * sizeof(char *), GFP_KERNEL); if (!io_names) { - err = -ENOMEM; goto free_callbacks; } portdev->in_vqs = kmalloc(nr_ports * sizeof(struct virtqueue *), GFP_KERNEL); if (!portdev->in_vqs) { - err = -ENOMEM; goto free_names; } portdev->out_vqs = kmalloc(nr_ports * sizeof(struct virtqueue *), GFP_KERNEL); if (!portdev->out_vqs) { - err = -ENOMEM; goto free_invqs; } -- 1.7.1 Best regards -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |