Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87757e32 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: protocol: handle static connections 



Use host-device device and connection name for log messages, as not all
connections have a bundle.

Note that the "initial" svc connection has never had a bundle.

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

drivers/staging/greybus/protocol.c

+5 −5
Original line number Diff line number Diff line
@@ -165,9 +165,9 @@ int gb_protocol_get_version(struct gb_connection *connection) 
		return retval;



	if (response.major > connection->protocol->major) {

		dev_err(&connection->bundle->dev,

			"%d: unsupported major version (%hhu > %hhu)\n",

			connection->intf_cport_id, response.major,

		dev_err(&connection->hd->dev,

			"%s: unsupported major version (%hhu > %hhu)\n",

			connection->name, response.major,

			connection->protocol->major);

		return -ENOTSUPP;

	}
@@ -175,8 +175,8 @@ int gb_protocol_get_version(struct gb_connection *connection) 
	connection->module_major = response.major;

	connection->module_minor = response.minor;



	dev_dbg(&connection->bundle->dev,

		"%d: %s (0x%02hhx) v%hhu.%hhu\n", connection->intf_cport_id,

	dev_dbg(&connection->hd->dev,

		"%s: %s (0x%02hhx) v%hhu.%hhu\n", connection->name,

		protocol->name, protocol->id, response.major, response.minor);



	return 0;