Merge branch 'staging-linus' into staging-work

[linux-beck.git] / drivers / staging / rtl8188eu / os_dep / ioctl_linux.c

diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index 4ad80ae1067f0fbe70eefe7b2efab5f08db76962..02040820f6f0772a7db7dfee43afd635c4860297 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -5648,12 +5648,12 @@ static int rtw_wx_set_priv(struct net_device *dev,
                return -EFAULT;
 
        len = dwrq->length;
-       ext = rtw_vmalloc(len);
+       ext = vmalloc(len);
        if (!ext)
                return -ENOMEM;
 
        if (copy_from_user(ext, dwrq->pointer, len)) {
-               rtw_vmfree(ext, len);
+               vfree(ext);
                return -EFAULT;
        }
 
@@ -5693,7 +5693,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
 
 FREE_EXT:
 
-       rtw_vmfree(ext, len);
+       vfree(ext);
 
        return ret;
 }