linux-next: manual merge of the libata tree with the at91 tree

[Stephen Rothwell]

Hi Jeff,

Today's linux-next merge of the libata tree got a conflict in
drivers/ata/pata_at91.c between commit 9585cf300d98 ("ARM: at91/pata: use
gpio_is_valid to check the gpio") from the at91 tree and commit
8e3bfdb95ad7 ("pata_at91: call clk_put() on ata_host_activate() failure")
from the libata tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/ata/pata_at91.c
index 7822813,c6d1409..0000000
--- 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;

Attachment: pgp00000.pgp
Description: PGP signature