git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[pandora-kernel.git]
/
drivers
/
acpi
/
button.c
diff --git
a/drivers/acpi/button.c
b/drivers/acpi/button.c
index
1575a9b
..
71ef9cd
100644
(file)
--- a/
drivers/acpi/button.c
+++ b/
drivers/acpi/button.c
@@
-338,7
+338,8
@@
static int acpi_button_add(struct acpi_device *device)
{
struct acpi_button *button;
struct input_dev *input;
{
struct acpi_button *button;
struct input_dev *input;
- char *hid, *name, *class;
+ const char *hid = acpi_device_hid(device);
+ char *name, *class;
int error;
button = kzalloc(sizeof(struct acpi_button), GFP_KERNEL);
int error;
button = kzalloc(sizeof(struct acpi_button), GFP_KERNEL);
@@
-353,7
+354,6
@@
static int acpi_button_add(struct acpi_device *device)
goto err_free_button;
}
goto err_free_button;
}
- hid = acpi_device_hid(device);
name = acpi_device_name(device);
class = acpi_device_class(device);
name = acpi_device_name(device);
class = acpi_device_class(device);