diff options
| author | Jee Su Chang <w20740@motorola.com> | 2014-04-30 14:56:10 -0500 |
|---|---|---|
| committer | Jee Su Chang <w20740@motorola.com> | 2014-04-30 20:08:51 +0000 |
| commit | dbf18070a8b3856d42fbfc41f7440fb10e645080 (patch) | |
| tree | ff3650c7c81e839985f76690a16eca5d2a1965bf | |
| parent | c4494c4ed1458d628b0f8f9b4d29a854dc9fa2e2 (diff) | |
| download | olio-linux-3.10-dbf18070a8b3856d42fbfc41f7440fb10e645080.tar.xz olio-linux-3.10-dbf18070a8b3856d42fbfc41f7440fb10e645080.zip | |
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
| -rw-r--r-- | drivers/misc/c55_ctrl.c | 5 |
1 files changed, 2 insertions, 3 deletions
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 |