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

Commit a1fd2877 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] bttv-driver: fix two warnings 



drivers/media/pci/bt8xx/bttv-driver.c:308:3: warning: initialized field overwritten [-Woverride-init]
drivers/media/pci/bt8xx/bttv-driver.c:308:3: warning: (near initialization for 'bttv_tvnorms[0].cropcap.bounds.height') [-Woverride-init]
drivers/media/pci/bt8xx/bttv-driver.c: In function 'bttv_remove':
drivers/media/pci/bt8xx/bttv-driver.c:4467:29: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 50c8012c

drivers/media/pci/bt8xx/bttv-driver.c

+3 −4
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static void flush_request_modules(struct bttv *dev) 
}

#else

#define request_modules(dev)

#define flush_request_modules(dev)

#define flush_request_modules(dev) do {} while(0)

#endif /* CONFIG_MODULES */
@@ -301,11 +301,10 @@ const struct bttv_tvnorm bttv_tvnorms[] = { 
			/* totalwidth */ 1135,

			/* sqwidth */ 944,

			/* vdelay */ 0x20,

			/* sheight */ 576,

			/* videostart0 */ 23)

		/* bt878 (and bt848?) can capture another

		   line below active video. */

		.cropcap.bounds.height = (576 + 2) + 0x20 - 2,

			/* sheight */ (576 + 2) + 0x20 - 2,

			/* videostart0 */ 23)

	},{

		.v4l2_id        = V4L2_STD_NTSC_M | V4L2_STD_NTSC_M_KR,

		.name           = "NTSC",