Prev: linux-next: build failure after merge of the kbuild-current tree
Next: [PATCH 1/2] asus_acpi: fix a memory leask in asus_hotk_get_info
From: Axel Lin on 4 Jul 2010 21:00 In the case of no match ( hotk->model == END_MODEL ), the only posible case to return 0 is to have a Samsung P30 detected. This patch improves readability by moving related code after if/else clause to be inside if clause. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- drivers/platform/x86/asus_acpi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c index ae0914d..e058c2b 100644 --- a/drivers/platform/x86/asus_acpi.c +++ b/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); -- 1.5.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |