lkml.org 
[lkml]   [2016]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 131/163] rtc: ds1685: passing bogus values to irq_restore
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit 8c09b9fdecab1f4a289f07b46e2ad174b6641928 upstream.

    We call spin_lock_irqrestore with "flags" set to zero instead of to the
    value from spin_lock_irqsave().

    Fixes: aaaf5fbf56f1 ('rtc: add driver for DS1685 family of real time clocks')
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/rtc/rtc-ds1685.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/rtc/rtc-ds1685.c
    +++ b/drivers/rtc/rtc-ds1685.c
    @@ -187,9 +187,9 @@ ds1685_rtc_end_data_access(struct ds1685
    * Only use this where you are certain another lock will not be held.
    */
    static inline void
    -ds1685_rtc_begin_ctrl_access(struct ds1685_priv *rtc, unsigned long flags)
    +ds1685_rtc_begin_ctrl_access(struct ds1685_priv *rtc, unsigned long *flags)
    {
    - spin_lock_irqsave(&rtc->lock, flags);
    + spin_lock_irqsave(&rtc->lock, *flags);
    ds1685_rtc_switch_to_bank1(rtc);
    }

    @@ -1304,7 +1304,7 @@ ds1685_rtc_sysfs_ctrl_regs_store(struct
    {
    struct ds1685_priv *rtc = dev_get_drvdata(dev);
    u8 reg = 0, bit = 0, tmp;
    - unsigned long flags = 0;
    + unsigned long flags;
    long int val = 0;
    const struct ds1685_rtc_ctrl_regs *reg_info =
    ds1685_rtc_sysfs_ctrl_regs_lookup(attr->attr.name);
    @@ -1325,7 +1325,7 @@ ds1685_rtc_sysfs_ctrl_regs_store(struct
    bit = reg_info->bit;

    /* Safe to spinlock during a write. */
    - ds1685_rtc_begin_ctrl_access(rtc, flags);
    + ds1685_rtc_begin_ctrl_access(rtc, &flags);
    tmp = rtc->read(rtc, reg);
    rtc->write(rtc, reg, (val ? (tmp | bit) : (tmp & ~(bit))));
    ds1685_rtc_end_ctrl_access(rtc, flags);

    \
     
     \ /
      Last update: 2016-05-03 04:01    [W:4.209 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site