From aba8f0817a91668ec3694d09d1f1e7d7250973e8 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 8 May 2007 00:29:01 -0700 Subject: [PATCH] --- yaml --- r: 54657 b: refs/heads/master c: 10f8a59813ee8bb41fb1d72ed2ec12a1c9f66da2 h: refs/heads/master i: 54655: 96fa05069e3b6ca1b42e1f7d6995a4d86d1772a6 v: v3 --- [refs] | 2 +- trunk/drivers/parport/parport_serial.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 41b9a16169b0..59a200c070bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e80d0d0b64f5c00b0ac7e623d96189309c298ca +refs/heads/master: 10f8a59813ee8bb41fb1d72ed2ec12a1c9f66da2 diff --git a/trunk/drivers/parport/parport_serial.c b/trunk/drivers/parport/parport_serial.c index e06223cf6c26..90ea3b8b99b0 100644 --- a/trunk/drivers/parport/parport_serial.c +++ b/trunk/drivers/parport/parport_serial.c @@ -392,6 +392,7 @@ static int parport_serial_pci_suspend(struct pci_dev *dev, pm_message_t state) static int parport_serial_pci_resume(struct pci_dev *dev) { struct parport_serial_private *priv = pci_get_drvdata(dev); + int err; pci_set_power_state(dev, PCI_D0); pci_restore_state(dev); @@ -399,7 +400,12 @@ static int parport_serial_pci_resume(struct pci_dev *dev) /* * The device may have been disabled. Re-enable it. */ - pci_enable_device(dev); + err = pci_enable_device(dev); + if (err) { + printk(KERN_ERR "parport_serial: %s: error enabling " + "device for resume (%d)\n", pci_name(dev), err); + return err; + } if (priv->serial) pciserial_resume_ports(priv->serial);