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;
 }