On Tue, Apr 26, 2011 at 09:20:29AM -0700, K. Y. Srinivasan wrote:
> Cleanup error handling in vmbus_child_device_register().
>
> Signed-off-by: K. Y. Srinivasan <[email protected]>
> Signed-off-by: Haiyang Zhang <[email protected]>
> Signed-off-by: Abhishek Kane <[email protected]>
> Signed-off-by: Hank Janssen <[email protected]>
> ---
> drivers/staging/hv/vmbus_drv.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
> index d597dd4..4d569ad 100644
> --- a/drivers/staging/hv/vmbus_drv.c
> +++ b/drivers/staging/hv/vmbus_drv.c
> @@ -720,11 +720,16 @@ int vmbus_child_device_register(struct hv_device
> *child_device_obj)
> */
> ret = device_register(&child_device_obj->device);
>
> + if (ret)
> + return ret;
> +
> /* vmbus_probe() error does not get propergate to device_register(). */
> ret = child_device_obj->probe_error;
Wait, why not? Why is the probe_error have to be saved off like this?
That seems like something is wrong here, this patch should not be
needed.
Well, you should check the return value of device_register, that is
needed, but this seems broken somehow.
>
> - if (ret)
> + if (ret) {
> pr_err("Unable to register child device\n");
> + device_unregister(&child_device_obj->device);
> + }
> else
} else
is the preferred way.
Care to send a fixup patch to remove the probe_error field and fix this
formatting error up?
thanks,
greg k-h
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
