diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2006-10-03 01:14:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:04:11 -0700 |
| commit | 9237ed0fef8d0373b39cc7884451d3c3e3bc8a2a (patch) | |
| tree | e901703863e07f189e563961e45de4a9d70c61d6 /drivers | |
| parent | 7b566b1f7bdbbcfa8d11b8018c6dec5467f7c62b (diff) | |
| download | blackbird-op-linux-9237ed0fef8d0373b39cc7884451d3c3e3bc8a2a.tar.gz blackbird-op-linux-9237ed0fef8d0373b39cc7884451d3c3e3bc8a2a.zip | |
[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')
| -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) 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; } |
