|
@@ -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);
|
|
|
|