lkml.org 
[lkml]   [2015]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH char-misc-next 4/4] misc: mic: use common error path
From
Date
On Mon, 2015-11-23 at 17:24 +0530, Sudip Mukherjee wrote:
> Instead of calling release_firmware() on every error and then jumping
> lets have a common release_firmware() in the error path.
> This patch also fixes a memory leak where we missed release_firmware()
> if mic_x100_load_command_line() fails.
>

Thanks for this patch series Sudip. All 4 patches look good.

Reviewed-by: Sudeep Dutt <sudeep.dutt@intel.com>


> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---
> drivers/misc/mic/host/mic_x100.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/mic/host/mic_x100.c b/drivers/misc/mic/host/mic_x100.c
> index 37fa898..82a973c 100644
> --- a/drivers/misc/mic/host/mic_x100.c
> +++ b/drivers/misc/mic/host/mic_x100.c
> @@ -463,8 +463,7 @@ mic_x100_load_firmware(struct mic_device *mdev, const char *buf)
> rc = -EINVAL;
> dev_err(&mdev->pdev->dev, "%s %d rc %d bootaddr 0x%x\n",
> __func__, __LINE__, rc, mdev->bootaddr);
> - release_firmware(fw);
> - goto done;
> + goto error;
> }
> memcpy_toio(mdev->aper.va + mdev->bootaddr, fw->data, fw->size);
> mdev->ops->write_spad(mdev, MIC_X100_FW_SIZE, fw->size);
> @@ -472,22 +471,24 @@ mic_x100_load_firmware(struct mic_device *mdev, const char *buf)
> rc = -EINVAL;
> dev_err(&mdev->pdev->dev, "%s %d rc %d\n",
> __func__, __LINE__, rc);
> - release_firmware(fw);
> - goto done;
> + goto error;
> }
> /* load command line */
> rc = mic_x100_load_command_line(mdev, fw);
> if (rc) {
> dev_err(&mdev->pdev->dev, "%s %d rc %d\n",
> __func__, __LINE__, rc);
> - goto done;
> + goto error;
> }
> release_firmware(fw);
> /* load ramdisk */
> if (mdev->cosm_dev->ramdisk)
> rc = mic_x100_load_ramdisk(mdev);
>
> -done:
> + return rc;
> +
> +error:
> + release_firmware(fw);
> return rc;
> }
>




\
 
 \ /
  Last update: 2015-12-12 04:01    [W:0.055 / U:0.152 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site