Merge remote-tracking branch 'libata/NEXT'

Conflicts:
	drivers/ata/pata_at91.c

diff --cc drivers/ata/pata_at91.c
index 782281312abc822019f18a7bb96fe1681730101d,c6d14090a42b1eb3957527a9b937434077b48314..5970503d671138a5abf572bc4b8e2f5907bde5de
--- 1/drivers/ata/pata_at91.c
--- 2/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;