From: Jason Hrycay <jhry...@gmail.com>

[ 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 <jhry...@gmail.com>
Reviewed-by: Bryan O'Donoghue <pure.lo...@nexus-software.ie>
Acked-by: Johan Hovold <jo...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.le...@verizon.com>
---
 drivers/staging/greybus/connection.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/staging/greybus/connection.c 
b/drivers/staging/greybus/connection.c
index 557075147f2d..1bf0ee403106 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -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",
-- 
2.11.0

Reply via email to