2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 2f6185c845e0..7a104e2de3fa 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -527,12 +527,12 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
 
         /* start polling new socket */
         oldsock = vq->private_data;
-        if (sock == oldsock)
-                goto done;
+        if (sock != oldsock) {
+                vhost_net_disable_vq(n, vq);
+                rcu_assign_pointer(vq->private_data, sock);
+                vhost_net_enable_vq(n, vq);
+        }
 
-        vhost_net_disable_vq(n, vq);
-        rcu_assign_pointer(vq->private_data, sock);
-        vhost_net_enable_vq(n, vq);
 done:
         mutex_unlock(&vq->mutex);
 
@@ -639,7 +639,7 @@ static long vhost_net_compat_ioctl(struct file *f, unsigned int ioctl,
 }
 #endif
 
-const static struct file_operations vhost_net_fops = {
+static const struct file_operations vhost_net_fops = {
         .owner          = THIS_MODULE,
         .release        = vhost_net_release,
         .unlocked_ioctl = vhost_net_ioctl,
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 0b99783083f6..248ed2db0711 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -237,8 +237,8 @@ static int vq_memory_access_ok(void __user *log_base, struct vhost_memory *mem,
 {
         int i;
 
-        if (!mem)
-                return 0;
+        if (!mem)
+                return 0;
 
         for (i = 0; i < mem->nregions; ++i) {
                 struct vhost_memory_region *m = mem->regions + i;