From 847b51ad28e9b7d895471518bccdd2a9f489bc4e Mon Sep 17 00:00:00 2001
From: Asias He <asias@redhat.com>
Date: Tue, 23 Apr 2013 20:33:52 +0000
Subject: [PATCH] --- yaml --- r: 369886 b: refs/heads/master c:
 6ad0b2f7fdfd95fe3107367f8aed252e94c3f654 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/vmw_vsock/af_vsock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c05f1824f025..0e723a77f0b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6cdcf6d82bc8f53e64ad59464e0114fe48e28bb
+refs/heads/master: 6ad0b2f7fdfd95fe3107367f8aed252e94c3f654
diff --git a/trunk/net/vmw_vsock/af_vsock.c b/trunk/net/vmw_vsock/af_vsock.c
index 7f93e2a42d7a..4b4db18ba92c 100644
--- a/trunk/net/vmw_vsock/af_vsock.c
+++ b/trunk/net/vmw_vsock/af_vsock.c
@@ -1932,7 +1932,6 @@ static const struct file_operations vsock_device_ops = {
 
 static struct miscdevice vsock_device = {
 	.name		= "vsock",
-	.minor		= MISC_DYNAMIC_MINOR,
 	.fops		= &vsock_device_ops,
 };
 
@@ -1942,6 +1941,7 @@ static int __vsock_core_init(void)
 
 	vsock_init_tables();
 
+	vsock_device.minor = MISC_DYNAMIC_MINOR;
 	err = misc_register(&vsock_device);
 	if (err) {
 		pr_err("Failed to register misc device\n");