1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index d9b94a1b6954..837b7fe77dc7 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -25,11 +25,12 @@
 /**
  *      marvell_pre_reset       -       check for 40/80 pin
  *      @ap: Port
+ *      @deadline: deadline jiffies for the operation
  *
  *      Perform the PATA port setup we need.
  */
 
-static int marvell_pre_reset(struct ata_port *ap)
+static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         u32 devices;
@@ -52,7 +53,8 @@ static int marvell_pre_reset(struct ata_port *ap)
         if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
             (!(devices & 0x10)))        /* PATA enable ? */
                 return -ENOENT;
-        return ata_std_prereset(ap);
+
+        return ata_std_prereset(ap, deadline);
 }
 
 static int marvell_cable_detect(struct ata_port *ap)
@@ -67,6 +69,7 @@ static int marvell_cable_detect(struct ata_port *ap)
         case 1: /* Legacy SATA port */
                 return ATA_CBL_SATA;
         }
+
         BUG();
         return 0;       /* Our BUG macro needs the right markup */
 }