diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /drivers/mmc | |
| parent | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff) | |
| parent | 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff) | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/pxamci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index c85f6166056e..bb47ff465c04 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
| @@ -762,6 +762,8 @@ static int pxamci_remove(struct platform_device *pdev) | |||
| 762 | if (mmc) { | 762 | if (mmc) { |
| 763 | struct pxamci_host *host = mmc_priv(mmc); | 763 | struct pxamci_host *host = mmc_priv(mmc); |
| 764 | 764 | ||
| 765 | mmc_remove_host(mmc); | ||
| 766 | |||
| 765 | if (host->pdata) { | 767 | if (host->pdata) { |
| 766 | gpio_cd = host->pdata->gpio_card_detect; | 768 | gpio_cd = host->pdata->gpio_card_detect; |
| 767 | gpio_ro = host->pdata->gpio_card_ro; | 769 | gpio_ro = host->pdata->gpio_card_ro; |
| @@ -781,8 +783,6 @@ static int pxamci_remove(struct platform_device *pdev) | |||
| 781 | if (host->pdata && host->pdata->exit) | 783 | if (host->pdata && host->pdata->exit) |
| 782 | host->pdata->exit(&pdev->dev, mmc); | 784 | host->pdata->exit(&pdev->dev, mmc); |
| 783 | 785 | ||
| 784 | mmc_remove_host(mmc); | ||
| 785 | |||
| 786 | pxamci_stop_clock(host); | 786 | pxamci_stop_clock(host); |
| 787 | writel(TXFIFO_WR_REQ|RXFIFO_RD_REQ|CLK_IS_OFF|STOP_CMD| | 787 | writel(TXFIFO_WR_REQ|RXFIFO_RD_REQ|CLK_IS_OFF|STOP_CMD| |
| 788 | END_CMD_RES|PRG_DONE|DATA_TRAN_DONE, | 788 | END_CMD_RES|PRG_DONE|DATA_TRAN_DONE, |