]> Pileus Git - ~andy/linux/commitdiff
drivers/video/savage/savagefb_driver.c: fix error return code
authorPeter Senna Tschudin <peter.senna@gmail.com>
Wed, 3 Oct 2012 12:40:43 +0000 (14:40 +0200)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Wed, 10 Oct 2012 02:06:18 +0000 (02:06 +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/savage/savagefb_driver.c

index 0d0f52c18fd8b56eca8836dea944601fe0047070..f4f53b082d0546b9e7c5ff21df2be606991a4152 100644 (file)
@@ -2266,8 +2266,10 @@ static int __devinit savagefb_probe(struct pci_dev* dev,
        lpitch = info->var.xres_virtual*((info->var.bits_per_pixel + 7) >> 3);
        info->var.yres_virtual = info->fix.smem_len/lpitch;
 
-       if (info->var.yres_virtual < info->var.yres)
+       if (info->var.yres_virtual < info->var.yres) {
+               err = -ENOMEM;
                goto failed;
+       }
 
 #if defined(CONFIG_FB_SAVAGE_ACCEL)
        /*