summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2010-08-09 09:16:50 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-10 22:10:54 +0100
commitc2fab1242a16f8e66b680d664322c3811e7b003d (patch)
treebc957a804f02775117d80ac552473bac054e5fd9 /arch/arm/mach-u300
parentcdf357f1e13a08a11261edacb3083746f65c1ed9 (diff)
downloadlinux-c2fab1242a16f8e66b680d664322c3811e7b003d.tar.gz
linux-c2fab1242a16f8e66b680d664322c3811e7b003d.tar.bz2
linux-c2fab1242a16f8e66b680d664322c3811e7b003d.zip
ARM: 6306/1: fix inverted MMC card detect in U300
This converts the U300 to uninverted logic for MMCI card detect, fixing a regression in the current tree. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/mmc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-u300/mmc.c b/arch/arm/mach-u300/mmc.c
index 88506d030596..de1ac9ad2213 100644
--- a/arch/arm/mach-u300/mmc.c
+++ b/arch/arm/mach-u300/mmc.c
@@ -74,16 +74,16 @@ static void _mmci_callback(struct work_struct *ws)
mdelay(20);
- mmci_card->mmc_inserted = !!gpio_get_value(U300_GPIO_PIN_MMC_CD);
+ mmci_card->mmc_inserted = !gpio_get_value(U300_GPIO_PIN_MMC_CD);
input_report_switch(mmci_card->mmc_input, KEY_INSERT,
- !mmci_card->mmc_inserted);
+ mmci_card->mmc_inserted);
input_sync(mmci_card->mmc_input);
pr_debug("MMC/SD card was %s\n",
- mmci_card->mmc_inserted ? "removed" : "inserted");
+ mmci_card->mmc_inserted ? "inserted" : "removed");
- enable_irq_on_gpio_pin(U300_GPIO_PIN_MMC_CD, !mmci_card->mmc_inserted);
+ enable_irq_on_gpio_pin(U300_GPIO_PIN_MMC_CD, mmci_card->mmc_inserted);
}
int __devinit mmc_init(struct amba_device *adev)