Commit 472957d1 authored by Dan Carpenter's avatar Dan Carpenter Committed by Luis Henriques

mfd: 88pm80x: Double shifting bug in suspend/resume

BugLink: http://bugs.launchpad.net/bugs/1634153

commit 9a6dc644 upstream.

set_bit() and clear_bit() take the bit number so this code is really
doing "1 << (1 << irq)" which is a double shift bug.  It's done
consistently so it won't cause a problem unless "irq" is more than 4.

Fixes: 70c6cce0 ('mfd: Support 88pm80x in 80x driver')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
parent 337a861b
...@@ -350,7 +350,7 @@ static inline int pm80x_dev_suspend(struct device *dev) ...@@ -350,7 +350,7 @@ static inline int pm80x_dev_suspend(struct device *dev)
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
set_bit((1 << irq), &chip->wu_flag); set_bit(irq, &chip->wu_flag);
return 0; return 0;
} }
...@@ -362,7 +362,7 @@ static inline int pm80x_dev_resume(struct device *dev) ...@@ -362,7 +362,7 @@ static inline int pm80x_dev_resume(struct device *dev)
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
clear_bit((1 << irq), &chip->wu_flag); clear_bit(irq, &chip->wu_flag);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment