diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2006-10-03 04:14:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:11 -0400 |
commit | 9237ed0fef8d0373b39cc7884451d3c3e3bc8a2a (patch) | |
tree | e901703863e07f189e563961e45de4a9d70c61d6 /drivers/video/i810 | |
parent | 7b566b1f7bdbbcfa8d11b8018c6dec5467f7c62b (diff) |
[PATCH] i810fb: Honor the return value of pci_enable_device
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>
Diffstat (limited to 'drivers/video/i810')
-rw-r--r-- | drivers/video/i810/i810_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index d42edaccb84c..b55a12d95eb2 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c | |||
@@ -1602,7 +1602,10 @@ static int i810fb_resume(struct pci_dev *dev) | |||
1602 | acquire_console_sem(); | 1602 | acquire_console_sem(); |
1603 | pci_set_power_state(dev, PCI_D0); | 1603 | pci_set_power_state(dev, PCI_D0); |
1604 | pci_restore_state(dev); | 1604 | pci_restore_state(dev); |
1605 | pci_enable_device(dev); | 1605 | |
1606 | if (pci_enable_device(dev)) | ||
1607 | goto fail; | ||
1608 | |||
1606 | pci_set_master(dev); | 1609 | pci_set_master(dev); |
1607 | agp_bind_memory(par->i810_gtt.i810_fb_memory, | 1610 | agp_bind_memory(par->i810_gtt.i810_fb_memory, |
1608 | par->fb.offset); | 1611 | par->fb.offset); |
@@ -1611,6 +1614,7 @@ static int i810fb_resume(struct pci_dev *dev) | |||
1611 | i810fb_set_par(info); | 1614 | i810fb_set_par(info); |
1612 | fb_set_suspend (info, 0); | 1615 | fb_set_suspend (info, 0); |
1613 | info->fbops->fb_blank(VESA_NO_BLANKING, info); | 1616 | info->fbops->fb_blank(VESA_NO_BLANKING, info); |
1617 | fail: | ||
1614 | release_console_sem(); | 1618 | release_console_sem(); |
1615 | return 0; | 1619 | return 0; |
1616 | } | 1620 | } |