From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755132AbdKASrU (ORCPT ); Wed, 1 Nov 2017 14:47:20 -0400 Received: from mout.web.de ([212.227.15.14]:60943 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754821AbdKASrR (ORCPT ); Wed, 1 Nov 2017 14:47:17 -0400 Subject: [PATCH v2 1/3] Sony-laptop: Fix exception handling in sony_nc_setup_rfkill() From: SF Markus Elfring To: platform-driver-x86@vger.kernel.org, Andy Shevchenko , Darren Hart , Marco Chiappero , Matthew Garrett , Mattia Dongili Cc: LKML , kernel-janitors@vger.kernel.org, Andy Shevchenko References: <17ee534c-9fe6-19c4-0522-76cd3cbe5f88@users.sourceforge.net> Message-ID: <354baacc-58dd-7012-de2c-11042604826e@users.sourceforge.net> Date: Wed, 1 Nov 2017 19:46:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <17ee534c-9fe6-19c4-0522-76cd3cbe5f88@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:bYpljH5dFveNql+smjZ39xYtZIoKlsxcF+YubvsDJ0rMcFjFhKW oUClJ1G0+24TvBFRc0uXJ+xzRquvSDfwZjxfrPP4GNu0f0h3vlaQYqtC6A7aJn/LYkx4C4I NcgDqShl2dB84kA11d5utbwPKpbNT/V4zuYjaLhQPOCwhN0dJSIZW/A/XI0xMmRADEXWOVa VYGFldstyVAYek+QyLxbQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:scI+/yb+FEo=:X0OIxh1BXVX2f6I1QgU5LV al71VLazCuC8VXyd6UswaYglMEvuMTtYWxKr40l6ONVmUuLoRd/Ly1if1Xpv/2bOpq93ptx2L fn/u8w0gTnM51ixVb6TlB2+T5/Uk8NvoB0puHd4/9WMqzIKZuplSgk7ETveSrtDyaV6g67eMk ig1VsBpgXERZ2k8V8vPjbrKzKieyQ2RfAINkxrqf9gNMfzuKmFBkn6g9ZPJv0Xw+dJ2HD5kqP NOYclSCgn+a6d20iQLmDgRaoKon7GREkPSwU3samYaq67ZWR5rGYwlHtaW/reOHTuVbho4ZnA u7DvjsdttXMvv2nFwWjgYoRFSj4EuMYhggM95buUh3ofRt7+dE6MaxU7sYLlEY1q6kSOCdcjj TtcGFYfSH4zpj0YW3dggRqTOQfHgqHW1qkLKvWw9fDX/ozIAo68+Wx9yh/oCUNjlLbTCVGz5u vsN61+aqp9gO8Riioqa+va0b/A9bRSj2JACFbXyjSHp4+jZlw+/eRt7EfbJQmeXIrc6npj2g0 UZYQZApsbQdMSkK6qk1RNUKnMwHN57S8BPX2PWziLo8CKK4NjKpWcT0EuCk/kUz5HhjtuOrqc t80a15l5PfdGBMMOIGrAi7Ubzchhi6f87pZSPNVp6goN2NgG+zhaTKIYki6Ds83wOjg2UPK+f 0WWCvNTtVeHE9u7Onqj2JX9vVWV0cRkxlMhK4nBhq1heyRG0aCqN64I5RO/b8jkAEtYRrO7Y9 GSMnuOo7YinSEvNaWGJuZsOeEb3ebRCgf+bodglk334jLX1uWzynWkTS3FX1wulzGTgYk/F6q se/A1NJnOameZDpEjIgg7Ym0ygLS/Ab/L/ulqXweOVecDXKc9U= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 1 Nov 2017 18:42:45 +0100 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 Link: https://lkml.org/lkml/2017/10/31/463 Link: https://lkml.kernel.org/r/ Signed-off-by: Markus Elfring --- drivers/platform/x86/sony-laptop.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index a16cea2be9c3..4332cc982ce0 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -1660,17 +1660,19 @@ static int sony_nc_setup_rfkill(struct acpi_device *device, 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); -- 2.14.3