From patchwork Tue Jul 20 22:19:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 113119 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6KMeSXM013008 for ; Tue, 20 Jul 2010 22:40:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932962Ab0GTWkj (ORCPT ); Tue, 20 Jul 2010 18:40:39 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:57292 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932948Ab0GTWki (ORCPT ); Tue, 20 Jul 2010 18:40:38 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o6KMUkts015865 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 20 Jul 2010 15:40:16 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o6KMJgb8021028; Tue, 20 Jul 2010 15:19:42 -0700 Message-Id: <201007202219.o6KMJgb8021028@imap1.linux-foundation.org> Subject: [patch 11/26] asus_acpi: fix coding style to improve readability To: mjg59@srcf.ucam.org Cc: platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org, akpm@linux-foundation.org, axel.lin@gmail.com, corentincj@iksaif.net, len.brown@intel.com, mjg@redhat.com, sziwan@users.sourceforge.net From: akpm@linux-foundation.org Date: Tue, 20 Jul 2010 15:19:42 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.495 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Jul 2010 22:40:58 +0000 (UTC) diff -puN drivers/platform/x86/asus_acpi.c~asus_acpi-fix-coding-style-to-improve-readability drivers/platform/x86/asus_acpi.c --- a/drivers/platform/x86/asus_acpi.c~asus_acpi-fix-coding-style-to-improve-readability +++ a/drivers/platform/x86/asus_acpi.c @@ -1330,6 +1330,9 @@ static int asus_hotk_get_info(void) hotk->model = P30; printk(KERN_NOTICE " Samsung P30 detected, supported\n"); + hotk->methods = &model_conf[hotk->model]; + kfree(model); + return 0; } else { hotk->model = M2E; printk(KERN_NOTICE " unsupported model %s, trying " @@ -1339,9 +1342,6 @@ static int asus_hotk_get_info(void) kfree(model); return -ENODEV; } - hotk->methods = &model_conf[hotk->model]; - kfree(model); - return 0; } hotk->methods = &model_conf[hotk->model]; printk(KERN_NOTICE " %s model detected, supported\n", string);