This is a note to let you know that we have just queued up the patch titled

    Subject: mmc: atmel-mci: fix two parameters swapped

to the 2.6.33-stable tree.  Its filename is

    mmc-atmel-mci-fix-two-parameters-swapped.patch

A git repo of this tree can be found at 
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary


>From ebb1fea9b3adf25d7e2f643c614163af4f93a17f Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.fe...@atmel.com>
Date: Tue, 11 May 2010 14:06:48 -0700
Subject: mmc: atmel-mci: fix two parameters swapped

From: Nicolas Ferre <nicolas.fe...@atmel.com>

commit ebb1fea9b3adf25d7e2f643c614163af4f93a17f upstream.

Two parameters were swapped in the calls to atmci_init_slot().

Signed-off-by: Nicolas Ferre <nicolas.fe...@atmel.com>
Reported-by: Anders Grahn <anders.gr...@hd-wireless.se>
Cc: Haavard Skinnemoen <hskinnem...@atmel.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

---
 drivers/mmc/host/atmel-mci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -1750,13 +1750,13 @@ static int __init atmci_probe(struct pla
        ret = -ENODEV;
        if (pdata->slot[0].bus_width) {
                ret = atmci_init_slot(host, &pdata->slot[0],
-                               MCI_SDCSEL_SLOT_A, 0);
+                               0, MCI_SDCSEL_SLOT_A);
                if (!ret)
                        nr_slots++;
        }
        if (pdata->slot[1].bus_width) {
                ret = atmci_init_slot(host, &pdata->slot[1],
-                               MCI_SDCSEL_SLOT_B, 1);
+                               1, MCI_SDCSEL_SLOT_B);
                if (!ret)
                        nr_slots++;
        }


Patches currently in stable-queue which might be from nicolas.fe...@atmel.com 
are

queue-2.6.33/mmc-atmel-mci-remove-data-error-interrupt-after-xfer.patch
queue-2.6.33/mmc-atmel-mci-prevent-kernel-oops-while-removing-card.patch
queue-2.6.33/mmc-atmel-mci-fix-two-parameters-swapped.patch
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to