Skip to content

Commit

Permalink
Staging: hv: fix oops in vmbus - udev events
Browse files Browse the repository at this point in the history
Fix typos in udev event send and guid variables copy

Signed-off-by: Milan Dadok <milan@dadok.name>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Milan Dadok authored and Greg Kroah-Hartman committed Oct 30, 2009
1 parent 78f98ba commit 9fb5cce
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -507,12 +507,12 @@ static struct hv_device *vmbus_child_device_create(struct hv_guid *type,

child_device_obj = &child_device_ctx->device_obj;
child_device_obj->context = context;
memcpy(&child_device_obj->deviceType, &type, sizeof(struct hv_guid));
memcpy(&child_device_obj->deviceInstance, &instance,
memcpy(&child_device_obj->deviceType, type, sizeof(struct hv_guid));
memcpy(&child_device_obj->deviceInstance, instance,
sizeof(struct hv_guid));

memcpy(&child_device_ctx->class_id, &type, sizeof(struct hv_guid));
memcpy(&child_device_ctx->device_id, &instance, sizeof(struct hv_guid));
memcpy(&child_device_ctx->class_id, type, sizeof(struct hv_guid));
memcpy(&child_device_ctx->device_id, instance, sizeof(struct hv_guid));

DPRINT_EXIT(VMBUS_DRV);

Expand Down Expand Up @@ -611,8 +611,6 @@ static void vmbus_child_device_destroy(struct hv_device *device_obj)
static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
{
struct device_context *device_ctx = device_to_device_context(device);
int i = 0;
int len = 0;
int ret;

DPRINT_ENTER(VMBUS_DRV);
Expand All @@ -632,8 +630,6 @@ static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
device_ctx->class_id.data[14],
device_ctx->class_id.data[15]);

env->envp_idx = i;
env->buflen = len;
ret = add_uevent_var(env, "VMBUS_DEVICE_CLASS_GUID={"
"%02x%02x%02x%02x-%02x%02x-%02x%02x-"
"%02x%02x%02x%02x%02x%02x%02x%02x}",
Expand Down Expand Up @@ -679,8 +675,6 @@ static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
if (ret)
return ret;

env->envp[env->envp_idx] = NULL;

DPRINT_EXIT(VMBUS_DRV);

return 0;
Expand Down

0 comments on commit 9fb5cce

Please sign in to comment.