Commit b95d13ea authored by Thadeu Lima de Souza Cascardo's avatar Thadeu Lima de Souza Cascardo Committed by Matthew Garrett

classmate-laptop: should check for NULL as retval for rfkill_alloc

rfkill_alloc returns NULL when it fails if RFKILL is enabled. When RFKILL is
disabled, its return value of ERR_PTR(-ENODEV) is OK to use as all rfkill
functions will work with it, as they are simply empty stubs.
Reported-by: default avatarAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: platform-driver-x86@vger.kernel.org
Cc: mjg@redhat.com
Cc: don@syst.com.br
Cc: rpurdie@rpsys.net
Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 0385e521
...@@ -573,16 +573,17 @@ static int cmpc_ipml_add(struct acpi_device *acpi) ...@@ -573,16 +573,17 @@ static int cmpc_ipml_add(struct acpi_device *acpi)
ipml->rf = rfkill_alloc("cmpc_rfkill", &acpi->dev, RFKILL_TYPE_WLAN, ipml->rf = rfkill_alloc("cmpc_rfkill", &acpi->dev, RFKILL_TYPE_WLAN,
&cmpc_rfkill_ops, acpi->handle); &cmpc_rfkill_ops, acpi->handle);
/* rfkill_alloc may fail if RFKILL is disabled. We should still work /*
* anyway. */ * If RFKILL is disabled, rfkill_alloc will return ERR_PTR(-ENODEV).
if (!IS_ERR(ipml->rf)) { * This is OK, however, since all other uses of the device will not
* derefence it.
*/
if (ipml->rf) {
retval = rfkill_register(ipml->rf); retval = rfkill_register(ipml->rf);
if (retval) { if (retval) {
rfkill_destroy(ipml->rf); rfkill_destroy(ipml->rf);
ipml->rf = NULL; ipml->rf = NULL;
} }
} else {
ipml->rf = NULL;
} }
dev_set_drvdata(&acpi->dev, ipml); dev_set_drvdata(&acpi->dev, ipml);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment