rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / arch / sparc / kernel / ldc.c

diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index fa4c900a0d1ff8bbd78bf000b8a8feff54f5777c..54df554b82d98a684a3cbd7710ea10998e0d1722 100644 (file)
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -1336,7 +1336,7 @@ int ldc_connect(struct ldc_channel *lp)
        if (!(lp->flags & LDC_FLAG_ALLOCED_QUEUES) ||
            !(lp->flags & LDC_FLAG_REGISTERED_QUEUES) ||
            lp->hs_state != LDC_HS_OPEN)
-               err = ((lp->hs_state > LDC_HS_OPEN) ? 0 : -EINVAL);
+               err = -EINVAL;
        else
                err = start_handshake(lp);