X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fserial%2F8250_pci.c;h=ceb03c9e749f8f918732d88c635de618d1f04125;hb=444ad82bc3eaa554be40d22dc248e58aeefd54d9;hp=0e357562ce9e37e080c6f5e84ed8f630e92966c7;hpb=92d15c2ccbb3e31a3fc71ad28fdb55e1319383c0;p=linux-2.6 diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 0e357562ce..ceb03c9e74 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c @@ -1986,6 +1986,7 @@ static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state) static int pciserial_resume_one(struct pci_dev *dev) { + int err; struct serial_private *priv = pci_get_drvdata(dev); pci_set_power_state(dev, PCI_D0); @@ -1995,7 +1996,9 @@ static int pciserial_resume_one(struct pci_dev *dev) /* * The device may have been disabled. Re-enable it. */ - pci_enable_device(dev); + err = pci_enable_device(dev); + if (err) + return err; pciserial_resume_ports(priv); }