diff options
Diffstat (limited to 'drivers/media/video/davinci')
-rw-r--r-- | drivers/media/video/davinci/dm644x_ccdc.c | 4 | ||||
-rw-r--r-- | drivers/media/video/davinci/vpfe_capture.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c index 490aafb34e2f..c8b32c1c7386 100644 --- a/drivers/media/video/davinci/dm644x_ccdc.c +++ b/drivers/media/video/davinci/dm644x_ccdc.c | |||
@@ -258,7 +258,7 @@ static int ccdc_update_raw_params(struct ccdc_config_params_raw *raw_params) | |||
258 | /* | 258 | /* |
259 | * Allocate memory for FPC table if current | 259 | * Allocate memory for FPC table if current |
260 | * FPC table buffer is not big enough to | 260 | * FPC table buffer is not big enough to |
261 | * accomodate FPC Number requested | 261 | * accommodate FPC Number requested |
262 | */ | 262 | */ |
263 | if (raw_params->fault_pxl.fp_num != config_params->fault_pxl.fp_num) { | 263 | if (raw_params->fault_pxl.fp_num != config_params->fault_pxl.fp_num) { |
264 | if (fpc_physaddr != NULL) { | 264 | if (fpc_physaddr != NULL) { |
@@ -436,7 +436,7 @@ void ccdc_config_ycbcr(void) | |||
436 | 436 | ||
437 | /* | 437 | /* |
438 | * configure the horizontal line offset. This should be a | 438 | * configure the horizontal line offset. This should be a |
439 | * on 32 byte bondary. So clear LSB 5 bits | 439 | * on 32 byte boundary. So clear LSB 5 bits |
440 | */ | 440 | */ |
441 | regw(((params->win.width * 2 + 31) & ~0x1f), CCDC_HSIZE_OFF); | 441 | regw(((params->win.width * 2 + 31) & ~0x1f), CCDC_HSIZE_OFF); |
442 | 442 | ||
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index 71e961e53a56..5b38fc93ff28 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/video/davinci/vpfe_capture.c | |||
@@ -1691,7 +1691,7 @@ static int vpfe_s_crop(struct file *file, void *priv, | |||
1691 | goto unlock_out; | 1691 | goto unlock_out; |
1692 | } | 1692 | } |
1693 | 1693 | ||
1694 | /* adjust the width to 16 pixel boundry */ | 1694 | /* adjust the width to 16 pixel boundary */ |
1695 | crop->c.width = ((crop->c.width + 15) & ~0xf); | 1695 | crop->c.width = ((crop->c.width + 15) & ~0xf); |
1696 | 1696 | ||
1697 | /* make sure parameters are valid */ | 1697 | /* make sure parameters are valid */ |