From ea60011c5f08e5d445f25ea32b553c029ddb3ed0 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 8 Oct 2010 14:56:58 +0200 Subject: [PATCH] --- yaml --- r: 220234 b: refs/heads/master c: ef5d2056456d63528daa762b32afa5c430635f33 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/InterfaceDld.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a96428f158ca..fb333a8adce4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: acedadfae589885e1753f8fc4eb0d797846861b9 +refs/heads/master: ef5d2056456d63528daa762b32afa5c430635f33 diff --git a/trunk/drivers/staging/bcm/InterfaceDld.c b/trunk/drivers/staging/bcm/InterfaceDld.c index 8825b8e4460b..60c0f29f3eef 100644 --- a/trunk/drivers/staging/bcm/InterfaceDld.c +++ b/trunk/drivers/staging/bcm/InterfaceDld.c @@ -167,7 +167,7 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter, { bcm_kfree (Adapter->pstargetparams); Adapter->pstargetparams = NULL; - return retval; + return -EFAULT; } /* Parse the structure and then Download the Firmware */ beceem_parse_target_struct(Adapter); @@ -385,6 +385,7 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo) if(retval != STATUS_SUCCESS) { BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "copying buffer from user space failed"); + retval = -EFAULT; goto error ; }