From de546786ec8c5ab18495334959e3b6dd384637e3 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 27 Oct 2012 16:20:27 -0300 Subject: [PATCH] --- yaml --- r: 343848 b: refs/heads/master c: 3eeba4a796ac7e04404ef12d41520fafb7e07588 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/saa7134/saa7134-core.c | 3 +-- trunk/drivers/media/pci/saa7134/saa7134-video.c | 2 +- trunk/drivers/media/pci/saa7164/saa7164-core.c | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 68ef82c2c2e5..6778113cb1a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2827a4400a181437a2a3e0ccc2307f90bd204fdd +refs/heads/master: 3eeba4a796ac7e04404ef12d41520fafb7e07588 diff --git a/trunk/drivers/media/pci/saa7134/saa7134-core.c b/trunk/drivers/media/pci/saa7134/saa7134-core.c index f2b37e05b964..8976d0e65813 100644 --- a/trunk/drivers/media/pci/saa7134/saa7134-core.c +++ b/trunk/drivers/media/pci/saa7134/saa7134-core.c @@ -944,8 +944,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, /* board config */ dev->board = pci_id->driver_data; - if (card[dev->nr] >= 0 && - card[dev->nr] < saa7134_bcount) + if ((unsigned)card[dev->nr] < saa7134_bcount) dev->board = card[dev->nr]; if (SAA7134_BOARD_UNKNOWN == dev->board) must_configure_manually(0); diff --git a/trunk/drivers/media/pci/saa7134/saa7134-video.c b/trunk/drivers/media/pci/saa7134/saa7134-video.c index 4a77124ee70e..3abf52711e13 100644 --- a/trunk/drivers/media/pci/saa7134/saa7134-video.c +++ b/trunk/drivers/media/pci/saa7134/saa7134-video.c @@ -2511,7 +2511,7 @@ int saa7134_video_init1(struct saa7134_dev *dev) /* sanitycheck insmod options */ if (gbuffers < 2 || gbuffers > VIDEO_MAX_FRAME) gbuffers = 2; - if (gbufsize < 0 || gbufsize > gbufsize_max) + if (gbufsize > gbufsize_max) gbufsize = gbufsize_max; gbufsize = (gbufsize + PAGE_SIZE - 1) & PAGE_MASK; diff --git a/trunk/drivers/media/pci/saa7164/saa7164-core.c b/trunk/drivers/media/pci/saa7164/saa7164-core.c index 2c9ad878bef3..063047f56766 100644 --- a/trunk/drivers/media/pci/saa7164/saa7164-core.c +++ b/trunk/drivers/media/pci/saa7164/saa7164-core.c @@ -410,7 +410,7 @@ static void saa7164_work_enchandler(struct work_struct *w) } else rp = (port->last_svc_rp + 1) % 8; - if ((rp < 0) || (rp > (port->hwcfg.buffercount - 1))) { + if (rp > (port->hwcfg.buffercount - 1)) { printk(KERN_ERR "%s() illegal rp count %d\n", __func__, rp); break; } @@ -486,7 +486,7 @@ static void saa7164_work_vbihandler(struct work_struct *w) } else rp = (port->last_svc_rp + 1) % 8; - if ((rp < 0) || (rp > (port->hwcfg.buffercount - 1))) { + if (rp > (port->hwcfg.buffercount - 1)) { printk(KERN_ERR "%s() illegal rp count %d\n", __func__, rp); break; }