The following commit has been merged in the linux branch: commit 1bb40a25b26ef7e2c4fb79ce430de2b9f836527f Author: Haiyang Zhang haiyangz@microsoft.com Date: Fri Oct 23 18:14:24 2009 +0000

Staging: hv: Fix null pointer error after vmbus loading

Fix null pointer error after vmbus loading. Remove code that checks for dev_name, the affected structure is kzalloc-ed prior to this routine, so it is always null at this stage.

Signed-off-by: Hank Janssen hjanssen@microsoft.com Signed-off-by: Haiyang Zhang haiyangz@microsoft.com Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 582318f..270fb7f 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -537,18 +537,7 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj, DPRINT_DBG(VMBUS_DRV, "child device (%p) registering", child_device_ctx);

- /* Make sure we are not registered already */ - if (strlen(dev_name(&child_device_ctx->device)) != 0) { - DPRINT_ERR(VMBUS_DRV, - "child device (%p) already registered - busid %s", - child_device_ctx, - dev_name(&child_device_ctx->device)); - - ret = -1; - goto Cleanup; - } - - /* Set the device bus id. Otherwise, device_register()will fail. */ + /* Set the device name. Otherwise, device_register() will fail. */ dev_set_name(&child_device_ctx->device, "vmbus_0_%d", atomic_inc_return(&device_num));

@@ -573,7 +562,6 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj, DPRINT_INFO(VMBUS_DRV, "child device (%p) registered", &child_device_ctx->device);

-Cleanup: DPRINT_EXIT(VMBUS_DRV);

return ret;