diff options
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/irqs-board-mop500.h | 2 | ||||
| -rw-r--r-- | drivers/misc/sim_detect.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index d1467ea64c0..be1730bd765 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -654,7 +654,7 @@ static struct hsi_board_info __initdata u8500_hsi_devices[] = { #ifdef CONFIG_U8500_SIM_DETECT static struct sim_detect_platform_data sim_detect_pdata = { - .irq_num = NOMADIK_GPIO_TO_IRQ(MOP500_AB8500_GPIO(12)), + .irq_num = NOMADIK_GPIO_TO_IRQ(MOP500_AB8500_GPIO(6)), }; struct platform_device u8500_sim_detect_device = { .name = "sim_detect", diff --git a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h index 973bae33263..a58aa51fccf 100644 --- a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h +++ b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h @@ -43,6 +43,8 @@ #define MOP500_AB8500_VIR_GPIO_IRQ_BASE \ MOP500_STMPE1601_IRQ_END +#define MOP500_AB8500_VIR_GPIO_IRQ(x) \ + (MOP500_AB8500_VIR_GPIO_IRQ_BASE + (x)) #define MOP500_AB8500_VIR_GPIO_IRQ_END \ (MOP500_AB8500_VIR_GPIO_IRQ_BASE + AB8500_VIR_GPIO_NR_IRQS) diff --git a/drivers/misc/sim_detect.c b/drivers/misc/sim_detect.c index 24862edfca7..c267fe95ee3 100644 --- a/drivers/misc/sim_detect.c +++ b/drivers/misc/sim_detect.c @@ -115,6 +115,7 @@ static int __devinit sim_detect_probe(struct platform_device *pdev) "sim activity", sim_detect); if (ret < 0) goto out_free_irq; + return 0; out_free_irq: modem_put(sim_detect->modem); platform_set_drvdata(pdev, NULL); |