summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-05-28 13:26:25 +0800
committerChris Ball <cjb@laptop.org>2013-06-27 10:56:03 -0400
commit5a0e8074660444010fee40eebcd57aaaf8d44662 (patch)
tree378e8e785f6032094b3b93762b9c406fd0f683c5 /drivers/mmc
parent3f7eec62ecb7e30bd2f7e0fc4432d0d08a1aae46 (diff)
downloadop-kernel-dev-5a0e8074660444010fee40eebcd57aaaf8d44662.zip
op-kernel-dev-5a0e8074660444010fee40eebcd57aaaf8d44662.tar.gz
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-acpi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index a51e603..08a85ec 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);
OpenPOWER on IntegriCloud