Commit 9237ed0f authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds

[PATCH] i810fb: Honor the return value of pci_enable_device

Check the return value of pci_enable_device().
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7b566b1f
...@@ -1602,7 +1602,10 @@ static int i810fb_resume(struct pci_dev *dev) ...@@ -1602,7 +1602,10 @@ static int i810fb_resume(struct pci_dev *dev)
acquire_console_sem(); acquire_console_sem();
pci_set_power_state(dev, PCI_D0); pci_set_power_state(dev, PCI_D0);
pci_restore_state(dev); pci_restore_state(dev);
pci_enable_device(dev);
if (pci_enable_device(dev))
goto fail;
pci_set_master(dev); pci_set_master(dev);
agp_bind_memory(par->i810_gtt.i810_fb_memory, agp_bind_memory(par->i810_gtt.i810_fb_memory,
par->fb.offset); par->fb.offset);
...@@ -1611,6 +1614,7 @@ static int i810fb_resume(struct pci_dev *dev) ...@@ -1611,6 +1614,7 @@ static int i810fb_resume(struct pci_dev *dev)
i810fb_set_par(info); i810fb_set_par(info);
fb_set_suspend (info, 0); fb_set_suspend (info, 0);
info->fbops->fb_blank(VESA_NO_BLANKING, info); info->fbops->fb_blank(VESA_NO_BLANKING, info);
fail:
release_console_sem(); release_console_sem();
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment