diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-22 14:28:31 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-22 14:28:31 -0800 |
commit | 82d939ecf0469f0af048724fdbca544f02baed7f (patch) | |
tree | 8596e5b265fe4279c6afd9ca75f304aacac6d15f /drivers/staging/rtl8188eu/os_dep/osdep_service.c | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
parent | 4f317748f2660cb62bcf43aac368aa42dbeb2b78 (diff) |
Merge branch 'opw-next' into staging-next
This pulls in all of the staging patches applied during the opw
application process, and some other staging patches that were submitted
during that period of time. All of these are for 3.14-rc1.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu/os_dep/osdep_service.c')
-rw-r--r-- | drivers/staging/rtl8188eu/os_dep/osdep_service.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c b/drivers/staging/rtl8188eu/os_dep/osdep_service.c index a1ae72772c5f..2ffb4184fd08 100644 --- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c +++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c @@ -52,7 +52,7 @@ u32 rtw_atoi(u8 *s) } if (flag == 1) num = num * -1; - return num; + return num; } inline u8 *_rtw_vmalloc(u32 sz) |