From 584b4c7c04b45e253cce3772403ad2a54fc3339c Mon Sep 17 00:00:00 2001 From: Mattia Dongili Date: Sat, 19 May 2012 22:35:45 +0900 Subject: [PATCH] --- yaml --- r: 310150 b: refs/heads/master c: 3398241b0567c662a6fcf7e61c72c74aa9cee3e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/sony-laptop.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 771220811731..ed55ca41291f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6f15ed876b83a1a0eba1d0473eef58acc95444a +refs/heads/master: 3398241b0567c662a6fcf7e61c72c74aa9cee3e8 diff --git a/trunk/drivers/platform/x86/sony-laptop.c b/trunk/drivers/platform/x86/sony-laptop.c index c6dc3f741ccd..455beeb98be1 100644 --- a/trunk/drivers/platform/x86/sony-laptop.c +++ b/trunk/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",