Commit 7ee422dc authored by Magnus Damm's avatar Magnus Damm Committed by Samuel Ortiz

tmio_mmc: Balance cell enable()/disable() calls

This patch adds cell->disable() calls to the tmio-mmc
probe() error handling and the remove() function.
Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 707f0b2f
...@@ -569,14 +569,14 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) ...@@ -569,14 +569,14 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
if (ret >= 0) if (ret >= 0)
host->irq = ret; host->irq = ret;
else else
goto unmap_ctl; goto cell_disable;
disable_mmc_irqs(host, TMIO_MASK_ALL); disable_mmc_irqs(host, TMIO_MASK_ALL);
ret = request_irq(host->irq, tmio_mmc_irq, IRQF_DISABLED | ret = request_irq(host->irq, tmio_mmc_irq, IRQF_DISABLED |
IRQF_TRIGGER_FALLING, dev_name(&dev->dev), host); IRQF_TRIGGER_FALLING, dev_name(&dev->dev), host);
if (ret) if (ret)
goto unmap_ctl; goto cell_disable;
mmc_add_host(mmc); mmc_add_host(mmc);
...@@ -588,6 +588,9 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) ...@@ -588,6 +588,9 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
return 0; return 0;
cell_disable:
if (cell->disable)
cell->disable(dev);
unmap_ctl: unmap_ctl:
iounmap(host->ctl); iounmap(host->ctl);
host_free: host_free:
...@@ -598,6 +601,7 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev) ...@@ -598,6 +601,7 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
static int __devexit tmio_mmc_remove(struct platform_device *dev) static int __devexit tmio_mmc_remove(struct platform_device *dev)
{ {
struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data;
struct mmc_host *mmc = platform_get_drvdata(dev); struct mmc_host *mmc = platform_get_drvdata(dev);
platform_set_drvdata(dev, NULL); platform_set_drvdata(dev, NULL);
...@@ -606,6 +610,8 @@ static int __devexit tmio_mmc_remove(struct platform_device *dev) ...@@ -606,6 +610,8 @@ static int __devexit tmio_mmc_remove(struct platform_device *dev)
struct tmio_mmc_host *host = mmc_priv(mmc); struct tmio_mmc_host *host = mmc_priv(mmc);
mmc_remove_host(mmc); mmc_remove_host(mmc);
free_irq(host->irq, host); free_irq(host->irq, host);
if (cell->disable)
cell->disable(dev);
iounmap(host->ctl); iounmap(host->ctl);
mmc_free_host(mmc); mmc_free_host(mmc);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment