summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Dongili <malattia@linux.it>2012-05-19 22:35:45 +0900
committerMatthew Garrett <mjg@redhat.com>2012-05-31 14:29:34 -0400
commit3398241b0567c662a6fcf7e61c72c74aa9cee3e8 (patch)
tree7dd9271a7f61c28f142958fc0d3eb50b9e802ff1
parentd6f15ed876b83a1a0eba1d0473eef58acc95444a (diff)
downloadlinux-3398241b0567c662a6fcf7e61c72c74aa9cee3e8.tar.bz2
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>
-rw-r--r--drivers/platform/x86/sony-laptop.c4
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)
device_enum = (union acpi_object *) buffer.pointer;
if (!device_enum) {
- pr_err("No SN06 return object\n");
- goto out_no_enum;
+ pr_err("No SN06 return object.");
+ return;
}
if (device_enum->type != ACPI_TYPE_BUFFER) {
pr_err("Invalid SN06 return object 0x%.2x\n",