lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 003/115] staging: speakup: Replace BUG_ON() with WARN_ON().
    Date
    From: Varsha Rao <rvarsha016@gmail.com>

    [ Upstream commit d351c2db5420bb17dcd2d9aac7ddb5f64c6d04b3 ]

    BUG_ON() is replaced with WARN_ON() and EINVAL is returned, when
    WARN_ON() is true. This fixes the following checkpatch issue:

    Avoid crashing the kernel - try using WARN_ON & recovery code rather
    than BUG() or BUG_ON().

    Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
    Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/staging/speakup/kobjects.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
    index fdfeb42b2b8f..06ef26872462 100644
    --- a/drivers/staging/speakup/kobjects.c
    +++ b/drivers/staging/speakup/kobjects.c
    @@ -831,7 +831,9 @@ static ssize_t message_show(struct kobject *kobj,
    struct msg_group_t *group = spk_find_msg_group(attr->attr.name);
    unsigned long flags;

    - BUG_ON(!group);
    + if (WARN_ON(!group))
    + return -EINVAL;
    +
    spin_lock_irqsave(&speakup_info.spinlock, flags);
    retval = message_show_helper(buf, group->start, group->end);
    spin_unlock_irqrestore(&speakup_info.spinlock, flags);
    @@ -843,7 +845,9 @@ static ssize_t message_store(struct kobject *kobj, struct kobj_attribute *attr,
    {
    struct msg_group_t *group = spk_find_msg_group(attr->attr.name);

    - BUG_ON(!group);
    + if (WARN_ON(!group))
    + return -EINVAL;
    +
    return message_store_helper(buf, count, group);
    }

    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 00:22    [W:4.111 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site