summaryrefslogtreecommitdiff
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorSivaram Nair <sivaramn@nvidia.com>2013-02-06 18:06:32 +0200
committerRiham Haidar <rhaidar@nvidia.com>2013-02-13 12:26:38 -0800
commitdd391917636054d873fb132a94ffbda16e128dcc (patch)
treed304c7c626cc11a3770ec0016260a045b930a4fd /drivers/input/misc
parent28b5bdb9a9da534b6c05d4d803befef8991006be (diff)
EDP: fixing bug with priority definitions
The min and max priority constants are defined incorrectly (in the wrong order). This patch corrects it and updates the affected drivers and platform data. Change-Id: I94a628c4f4076d1c36dff1692f0427ad1f218fb5 Signed-off-by: Sivaram Nair <sivaramn@nvidia.com> (cherry picked from commit 3d2fe9f41fdd54d4c79b7202680e93de8debc8a1) Reviewed-on: http://git-master/r/198395 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/max77665_haptic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/max77665_haptic.c b/drivers/input/misc/max77665_haptic.c
index eb1cb170a53f..d47b668de758 100644
--- a/drivers/input/misc/max77665_haptic.c
+++ b/drivers/input/misc/max77665_haptic.c
@@ -1,7 +1,7 @@
/*
* MAX77665-haptic controller driver
*
- * Copyright (c) 2012, NVIDIA Corporation, All Rights Reserved.
+ * Copyright (c) 2012-2013, NVIDIA Corporation, All Rights Reserved.
*
* Based on driver max8997_haptic.c
* Copyright (c) 2012 Samsung Electronics
@@ -466,7 +466,7 @@ static int __devinit max77665_haptic_probe(struct platform_device *pdev)
chip->haptic_edp_client->states = haptic_pdata->edp_states;
chip->haptic_edp_client->num_states = MAX77665_HAPTIC_EDP_NUM_STATES;
chip->haptic_edp_client->e0_index = MAX77665_HAPTIC_EDP_LOW;
- chip->haptic_edp_client->priority = EDP_MAX_PRIO - 2;
+ chip->haptic_edp_client->priority = EDP_MAX_PRIO + 2;
chip->haptic_edp_client->throttle = max77665_haptic_throttle;
chip->haptic_edp_client->private_data = chip;