lkml.org 
[lkml]   [2018]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 051/136] platform/x86: sony-laptop: Fix error handling in sony_nc_setup_rfkill()
    3.16.54-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Markus Elfring <elfring@users.sourceforge.net>

    commit f6c8a317ab208aee223776327c06f23342492d54 upstream.

    Source code review for a specific software refactoring showed the need
    for another correction because the error code "-1" was returned so far
    if a call of the function "sony_call_snc_handle" failed here.
    Thus assign the return value from these two function calls also to
    the variable "err" and provide it in case of a failure.

    Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill status stored in hw")
    Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
    Link: https://lkml.org/lkml/2017/10/31/463
    Link: https://lkml.kernel.org/r/<CAHp75VcMkXCioCzmLE0+BTmkqc5RSOx9yPO0ectVHMrMvewgwg@mail.gmail.com>
    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/platform/x86/sony-laptop.c | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    --- a/drivers/platform/x86/sony-laptop.c
    +++ b/drivers/platform/x86/sony-laptop.c
    @@ -1654,17 +1654,19 @@ static int sony_nc_setup_rfkill(struct a
    if (!rfk)
    return -ENOMEM;

    - if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) {
    + err = sony_call_snc_handle(sony_rfkill_handle, 0x200, &result);
    + if (err < 0) {
    rfkill_destroy(rfk);
    - return -1;
    + return err;
    }
    hwblock = !(result & 0x1);

    - if (sony_call_snc_handle(sony_rfkill_handle,
    - sony_rfkill_address[nc_type],
    - &result) < 0) {
    + err = sony_call_snc_handle(sony_rfkill_handle,
    + sony_rfkill_address[nc_type],
    + &result);
    + if (err < 0) {
    rfkill_destroy(rfk);
    - return -1;
    + return err;
    }
    swblock = !(result & 0x2);

    \
     
     \ /
      Last update: 2018-02-11 05:38    [W:4.109 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site