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

Commit 13f1371e authored by Alan Cox's avatar Alan Cox Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4634): Zr36120: implement pcipci checks 



Again depends on the PCIAGP_FAIL patch for a define. Someone with more
card knowledge should look at the ALIMAGIK case and whether latency can
be safely to set to 0xA or so.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent e355880b

drivers/media/video/zr36120.c

+5 −1
Original line number Diff line number Diff line
@@ -987,6 +987,8 @@ int zoran_ioctl(struct video_device* dev, unsigned int cmd, void *arg) 
			 VID_TYPE_SCALES;

		if (ztv->have_tuner)

			c.type |= VID_TYPE_TUNER;

		if (pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL))

			c.type &= ~VID_TYPE_OVERLAY;

		if (ztv->have_decoder) {

			c.channels = ztv->card->video_inputs;

			c.audios = ztv->card->audio_inputs;
@@ -1284,6 +1286,8 @@ int zoran_ioctl(struct video_device* dev, unsigned int cmd, void *arg) 
		struct video_buffer v;

		if(!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (pcipci_problems & (PCIPCI_FAIL|PCIAGP_FAIL))

			return -ENXIO;

		if (copy_from_user(&v, arg,sizeof(v)))

			return -EFAULT;

		DEBUG(printk(CARD_DEBUG "VIDIOCSFBUF(%p,%d,%d,%d,%d)\n",CARD,v.base, v.width,v.height,v.depth,v.bytesperline));