mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
pata_at91: fix ata_host_activate() failure handling
Add missing clk_put() call to ata_host_activate() failure path.
Sergei says,
"Hm, I have once fixed that (see that *if* (!ret)) but looks like a
later commit 477c87e908 (ARM:
at91/pata: use gpio_is_valid to check the gpio) broke it again. :-(
Would be good if the changelog did mention that..."
Cc: Andrew Victor <[email protected]>
Cc: Nicolas Ferre <[email protected]>
Cc: Jean-Christophe Plagniol-Villard <[email protected]>
Cc: Sergei Shtylyov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
Signed-off-by: Tejun Heo <[email protected]>
Cc: [email protected]
This commit is contained in:
parent
d121f7d0cb
commit
27aa64b9d1
1 changed files with 6 additions and 5 deletions
|
|
@ -407,12 +407,13 @@ static int pata_at91_probe(struct platform_device *pdev)
|
|||
|
||||
host->private_data = info;
|
||||
|
||||
return 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);
|
||||
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)
|
||||
goto err_put;
|
||||
|
||||
if (!ret)
|
||||
return 0;
|
||||
return 0;
|
||||
|
||||
err_put:
|
||||
clk_put(info->mck);
|
||||
|
|
|
|||
Loading…
Reference in a new issue