]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mfd: 88pm80x: Double shifting bug in suspend/resume
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 4 Aug 2016 05:26:56 +0000 (08:26 +0300)
committerJiri Slaby <jslaby@suse.cz>
Mon, 17 Oct 2016 07:46:19 +0000 (09:46 +0200)
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>
include/linux/mfd/88pm80x.h

index 97cb283cc8e112ef23a08ca2b03e9acfacd42669..0d37e8da3654cc3c9a1e3cc88e97e83db87d4987 100644 (file)
@@ -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;
 }