diff options
Diffstat (limited to 'drivers/platform/x86/asus_acpi.c')
| -rw-r--r-- | drivers/platform/x86/asus_acpi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c index 92fd30c9379..e058c2ba2a1 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) | |||
| 1330 | hotk->model = P30; | 1330 | hotk->model = P30; |
| 1331 | printk(KERN_NOTICE | 1331 | printk(KERN_NOTICE |
| 1332 | " Samsung P30 detected, supported\n"); | 1332 | " Samsung P30 detected, supported\n"); |
| 1333 | hotk->methods = &model_conf[hotk->model]; | ||
| 1334 | kfree(model); | ||
| 1335 | return 0; | ||
| 1333 | } else { | 1336 | } else { |
| 1334 | hotk->model = M2E; | 1337 | hotk->model = M2E; |
| 1335 | printk(KERN_NOTICE " unsupported model %s, trying " | 1338 | printk(KERN_NOTICE " unsupported model %s, trying " |
| @@ -1339,8 +1342,6 @@ static int asus_hotk_get_info(void) | |||
| 1339 | kfree(model); | 1342 | kfree(model); |
| 1340 | return -ENODEV; | 1343 | return -ENODEV; |
| 1341 | } | 1344 | } |
| 1342 | hotk->methods = &model_conf[hotk->model]; | ||
| 1343 | return AE_OK; | ||
| 1344 | } | 1345 | } |
| 1345 | hotk->methods = &model_conf[hotk->model]; | 1346 | hotk->methods = &model_conf[hotk->model]; |
| 1346 | printk(KERN_NOTICE " %s model detected, supported\n", string); | 1347 | printk(KERN_NOTICE " %s model detected, supported\n", string); |
| @@ -1374,7 +1375,7 @@ static int asus_hotk_get_info(void) | |||
| 1374 | 1375 | ||
| 1375 | kfree(model); | 1376 | kfree(model); |
| 1376 | 1377 | ||
| 1377 | return AE_OK; | 1378 | return 0; |
| 1378 | } | 1379 | } |
| 1379 | 1380 | ||
| 1380 | static int asus_hotk_check(void) | 1381 | static int asus_hotk_check(void) |
