Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 269333
b: refs/heads/master
c: 8e3bfdb
h: refs/heads/master
i:
  269331: 9aafdef
v: v3
  • Loading branch information
Sergei Shtylyov authored and Jeff Garzik committed Oct 14, 2011
1 parent f8262c1 commit c7f9f8a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c2036033604060adc85098bd0e7179a6b2a7b48c
refs/heads/master: 8e3bfdb95ad7440fa2c7eca5551b9169a5cdcf58
5 changes: 4 additions & 1 deletion trunk/drivers/ata/pata_at91.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c7f9f8a

Please sign in to comment.