a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8188eu: Use kstrtoul() for string to long conversion

Browse Source 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
navin patidar 2014-06-22 13:49:36 +05:30 committed by Greg Kroah-Hartman
parent fb46424e6c
commit a733e46751
3 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/rtl8188eu/include/osdep_service.h
View File

@ -211,9 +211,6 @@ u32 rtw_ms_to_systime(u32 ms);
s32 rtw_get_passing_time_ms(u32 start);
s32 rtw_get_time_interval_ms(u32 start, u32 end);
u32 rtw_atoi(u8 *s);
static inline unsigned char _cancel_timer_ex(struct timer_list *ptimer)
{
return del_timer_sync(ptimer);

24
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
View File

@ -6590,9 +6590,10 @@ static int rtw_mp_rate(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *wrqu, char *extra)
{
u32 rate = MPT_RATE_1M;
unsigned long rate = MPT_RATE_1M;
char *input = kmalloc(wrqu->length, GFP_KERNEL);
struct adapter *padapter = rtw_netdev_priv(dev);
int status;
if (!input)
return -ENOMEM;
@ -6600,8 +6601,12 @@ static int rtw_mp_rate(struct net_device *dev,
kfree(input);
return -EFAULT;
}
rate = rtw_atoi(input);
sprintf(extra, "Set data rate to %d", rate);
status = kstrtoul(input, 0, &rate);
if (status)
return status;
sprintf(extra, "Set data rate to %lu", rate);
kfree(input);
if (rate <= 0x7f)
rate = wifirate2_ratetbl_inx((u8)rate);
@ -6623,8 +6628,9 @@ static int rtw_mp_channel(struct net_device *dev,
struct iw_point *wrqu, char *extra)
{
struct adapter *padapter = rtw_netdev_priv(dev);
char *input = kmalloc(wrqu->length, GFP_KERNEL);
u32 channel = 1;
char *input = kmalloc(wrqu->length, GFP_KERNEL);
unsigned long channel = 1;
int status;
if (!input)
return -ENOMEM;
@ -6632,8 +6638,12 @@ static int rtw_mp_channel(struct net_device *dev,
kfree(input);
return -EFAULT;
}
channel = rtw_atoi(input);
sprintf(extra, "Change channel %d to channel %d", padapter->mppriv.channel, channel);
status = kstrtoul(input, 0, &channel);
if (status)
return status;
sprintf(extra, "Change channel %d to channel %lu", padapter->mppriv.channel, channel);
padapter->mppriv.channel = channel;
Hal_SetChannel(padapter);

17
drivers/staging/rtl8188eu/os_dep/osdep_service.c
View File

@ -39,23 +39,6 @@ inline int RTW_STATUS_CODE(int error_code)
return _FAIL;
}
u32 rtw_atoi(u8 *s)
{
int num = 0, flag = 0;
int i;
for (i = 0; i <= strlen(s); i++) {
if (s[i] >= '0' && s[i] <= '9')
num = num * 10 + s[i] - '0';
else if (s[0] == '-' && i == 0)
flag = 1;
else
break;
}
if (flag == 1)
num = num * -1;
return num;
}
u8 *_rtw_malloc(u32 sz)
{
u8 *pbuf = NULL;