Staging: hv: file2alias: fix up alias creation logic for hv_vmbus_device_id

When I added the driver_data field to hv_vmbus_device_id, I forgot to
take into the account how the alias was created, so it would append the
kernel pointer to the end of the alias, which is not correct.

This changes how the hv_vmbus_device_id alias is created to proper
account for the driver_data field.  As no module yet uses this alias, it
is safe to fix this up at this point in the commit stream.

Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index b74d21ab91f74c2c9bbabfbdb3b18a9fcd51892d..f936d1fa969d76e9f6b97cc584058e96ede5c061 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -745,9 +745,9 @@ static int do_vmbus_entry(const char *filename, struct hv_vmbus_device_id *id,
                          char *alias)
 {
        int i;
-       char guid_name[((sizeof(struct hv_vmbus_device_id) + 1)) * 2];
+       char guid_name[((sizeof(id->guid) + 1)) * 2];
 
-       for (i = 0; i < (sizeof(struct hv_vmbus_device_id) * 2); i += 2)
+       for (i = 0; i < (sizeof(id->guid) * 2); i += 2)
                sprintf(&guid_name[i], "%02x", id->guid[i/2]);
 
        strcpy(alias, "vmbus:");