greybus: ap: fix svc handshake protocol check

Fix incorrect SVC handshake protocol check, which would only bail out if
both major and minor protocol versions supported by the SVC differed.

Since we currently only support one version of the protocol, upgrade the
debug message to warning and bail unless the protocol versions match
perfectly for now.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/staging/greybus/ap.c b/drivers/staging/greybus/ap.c
index 3e4d4fb..d5edef9 100644 (file)
--- a/drivers/staging/greybus/ap.c
+++ b/drivers/staging/greybus/ap.c
@@ -91,9 +91,10 @@ static void svc_handshake(struct svc_function_handshake *handshake,
        }
 
        /* A new SVC communication channel, let's verify a supported version */
-       if ((handshake->version_major != GREYBUS_VERSION_MAJOR) &&
+       if ((handshake->version_major != GREYBUS_VERSION_MAJOR) ||
            (handshake->version_minor != GREYBUS_VERSION_MINOR)) {
-               dev_dbg(hd->parent, "received invalid greybus version %d:%d\n",
+               dev_warn(hd->parent,
+                       "received invalid greybus version %u.%u\n",
                        handshake->version_major, handshake->version_minor);
                return;
        }