diff --git a/[refs] b/[refs] index f5f11f63dfc6..d039ca52063f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2a6a5528f3144cf42b8b4d0655106f573f71fae +refs/heads/master: e6c5abf2542f1a91d31ae536707c00cf0ceaf376 diff --git a/trunk/drivers/staging/ced1401/ced_ioc.c b/trunk/drivers/staging/ced1401/ced_ioc.c index 0adba75be8b7..efe6aecbf9b7 100644 --- a/trunk/drivers/staging/ced1401/ced_ioc.c +++ b/trunk/drivers/staging/ced1401/ced_ioc.c @@ -697,8 +697,7 @@ static int SetArea(DEVICE_EXTENSION * pdx, int nArea, char __user * puBuf, return -EFAULT; // ...then we are done // Now allocate space to hold the page pointer and virtual address pointer tables - pPages = - (struct page **)kmalloc(len * sizeof(struct page *), GFP_KERNEL); + pPages = kmalloc(len * sizeof(struct page *), GFP_KERNEL); if (!pPages) { iReturn = U14ERR_NOMEMORY; goto error;