mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

Input: atlas_btns - fix mixing acpi_status and int for return value

Browse source 
To improve readability, this patch fixes mixing acpi_status
and int for return value.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Axel Lin 2010-07-13 09:25:12 -07:00 committed by Dmitry Torokhov
parent 07d19ffce5
commit 02b5fac1f7
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/input/misc/atlas_btns.c
View file

@ -60,12 +60,12 @@ static acpi_status acpi_atlas_button_handler(u32 function,
input_report_key(input_dev, atlas_keymap[code], key_down);
input_sync(input_dev);
status = 0;
status = AE_OK;
} else {
printk(KERN_WARNING "atlas: shrugged on unexpected function"
":function=%x,address=%lx,value=%x\n",
function, (unsigned long)address, (u32)*value);
status = -EINVAL;
status = AE_BAD_PARAMETER;
}
return status;
@ -114,10 +114,10 @@ static int atlas_acpi_button_add(struct acpi_device *device)
if (ACPI_FAILURE(status)) {
printk(KERN_ERR "Atlas: Error installing addr spc handler\n");
input_unregister_device(input_dev);
status = -EINVAL;
err = -EINVAL;
}
return status;
return err;
}
static int atlas_acpi_button_remove(struct acpi_device *device, int type)
@ -126,14 +126,12 @@ static int atlas_acpi_button_remove(struct acpi_device *device, int type)
status = acpi_remove_address_space_handler(device->handle,
0x81, &acpi_atlas_button_handler);
if (ACPI_FAILURE(status)) {
if (ACPI_FAILURE(status))
printk(KERN_ERR "Atlas: Error removing addr spc handler\n");
status = -EINVAL;
}
input_unregister_device(input_dev);
return status;
return 0;
}
static const struct acpi_device_id atlas_device_ids[] = {