xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] omap3isp: separate links creation from entities init

Browse Source 
The omap3isp driver initializes the entities and creates the pads links
before the entities are registered with the media device. This does not
work now that object IDs are used to create links so the media_device
has to be set.

Split out the pads links creation from the entity initialization so the links
are created after the entities have been registered with the media device.

Suggested-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Javier Martinez Canillas
2015-08-26 09:24:45 -03:00
committed by Mauro Carvalho Chehab
parent 27e543fa87
commit f2f6da0d77
11 changed files with 185 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/media/platform/omap3isp/ispccdc.c
View File

@@ -2666,16 +2666,8 @@ static int ccdc_init_entities(struct isp_ccdc_device *ccdc)
if (ret < 0)
goto error_video;
/* Connect the CCDC subdev to the video node. */
ret = media_create_pad_link(&ccdc->subdev.entity, CCDC_PAD_SOURCE_OF,
&ccdc->video_out.video.entity, 0, 0);
if (ret < 0)
goto error_link;
return 0;
error_link:
omap3isp_video_cleanup(&ccdc->video_out);
error_video:
media_entity_cleanup(me);
return ret;
@@ -2720,6 +2712,20 @@ int omap3isp_ccdc_init(struct isp_device *isp)
return 0;
}
/*
* omap3isp_ccdc_create_pads_links - CCDC pads links creation
* @isp : Pointer to ISP device
* return negative error code or zero on success
*/
int omap3isp_ccdc_create_pads_links(struct isp_device *isp)
{
struct isp_ccdc_device *ccdc = &isp->isp_ccdc;
/* Connect the CCDC subdev to the video node. */
return media_create_pad_link(&ccdc->subdev.entity, CCDC_PAD_SOURCE_OF,
&ccdc->video_out.video.entity, 0, 0);
}
/*
* omap3isp_ccdc_cleanup - CCDC module cleanup.
* @isp: Device pointer specific to the OMAP3 ISP.