Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-13 16:50:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] media: vb2: change plane sizes array to unsigned int[]

Browse Source 
Plane sizes array was declared as unsigned long[], while unsigned int is
more than enough for storing size of the video buffer. This patch reduces
the size of the array by definiting it as unsigned int[].

Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Marek Szyprowski 2011-08-24 06:43:36 -03:00 committed by Mauro Carvalho Chehab
parent 25a27d9100
commit 035aa1475d
13 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/atmel-isi.c
View File

@ -249,7 +249,7 @@ static int atmel_isi_wait_status(struct atmel_isi *isi, int wait_reset)
Videobuf operations Videobuf operations
------------------------------------------------------------------*/ ------------------------------------------------------------------*/
static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
unsigned int *nplanes, unsigned long sizes[], unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[]) void *alloc_ctxs[])
{ {
struct soc_camera_device *icd = soc_camera_from_vb2q(vq); struct soc_camera_device *icd = soc_camera_from_vb2q(vq);

2
drivers/media/video/marvell-ccic/mcam-core.c
View File

@ -884,7 +884,7 @@ static int mcam_read_setup(struct mcam_camera *cam)
*/ */
static int mcam_vb_queue_setup(struct vb2_queue *vq, unsigned int *nbufs, static int mcam_vb_queue_setup(struct vb2_queue *vq, unsigned int *nbufs,
unsigned int *num_planes, unsigned long sizes[], unsigned int *num_planes, unsigned int sizes[],
void *alloc_ctxs[]) void *alloc_ctxs[])
{ {
struct mcam_camera *cam = vb2_get_drv_priv(vq); struct mcam_camera *cam = vb2_get_drv_priv(vq);

2
drivers/media/video/mem2mem_testdev.c
View File

@ -739,7 +739,7 @@ static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
*/ */
static int m2mtest_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, static int m2mtest_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
unsigned int *nplanes, unsigned long sizes[], unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[]) void *alloc_ctxs[])
{ {
struct m2mtest_ctx *ctx = vb2_get_drv_priv(vq); struct m2mtest_ctx *ctx = vb2_get_drv_priv(vq);

2
drivers/media/video/mx3_camera.c
View File

@ -191,7 +191,7 @@ static void mx3_cam_dma_done(void *arg)
*/ */
static int mx3_videobuf_setup(struct vb2_queue *vq, static int mx3_videobuf_setup(struct vb2_queue *vq,
unsigned int *count, unsigned int *num_planes, unsigned int *count, unsigned int *num_planes,
unsigned long sizes[], void *alloc_ctxs[]) unsigned int sizes[], void *alloc_ctxs[])
{ {
struct soc_camera_device *icd = soc_camera_from_vb2q(vq); struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

2
drivers/media/video/pwc/pwc-if.c
View File

@ -745,7 +745,7 @@ static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)
/* Videobuf2 operations */ /* Videobuf2 operations */
static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
unsigned int *nplanes, unsigned long sizes[], unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[]) void *alloc_ctxs[])
{ {
struct pwc_device *pdev = vb2_get_drv_priv(vq); struct pwc_device *pdev = vb2_get_drv_priv(vq);

2
drivers/media/video/s5p-fimc/fimc-capture.c
View File

@ -265,7 +265,7 @@ static unsigned int get_plane_size(struct fimc_frame *fr, unsigned int plane)
} }
static int queue_setup(struct vb2_queue *vq, unsigned int *num_buffers, static int queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
unsigned int *num_planes, unsigned long sizes[], unsigned int *num_planes, unsigned int sizes[],
void *allocators[]) void *allocators[])
{ {
struct fimc_ctx *ctx = vq->drv_priv; struct fimc_ctx *ctx = vq->drv_priv;

2
drivers/media/video/s5p-fimc/fimc-core.c
View File

@ -692,7 +692,7 @@ static void fimc_job_abort(void *priv)
} }
static int fimc_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers, static int fimc_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
unsigned int *num_planes, unsigned long sizes[], unsigned int *num_planes, unsigned int sizes[],
void *allocators[]) void *allocators[])
{ {
struct fimc_ctx *ctx = vb2_get_drv_priv(vq); struct fimc_ctx *ctx = vb2_get_drv_priv(vq);

2
drivers/media/video/s5p-mfc/s5p_mfc_dec.c
View File

@ -745,7 +745,7 @@ static const struct v4l2_ioctl_ops s5p_mfc_dec_ioctl_ops = {
}; };
static int s5p_mfc_queue_setup(struct vb2_queue *vq, unsigned int *buf_count, static int s5p_mfc_queue_setup(struct vb2_queue *vq, unsigned int *buf_count,
unsigned int *plane_count, unsigned long psize[], unsigned int *plane_count, unsigned int psize[],
void *allocators[]) void *allocators[])
{ {
struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv); struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);

2
drivers/media/video/s5p-mfc/s5p_mfc_enc.c
View File

@ -1514,7 +1514,7 @@ static int check_vb_with_fmt(struct s5p_mfc_fmt *fmt, struct vb2_buffer *vb)
static int s5p_mfc_queue_setup(struct vb2_queue *vq, static int s5p_mfc_queue_setup(struct vb2_queue *vq,
unsigned int *buf_count, unsigned int *plane_count, unsigned int *buf_count, unsigned int *plane_count,
unsigned long psize[], void *allocators[]) unsigned int psize[], void *allocators[])
{ {
struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv); struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);

2
drivers/media/video/s5p-tv/mixer_video.c
View File

@ -728,7 +728,7 @@ static const struct v4l2_file_operations mxr_fops = {
}; };
static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
unsigned int *nplanes, unsigned long sizes[], unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[]) void *alloc_ctxs[])
{ {
struct mxr_layer *layer = vb2_get_drv_priv(vq); struct mxr_layer *layer = vb2_get_drv_priv(vq);

4
drivers/media/video/sh_mobile_ceu_camera.c
View File

@ -218,7 +218,7 @@ static int sh_mobile_ceu_soft_reset(struct sh_mobile_ceu_dev *pcdev)
*/ */
static int sh_mobile_ceu_videobuf_setup(struct vb2_queue *vq, static int sh_mobile_ceu_videobuf_setup(struct vb2_queue *vq,
unsigned int *count, unsigned int *num_planes, unsigned int *count, unsigned int *num_planes,
unsigned long sizes[], void *alloc_ctxs[]) unsigned int sizes[], void *alloc_ctxs[])
{ {
struct soc_camera_device *icd = container_of(vq, struct soc_camera_device, vb2_vidq); struct soc_camera_device *icd = container_of(vq, struct soc_camera_device, vb2_vidq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
@ -243,7 +243,7 @@ static int sh_mobile_ceu_videobuf_setup(struct vb2_queue *vq,
*count = pcdev->video_limit / PAGE_ALIGN(sizes[0]); *count = pcdev->video_limit / PAGE_ALIGN(sizes[0]);
} }
dev_dbg(icd->parent, "count=%d, size=%lu\n", *count, sizes[0]); dev_dbg(icd->parent, "count=%d, size=%u\n", *count, sizes[0]);
return 0; return 0;
} }

2
drivers/media/video/vivi.c
View File

@ -651,7 +651,7 @@ static void vivi_stop_generating(struct vivi_dev *dev)
Videobuf operations Videobuf operations
------------------------------------------------------------------*/ ------------------------------------------------------------------*/
static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
unsigned int *nplanes, unsigned long sizes[], unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[]) void *alloc_ctxs[])
{ {
struct vivi_dev *dev = vb2_get_drv_priv(vq); struct vivi_dev *dev = vb2_get_drv_priv(vq);

4
include/media/videobuf2-core.h
View File

@ -208,7 +208,7 @@ struct vb2_buffer {
*/ */
struct vb2_ops { struct vb2_ops {
int (*queue_setup)(struct vb2_queue *q, unsigned int *num_buffers, int (*queue_setup)(struct vb2_queue *q, unsigned int *num_buffers,
unsigned int *num_planes, unsigned long sizes[], unsigned int *num_planes, unsigned int sizes[],
void *alloc_ctxs[]); void *alloc_ctxs[]);
void (*wait_prepare)(struct vb2_queue *q); void (*wait_prepare)(struct vb2_queue *q);
@ -273,7 +273,7 @@ struct vb2_queue {
wait_queue_head_t done_wq; wait_queue_head_t done_wq;
void *alloc_ctx[VIDEO_MAX_PLANES]; void *alloc_ctx[VIDEO_MAX_PLANES];
unsigned long plane_sizes[VIDEO_MAX_PLANES]; unsigned int plane_sizes[VIDEO_MAX_PLANES];
unsigned int streaming:1; unsigned int streaming:1;