From: "Antonino A. Daplas" - The recent changes that involved code reordering invalidated the error pathway. Fix. - Whitespace changes Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton --- drivers/video/nvidia/nvidia.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff -puN drivers/video/nvidia/nvidia.c~nvidiafb-add-support-for-some-pci-e-chipsets-fix drivers/video/nvidia/nvidia.c --- devel/drivers/video/nvidia/nvidia.c~nvidiafb-add-support-for-some-pci-e-chipsets-fix 2005-12-10 23:25:21.000000000 -0800 +++ devel-akpm/drivers/video/nvidia/nvidia.c 2005-12-10 23:25:21.000000000 -0800 @@ -1568,15 +1568,6 @@ static int __devinit nvidiafb_probe(stru goto err_out_request; } - printk(KERN_INFO PFX "nVidia device/chipset %X\n", par->Chipset); - - if (par->Architecture == 0) { - printk(KERN_ERR PFX "unknown NV_ARCH\n"); - goto err_out_free_base0; - } - - sprintf(nvidiafb_fix.id, "NV%x", (pd->device & 0x0ff0) >> 4); - par->FlatPanel = flatpanel; if (flatpanel == 1) printk(KERN_INFO PFX "flatpanel support enabled\n"); @@ -1603,7 +1594,16 @@ static int __devinit nvidiafb_probe(stru } par->Chipset = nvidia_get_chipset(info); + printk(KERN_INFO PFX "nVidia device/chipset %X\n", par->Chipset); par->Architecture = nvidia_get_arch(info); + + if (par->Architecture == 0) { + printk(KERN_ERR PFX "unknown NV_ARCH\n"); + goto err_out_arch; + } + + sprintf(nvidiafb_fix.id, "NV%x", (pd->device & 0x0ff0) >> 4); + NVCommonSetup(info); par->FbAddress = nvidiafb_fix.smem_start; @@ -1679,21 +1679,22 @@ static int __devinit nvidiafb_probe(stru NVTRACE_LEAVE(); return 0; - err_out_iounmap_fb: +err_out_iounmap_fb: iounmap(info->screen_base); - err_out_free_base1: +err_out_free_base1: fb_destroy_modedb(info->monspecs.modedb); nvidia_delete_i2c_busses(par); +err_out_arch: iounmap(par->REGS); - err_out_free_base0: +err_out_free_base0: pci_release_regions(pd); - err_out_request: +err_out_request: pci_disable_device(pd); - err_out_enable: +err_out_enable: kfree(info->pixmap.addr); - err_out_kfree: +err_out_kfree: framebuffer_release(info); - err_out: +err_out: return -ENODEV; } _