From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Date: Sun, 31 May 2015 18:19:47 +0000 (+0200)
Subject: staging: rtl8192e: Replace ?: with max
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=622fd4942dc301cb9fcd38243c92218cfa5bd7f5;p=deliverable%2Flinux.git

staging: rtl8192e: Replace ?: with max

All get_key implementations return either -1 or small buffers, so
cast int->u16 is not a problem.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 2ac161786796..f31d864df6cc 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -510,7 +510,8 @@ int rtllib_wx_get_encode(struct rtllib_device *ieee,
 		return 0;
 	}
 	len = crypt->ops->get_key(keybuf, SCM_KEY_LEN, NULL, crypt->priv);
-	erq->length = (len >= 0 ? len : 0);
+
+	erq->length = max(len, 0);
 
 	erq->flags |= IW_ENCODE_ENABLED;