From 7ec3302a0a47f26dbc3b13ac92fe9e31ba8fac67 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 6 Feb 2008 01:39:23 -0800 Subject: [PATCH] --- yaml --- r: 83567 b: refs/heads/master c: 625fcaf97340b9409e41fcefbbd18e02e3a9e9dd h: refs/heads/master i: 83565: 611486e0354e2b1c8a8816a4fff231142d09ad8a 83563: 0818df9b60e21cf0fd129855f6729e8d3b6b0f40 83559: 5c219d2d6db4f450ab2188431fef706d4c40300a 83551: 7f955f3f2e396dfd34fbfbbae244b562b7df5851 v: v3 --- [refs] | 2 +- trunk/drivers/video/igafb.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c2b5430f6824..6d7b1fee8a39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5eb03a4ab239d8769fa13df6c894d618ecae1b50 +refs/heads/master: 625fcaf97340b9409e41fcefbbd18e02e3a9e9dd diff --git a/trunk/drivers/video/igafb.c b/trunk/drivers/video/igafb.c index b87ea21d3d78..3a81060137a2 100644 --- a/trunk/drivers/video/igafb.c +++ b/trunk/drivers/video/igafb.c @@ -400,6 +400,7 @@ int __init igafb_init(void) info = kzalloc(size, GFP_ATOMIC); if (!info) { printk("igafb_init: can't alloc fb_info\n"); + pci_dev_put(pdev); return -ENOMEM; } @@ -409,12 +410,14 @@ int __init igafb_init(void) if ((addr = pdev->resource[0].start) == 0) { printk("igafb_init: no memory start\n"); kfree(info); + pci_dev_put(pdev); return -ENXIO; } if ((info->screen_base = ioremap(addr, 1024*1024*2)) == 0) { printk("igafb_init: can't remap %lx[2M]\n", addr); kfree(info); + pci_dev_put(pdev); return -ENXIO; } @@ -449,6 +452,7 @@ int __init igafb_init(void) printk("igafb_init: can't remap %lx[4K]\n", igafb_fix.mmio_start); iounmap((void *)info->screen_base); kfree(info); + pci_dev_put(pdev); return -ENXIO; } @@ -466,6 +470,7 @@ int __init igafb_init(void) iounmap((void *)par->io_base); iounmap(info->screen_base); kfree(info); + pci_dev_put(pdev); return -ENOMEM; }