Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[~andy/linux] / drivers / staging / rt2860 / rt_linux.c

diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index 27b78102f4bd472a6990f5de0ebaf5cd9b1df407..0029b2d73b706333f4a23fe96a5b303ae7aa21f6 100644 (file)
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -154,7 +154,7 @@ void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time)
 /* pAd MUST allow to be NULL */
 int os_alloc_mem(struct rt_rtmp_adapter *pAd, u8 ** mem, unsigned long size)
 {
-       *mem = (u8 *)kmalloc(size, GFP_ATOMIC);
+       *mem = kmalloc(size, GFP_ATOMIC);
        if (*mem)
                return NDIS_STATUS_SUCCESS;
        else