From ba0f884b296add8a5310e0d9b0b88eeb84606d56 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sun, 19 Aug 2012 10:44:24 +0200 Subject: [PATCH] --- yaml --- r: 333434 b: refs/heads/master c: 11bce6459fa3b9d7768a0a0d71c695e85f398c55 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/sunxvr2500.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aeed10d46b08..9ec40615423a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ac5de0c575ee10739fd1c1a4bcedab7b0dde631 +refs/heads/master: 11bce6459fa3b9d7768a0a0d71c695e85f398c55 diff --git a/trunk/drivers/video/sunxvr2500.c b/trunk/drivers/video/sunxvr2500.c index 5848436c19da..7fbcba86d1a2 100644 --- a/trunk/drivers/video/sunxvr2500.c +++ b/trunk/drivers/video/sunxvr2500.c @@ -181,8 +181,10 @@ static int __devinit s3d_pci_register(struct pci_dev *pdev, sp->fb_size = info->fix.line_length * sp->height; sp->fb_base = ioremap(sp->fb_base_phys, sp->fb_size); - if (!sp->fb_base) + if (!sp->fb_base) { + err = -ENOMEM; goto err_release_pci; + } err = s3d_set_fbinfo(sp); if (err)