summaryrefslogtreecommitdiff
path: root/drivers/serial/8250_pci.c
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-10-13 13:36:11 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-13 20:51:39 +0400
commit40836c484c31301998a14be0439cc4e856399843 (patch)
tree3852b0d70a038d5a94a65d850dfb29f78363a15d /drivers/serial/8250_pci.c
parent43b11d33f2c20c33fcf197780edb2e5d8a1b6a67 (diff)
downloadlinux-40836c484c31301998a14be0439cc4e856399843.tar.xz
serial_8250: pci_enable_device fail is not fully handled
<rmk> talking about leaks - I noticed that the 'check return of pci_enable_dev()' in the 8250 pci resume function finally made it in despite my objections against it (causing stuff in higher levels to leak). Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial/8250_pci.c')
-rw-r--r--drivers/serial/8250_pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index c2f23933155b..c014ffb110e9 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -2041,9 +2041,9 @@ static int pciserial_resume_one(struct pci_dev *dev)
* The device may have been disabled. Re-enable it.
*/
err = pci_enable_device(dev);
+ /* FIXME: We cannot simply error out here */
if (err)
- return err;
-
+ printk(KERN_ERR "pciserial: Unable to re-enable ports, trying to continue.\n");
pciserial_resume_ports(priv);
}
return 0;