diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-05-08 03:38:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:28 -0400 |
commit | 6314db4110ad79cc666faff2209ed2691259afd9 (patch) | |
tree | 03b370bd35e949d2c557dfe58da9b04340dba1ed /drivers/video | |
parent | 042f10ec6533e53181284c96d22ae051e49ac707 (diff) |
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')
-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) | |||
1061 | { | 1061 | { |
1062 | struct fb_info *info = pci_get_drvdata(dev); | 1062 | struct fb_info *info = pci_get_drvdata(dev); |
1063 | struct s3fb_info *par = info->par; | 1063 | struct s3fb_info *par = info->par; |
1064 | int err; | ||
1064 | 1065 | ||
1065 | dev_info(&(dev->dev), "resume\n"); | 1066 | dev_info(&(dev->dev), "resume\n"); |
1066 | 1067 | ||
@@ -1075,7 +1076,13 @@ static int s3_pci_resume(struct pci_dev* dev) | |||
1075 | 1076 | ||
1076 | pci_set_power_state(dev, PCI_D0); | 1077 | pci_set_power_state(dev, PCI_D0); |
1077 | pci_restore_state(dev); | 1078 | pci_restore_state(dev); |
1078 | pci_enable_device(dev); | 1079 | err = pci_enable_device(dev); |
1080 | if (err) { | ||
1081 | mutex_unlock(&(par->open_lock)); | ||
1082 | release_console_sem(); | ||
1083 | dev_err(&(dev->dev), "error %d enabling device for resume\n", err); | ||
1084 | return err; | ||
1085 | } | ||
1079 | pci_set_master(dev); | 1086 | pci_set_master(dev); |
1080 | 1087 | ||
1081 | s3fb_set_par(info); | 1088 | s3fb_set_par(info); |