diff options
Diffstat (limited to 'drivers/ata/pata_jmicron.c')
-rw-r--r-- | drivers/ata/pata_jmicron.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c index 43763c99ea02..1daf78ac6efb 100644 --- a/drivers/ata/pata_jmicron.c +++ b/drivers/ata/pata_jmicron.c | |||
@@ -30,16 +30,17 @@ typedef enum { | |||
30 | /** | 30 | /** |
31 | * jmicron_pre_reset - check for 40/80 pin | 31 | * jmicron_pre_reset - check for 40/80 pin |
32 | * @ap: Port | 32 | * @ap: Port |
33 | * @deadline: deadline jiffies for the operation | ||
33 | * | 34 | * |
34 | * Perform the PATA port setup we need. | 35 | * Perform the PATA port setup we need. |
35 | 36 | * | |
36 | * On the Jmicron 361/363 there is a single PATA port that can be mapped | 37 | * On the Jmicron 361/363 there is a single PATA port that can be mapped |
37 | * either as primary or secondary (or neither). We don't do any policy | 38 | * either as primary or secondary (or neither). We don't do any policy |
38 | * and setup here. We assume that has been done by init_one and the | 39 | * and setup here. We assume that has been done by init_one and the |
39 | * BIOS. | 40 | * BIOS. |
40 | */ | 41 | */ |
41 | 42 | ||
42 | static int jmicron_pre_reset(struct ata_port *ap) | 43 | static int jmicron_pre_reset(struct ata_port *ap, unsigned long deadline) |
43 | { | 44 | { |
44 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 45 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
45 | u32 control; | 46 | u32 control; |
@@ -102,7 +103,7 @@ static int jmicron_pre_reset(struct ata_port *ap) | |||
102 | ap->cbl = ATA_CBL_SATA; | 103 | ap->cbl = ATA_CBL_SATA; |
103 | break; | 104 | break; |
104 | } | 105 | } |
105 | return ata_std_prereset(ap); | 106 | return ata_std_prereset(ap, deadline); |
106 | } | 107 | } |
107 | 108 | ||
108 | /** | 109 | /** |