diff options
Diffstat (limited to 'drivers/staging/media/davinci_vpfe')
6 files changed, 38 insertions, 32 deletions
diff --git a/drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h b/drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h index d3f34f9..7cc115c 100644 --- a/drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h +++ b/drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h @@ -155,8 +155,8 @@ struct vpfe_isif_dfc { }; /************************************************************************ -* Digital/Black clamp or DC Subtract parameters -************************************************************************/ + * Digital/Black clamp or DC Subtract parameters + ************************************************************************/ /** * Horizontal Black Clamp modes */ @@ -309,8 +309,8 @@ struct vpfe_isif_black_clamp { }; /************************************************************************* -** Color Space Conversion (CSC) -*************************************************************************/ + ** Color Space Conversion (CSC) + *************************************************************************/ /** * Number of Coefficient values used for CSC */ @@ -331,8 +331,8 @@ struct float_16_bit { }; /************************************************************************* -** Color Space Conversion parameters -*************************************************************************/ + ** Color Space Conversion parameters + *************************************************************************/ /** * Structure used for CSC config params */ @@ -365,8 +365,8 @@ enum vpfe_isif_datasft { #define VPFE_ISIF_LINEAR_TAB_SIZE 192 /************************************************************************* -** Linearization parameters -*************************************************************************/ + ** Linearization parameters + *************************************************************************/ /** * Structure for Sensor data linearization */ @@ -382,8 +382,8 @@ struct vpfe_isif_linearize { }; /************************************************************************* -** ISIF Raw configuration parameters -*************************************************************************/ + ** ISIF Raw configuration parameters + *************************************************************************/ enum vpfe_isif_fmt_mode { VPFE_ISIF_SPLIT, VPFE_ISIF_COMBINE @@ -1189,8 +1189,8 @@ struct vpfe_ipipe_config { }; /******************************************************************* -** Resizer API structures -*******************************************************************/ + ** Resizer API structures + *******************************************************************/ /* Interpolation types used for horizontal rescale */ enum vpfe_rsz_intp_t { VPFE_RSZ_INTP_CUBIC, diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c index ff47a8f3..6a3434c 100644 --- a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c +++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c @@ -1803,14 +1803,14 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev) return -EBUSY; ipipe->base_addr = ioremap_nocache(res->start, res_len); if (!ipipe->base_addr) - return -EBUSY; + goto error_release; res = platform_get_resource(pdev, IORESOURCE_MEM, 6); if (!res) - return -ENOENT; + goto error_unmap; ipipe->isp5_base_addr = ioremap_nocache(res->start, res_len); if (!ipipe->isp5_base_addr) - return -EBUSY; + goto error_unmap; v4l2_subdev_init(sd, &ipipe_v4l2_ops); sd->internal_ops = &ipipe_v4l2_internal_ops; @@ -1839,6 +1839,12 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev) sd->ctrl_handler = &ipipe->ctrls; return media_entity_pads_init(me, IPIPE_PADS_NUM, pads); + +error_unmap: + iounmap(ipipe->base_addr); +error_release: + release_mem_region(res->start, res_len); + return -ENOMEM; } /* diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c index 958ef71..a893072 100644 --- a/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c +++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c @@ -1003,8 +1003,8 @@ void ipipe_set_car_regs(void __iomem *base_addr, struct vpfe_ipipe_car *car) ipipe_set_mf(base_addr); ipipe_set_gain_ctrl(base_addr, car); /* Set the threshold for switching between - * the two Here we overwrite the MF SW0 value - */ + * the two Here we overwrite the MF SW0 value + */ regw_ip(base_addr, VPFE_IPIPE_CAR_DYN_SWITCH, CAR_TYP); val = car->sw1; val <<= CAR_SW1_SHIFT; diff --git a/drivers/staging/media/davinci_vpfe/dm365_isif_regs.h b/drivers/staging/media/davinci_vpfe/dm365_isif_regs.h index 8aceabb..64fbb45 100644 --- a/drivers/staging/media/davinci_vpfe/dm365_isif_regs.h +++ b/drivers/staging/media/davinci_vpfe/dm365_isif_regs.h @@ -59,8 +59,8 @@ #define REC656IF 0x84 #define CCDCFG 0x88 /***************************************************** -* Defect Correction registers -*****************************************************/ + * Defect Correction registers + *****************************************************/ #define DFCCTL 0x8c #define VDFSATLV 0x90 #define DFCMEMCTL 0x94 @@ -70,8 +70,8 @@ #define DFCMEM3 0xa4 #define DFCMEM4 0xa8 /**************************************************** -* Black Clamp registers -****************************************************/ + * Black Clamp registers + ****************************************************/ #define CLAMPCFG 0xac #define CLDCOFST 0xb0 #define CLSV 0xb4 @@ -84,8 +84,8 @@ #define CLVWIN2 0xd0 #define CLVWIN3 0xd4 /**************************************************** -* Lense Shading Correction -****************************************************/ + * Lense Shading Correction + ****************************************************/ #define DATAHOFST 0xd8 #define DATAVOFST 0xdc #define LSCHVAL 0xe0 @@ -102,8 +102,8 @@ #define TWODLSCIRQEN 0x10c #define TWODLSCIRQST 0x110 /**************************************************** -* Data formatter -****************************************************/ + * Data formatter + ****************************************************/ #define FMTCFG 0x114 #define FMTPLEN 0x118 #define FMTSPH 0x11c @@ -128,8 +128,8 @@ #define FMTPGMAPS6 0x19c #define FMTPGMAPS7 0x1a0 /************************************************ -* Color Space Converter -************************************************/ + * Color Space Converter + ************************************************/ #define CSCCTL 0x1a4 #define CSCM0 0x1a8 #define CSCM1 0x1ac diff --git a/drivers/staging/media/davinci_vpfe/dm365_resizer.c b/drivers/staging/media/davinci_vpfe/dm365_resizer.c index 5fbc2d4..857b0e8 100644 --- a/drivers/staging/media/davinci_vpfe/dm365_resizer.c +++ b/drivers/staging/media/davinci_vpfe/dm365_resizer.c @@ -1133,9 +1133,9 @@ void vpfe_resizer_buffer_isr(struct vpfe_resizer_device *resizer) } } else if (fid == 0) { /* - * out of sync. Recover from any hardware out-of-sync. - * May loose one frame - */ + * out of sync. Recover from any hardware out-of-sync. + * May loose one frame + */ video_out->field_id = fid; } } diff --git a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c index 32109cd..bffe215 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c @@ -228,7 +228,7 @@ static int vpfe_enable_clock(struct vpfe_device *vpfe_dev) vpfe_dev->clks = kcalloc(vpfe_cfg->num_clocks, sizeof(*vpfe_dev->clks), GFP_KERNEL); - if (vpfe_dev->clks == NULL) + if (!vpfe_dev->clks) return -ENOMEM; for (i = 0; i < vpfe_cfg->num_clocks; i++) { @@ -348,7 +348,7 @@ static int register_i2c_devices(struct vpfe_device *vpfe_dev) vpfe_dev->sd = kcalloc(num_subdevs, sizeof(struct v4l2_subdev *), GFP_KERNEL); - if (vpfe_dev->sd == NULL) + if (!vpfe_dev->sd) return -ENOMEM; for (i = 0, k = 0; i < num_subdevs; i++) { |
