From: Arvind Yadav <arvind.yadav.cs@gmail.com>
To: ibm-acpi@hmh.eng.b, dvhart@infradead.org, andy@infradead.org
Cc: ibm-acpi-devel@lists.sourceforge.net,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] x86: thinkpad_acpi: Handle return error.
Date: Mon, 6 Mar 2017 13:13:26 +0530 [thread overview]
Message-ID: <1488786206-20190-1-git-send-email-arvind.yadav.cs@gmail.com> (raw)
This patch is for handling a return error.
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
drivers/platform/x86/thinkpad_acpi.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 1d18b32..19ad3ec 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -1237,9 +1237,11 @@ static int tpacpi_rfk_hook_set_block(void *data, bool blocked)
/* try to set radio state */
res = (tp_rfk->ops->set_status)(blocked ?
TPACPI_RFK_RADIO_OFF : TPACPI_RFK_RADIO_ON);
+ if (res < 0)
+ return res;
/* and update the rfkill core with whatever the FW really did */
- tpacpi_rfk_update_swstate(tp_rfk);
+ res = tpacpi_rfk_update_swstate(tp_rfk);
return (res < 0) ? res : 0;
}
@@ -1371,7 +1373,10 @@ static ssize_t tpacpi_rfk_sysfs_enable_store(const enum tpacpi_rfk_id id,
res = tpacpi_rfkill_switches[id]->ops->set_status((!!t) ?
TPACPI_RFK_RADIO_ON : TPACPI_RFK_RADIO_OFF);
- tpacpi_rfk_update_swstate(tpacpi_rfkill_switches[id]);
+ if (res < 0)
+ return res;
+
+ res = tpacpi_rfk_update_swstate(tpacpi_rfkill_switches[id]);
return (res < 0) ? res : count;
}
@@ -1427,7 +1432,9 @@ static int tpacpi_rfk_procfs_write(const enum tpacpi_rfk_id id, char *buf)
"enable" : "disable",
tpacpi_rfkill_names[id]);
res = (tpacpi_rfkill_switches[id]->ops->set_status)(status);
- tpacpi_rfk_update_swstate(tpacpi_rfkill_switches[id]);
+ if (res < 0)
+ return res;
+ res = tpacpi_rfk_update_swstate(tpacpi_rfkill_switches[id]);
}
return res;
@@ -3517,6 +3524,8 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
if (tp_features.hotkey_wlsw)
res = add_to_attr_set(hotkey_dev_attributes,
&dev_attr_hotkey_radio_sw.attr);
+ if (res)
+ goto err_exit;
res = hotkey_init_tablet_mode();
if (res < 0)
--
1.9.1
next reply other threads:[~2017-03-06 7:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-06 7:43 Arvind Yadav [this message]
2017-03-06 8:45 ` [PATCH] x86: thinkpad_acpi: Handle return error Andy Shevchenko
2017-03-16 0:28 ` Darren Hart
2017-03-06 7:46 Arvind Yadav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488786206-20190-1-git-send-email-arvind.yadav.cs@gmail.com \
--to=arvind.yadav.cs@gmail.com \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=ibm-acpi-devel@lists.sourceforge.net \
--cc=ibm-acpi@hmh.eng.b \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).