Commit 8d7a712c authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: connection: clean up init error paths 



Clearly mark error-path labels as such and clean up control flow.

Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent a95c258c

drivers/staging/greybus/connection.c

+8 −6
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static int gb_connection_init(struct gb_connection *connection) 
			dev_err(&connection->dev,

				"Failed to connect CPort-%d (%d)\n",

				cport_id, ret);

			goto svc_destroy;

			goto err_svc_destroy;

		}

	}
@@ -424,21 +424,23 @@ static int gb_connection_init(struct gb_connection *connection) 
			dev_err(&connection->dev,

				"Failed to get version CPort-%d (%d)\n",

				cport_id, ret);

			goto disconnect;

			goto err_disconnect;

		}

	}



	ret = protocol->connection_init(connection);

	if (!ret)

	if (ret)

		goto err_disconnect;



	return 0;



disconnect:

err_disconnect:

	spin_lock_irq(&connection->lock);

	connection->state = GB_CONNECTION_STATE_ERROR;

	spin_unlock_irq(&connection->lock);



	gb_connection_disconnected(connection);

svc_destroy:

err_svc_destroy:

	gb_connection_svc_connection_destroy(connection);



	return ret;