diff options
Diffstat (limited to 'drivers/media/video/mx3_camera.c')
-rw-r--r-- | drivers/media/video/mx3_camera.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index bd297f567dc7..d477e3058002 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c | |||
@@ -796,7 +796,7 @@ static int acquire_dma_channel(struct mx3_camera_dev *mx3_cam) | |||
796 | * FIXME: learn to use stride != width, then we can keep stride properly aligned | 796 | * FIXME: learn to use stride != width, then we can keep stride properly aligned |
797 | * and support arbitrary (even) widths. | 797 | * and support arbitrary (even) widths. |
798 | */ | 798 | */ |
799 | static inline void stride_align(__s32 *width) | 799 | static inline void stride_align(__u32 *width) |
800 | { | 800 | { |
801 | if (((*width + 7) & ~7) < 4096) | 801 | if (((*width + 7) & ~7) < 4096) |
802 | *width = (*width + 7) & ~7; | 802 | *width = (*width + 7) & ~7; |
@@ -844,7 +844,7 @@ static int mx3_camera_set_crop(struct soc_camera_device *icd, | |||
844 | * So far only direct camera-to-memory is supported | 844 | * So far only direct camera-to-memory is supported |
845 | */ | 845 | */ |
846 | if (channel_change_requested(icd, rect)) { | 846 | if (channel_change_requested(icd, rect)) { |
847 | int ret = acquire_dma_channel(mx3_cam); | 847 | ret = acquire_dma_channel(mx3_cam); |
848 | if (ret < 0) | 848 | if (ret < 0) |
849 | return ret; | 849 | return ret; |
850 | } | 850 | } |