diff --git a/[refs] b/[refs] index 3a9783a3e516..ad3970cf94f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a8488e0da9335360ba539f05d92c8e150a102e8 +refs/heads/master: 703027d0e4b329dc27fd152934a5ddb3d9f2ddab diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c index d597dd4dd846..1183459f394e 100644 --- a/trunk/drivers/staging/hv/vmbus_drv.c +++ b/trunk/drivers/staging/hv/vmbus_drv.c @@ -720,9 +720,6 @@ int vmbus_child_device_register(struct hv_device *child_device_obj) */ ret = device_register(&child_device_obj->device); - /* vmbus_probe() error does not get propergate to device_register(). */ - ret = child_device_obj->probe_error; - if (ret) pr_err("Unable to register child device\n"); else