Commit 6314db41 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 042f10ec
...@@ -1061,6 +1061,7 @@ static int s3_pci_resume(struct pci_dev* dev) ...@@ -1061,6 +1061,7 @@ static int s3_pci_resume(struct pci_dev* dev)
{ {
struct fb_info *info = pci_get_drvdata(dev); struct fb_info *info = pci_get_drvdata(dev);
struct s3fb_info *par = info->par; struct s3fb_info *par = info->par;
int err;
dev_info(&(dev->dev), "resume\n"); dev_info(&(dev->dev), "resume\n");
...@@ -1075,7 +1076,13 @@ static int s3_pci_resume(struct pci_dev* dev) ...@@ -1075,7 +1076,13 @@ static int s3_pci_resume(struct pci_dev* dev)
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); 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); pci_set_master(dev);
s3fb_set_par(info); s3fb_set_par(info);
......
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