diff options
| author | Luis Henriques <luis.henriques@canonical.com> | 2013-08-15 00:10:06 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-08-15 18:17:05 +0200 |
| commit | dee08ab83d0378d922b67e7cf10bbec3e4ea343b (patch) | |
| tree | 4f5786e70c1c89f63d2269ad19c94725ce03f896 /net | |
| parent | mac80211: ibss - do not scan if not needed when creating an IBSS (diff) | |
| download | linux-dee08ab83d0378d922b67e7cf10bbec3e4ea343b.tar.xz linux-dee08ab83d0378d922b67e7cf10bbec3e4ea343b.zip | |
net: rfkill: Do not ignore errors from regulator_enable()
Function regulator_enable() may return an error that has to be checked.
This patch changes function rfkill_regulator_set_block() so that it checks
for the return code. Also, rfkill_data->reg_enabled is set to 'true' only
if there is no error.
This fixes the following compilation warning:
net/rfkill/rfkill-regulator.c:43:20: warning: ignoring return value of 'regulator_enable', declared with attribute warn_unused_result [-Wunused-result]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/rfkill/rfkill-regulator.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/rfkill/rfkill-regulator.c b/net/rfkill/rfkill-regulator.c index d11ac79246e4..cf5b145902e5 100644 --- a/net/rfkill/rfkill-regulator.c +++ b/net/rfkill/rfkill-regulator.c @@ -30,6 +30,7 @@ struct rfkill_regulator_data { static int rfkill_regulator_set_block(void *data, bool blocked) { struct rfkill_regulator_data *rfkill_data = data; + int ret = 0; pr_debug("%s: blocked: %d\n", __func__, blocked); @@ -40,15 +41,16 @@ static int rfkill_regulator_set_block(void *data, bool blocked) } } else { if (!rfkill_data->reg_enabled) { - regulator_enable(rfkill_data->vcc); - rfkill_data->reg_enabled = true; + ret = regulator_enable(rfkill_data->vcc); + if (!ret) + rfkill_data->reg_enabled = true; } } pr_debug("%s: regulator_is_enabled after set_block: %d\n", __func__, regulator_is_enabled(rfkill_data->vcc)); - return 0; + return ret; } static struct rfkill_ops rfkill_regulator_ops = { |