Commit 5f648e00 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: svc: clean up hello error path 



While currently safe, it is unnecessary (and confusing) to try to
destroy the watchdog when watchdog creation fails.

Change the corresponding error path to only deregister the svc.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20220202113347.1288-3-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f8583a3

drivers/greybus/svc.c

+3 −2
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ static int gb_svc_hello(struct gb_operation *op) 
	ret = gb_svc_watchdog_create(svc);

	if (ret) {

		dev_err(&svc->dev, "failed to create watchdog: %d\n", ret);

		goto err_unregister_device;

		goto err_deregister_svc;

	}



	gb_svc_debugfs_init(svc);
@@ -874,9 +874,10 @@ static int gb_svc_hello(struct gb_operation *op) 


err_remove_debugfs:

	gb_svc_debugfs_exit(svc);

err_unregister_device:

	gb_svc_watchdog_destroy(svc);

err_deregister_svc:

	device_del(&svc->dev);



	return ret;

}