aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2010-05-11 17:06:48 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-11 20:33:41 -0400
commitebb1fea9b3adf25d7e2f643c614163af4f93a17f (patch)
treefcfd016844b9b505417ff2cf76d5dc6651bfdae7
parent34441427aab4bdb3069a4ffcda69a99357abcb2e (diff)
mmc: atmel-mci: fix two parameters swapped
Two parameters were swapped in the calls to atmci_init_slot(). Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Reported-by: Anders Grahn <anders.grahn@hd-wireless.se> Cc: Haavard Skinnemoen <hskinnemoen@atmel.com> Cc: <linux-mmc@vger.kernel.org> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/mmc/host/atmel-mci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 88be37d9e9a5..57d3cb2dbb5f 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -1751,13 +1751,13 @@ static int __init atmci_probe(struct platform_device *pdev)
1751 ret = -ENODEV; 1751 ret = -ENODEV;
1752 if (pdata->slot[0].bus_width) { 1752 if (pdata->slot[0].bus_width) {
1753 ret = atmci_init_slot(host, &pdata->slot[0], 1753 ret = atmci_init_slot(host, &pdata->slot[0],
1754 MCI_SDCSEL_SLOT_A, 0); 1754 0, MCI_SDCSEL_SLOT_A);
1755 if (!ret) 1755 if (!ret)
1756 nr_slots++; 1756 nr_slots++;
1757 } 1757 }
1758 if (pdata->slot[1].bus_width) { 1758 if (pdata->slot[1].bus_width) {
1759 ret = atmci_init_slot(host, &pdata->slot[1], 1759 ret = atmci_init_slot(host, &pdata->slot[1],
1760 MCI_SDCSEL_SLOT_B, 1); 1760 1, MCI_SDCSEL_SLOT_B);
1761 if (!ret) 1761 if (!ret)
1762 nr_slots++; 1762 nr_slots++;
1763 } 1763 }