| From 83b1c9317a907af5048d5c8cea47d89a812e0c7e Mon Sep 17 00:00:00 2001 |
| From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> |
| Date: Tue, 28 May 2013 13:26:25 +0800 |
| Subject: mmc: sdhci-acpi: fix error return code in sdhci_acpi_add_own_cd() |
| |
| Fix to return a negative error code in the gpio_to_irq() error |
| handling case instead of 0, as done elsewhere in this function. |
| |
| Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> |
| Reviewed-by: Jingoo Han <jg1.han@samsung.com> |
| Acked-by: Adrian Hunter <adrian.hunter@intel.com> |
| Signed-off-by: Chris Ball <cjb@laptop.org> |
| (cherry picked from commit 5a0e8074660444010fee40eebcd57aaaf8d44662) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/mmc/host/sdhci-acpi.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c |
| index 17fcebae26be..4b8c7c9901d6 100644 |
| --- a/drivers/mmc/host/sdhci-acpi.c |
| +++ b/drivers/mmc/host/sdhci-acpi.c |
| @@ -189,8 +189,10 @@ static int sdhci_acpi_add_own_cd(struct device *dev, int gpio, |
| goto out; |
| |
| irq = gpio_to_irq(gpio); |
| - if (irq < 0) |
| + if (irq < 0) { |
| + err = irq; |
| goto out_free; |
| + } |
| |
| flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING; |
| err = devm_request_irq(dev, irq, sdhci_acpi_sd_cd, flags, "sd_cd", mmc); |
| -- |
| 1.8.5.rc3 |
| |
