diff options
| author | Gary King <gking@nvidia.com> | 2009-12-16 18:40:09 -0800 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2009-12-16 19:27:55 -0800 |
| commit | 6b7cd4782f9e2d023603d9ce72b941f88c11ba3d (patch) | |
| tree | dc3e61dc04f97dda226dcae13e8a1411018fd5f9 | |
| parent | f00465b5681a4fbb0da6b46e7ac5ab5af61faad2 (diff) | |
input: various build fixes for tegra drivers
drivers were originally submitted before compilation, now they compile cleanly
| -rw-r--r-- | drivers/input/keyboard/tegra-kbc.c | 2 | ||||
| -rw-r--r-- | drivers/input/misc/tegra_odm_accel.c | 8 | ||||
| -rw-r--r-- | drivers/input/misc/tegra_odm_scroll.c | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c index d5859c21a7b4..f2d8b8dc2ebf 100644 --- a/drivers/input/keyboard/tegra-kbc.c +++ b/drivers/input/keyboard/tegra-kbc.c @@ -62,6 +62,8 @@ static NvU32 tegra_kbc_handle_keyev(struct tegra_kbc_driver_data *kbc) NvU32 EventCount; NvU32 WaitTime; NvU32 i; + NvU32 value; + NvU32 key; WaitTime = NvDdkKbcGetKeyEvents(kbc->ddkHandle, &EventCount, codes, key_ev); diff --git a/drivers/input/misc/tegra_odm_accel.c b/drivers/input/misc/tegra_odm_accel.c index 13a9cca2493a..badd580c4103 100644 --- a/drivers/input/misc/tegra_odm_accel.c +++ b/drivers/input/misc/tegra_odm_accel.c @@ -28,6 +28,7 @@ #include <linux/device.h> #include <asm/uaccess.h> #include <linux/kernel.h> +#include <linux/tegra_devices.h> #include <nvodm_services.h> #include <nvodm_accelerometer.h> @@ -291,12 +292,11 @@ err_0: * write functions */ -DEVICE_ATTR(tegra_accelerometer, 0777, read_sysfs_accel, - write_sysfs_accel); +DEVICE_ATTR(tegra_accelerometer, 0777, read_sysfs_accel, write_sysfs_accel); NvS32 add_sysfs_entry(void) { return device_create_file(&accel_dev->input_dev->dev, - &dev_attr_tegra_acc); + &dev_attr_tegra_accelerometer); } /** @@ -306,7 +306,7 @@ NvS32 add_sysfs_entry(void) NvS32 remove_sysfs_entry(void) { device_remove_file(&accel_dev->input_dev->dev, - &dev_attr_tegra_acc); + &dev_attr_tegra_accelerometer); return 0; } diff --git a/drivers/input/misc/tegra_odm_scroll.c b/drivers/input/misc/tegra_odm_scroll.c index cf859c221f2e..6d0022f9cea9 100644 --- a/drivers/input/misc/tegra_odm_scroll.c +++ b/drivers/input/misc/tegra_odm_scroll.c @@ -95,7 +95,7 @@ static int __init tegra_scroll_probe(struct platform_device *pdev) scroll = kzalloc(sizeof(struct tegra_scroll_dev), GFP_KERNEL); input_dev = input_allocate_device(); - if (input_dev == NULL || ScrollWheel == NULL) { + if (input_dev == NULL || scroll == NULL) { err = -ENOMEM; pr_err("tegra_scroll_probe: Failed to allocate input device\n"); goto err_alloc_failed; @@ -146,7 +146,7 @@ static int tegra_scroll_remove(struct platform_device *pdev) input_unregister_device(scroll->input_dev); NvOdmScrollWheelClose(scroll->odm_dev); NvOdmOsSemaphoreDestroy(scroll->sem); - kfree(ScrollWheel); + kfree(scroll); return 0; } |