A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

haptic: revert update aw8624 vibrator driver

Browse source 
Kernel panic:
So revert "(CR): haptic: update aw8624 vibrator driver"

This reverts commit e9324b897bee9f301f91d46e95401342c9410142.

Change-Id: Ibc944b4a5a4427a13cc30384f94e376be75b0abd
Reviewed-on: https://gerrit.mot.com/1308803
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Wen Xie 2019-02-14 18:45:59 +08:00
commit 7016c7d9cf
2 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/misc/awinic/aw8624/aw8624.c
View file

@ -28,8 +28,6 @@
#include <asm/uaccess.h>
#include <linux/syscalls.h>
#include <linux/power_supply.h>
#include <linux/wakelock.h>
#include <linux/jiffies.h>
#include "aw8624.h"
#include "aw8624_reg.h"
@ -40,7 +38,7 @@
******************************************************/
#define AW8624_I2C_NAME "aw8624_haptic"
#define AW8624_HAPTIC_NAME "aw8624_haptic"
#define AW8624_VERSION "v1.0.5"
#define AW8624_VERSION "v1.0.4"
#define AWINIC_RAM_UPDATE_DELAY
#define AW_I2C_RETRIES 2
#define AW_I2C_RETRY_DELAY 2
@ -2339,13 +2337,6 @@ static void aw8624_vibrator_work_routine(struct work_struct *work)
hrtimer_start(&aw8624->timer,
ktime_set(aw8624->duration / 1000, (aw8624->duration % 1000) * 1000000),
HRTIMER_MODE_REL);
wake_lock(&aw8624->wk_lock);
aw8624->wk_lock_flag = 1;
} else {
if (aw8624->wk_lock_flag == 1) {
wake_unlock(&aw8624->wk_lock);
aw8624->wk_lock_flag = 0;
}
}
mutex_unlock(&aw8624->lock);
@ -2724,7 +2715,6 @@ static int aw8624_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *
aw8624->dev = &i2c->dev;
aw8624->i2c = i2c;
wake_lock_init(&aw8624->wk_lock, WAKE_LOCK_SUSPEND, "aw8624_wakelock");
i2c_set_clientdata(i2c, aw8624);

2
drivers/misc/awinic/aw8624/aw8624.h
View file

@ -164,8 +164,6 @@ struct aw8624 {
struct device *dev;
struct mutex lock;
struct wake_lock wk_lock;
unsigned char wk_lock_flag;
struct hrtimer timer;
struct work_struct vibrator_work;
struct work_struct irq_work;