diff options
| -rw-r--r-- | drivers/ata/pata_hpt37x.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c index 84d9c5568567..96bbe7c39bee 100644 --- a/drivers/ata/pata_hpt37x.c +++ b/drivers/ata/pata_hpt37x.c | |||
| @@ -8,12 +8,10 @@ | |||
| 8 | * Copyright (C) 1999-2003 Andre Hedrick <andre@linux-ide.org> | 8 | * Copyright (C) 1999-2003 Andre Hedrick <andre@linux-ide.org> |
| 9 | * Portions Copyright (C) 2001 Sun Microsystems, Inc. | 9 | * Portions Copyright (C) 2001 Sun Microsystems, Inc. |
| 10 | * Portions Copyright (C) 2003 Red Hat Inc | 10 | * Portions Copyright (C) 2003 Red Hat Inc |
| 11 | * Portions Copyright (C) 2005-2006 MontaVista Software, Inc. | 11 | * Portions Copyright (C) 2005-2007 MontaVista Software, Inc. |
| 12 | * | 12 | * |
| 13 | * TODO | 13 | * TODO |
| 14 | * PLL mode | 14 | * Look into engine reset on timeout errors. Should not be required. |
| 15 | * Look into engine reset on timeout errors. Should not be | ||
| 16 | * required. | ||
| 17 | */ | 15 | */ |
| 18 | 16 | ||
| 19 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| @@ -26,7 +24,7 @@ | |||
| 26 | #include <linux/libata.h> | 24 | #include <linux/libata.h> |
| 27 | 25 | ||
| 28 | #define DRV_NAME "pata_hpt37x" | 26 | #define DRV_NAME "pata_hpt37x" |
| 29 | #define DRV_VERSION "0.6.7" | 27 | #define DRV_VERSION "0.6.8" |
| 30 | 28 | ||
| 31 | struct hpt_clock { | 29 | struct hpt_clock { |
| 32 | u8 xfer_speed; | 30 | u8 xfer_speed; |
| @@ -1092,9 +1090,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
| 1092 | int dpll, adjust; | 1090 | int dpll, adjust; |
| 1093 | 1091 | ||
| 1094 | /* Compute DPLL */ | 1092 | /* Compute DPLL */ |
| 1095 | dpll = 2; | 1093 | dpll = (port->udma_mask & 0xC0) ? 3 : 2; |
| 1096 | if (port->udma_mask & 0xE0) | ||
| 1097 | dpll = 3; | ||
| 1098 | 1094 | ||
| 1099 | f_low = (MHz[clock_slot] * 48) / MHz[dpll]; | 1095 | f_low = (MHz[clock_slot] * 48) / MHz[dpll]; |
| 1100 | f_high = f_low + 2; | 1096 | f_high = f_low + 2; |
