diff options
author | Mattia Dongili <malattia@linux.it> | 2012-05-19 09:35:45 -0400 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2012-05-31 14:29:34 -0400 |
commit | 3398241b0567c662a6fcf7e61c72c74aa9cee3e8 (patch) | |
tree | 7dd9271a7f61c28f142958fc0d3eb50b9e802ff1 /drivers/platform/x86 | |
parent | d6f15ed876b83a1a0eba1d0473eef58acc95444a (diff) |
sony-laptop: fix return path when no ACPI buffer is allocated
The goto target location would still try to free a buffer that was
never allocated.
Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r-- | drivers/platform/x86/sony-laptop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index c6dc3f741ccd..455beeb98be1 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c | |||
@@ -1349,8 +1349,8 @@ static void sony_nc_rfkill_setup(struct acpi_device *device) | |||
1349 | 1349 | ||
1350 | device_enum = (union acpi_object *) buffer.pointer; | 1350 | device_enum = (union acpi_object *) buffer.pointer; |
1351 | if (!device_enum) { | 1351 | if (!device_enum) { |
1352 | pr_err("No SN06 return object\n"); | 1352 | pr_err("No SN06 return object."); |
1353 | goto out_no_enum; | 1353 | return; |
1354 | } | 1354 | } |
1355 | if (device_enum->type != ACPI_TYPE_BUFFER) { | 1355 | if (device_enum->type != ACPI_TYPE_BUFFER) { |
1356 | pr_err("Invalid SN06 return object 0x%.2x\n", | 1356 | pr_err("Invalid SN06 return object 0x%.2x\n", |