diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-05-08 00:38:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:28 -0700 |
| commit | 6314db4110ad79cc666faff2209ed2691259afd9 (patch) | |
| tree | 03b370bd35e949d2c557dfe58da9b04340dba1ed /drivers/video/s3fb.c | |
| parent | 042f10ec6533e53181284c96d22ae051e49ac707 (diff) | |
| download | linux-6314db4110ad79cc666faff2209ed2691259afd9.tar.bz2 | |
s3fb: fix PCI must_checks
drivers/video/s3fb.c:1078: warning: ignoring return value of 'pci_enable_device', declared with attribute warn_unused_result
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/s3fb.c')
| -rw-r--r-- | drivers/video/s3fb.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c index 3091b20124b4..c348813e6132 100644 --- a/drivers/video/s3fb.c +++ b/drivers/video/s3fb.c @@ -1061,6 +1061,7 @@ static int s3_pci_resume(struct pci_dev* dev) { struct fb_info *info = pci_get_drvdata(dev); struct s3fb_info *par = info->par; + int err; dev_info(&(dev->dev), "resume\n"); @@ -1075,7 +1076,13 @@ static int s3_pci_resume(struct pci_dev* dev) pci_set_power_state(dev, PCI_D0); pci_restore_state(dev); - pci_enable_device(dev); + err = pci_enable_device(dev); + if (err) { + mutex_unlock(&(par->open_lock)); + release_console_sem(); + dev_err(&(dev->dev), "error %d enabling device for resume\n", err); + return err; + } pci_set_master(dev); s3fb_set_par(info); |