diff options
Diffstat (limited to 'drivers/media/platform/omap3isp/ispccdc.c')
-rw-r--r-- | drivers/media/platform/omap3isp/ispccdc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c index 5db2c88b9ad8..4d920c800ff5 100644 --- a/drivers/media/platform/omap3isp/ispccdc.c +++ b/drivers/media/platform/omap3isp/ispccdc.c | |||
@@ -293,7 +293,7 @@ static int __ccdc_lsc_enable(struct isp_ccdc_device *ccdc, int enable) | |||
293 | isp_reg_clr(isp, OMAP3_ISP_IOMEM_CCDC, | 293 | isp_reg_clr(isp, OMAP3_ISP_IOMEM_CCDC, |
294 | ISPCCDC_LSC_CONFIG, ISPCCDC_LSC_ENABLE); | 294 | ISPCCDC_LSC_CONFIG, ISPCCDC_LSC_ENABLE); |
295 | ccdc->lsc.state = LSC_STATE_STOPPED; | 295 | ccdc->lsc.state = LSC_STATE_STOPPED; |
296 | dev_warn(to_device(ccdc), "LSC prefecth timeout\n"); | 296 | dev_warn(to_device(ccdc), "LSC prefetch timeout\n"); |
297 | return -ETIMEDOUT; | 297 | return -ETIMEDOUT; |
298 | } | 298 | } |
299 | ccdc->lsc.state = LSC_STATE_RUNNING; | 299 | ccdc->lsc.state = LSC_STATE_RUNNING; |
@@ -674,7 +674,7 @@ static void ccdc_config_imgattr(struct isp_ccdc_device *ccdc, u32 colptn) | |||
674 | /* | 674 | /* |
675 | * ccdc_config - Set CCDC configuration from userspace | 675 | * ccdc_config - Set CCDC configuration from userspace |
676 | * @ccdc: Pointer to ISP CCDC device. | 676 | * @ccdc: Pointer to ISP CCDC device. |
677 | * @userspace_add: Structure containing CCDC configuration sent from userspace. | 677 | * @ccdc_struct: Structure containing CCDC configuration sent from userspace. |
678 | * | 678 | * |
679 | * Returns 0 if successful, -EINVAL if the pointer to the configuration | 679 | * Returns 0 if successful, -EINVAL if the pointer to the configuration |
680 | * structure is null, or the copy_from_user function fails to copy user space | 680 | * structure is null, or the copy_from_user function fails to copy user space |
@@ -793,7 +793,7 @@ static void ccdc_apply_controls(struct isp_ccdc_device *ccdc) | |||
793 | 793 | ||
794 | /* | 794 | /* |
795 | * omap3isp_ccdc_restore_context - Restore values of the CCDC module registers | 795 | * omap3isp_ccdc_restore_context - Restore values of the CCDC module registers |
796 | * @dev: Pointer to ISP device | 796 | * @isp: Pointer to ISP device |
797 | */ | 797 | */ |
798 | void omap3isp_ccdc_restore_context(struct isp_device *isp) | 798 | void omap3isp_ccdc_restore_context(struct isp_device *isp) |
799 | { | 799 | { |
@@ -2525,7 +2525,7 @@ error_video: | |||
2525 | 2525 | ||
2526 | /* | 2526 | /* |
2527 | * omap3isp_ccdc_init - CCDC module initialization. | 2527 | * omap3isp_ccdc_init - CCDC module initialization. |
2528 | * @dev: Device pointer specific to the OMAP3 ISP. | 2528 | * @isp: Device pointer specific to the OMAP3 ISP. |
2529 | * | 2529 | * |
2530 | * TODO: Get the initialisation values from platform data. | 2530 | * TODO: Get the initialisation values from platform data. |
2531 | * | 2531 | * |
@@ -2564,7 +2564,7 @@ int omap3isp_ccdc_init(struct isp_device *isp) | |||
2564 | 2564 | ||
2565 | /* | 2565 | /* |
2566 | * omap3isp_ccdc_cleanup - CCDC module cleanup. | 2566 | * omap3isp_ccdc_cleanup - CCDC module cleanup. |
2567 | * @dev: Device pointer specific to the OMAP3 ISP. | 2567 | * @isp: Device pointer specific to the OMAP3 ISP. |
2568 | */ | 2568 | */ |
2569 | void omap3isp_ccdc_cleanup(struct isp_device *isp) | 2569 | void omap3isp_ccdc_cleanup(struct isp_device *isp) |
2570 | { | 2570 | { |