From b64d98a2166dd078d0e236b42b8ca1c5a8be5d66 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Thu, 4 Aug 2011 16:49:03 +0100 Subject: [PATCH] --- yaml --- r: 270235 b: refs/heads/master c: 51c5d8d1499b8442e863fe756f76e7f4ea7476fb h: refs/heads/master i: 270233: 0b82b2cee4fc77bb22ef3b5cfe39cd3d936ea094 270231: 3c79cb51f5f0505d2ee1d5a2a5f8938b14771cbb v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/at91_mci.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3855a8678ee0..cd55582b0926 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e8ba228d9f43a4e4b3ed0e6aa3399e8f30d7bc1 +refs/heads/master: 51c5d8d1499b8442e863fe756f76e7f4ea7476fb diff --git a/trunk/drivers/mmc/host/at91_mci.c b/trunk/drivers/mmc/host/at91_mci.c index a4aa3af86fed..a8b4d2aa18e5 100644 --- a/trunk/drivers/mmc/host/at91_mci.c +++ b/trunk/drivers/mmc/host/at91_mci.c @@ -869,7 +869,11 @@ static irqreturn_t at91_mci_irq(int irq, void *devid) static irqreturn_t at91_mmc_det_irq(int irq, void *_host) { struct at91mci_host *host = _host; - int present = !gpio_get_value(irq_to_gpio(irq)); + int present; + + /* entering this ISR means that we have configured det_pin: + * we can use its value in board structure */ + present = !gpio_get_value(host->board->det_pin); /* * we expect this irq on both insert and remove,