From 708a2abd86acab70b5e2b3a31f14858d5dcf155f Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Tue, 8 May 2007 00:40:16 -0700 Subject: [PATCH] --- yaml --- r: 54972 b: refs/heads/master c: 435d56fcd45cdf32bfb4db5d4e1efe17f3da95b2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/pm2fb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8975aa567816..ef294af68e82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19c1a8b3122e7b2007cfd2836da2318816f324cc +refs/heads/master: 435d56fcd45cdf32bfb4db5d4e1efe17f3da95b2 diff --git a/trunk/drivers/video/pm2fb.c b/trunk/drivers/video/pm2fb.c index 7f4c753b1d89..1ac5264bb2c1 100644 --- a/trunk/drivers/video/pm2fb.c +++ b/trunk/drivers/video/pm2fb.c @@ -1335,10 +1335,10 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, info->var = pm2fb_var; if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) - goto err_exit_all; + goto err_exit_both; if (register_framebuffer(info) < 0) - goto err_exit_both; + goto err_exit_all; printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n", info->node, info->fix.id, pm2fb_fix.smem_len / 1024);