linux-mips
[Top] [All Lists]

[PATCH] MMC: jz4740: Fixed card change detection.

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH] MMC: jz4740: Fixed card change detection.
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Tue, 3 Aug 2010 18:32:44 +0200
Cc: linux-mips@linux-mips.org, linux-mmc@vger.kernel.org, Maarten ter Huurne <maarten@treewalker.org>, Lars-Peter Clausen <lars@metafoo.de>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
From: Maarten ter Huurne <maarten@treewalker.org>

The GPIO validity check was reversed.
Also removed some dead code.

Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/mmc/host/jz4740_mmc.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
index 12efd9c..ad4f987 100644
--- a/drivers/mmc/host/jz4740_mmc.c
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -761,24 +761,20 @@ err:
 static int __devinit jz4740_mmc_request_cd_irq(struct platform_device *pdev,
        struct jz4740_mmc_host *host)
 {
-       int ret;
        struct jz4740_mmc_platform_data *pdata = pdev->dev.platform_data;
 
-       if (gpio_is_valid(pdata->gpio_card_detect))
+       if (!gpio_is_valid(pdata->gpio_card_detect))
                return 0;
 
        host->card_detect_irq = gpio_to_irq(pdata->gpio_card_detect);
-
        if (host->card_detect_irq < 0) {
                dev_warn(&pdev->dev, "Failed to get card detect irq\n");
                return 0;
        }
+
        return request_irq(host->card_detect_irq, jz4740_mmc_card_detect_irq,
                        IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                        "MMC card detect", host);
-
-
-       return ret;
 }
 
 static void jz4740_mmc_free_gpios(struct platform_device *pdev)
-- 
1.5.6.5


<Prev in Thread] Current Thread [Next in Thread>