summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-08-04 08:26:56 +0300
committerJiri Slaby <jslaby@suse.cz>2016-10-17 09:46:19 +0200
commitb13589e8b0ec18ce4efc9e67b20bf06c341608c3 (patch)
tree1d87ea1cd9d0faad5476513f583de4331008d24f
parent841abffa182dfd9f19e3420037b3edad18916f9c (diff)
downloadlinux-stable-b13589e8b0ec18ce4efc9e67b20bf06c341608c3.tar.gz
linux-stable-b13589e8b0ec18ce4efc9e67b20bf06c341608c3.tar.bz2
linux-stable-b13589e8b0ec18ce4efc9e67b20bf06c341608c3.zip
mfd: 88pm80x: Double shifting bug in suspend/resume
commit 9a6dc644512fd083400a96ac4a035ac154fe6b8d 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: 70c6cce04066 ('mfd: Support 88pm80x in 80x driver') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--include/linux/mfd/88pm80x.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h
index 97cb283cc8e1..0d37e8da3654 100644
--- a/include/linux/mfd/88pm80x.h
+++ b/include/linux/mfd/88pm80x.h
@@ -349,7 +349,7 @@ static inline int pm80x_dev_suspend(struct device *dev)
int irq = platform_get_irq(pdev, 0);
if (device_may_wakeup(dev))
- set_bit((1 << irq), &chip->wu_flag);
+ set_bit(irq, &chip->wu_flag);
return 0;
}
@@ -361,7 +361,7 @@ static inline int pm80x_dev_resume(struct device *dev)
int irq = platform_get_irq(pdev, 0);
if (device_may_wakeup(dev))
- clear_bit((1 << irq), &chip->wu_flag);
+ clear_bit(irq, &chip->wu_flag);
return 0;
}