| Message ID | 1347970080-25175-1-git-send-email-peter.senna@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Applied all 10 patches of this series. Thanks, Florian Tobias Schandinat On 09/18/2012 12:07 PM, Peter Senna Tschudin wrote: > From: Peter Senna Tschudin <peter.senna@gmail.com> > > Convert a nonnegative error return code to a negative one, as returned > elsewhere in the function. > > A simplified version of the semantic match that finds this problem is as > follows: (http://coccinelle.lip6.fr/) > > // <smpl> > ( > if@p1 (\(ret < 0\|ret != 0\)) > { ... return ret; } > | > ret@p1 = 0 > ) > ... when != ret = e1 > when != &ret > *if(...) > { > ... when != ret = e2 > when forall > return ret; > } > // </smpl> > > Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> > --- > drivers/video/mb862xx/mb862xxfbdrv.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c > index 57d940b..d68e332 100644 > --- a/drivers/video/mb862xx/mb862xxfbdrv.c > +++ b/drivers/video/mb862xx/mb862xxfbdrv.c > @@ -1052,12 +1052,14 @@ static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, > break; > default: > /* should never occur */ > + ret = -EIO; > goto rel_reg; > } > > par->fb_base = ioremap(par->fb_base_phys, par->mapped_vram); > if (par->fb_base == NULL) { > dev_err(dev, "Cannot map framebuffer\n"); > + ret = -EIO; > goto rel_reg; > } > > @@ -1073,11 +1075,13 @@ static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, > dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n", > (unsigned long long)par->mmio_base_phys, (ulong)par->mmio_len); > > - if (mb862xx_pci_gdc_init(par)) > + ret = mb862xx_pci_gdc_init(par); > + if (ret) > goto io_unmap; > > - if (request_irq(par->irq, mb862xx_intr, IRQF_SHARED, > - DRV_NAME, (void *)par)) { > + ret = request_irq(par->irq, mb862xx_intr, IRQF_SHARED, > + DRV_NAME, (void *)par); > + if (ret) { > dev_err(dev, "Cannot request irq\n"); > goto io_unmap; > } -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c index 57d940b..d68e332 100644 --- a/drivers/video/mb862xx/mb862xxfbdrv.c +++ b/drivers/video/mb862xx/mb862xxfbdrv.c @@ -1052,12 +1052,14 @@ static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, break; default: /* should never occur */ + ret = -EIO; goto rel_reg; } par->fb_base = ioremap(par->fb_base_phys, par->mapped_vram); if (par->fb_base == NULL) { dev_err(dev, "Cannot map framebuffer\n"); + ret = -EIO; goto rel_reg; } @@ -1073,11 +1075,13 @@ static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n", (unsigned long long)par->mmio_base_phys, (ulong)par->mmio_len); - if (mb862xx_pci_gdc_init(par)) + ret = mb862xx_pci_gdc_init(par); + if (ret) goto io_unmap; - if (request_irq(par->irq, mb862xx_intr, IRQF_SHARED, - DRV_NAME, (void *)par)) { + ret = request_irq(par->irq, mb862xx_intr, IRQF_SHARED, + DRV_NAME, (void *)par); + if (ret) { dev_err(dev, "Cannot request irq\n"); goto io_unmap; }