Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6314db4110ad79cc666faff2209ed2691259afd9
Commit: 6314db4110ad79cc666faff2209ed2691259afd9
Parent: 042f10ec6533e53181284c96d22ae051e49ac707
Author: Randy Dunlap <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 00:38:11 2007 -0700
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 8 11:15:28 2007 -0700
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 <[EMAIL PROTECTED]>
Cc: "Antonino A. Daplas" <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
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 3091b20..c348813 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
