From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Oct 2011 21:38:31 +0000 (+1100)
Subject: Merge remote-tracking branch 'libata/NEXT'
X-Git-Tag: next-20111025~65
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2c6a9224085ee1211f8647e81fb0bc7cab6f3252;p=karo-tx-linux.git

Merge remote-tracking branch 'libata/NEXT'

Conflicts:
	drivers/ata/pata_at91.c
---

2c6a9224085ee1211f8647e81fb0bc7cab6f3252
diff --cc drivers/ata/pata_at91.c
index 782281312abc,c6d14090a42b..5970503d6711
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@@ -414,10 -414,13 +414,13 @@@ static int __devinit pata_at91_probe(st
  
  	host->private_data = info;
  
- 	return ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
 -	ret = ata_host_activate(host, irq ? gpio_to_irq(irq) : 0,
 -			irq ? ata_sff_interrupt : NULL,
++	ret = ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
 +			gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
  			irq_flags, &pata_at91_sht);
  
+ 	if (!ret)
+ 		return 0;
+ 
  err_put:
  	clk_put(info->mck);
  	return ret;