diff options
| author | Mateusz Kulikowski <mateusz.kulikowski@gmail.com> | 2015-05-31 21:19:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-01 00:33:22 +0300 |
| commit | 622fd4942dc301cb9fcd38243c92218cfa5bd7f5 (patch) | |
| tree | 23657c82653165f814272fb09760d5c9427d86f2 /drivers | |
| parent | a5c06ad83bf444dc3219460820bdcd4707dc4c9a (diff) | |
| download | linux-622fd4942dc301cb9fcd38243c92218cfa5bd7f5.tar.xz | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_wx.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |