Commit b53bab72 authored Dec 20, 2016 by Jason Hrycay Committed by Greg Kroah-Hartman Nov 21, 2017

staging: greybus: add host device function pointer checks




[ Upstream commit f05a88a39c5b5f226e08e626998bb920723b7d85 ]

Add sanity checks for cport_quiesce and cport_clear before invoking the
callbacks as these function pointers are not required during the host
device registration. This follows the logic implemented elsewhere for
various other function pointers.

Signed-off-by: Jason Hrycay <jhrycay@gmail.com>
Reviewed-by: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Acked-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1f5a7cab

drivers/staging/greybus/connection.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -357,6 +357,9 @@ static int gb_connection_hd_cport_quiesce(struct gb_connection *connection)
		size_t peer_space;
		int ret;

		if (!hd->driver->cport_quiesce)
		return 0;

		peer_space = sizeof(struct gb_operation_msg_hdr) +
		sizeof(struct gb_cport_shutdown_request);

		@@ -380,6 +383,9 @@ static int gb_connection_hd_cport_clear(struct gb_connection *connection)
		struct gb_host_device *hd = connection->hd;
		int ret;

		if (!hd->driver->cport_clear)
		return 0;

		ret = hd->driver->cport_clear(hd, connection->hd_cport_id);
		if (ret) {
		dev_err(&hd->dev, "%s: failed to clear host cport: %d\n",