From 2cf8a0a204215b6026e33a0c9132666911165f4a Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Sat, 24 Apr 2010 20:29:58 +0400
Subject: [PATCH] --- yaml --- r: 192602 b: refs/heads/master c:
 ec86c81dfcc52e313920621b1d1e92343a842afe h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/ata/pata_scc.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e33e0fa57bce..d549c98169d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe6005b81e142c36f066b81ca85f80022c4ac979
+refs/heads/master: ec86c81dfcc52e313920621b1d1e92343a842afe
diff --git a/trunk/drivers/ata/pata_scc.c b/trunk/drivers/ata/pata_scc.c
index 1b41296a7a60..77ff829af176 100644
--- a/trunk/drivers/ata/pata_scc.c
+++ b/trunk/drivers/ata/pata_scc.c
@@ -903,8 +903,7 @@ static void scc_postreset(struct ata_link *link, unsigned int *classes)
 	}
 
 	/* set up device control */
-	if (ap->ioaddr.ctl_addr)
-		out_be32(ap->ioaddr.ctl_addr, ap->ctl);
+	out_be32(ap->ioaddr.ctl_addr, ap->ctl);
 
 	DPRINTK("EXIT\n");
 }