From: "Antonino A. Daplas" Check the return value of pci_enable_device(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton --- drivers/video/i810/i810_main.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) diff -puN drivers/video/i810/i810_main.c~i810fb-honor-the-return-value-of-pci_enable_device drivers/video/i810/i810_main.c --- a/drivers/video/i810/i810_main.c~i810fb-honor-the-return-value-of-pci_enable_device +++ a/drivers/video/i810/i810_main.c @@ -1602,7 +1602,10 @@ static int i810fb_resume(struct pci_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 i810fb_set_par(info); fb_set_suspend (info, 0); info->fbops->fb_blank(VESA_NO_BLANKING, info); +fail: release_console_sem(); return 0; } _