drivers/video/sunxvr500.c: fix error return code
authorPeter Senna Tschudin <peter.senna@gmail.com>
Tue, 18 Sep 2012 12:07:54 +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/sunxvr500.c

index eb931b8..6c71b1b 100644 (file)
@@ -298,8 +298,10 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev,
                goto err_release_fb;
        }
        ep->ramdac = ioremap(ep->regs_base_phys + 0x8000, 0x1000);
-       if (!ep->ramdac)
+       if (!ep->ramdac) {
+               err = -ENOMEM;
                goto err_release_pci1;
+       }
 
        ep->fb8_0_off = readl(ep->ramdac + RAMDAC_VID_8FB_0);
        ep->fb8_0_off -= ep->fb_base_reg;
@@ -343,8 +345,10 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev,
        ep->fb_size = info->fix.line_length * ep->height;
 
        ep->fb_base = ioremap(ep->fb_base_phys, ep->fb_size);
-       if (!ep->fb_base)
+       if (!ep->fb_base) {
+               err = -ENOMEM;
                goto err_release_pci0;
+       }
 
        err = e3d_set_fbinfo(ep);
        if (err)