From 619052ad1d5b2e44f20a9089645bf272df38b124 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 9 Apr 2008 13:34:40 +1000 Subject: [PATCH] --- yaml --- r: 89283 b: refs/heads/master c: e50e3ce5e70e36e6069a8cc8292df76058fa9e23 h: refs/heads/master i: 89281: 0fa46a0b45da42d6ffedd3c46333654e1fa7a1ba 89279: ec46b249990d5607d8f67c9e82940ed0eb4b5a3e v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_scc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b3a816a2d56b..24ba9d0bcee6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88fcd5627563722483427a55113c0a83f56e8080 +refs/heads/master: e50e3ce5e70e36e6069a8cc8292df76058fa9e23 diff --git a/trunk/drivers/ata/pata_scc.c b/trunk/drivers/ata/pata_scc.c index accc275e74cc..7bdea8a4ca7e 100644 --- a/trunk/drivers/ata/pata_scc.c +++ b/trunk/drivers/ata/pata_scc.c @@ -591,7 +591,7 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask, udelay(20); out_be32(ioaddr->ctl_addr, ap->ctl); - scc_wait_after_reset(&ap->link, devmask, deadlien); + scc_wait_after_reset(&ap->link, devmask, deadline); return 0; }