From: Elena Oat <oat.elena@gmail.com>
Date: Tue, 18 Mar 2014 17:16:49 +0000 (+0200)
Subject: Staging: rtl8188eu: Fix warning of unchecked sscanf return value.
X-Git-Tag: MMI-PSA29.97-13-9~12500^2~95
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f12919d5c9540ae01ca42f480ccec0fd8c70a6ad;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: rtl8188eu: Fix warning of unchecked sscanf return value.

This patch fixes the warning "unchecked sscanf return value" in file
rtw_mp.c. Zero is returned in case sscanf fails or if less than expected
items are read and assigned successfully. I have decided to return zero,
because in previous conditional statements zero was returned in case of
failure.

While at it, I have also fixed the warning of line over 80
characters.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/rtl8188eu/core/rtw_mp.c b/drivers/staging/rtl8188eu/core/rtw_mp.c
index 2e02b2063c20..705f666bca6b 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mp.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mp.c
@@ -883,7 +883,7 @@ u32 mp_query_psd(struct adapter *pAdapter, u8 *data)
 {
 	u32 i, psd_pts = 0, psd_start = 0, psd_stop = 0;
 	u32 psd_data = 0;
-
+	int ret;
 
 	if (!netif_running(pAdapter->pnetdev)) {
 		RT_TRACE(_module_mp_, _drv_warning_, ("mp_query_psd: Fail! interface not opened!\n"));
@@ -900,7 +900,10 @@ u32 mp_query_psd(struct adapter *pAdapter, u8 *data)
 		psd_start = 64;
 		psd_stop = 128;
 	} else {
-		sscanf(data, "pts =%d, start =%d, stop =%d", &psd_pts, &psd_start, &psd_stop);
+		ret = sscanf(data, "pts =%d, start =%d, stop =%d",
+				&psd_pts, &psd_start, &psd_stop);
+		if (ret != 3)
+			return 0;
 	}
 
 	_rtw_memset(data, '\0', sizeof(*data));