drivers/video/mb862xx/mb862xxfbdrv.c: fix error return code
authorPeter Senna Tschudin <peter.senna@gmail.com>
Tue, 18 Sep 2012 12:07:51 +0000 (14:07 +0200)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 22 Sep 2012 21:41:51 +0000 (21:41 +0000)
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>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
drivers/video/mb862xx/mb862xxfbdrv.c

index 57d940be5f3d7eaa25b2358c83e169947a779bdf..d68e332aa21c39d963b37bc3e7f5039a01c8c85c 100644 (file)
@@ -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;
        }