diff options
| author | Axel Lin <axel.lin@gmail.com> | 2010-07-21 00:19:42 +0200 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-08-03 15:48:58 +0200 |
| commit | 3bf460f7b2767df63b76257332c4a9a29d5733c1 (patch) | |
| tree | b6df4aab2f729b5e4b69a265735ab56683deec3f /drivers/platform | |
| parent | asus_acpi: fix a memory leak in asus_hotk_get_info() (diff) | |
| download | linux-3bf460f7b2767df63b76257332c4a9a29d5733c1.tar.xz linux-3bf460f7b2767df63b76257332c4a9a29d5733c1.zip | |
asus_acpi: fix coding style to improve readability
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@gmail.com>
Cc: Corentin Chary <corentincj@iksaif.net>
Cc: Karol Kozimor <sziwan@users.sourceforge.net>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Len Brown <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | 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 ae0914d4e02e..e058c2ba2a15 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); |