Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 170bd533 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cx25821: fix compiler warning 



drivers/media/pci/cx25821/cx25821-video.c: In function ‘cx25821_video_register’:
drivers/media/pci/cx25821/cx25821-video.c:518:1: warning: the frame size of 1600 bytes is larger than 1024 bytes [-Wframe-larger-than=]
Fixed by just making the struct video_device template static const.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 31b32073

drivers/media/pci/cx25821/cx25821-video.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -161,7 +161,7 @@ int cx25821_set_tvnorm(struct cx25821_dev *dev, v4l2_std_id norm) 




struct video_device *cx25821_vdev_init(struct cx25821_dev *dev,

struct video_device *cx25821_vdev_init(struct cx25821_dev *dev,

				       struct pci_dev *pci,

				       struct pci_dev *pci,

				       struct video_device *template,

				       const struct video_device *template,

				       char *type)

				       char *type)

{

{

	struct video_device *vfd;

	struct video_device *vfd;
@@ -447,10 +447,7 @@ void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num) 




int cx25821_video_register(struct cx25821_dev *dev)

int cx25821_video_register(struct cx25821_dev *dev)

{

{

	int err;

	static const struct video_device cx25821_video_device = {

	int i;



	struct video_device cx25821_video_device = {

		.name = "cx25821-video",

		.name = "cx25821-video",

		.fops = &video_fops,

		.fops = &video_fops,

		.minor = -1,

		.minor = -1,
@@ -458,6 +455,8 @@ int cx25821_video_register(struct cx25821_dev *dev) 
		.tvnorms = CX25821_NORMS,

		.tvnorms = CX25821_NORMS,

		.current_norm = V4L2_STD_NTSC_M,

		.current_norm = V4L2_STD_NTSC_M,

	};

	};

	int err;

	int i;





	spin_lock_init(&dev->slock);

	spin_lock_init(&dev->slock);

drivers/media/pci/cx25821/cx25821.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -610,6 +610,6 @@ extern void cx25821_set_pixel_format(struct cx25821_dev *dev, int channel, 
extern void cx25821_videoioctl_unregister(struct cx25821_dev *dev);

extern void cx25821_videoioctl_unregister(struct cx25821_dev *dev);

extern struct video_device *cx25821_vdev_init(struct cx25821_dev *dev,

extern struct video_device *cx25821_vdev_init(struct cx25821_dev *dev,

					      struct pci_dev *pci,

					      struct pci_dev *pci,

					      struct video_device *template,

					      const struct video_device *template,

					      char *type);

					      char *type);

#endif
 
#endif