aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorIgor Plyatov <plyatov@gmail.com>2011-03-28 08:56:14 -0400
committerJeff Garzik <jgarzik@pobox.com>2011-04-24 11:34:06 -0400
commit792d37af35386466cf5dda51d6b710fa1dd9aad1 (patch)
tree6da7ad6feeb76505e2748bad1aaff1b775c5aa06 /drivers
parent9719b8f5bc35664a23de1ddfbc85217398af0df8 (diff)
ata: pata_at91.c bugfix for initial_timing initialisation
The "struct ata_timing" must contain 10 members, but ".dmack_hold" member was forgotten for "initial_timing" initialisation. This patch fixes such a problem. Signed-off-by: Igor Plyatov <plyatov@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/pata_at91.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index a9a066a18ccf..a5fdbdcb0faf 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -50,8 +50,18 @@ struct at91_ide_info {
50 void __iomem *alt_addr; 50 void __iomem *alt_addr;
51}; 51};
52 52
53static const struct ata_timing initial_timing = 53static const struct ata_timing initial_timing = {
54 {XFER_PIO_0, 70, 290, 240, 600, 165, 150, 600, 0}; 54 .mode = XFER_PIO_0,
55 .setup = 70,
56 .act8b = 290,
57 .rec8b = 240,
58 .cyc8b = 600,
59 .active = 165,
60 .recover = 150,
61 .dmack_hold = 0,
62 .cycle = 600,
63 .udma = 0
64};
55 65
56static unsigned long calc_mck_cycles(unsigned long ns, unsigned long mck_hz) 66static unsigned long calc_mck_cycles(unsigned long ns, unsigned long mck_hz)
57{ 67{