From c7f9f8ab500f3673c6b9df61f754dba1761f76de Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Mon, 10 Oct 2011 19:09:17 +0400
Subject: [PATCH] --- yaml --- r: 269333 b: refs/heads/master c:
 8e3bfdb95ad7440fa2c7eca5551b9169a5cdcf58 h: refs/heads/master i:   269331:
 9aafdefd13d068fd125479a3645a30f4b17bc341 v: v3

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

diff --git a/[refs] b/[refs]
index 7df595ceafb5..666e5daaa871 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2036033604060adc85098bd0e7179a6b2a7b48c
+refs/heads/master: 8e3bfdb95ad7440fa2c7eca5551b9169a5cdcf58
diff --git a/trunk/drivers/ata/pata_at91.c b/trunk/drivers/ata/pata_at91.c
index 960c72571395..c6d14090a42b 100644
--- a/trunk/drivers/ata/pata_at91.c
+++ b/trunk/drivers/ata/pata_at91.c
@@ -414,10 +414,13 @@ static int __devinit pata_at91_probe(struct platform_device *pdev)
 
 	host->private_data = info;
 
-	return ata_host_activate(host, irq ? gpio_to_irq(irq) : 0,
+	ret = ata_host_activate(host, irq ? gpio_to_irq(irq) : 0,
 			irq ? ata_sff_interrupt : NULL,
 			irq_flags, &pata_at91_sht);
 
+	if (!ret)
+		return 0;
+
 err_put:
 	clk_put(info->mck);
 	return ret;