4 files changed, 13 insertions, 35 deletions

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 6c1b676643a..896a2ced1d2 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1547,31 +1547,16 @@ static int init_vqs(struct ports_device *portdev)
         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) {
+        if (!vqs || !io_callbacks || !io_names || !portdev->in_vqs ||
+                        !portdev->out_vqs) {
                 err = -ENOMEM;
-                goto free_invqs;
+                goto free;
         }
 
         /*
@@ -1605,7 +1590,7 @@ static int init_vqs(struct ports_device *portdev)
                                               io_callbacks,
                                               (const char **)io_names);
         if (err)
-                goto free_outvqs;
+                goto free;
 
         j = 0;
         portdev->in_vqs[0] = vqs[0];
@@ -1621,23 +1606,19 @@ static int init_vqs(struct ports_device *portdev)
                         portdev->out_vqs[i] = vqs[j + 1];
                 }
         }
-        kfree(io_callbacks);
         kfree(io_names);
+        kfree(io_callbacks);
         kfree(vqs);
 
         return 0;
 
-free_names:
-        kfree(io_names);
-free_callbacks:
-        kfree(io_callbacks);
-free_outvqs:
+free:
         kfree(portdev->out_vqs);
-free_invqs:
         kfree(portdev->in_vqs);
-free_vqs:
+        kfree(io_names);
+        kfree(io_callbacks);
         kfree(vqs);
-fail:
+
         return err;
 }
 
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 3a43ebf83a4..efb35aa8309 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -9,19 +9,19 @@ static ssize_t device_show(struct device *_d,
                            struct device_attribute *attr, char *buf)
 {
         struct virtio_device *dev = container_of(_d,struct virtio_device,dev);
-        return sprintf(buf, "%hu", dev->id.device);
+        return sprintf(buf, "0x%04x\n", dev->id.device);
 }
 static ssize_t vendor_show(struct device *_d,
                            struct device_attribute *attr, char *buf)
 {
         struct virtio_device *dev = container_of(_d,struct virtio_device,dev);
-        return sprintf(buf, "%hu", dev->id.vendor);
+        return sprintf(buf, "0x%04x\n", dev->id.vendor);
 }
 static ssize_t status_show(struct device *_d,
                            struct device_attribute *attr, char *buf)
 {
         struct virtio_device *dev = container_of(_d,struct virtio_device,dev);
-        return sprintf(buf, "0x%08x", dev->config->get_status(dev));
+        return sprintf(buf, "0x%08x\n", dev->config->get_status(dev));
 }
 static ssize_t modalias_show(struct device *_d,
                              struct device_attribute *attr, char *buf)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 1475ed6b575..cc2f73e0347 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -230,9 +230,6 @@ add_head:
         pr_debug("Added buffer head %i to %p\n", head, vq);
         END_USE(vq);
 
-        /* If we're indirect, we can fit many (assuming not OOM). */
-        if (vq->indirect)
-                return vq->num_free ? vq->vring.num : 0;
         return vq->num_free;
 }
 EXPORT_SYMBOL_GPL(virtqueue_add_buf_gfp);
diff --git a/include/linux/module.h b/include/linux/module.h
index b29e7458b96..7575bbbdf2a 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -517,7 +517,7 @@ static inline void __module_get(struct module *module)
 #define symbol_put_addr(p) do { } while(0)
 
 #endif /* CONFIG_MODULE_UNLOAD */
-int use_module(struct module *a, struct module *b);
+int ref_module(struct module *a, struct module *b);
 
 /* This is a #define so the string doesn't get put in every .o file */
 #define module_name(mod)                        \