Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef1d9480 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: fix memory leak issue in dynamic buffer mode"

parents 49e553a9 f8d331db

drivers/media/platform/msm/vidc/msm_vidc.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ static inline void populate_buf_info(struct buffer_info *binfo, 
	binfo->num_planes = b->length;

	binfo->memory = b->memory;

	binfo->v4l2_index = b->index;

	binfo->dequeued = false;

	binfo->timestamp.tv_sec = b->timestamp.tv_sec;

	binfo->timestamp.tv_usec = b->timestamp.tv_usec;

	dprintk(VIDC_DBG, "%s: fd[%d] = %d b->index = %d",
@@ -358,6 +357,7 @@ static inline void repopulate_v4l2_buffer(struct v4l2_buffer *b, 
	b->index = binfo->v4l2_index;

	b->timestamp.tv_sec = binfo->timestamp.tv_sec;

	b->timestamp.tv_usec = binfo->timestamp.tv_usec;

	binfo->dequeued = false;

	for (i = 0; i < binfo->num_planes; ++i) {

		b->m.planes[i].reserved[0] = binfo->fd[i];

		b->m.planes[i].reserved[1] = binfo->buff_off[i];

drivers/media/platform/msm/vidc/msm_vidc_common.c

+1 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -3078,9 +3078,6 @@ void msm_comm_flush_dynamic_buffers(struct msm_vidc_inst *inst) 
				dprintk(VIDC_DBG,

					"released buffer held in driver before issuing flush: 0x%x fd[0]: %d\n",

					binfo->device_addr[0], binfo->fd[0]);

				/*delete this buffer info from registered list*/

				list_del(&binfo->list);

				kfree(binfo);

				/*send event to client*/

				v4l2_event_queue_fh(&inst->event_handler,

					&buf_event);