1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 78c0a269a2ba..90ea3b8b99b0 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -305,7 +305,7 @@ static int __devinit parport_register (struct pci_dev *dev,
                 dev_dbg(&dev->dev, "PCI parallel port detected: I/O at "
                         "%#lx(%#lx)\n", io_lo, io_hi);
                 port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE,
-                                              PARPORT_DMA_NONE, dev);
+                                              PARPORT_DMA_NONE, &dev->dev);
                 if (port) {
                         priv->port[priv->num_par++] = port;
                         success = 1;
@@ -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);