From dbf18070a8b3856d42fbfc41f7440fb10e645080 Mon Sep 17 00:00:00 2001 From: Jee Su Chang Date: Wed, 30 Apr 2014 14:56:10 -0500 Subject: IKXCLOCK-975 c55: irq preventing kernel suspend - disable irq and not just irq wake when c55 disabled - remove irq wake functionality as not needed Change-Id: I27135a7459179f9ab4ab5c6ac0b3bffca0e213df --- drivers/misc/c55_ctrl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/misc/c55_ctrl.c') diff --git a/drivers/misc/c55_ctrl.c b/drivers/misc/c55_ctrl.c index 584754bfe50..6df8bbcbf43 100644 --- a/drivers/misc/c55_ctrl.c +++ b/drivers/misc/c55_ctrl.c @@ -86,7 +86,6 @@ static void c55_ctrl_int_setup(struct c55_ctrl_data *cdata, int gpio) return; } - enable_irq_wake(irq); cdata->c55_ap_int_gpio = gpio; } @@ -165,10 +164,10 @@ static ssize_t c55_ctrl_enable(struct device *dev, return -EINVAL; } - enable_irq_wake(__gpio_to_irq(cdata->c55_ap_int_gpio)); + enable_irq(__gpio_to_irq(cdata->c55_ap_int_gpio)); } else { /* Disable C55->AP IRQ when turning off C55 */ - disable_irq_wake(__gpio_to_irq(cdata->c55_ap_int_gpio)); + disable_irq_nosync(__gpio_to_irq(cdata->c55_ap_int_gpio)); if (m4sensorhub_reg_write_1byte (m4sensorhub, M4SH_REG_USERSETTINGS_SCREENSTATUS, 0x00, 0xFF -- cgit v1.2.3-70-g09d2