1 files changed, 7 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 30768c2f53f..37dcb1bc025 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -490,21 +490,22 @@ static struct platform_device omap_vwlan_device = {
 
 static int omap4_twl6030_hsmmc_late_init(struct device *dev)
 {
-        int ret = 0;
+        int irq = 0;
         struct platform_device *pdev = container_of(dev,
                                 struct platform_device, dev);
         struct omap_mmc_platform_data *pdata = dev->platform_data;
 
         /* Setting MMC1 Card detect Irq */
         if (pdev->id == 0) {
-                ret = twl6030_mmc_card_detect_config();
-                if (ret)
+                irq = twl6030_mmc_card_detect_config();
+                if (irq < 0) {
                         pr_err("Failed configuring MMC1 card detect\n");
-                pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE +
-                                                MMCDETECT_INTR_OFFSET;
+                        return irq;
+                }
+                pdata->slots[0].card_detect_irq = irq;
                 pdata->slots[0].card_detect = twl6030_mmc_card_detect;
         }
-        return ret;
+        return 0;
 }
 
 static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)