diff options
| author | Peter Senna Tschudin <peter.senna@gmail.com> | 2012-09-18 14:07:54 +0200 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-09-22 21:41:51 +0000 |
| commit | b157dd1c38de2acad1b490851bab2244f4ef517a (patch) | |
| tree | 28177440477e1f12cbe2eb7f8dd89d98896ba5aa /drivers/video/sunxvr500.c | |
| parent | c24249f5745f426d70c274e7f4dd70f32838c564 (diff) | |
| download | blackbird-op-linux-b157dd1c38de2acad1b490851bab2244f4ef517a.tar.gz blackbird-op-linux-b157dd1c38de2acad1b490851bab2244f4ef517a.zip | |
drivers/video/sunxvr500.c: fix error return code
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>
Diffstat (limited to 'drivers/video/sunxvr500.c')
| -rw-r--r-- | drivers/video/sunxvr500.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c index eb931b8626fa..6c71b1b44477 100644 --- a/drivers/video/sunxvr500.c +++ b/drivers/video/sunxvr500.c @@ -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) |
