diff --git a/[refs] b/[refs] index 965769dfad75..7ad1e3ae00d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d82c65f04b00093088002a1d8c147006c98f960 +refs/heads/master: a5e0f69c983a142daa95b70f709a3dabf76cb55f diff --git a/trunk/drivers/staging/ced1401/ced_ioc.c b/trunk/drivers/staging/ced1401/ced_ioc.c index c9492edaaddb..5813aee6b348 100644 --- a/trunk/drivers/staging/ced1401/ced_ioc.c +++ b/trunk/drivers/staging/ced1401/ced_ioc.c @@ -1508,7 +1508,7 @@ int FreeCircBlock(DEVICE_EXTENSION * pdx, TCIRCBLOCK __user * pCB) iReturn = U14ERR_BADAREA; if (copy_to_user(pCB, &cb, sizeof(cb))) - return -EFAULT; + iReturn = -EFAULT; mutex_unlock(&pdx->io_mutex); return iReturn;