]> err.no Git - linux-2.6/commitdiff
[PATCH] i810fb: Honor the return value of pci_enable_device
authorAntonino A. Daplas <adaplas@gmail.com>
Tue, 3 Oct 2006 08:14:54 +0000 (01:14 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 3 Oct 2006 15:04:11 +0000 (08:04 -0700)
Check the return value of pci_enable_device().

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/video/i810/i810_main.c

index d42edaccb84c732bab17286ef9b5fc90687ca419..b55a12d95eb22ebe641add5c6c9e9602803b2793 100644 (file)
@@ -1602,7 +1602,10 @@ static int i810fb_resume(struct pci_dev *dev)
        acquire_console_sem();
        pci_set_power_state(dev, PCI_D0);
        pci_restore_state(dev);
-       pci_enable_device(dev);
+
+       if (pci_enable_device(dev))
+               goto fail;
+
        pci_set_master(dev);
        agp_bind_memory(par->i810_gtt.i810_fb_memory,
                        par->fb.offset);
@@ -1611,6 +1614,7 @@ static int i810fb_resume(struct pci_dev *dev)
        i810fb_set_par(info);
        fb_set_suspend (info, 0);
        info->fbops->fb_blank(VESA_NO_BLANKING, info);
+fail:
        release_console_sem();
        return 0;
 }