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

Commit b446631c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: omap_vout: Don't free buffers if they haven't been allocated 



The VRFB buffers are freed when the device is closed even if they
haven't been allocated by a call to VIDIOC_REQBUFS, resulting in a
crash. Fix it by not trying to free buffers that are not allocated.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent cd1e11be

drivers/media/platform/omap/omap_vout_vrfb.c

+6 −4
Original line number Diff line number Diff line
@@ -79,12 +79,14 @@ void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout) 
	int j;



	for (j = 0; j < VRFB_NUM_BUFS; j++) {

		if (vout->smsshado_virt_addr[j]) {

			omap_vout_free_buffer(vout->smsshado_virt_addr[j],

					      vout->smsshado_size);

			vout->smsshado_virt_addr[j] = 0;

			vout->smsshado_phy_addr[j] = 0;

		}

	}

}



int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num,

			      bool static_vrfb_allocation)